Merge branch 'main' into develop

Author: thooyork

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fumix/fu-blog-client",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "scripts": {
     "start": "vite --port 5010",
     "build": "run-p type-check build-only",

client/src/util/storage.ts

@@ -1,5 +1,5 @@
 import type { JsonWebToken, SavedOAuthToken, UserTheme } from "@fumix/fu-blog-common";
-import { base64UrlToBuffer, isOAuthType } from "@fumix/fu-blog-common";
+import { base64UrlToBuffer, isOAuthType, isUserTheme } from "@fumix/fu-blog-common";
 
 type OAuthState = { key: string; redirect_uri?: string };
 const idTokenKey = "id_token";
@@ -67,9 +67,21 @@ export function saveCssPreference(css: UserTheme) {
 }
 
 export function loadCssPreference(): UserTheme {
-  return loadFromStorageAsString(window.localStorage, "cssTheme", "lightTheme") as UserTheme;
+  return loadFromStorage(
+    window.localStorage,
+    "cssTheme",
+    (saved) => {
+      if (isUserTheme(saved)) {
+        return saved;
+      }
+      return null;
+    },
+    "light",
+  );
 }
 
+
+
 //
 // General purpose helper functions, should only be called indirectly
 //

common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fumix/fu-blog-common",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "author": "fumiX GmbH & Co KG",
   "license": "Apache-2.0",
   "scripts": {

common/src/entity/User.ts

@@ -28,4 +28,9 @@ export type UserWithOAuthProviders = User & {
   oauthProviders: OAuthProviderId[];
 };
 
-export type UserTheme = "light" | "dark";
+const userThemes = ["light", "dark"] as const;
+export type UserTheme = (typeof userThemes)[number];
+
+export function isUserTheme(s: string): s is UserTheme {
+  return userThemes.some((it) => it === s);
+}

package.json

@@ -4,7 +4,7 @@
   },
   "engineStrict": true,
   "name": "@fumix/fu-blog",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "workspaces": [
     "common",
     "client",

portal/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fumix/fu-blog-portal",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "private": true,
   "main": "index.js",
   "type": "module",

server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fumix/fu-blog-server",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "Backend Server for Blog in Node/Express",
   "main": "server.js",
   "scripts": {

server/src/server.ts

@@ -1,3 +1,4 @@
+import console from "console";
 import cors from "cors";
 import express, { Application, NextFunction, Request, Response } from "express";
 import { readFile, writeFileSync } from "fs";
@@ -70,13 +71,17 @@ async function handleUncaught(error: Error) {
   process.exit(1);
 }
 
+console.log("IS_PRODUCTION:", AppSettings.IS_PRODUCTION);
+console.log("Run mode:", AppSettings.RUN_MODE);
+console.log("DTO:", AppSettings.DTO);
 // in production serve the built vue-app from static public folder:
 if (AppSettings.IS_PRODUCTION) {
   const indexResponse = (req: Request, res: Response) => {
     readFile(
       path.join(__dirname, "public/index.html"), //
       { encoding: "utf-8" },
       (err, data) => {
+        console.log("Data callback", data);
         if (err) {
           res.status(404).send(null);
         } else {