@qlover/create-app 0.7.8 → 0.7.10

package/dist/templates/next-app/src/uikit/components/ThemeSwitcher.tsx

@@ -1,73 +1,84 @@
 'use client';
 
 import {
-  BulbOutlined,
-  BulbFilled,
   HeartFilled,
-  HeartOutlined,
-  DesktopOutlined
+  SettingOutlined,
+  SunOutlined,
+  MoonOutlined,
+  SettingFilled,
+  SunFilled,
+  MoonFilled,
+  HeartOutlined
 } from '@ant-design/icons';
-import { Select } from 'antd';
+import { Dropdown } from 'antd';
 import { clsx } from 'clsx';
 import { useTheme } from 'next-themes';
-import { themeConfig } from '@config/theme';
+import { useMemo } from 'react';
+import { type SupportedTheme, themeConfig } from '@config/theme';
 import { useMountedClient } from '../hook/useMountedClient';
+import type { ItemType } from 'antd/es/menu/interface';
 
 const { supportedThemes } = themeConfig;
 
+const defaultTheme = supportedThemes[0] || 'system';
+const themesList = ['system', ...supportedThemes];
+
 const colorMap: Record<
   string,
-  { i18nkey: string; colors: string[]; icons: React.ElementType[] }
+  {
+    i18nkey: string;
+    selectedColor: string;
+    normalColor: string;
+    Icon: React.ElementType;
+    SelectedIcon: React.ElementType;
+    TriggerIcon: React.ElementType;
+  }
 > = {
   system: {
     i18nkey: 'System',
-    colors: ['text-text', 'text-text-secondary'],
-    icons: [DesktopOutlined, DesktopOutlined]
+    selectedColor: 'text-text',
+    normalColor: 'text-text-secondary',
+    Icon: SettingOutlined,
+    SelectedIcon: SettingFilled,
+    TriggerIcon: SettingOutlined
   },
   light: {
     i18nkey: 'Light',
-    colors: ['text-text', 'text-text-secondary'],
-    icons: [BulbFilled, BulbOutlined]
+    selectedColor: 'text-text',
+    normalColor: 'text-text-secondary',
+    Icon: SunOutlined,
+    SelectedIcon: SunFilled,
+    TriggerIcon: SunOutlined
   },
   dark: {
     i18nkey: 'Dark',
-    colors: ['text-[#9333ea]', 'text-[#a855f7]'],
-    icons: [BulbFilled, BulbOutlined]
+    selectedColor: 'text-[#9333ea]',
+    normalColor: 'text-[#a855f7]',
+    Icon: MoonOutlined,
+    SelectedIcon: MoonFilled,
+    TriggerIcon: MoonOutlined
   },
   pink: {
     i18nkey: 'Pink',
-    colors: ['text-[#f472b6]', 'text-[#ec4899]'],
-    icons: [HeartFilled, HeartOutlined]
+    selectedColor: 'text-[#f472b6]',
+    normalColor: 'text-[#ec4899]',
+    Icon: HeartOutlined,
+    SelectedIcon: HeartFilled,
+    TriggerIcon: HeartOutlined
   }
 };
 
 export function ThemeSwitcher() {
-  const { theme, resolvedTheme, setTheme } = useTheme();
+  const { theme: currentTheme, resolvedTheme, setTheme } = useTheme();
   const mounted = useMountedClient();
 
-  // 如果组件未挂载，返回空的 Select 以避免闪烁
-  if (!mounted) {
-    return (
-      <Select
-        data-testid="ThemeSwitcher"
-        loading
-        value="system"
-        options={[]}
-        style={{ width: 120 }}
-        className="min-w-40 max-w-full"
-        disabled
-      />
-    );
-  }
-
-  const themeOptions = ['system', ...supportedThemes!].map((themeName) => {
-    const { i18nkey, colors, icons } = colorMap[themeName] || colorMap.light;
-    const [currentColor, normalColor] = colors;
-    const [CurrentIcon, NormalIcon] = icons;
+  const themeOptions = themesList.map((themeName) => {
+    const { i18nkey, selectedColor, normalColor, Icon, SelectedIcon } =
+      colorMap[themeName] || colorMap.light;
 
     const isCurrentTheme =
-      theme === themeName ||
-      (themeName === resolvedTheme && theme === 'system');
+      currentTheme === themeName ||
+      (themeName === resolvedTheme && currentTheme === 'system');
 
     return {
       key: themeName,
@@ -76,24 +87,57 @@ export function ThemeSwitcher() {
         <div
           className={clsx(
             'flex items-center gap-2',
-            isCurrentTheme ? currentColor : normalColor
+            isCurrentTheme ? selectedColor : normalColor
           )}
         >
-          {isCurrentTheme ? <CurrentIcon /> : <NormalIcon />}
+          {isCurrentTheme ? <SelectedIcon /> : <Icon />}
           <span>{i18nkey}</span>
         </div>
       )
-    };
+    } as ItemType;
   });
 
+  const nextTheme = useMemo(() => {
+    if (!currentTheme) {
+      return defaultTheme;
+    }
+    const targetIndex =
+      supportedThemes.indexOf(currentTheme as SupportedTheme) + 1;
+    return supportedThemes[targetIndex % supportedThemes.length];
+  }, [currentTheme]);
+
+  const TriggerIcon = colorMap[currentTheme || defaultTheme].TriggerIcon;
+
+  if (!mounted) {
+    return (
+      <span
+        data-testid="ThemeSwitcher"
+        className="text-text hover:text-text-hover cursor-pointer text-lg transition-colors"
+      >
+        <SettingOutlined />
+      </span>
+    );
+  }
+
   return (
-    <Select
-      data-testid="ThemeSwitcher"
-      value={theme}
-      onChange={setTheme}
-      options={themeOptions}
-      style={{ width: 120 }}
-      className="min-w-40 max-w-full"
-    />
+    <Dropdown
+      data-testid="ThemeSwitcherDropdown"
+      trigger={['hover']}
+      menu={{
+        items: themeOptions,
+        selectedKeys: [currentTheme!],
+        onClick: ({ key }) => {
+          setTheme(key);
+        }
+      }}
+    >
+      <span
+        data-testid="ThemeSwitcher"
+        className="text-text hover:text-text-hover cursor-pointer text-lg transition-colors"
+        onClick={() => setTheme(nextTheme)}
+      >
+        <TriggerIcon />
+      </span>
+    </Dropdown>
   );
 }

package/dist/templates/next-app/tsconfig.json

@@ -22,13 +22,15 @@
     ],
     "paths": {
       "@/*": ["./src/*"],
-      "@config/*": ["./config/*"]
+      "@config/*": ["./config/*"],
+      "@migrations/*": ["./migrations/*"]
     }
   },
   "include": [
     "next-env.d.ts",
     "src/**/*.ts",
     "src/**/*.tsx",
+    "migrations/**/*.ts",
     ".next/types/**/*.ts",
     "config/**/*.ts"
   ],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qlover/create-app",
