Merge branch 'master' into web-demo

Hayden2018 · Oct 29, 2023 · a2a0808 · a2a0808
2 parents 3f6eae0 + 427d298
commit a2a0808
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "DialogCraft",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "author": "Hayden Chiu",
   "description": "Chat client for GPT API",
   "main": "electron-src/main.js",

diff --git a/public/about.html b/public/about.html
@@ -47,7 +47,7 @@ <h1>
         <img class="app-icon" src="./logo.svg" alt="DialogCraft Icon">
         DialogCraft
     </h1>
-    <p>Version: 1.0.0</p>
+    <p>Version: 1.0.2</p>
     <p>Craft your conversations with GPT</p>
     <p class="license" onclick="openLicense()">
         LICENSE

diff --git a/...ages/GlobalSetting/GlobalSettingModal.tsx → src/pages/GlobalSetting/GlobalSetting.tsx b/...ages/GlobalSetting/GlobalSettingModal.tsx → src/pages/GlobalSetting/GlobalSetting.tsx
@@ -5,7 +5,7 @@ import { styled } from '@mui/system';
 
 import { toggleTheme, updateChatSetting } from 'redux/settingSlice';
 import { AppState, SettingConfig, SettingStatus } from 'redux/type.d';
-import { useDataActions } from './GlobalSettingModalHook';
+import { useDataActions } from './GlobalSettingHook';
 import { onElectronEnv, useBackButton, useScreenWidth } from 'utils';
 import { back } from 'redux/pageSlice';
 

diff --git a/...s/GlobalSetting/GlobalSettingModalHook.ts → src/pages/GlobalSetting/GlobalSettingHook.ts b/...s/GlobalSetting/GlobalSettingModalHook.ts → src/pages/GlobalSetting/GlobalSettingHook.ts
diff --git a/src/pages/Greeting/Greeting.tsx → src/pages/Login/Login.tsx b/src/pages/Greeting/Greeting.tsx → src/pages/Login/Login.tsx
@@ -121,7 +121,7 @@ const releaseUrl = 'https://github.com/Hayden2018/dialogcraft/releases';
 const videoUrl = 'https://www.youtube.com/watch?v=aVog4J6nIAU';
 const openTarget = onElectronEnv() ? '' : '_blank';
 
-export default function GreetingPage() {
+export default function Login() {
 
     const dispatch = useDispatch();
     const { status } = useSelector((state: AppState) => state.setting.global);

diff --git a/src/pages/Greeting/logo.svg → src/pages/Login/logo.svg b/src/pages/Greeting/logo.svg → src/pages/Login/logo.svg
diff --git a/src/pages/PageSwitch.tsx b/src/pages/PageSwitch.tsx
@@ -1,9 +1,9 @@
 import { useSelector } from "react-redux";
 import { AppState, PageType } from "redux/type.d";
 
-import GlobalSetting from "pages/GlobalSetting/GlobalSettingModal";
-import GreetingPage from "./Greeting/Greeting";
+import Login from "./Login/Login";
 import Chat from "./Chat/Chat";
+import GlobalSetting from "pages/GlobalSetting/GlobalSetting";
 import ResetAppWarning from "./ResetAppWarning/ResetAppWarning";
 import ImportChats from "components/ChatImport/ChatImport";
 
@@ -13,7 +13,7 @@ function PageSwitch() {
 
     switch (current) {
         case PageType.LOGIN:
-            return <GreetingPage />;
+            return <Login />;
         case PageType.CHAT:
             return <Chat />;
         case PageType.SETTING_GLOBAL:
@@ -23,7 +23,7 @@ function PageSwitch() {
         case PageType.SETTING_IMPORT:
             return <ImportChats />;
         default:
-            return <GreetingPage />;
+            return <Login />;
     }
 }
 

diff --git a/src/redux/type.d.ts b/src/redux/type.d.ts
@@ -41,7 +41,6 @@ export enum ModalType {
     RESTORE_MESSAGE = 'RESTORE_MESSAGE',
     REGENERATE_MESSAGE = 'REGEN_MESSAGE',
     CHAT_SETTING = 'CHAT_SETTING',
-    GLOBAL_SETTING = 'GLOBAL_SETTING',
     CHAT_ERROR = 'CHAT_ERROR',
     CHAT_TIMEOUT = 'CHAT_TIMEOUT',
     RENAME_CHAT = 'RENAME_CHAT',