feat: support config home page

support config home page fix lisiur#60
templehasfallen · Aug 1, 2023 · 34cbb72 · 34cbb72
1 parent db84e6d
commit 34cbb72
Show file tree

Hide file tree

Showing 12 changed files with 90 additions and 7 deletions.
diff --git a/gui/src/main.rs b/gui/src/main.rs
@@ -38,6 +38,7 @@ pub struct SchemaPort(u16);
 pub struct EventBus {
     pub sender: Sender<CommandEvent>,
 }
+#[derive(Clone)]
 pub struct AppSetting(Arc<Mutex<Setting>>);
 
 impl EventBus {
@@ -71,20 +72,22 @@ async fn main() {
     let app_setting = AppSetting(Arc::new(Mutex::new(setting)));
 
     tauri::Builder::default()
+        .manage(conn.clone())
+        .manage(CommandExecutor::new())
+        .manage(app_setting.clone())
         .plugin(tauri_plugin_positioner::init())
         .plugin(tauri_plugin_single_instance::init(|handle, _argv, _cwd| {
-            let handle = handle.clone();
+            let app_handle = handle.clone();
             tokio::spawn(async move {
-                show_or_create_main_window(&handle, "index.html")
+                let app_setting = app_handle.state::<AppSetting>();
+                let home_page_url = app_setting.0.lock().await.home_page_url();
+                show_or_create_main_window(&app_handle, &home_page_url)
                     .await
                     .unwrap();
             });
         }))
         .system_tray(tray::system_tray())
         .on_system_tray_event(tray::on_system_tray_event)
-        .manage(conn.clone())
-        .manage(CommandExecutor::new())
-        .manage(app_setting)
         .setup(move |app| {
             let app_handle = app.handle();
             app.manage(EventBus::new(app_handle.clone()));
@@ -154,7 +157,9 @@ async fn main() {
             if !hide_main_window {
                 let handle = app_handle.clone();
                 tokio::spawn(async move {
-                    show_or_create_main_window(&handle, "index.html")
+                    let app_setting = handle.state::<AppSetting>();
+                    let home_page_url = app_setting.0.lock().await.home_page_url();
+                    show_or_create_main_window(&handle, &home_page_url)
                         .await
                         .unwrap();
                 });

diff --git a/service/migrations/2023-08-01-012741_insert_home_page_into_settings/down.sql b/service/migrations/2023-08-01-012741_insert_home_page_into_settings/down.sql
@@ -0,0 +1,2 @@
+-- This file should undo anything in `up.sql`
+ALTER TABLE settings DROP COLUMN home_page;
diff --git a/service/migrations/2023-08-01-012741_insert_home_page_into_settings/up.sql b/service/migrations/2023-08-01-012741_insert_home_page_into_settings/up.sql
@@ -0,0 +1,2 @@
+-- Your SQL goes here
+ALTER TABLE settings ADD COLUMN home_page TEXT NOT NULL DEFAULT 'casual';
diff --git a/service/src/models/setting.rs b/service/src/models/setting.rs
@@ -22,6 +22,7 @@ pub struct Setting {
     pub enable_web_server: bool,
     pub hide_main_window: bool,
     pub hide_taskbar: bool,
+    pub home_page: TextWrapper<HomePage>,
 }
 
 impl Setting {
@@ -75,6 +76,47 @@ impl Setting {
 
         OpenAIChatApi::new(client, host)
     }
+
+    pub fn home_page_url(&self) -> String {
+        self.home_page.as_ref().url().to_string()
+    }
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+#[serde(rename_all = "camelCase")]
+pub enum HomePage {
+    Casual,
+    Chats,
+}
+
+impl AsRef<str> for HomePage {
+    fn as_ref(&self) -> &str {
+        match self {
+            Self::Casual => "casual",
+            Self::Chats => "chats",
+        }
+    }
+}
+
+impl FromStr for HomePage {
+    type Err = String;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s {
+            "casual" => Ok(Self::Casual),
+            "chats" => Ok(Self::Chats),
+            _ => Err("Invalid home page".into()),
+        }
+    }
+}
+
+impl HomePage {
+    pub fn url(&self) -> &str {
+        match self {
+            Self::Casual => "index.html",
+            Self::Chats => "index.html#/main/chat",
+        }
+    }
 }
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -135,4 +177,5 @@ pub struct PatchSetting {
     pub hide_main_window: Option<bool>,
     pub hide_taskbar: Option<bool>,
     pub enable_web_server: Option<bool>,
+    pub home_page: Option<TextWrapper<HomePage>>,
 }
diff --git a/service/src/schema.rs b/service/src/schema.rs
@@ -97,6 +97,7 @@ diesel::table! {
         enable_web_server -> Bool,
         hide_main_window -> Bool,
         hide_taskbar -> Bool,
+        home_page -> Text,
     }
 }
 

diff --git a/service/src/services/setting.rs b/service/src/services/setting.rs
@@ -2,7 +2,7 @@ use serde::Deserialize;
 
 use crate::result::Result;
 use crate::{models::setting::Setting, repositories::setting::SettingRepo, DbConn, Id};
-use crate::{PatchSetting, Theme};
+use crate::{HomePage, PatchSetting, Theme};
 
 #[derive(Clone)]
 pub struct SettingService {
@@ -43,6 +43,7 @@ impl SettingService {
             hide_main_window: payload.hide_main_window,
             hide_taskbar: payload.hide_taskbar,
             enable_web_server: payload.enable_web_server,
+            home_page: payload.home_page.map(|h| h.into()),
         })?;
 
         Ok(())
@@ -62,4 +63,5 @@ pub struct UpdateSettingPayload {
     pub hide_main_window: Option<bool>,
     pub hide_taskbar: Option<bool>,
     pub enable_web_server: Option<bool>,
+    pub home_page: Option<HomePage>,
 }
diff --git a/web/src/api/index.ts b/web/src/api/index.ts
@@ -99,6 +99,12 @@ export interface Settings {
   enableWebServer?: boolean;
   hideMainWindow?: boolean;
   hideTaskbar?: boolean;
+  homePage?: HomePage;
+}
+
+export enum HomePage {
+  Casual = "casual",
+  Chats = "chats",
 }
 
 export enum Theme {

diff --git a/web/src/i18n/enUS.ts b/web/src/i18n/enUS.ts
@@ -118,6 +118,7 @@ export const messages = {
   "setting.hideMainWindow": "Hide Main Window",
   "setting.needRestart.hint":
     "The following settings will take effect after restarting the app",
+  "setting.homePage": "Home Page",
 };
 
 export default messages;

diff --git a/web/src/i18n/ruRU.ts b/web/src/i18n/ruRU.ts
@@ -122,6 +122,7 @@ const messages: Messages = {
   "setting.hideMainWindow": "Скрыть главное окно",
   "setting.needRestart.hint":
     "Следующие настройки вступят в силу после перезапуска приложения",
+  "setting.homePage": "Домашняя страница",
 };
 
 export default messages;
diff --git a/web/src/i18n/template.ts b/web/src/i18n/template.ts
@@ -121,6 +121,7 @@ const messages: Messages = {
   "setting.hideMainWindow": "Hide Main Window",
   "setting.needRestart.hint":
     "The following settings will take effect after restarting the app",
+  "setting.homePage": "Home Page",
 };
 
 export default messages;
diff --git a/web/src/i18n/zhCN.ts b/web/src/i18n/zhCN.ts
@@ -116,6 +116,7 @@ const messages: Messages = {
   "setting.hideTaskbar": "隐藏任务栏图标",
   "setting.hideMainWindow": "隐藏主窗口",
   "setting.needRestart.hint": "下面的设置需要重启应用才能生效",
+  "setting.homePage": "主页",
 };
 
 export default messages;
diff --git a/web/src/pages/setting/Index.tsx b/web/src/pages/setting/Index.tsx
@@ -106,6 +106,24 @@ export default defineComponent({
                     onUpdateValue={() => updateSettingHandler("forwardApiKey")}
                   ></NSwitch>
                 </NFormItem>
+                {isTauri ? (
+                  <NFormItem label={t("setting.homePage") + " :"}>
+                    <NSelect
+                      v-model:value={model.value.homePage}
+                      onUpdateValue={() => updateSettingHandler("homePage")}
+                      options={[
+                        {
+                          label: t("chat.casual.title"),
+                          value: "casual",
+                        },
+                        {
+                          label: t("chat.conversations"),
+                          value: "chats",
+                        },
+                      ]}
+                    ></NSelect>
+                  </NFormItem>
+                ) : null}
                 {isTauri ? (
                   <NDivider>{t("setting.needRestart.hint")}</NDivider>
                 ) : null}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		-- This file should undo anything in `up.sql`
		ALTER TABLE settings DROP COLUMN home_page;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		-- Your SQL goes here
		ALTER TABLE settings ADD COLUMN home_page TEXT NOT NULL DEFAULT 'casual';