-  "version": "0.7.8",
+  "version": "0.7.10",
   "description": "Create a new app with a single command",
   "private": false,
   "type": "module",
@@ -38,7 +38,7 @@
   "dependencies": {
     "commander": "^13.1.0",
     "inquirer": "^12.3.2",
-    "@qlover/scripts-context": "1.1.3"
+    "@qlover/scripts-context": "1.1.4"
   },
   "scripts": {
     "build": "tsup",

package/dist/templates/next-app/src/base/cases/ServerAuth.ts

@@ -1,17 +0,0 @@
-import { cookies } from 'next/headers';
-import { I } from '@config/IOCIdentifier';
-import type { ServerAuthInterface } from '../port/ServerAuthInterface';
-import type { ServerInterface } from '../port/ServerInterface';
-
-export class ServerAuth implements ServerAuthInterface {
-  constructor(protected server: ServerInterface) {}
-
-  async hasAuth(): Promise<boolean> {
-    const cookieStore = await cookies();
-    const appConfig = this.server.getIOC(I.AppConfig);
-
-    const token = cookieStore.get(appConfig.userTokenKey);
-
-    return !!token;
-  }
-}

package/dist/templates/next-app/src/base/port/ServerAuthInterface.ts

@@ -1,3 +0,0 @@
-export interface ServerAuthInterface {
-  hasAuth(): Promise<boolean>;
-}

package/dist/templates/next-app/src/base/port/ServerInterface.ts

@@ -1,12 +0,0 @@
-import {
-  type IOCContainerInterface,
-  type IOCFunctionInterface
-} from '@qlover/corekit-bridge';
-import { type IOCIdentifierMapServer } from '@config/IOCIdentifier';
-
-export interface ServerInterface {
-  getIOC(): IOCFunctionInterface<IOCIdentifierMapServer, IOCContainerInterface>;
-  getIOC<T extends keyof IOCIdentifierMapServer>(
-    identifier: T
-  ): IOCIdentifierMapServer[T];
-}