diff --git a/Cargo.lock b/Cargo.lock index 66c3434..ee07f2d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1272,7 +1272,7 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "edgen" -version = "0.1.1" +version = "0.1.2" dependencies = [ "edgen_core", "edgen_server", @@ -1364,7 +1364,7 @@ dependencies = [ [[package]] name = "edgen_server" -version = "0.1.1" +version = "0.1.2" dependencies = [ "argh", "axum 0.7.4", diff --git a/edgen/public/EdgenAI_dark_colored.svg b/edgen/public/EdgenAI_dark_colored.svg new file mode 100644 index 0000000..3c88bed --- /dev/null +++ b/edgen/public/EdgenAI_dark_colored.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/edgen/public/tauri.svg b/edgen/public/tauri.svg deleted file mode 100644 index 31b62c9..0000000 --- a/edgen/public/tauri.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/edgen/public/vite.svg b/edgen/public/vite.svg deleted file mode 100644 index e7b8dfb..0000000 --- a/edgen/public/vite.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/edgen/src-tauri/src/gui.rs b/edgen/src-tauri/src/gui.rs index 7b20c26..a46117c 100644 --- a/edgen/src-tauri/src/gui.rs +++ b/edgen/src-tauri/src/gui.rs @@ -26,6 +26,7 @@ fn greet(name: &str) -> String { pub fn run() { // here `"quit".to_string()` defines the menu item id, and the second parameter is the menu item label. + let menu_item_show = CustomMenuItem::new("show".to_string(), "Show"); let menu_item_quit = CustomMenuItem::new("quit".to_string(), "Quit"); let menu_item_edgen_chat = CustomMenuItem::new("edgenchat".to_string(), "EdgenChat"); let menu_item_config = CustomMenuItem::new("config".to_string(), "Config"); @@ -37,6 +38,7 @@ pub fn run() { .add_item(menu_item_config) .add_item(menu_item_reset_config) .add_native_item(SystemTrayMenuItem::Separator) + .add_item(menu_item_show) .add_item(menu_item_quit); tauri::Builder::default() diff --git a/edgen/src-tauri/tauri.conf.json b/edgen/src-tauri/tauri.conf.json index 8af705f..f65173f 100644 --- a/edgen/src-tauri/tauri.conf.json +++ b/edgen/src-tauri/tauri.conf.json @@ -38,8 +38,7 @@ "resizable": true, "title": "Edgen", "width": 800, - "height": 600, - "visible": false + "height": 600 } ], "systemTray": { diff --git a/edgen/src/App.tsx b/edgen/src/App.tsx index 840ef1f..4486b91 100644 --- a/edgen/src/App.tsx +++ b/edgen/src/App.tsx @@ -1,19 +1,24 @@ - import "./App.css"; -import edgenLogo from "./assets/edgen_logo.svg" - function App() { - return (
-

Welcome to Edgen!

-
- Edgen logo + + EdgenChat +
- -

GUI coming soon

+

+ Edgen is now running! Start chatting now with + EdgenChat. +

+ + +
); } diff --git a/edgen/src/assets/KEEP b/edgen/src/assets/KEEP new file mode 100644 index 0000000..8d1c8b6 --- /dev/null +++ b/edgen/src/assets/KEEP @@ -0,0 +1 @@ + diff --git a/edgen/src/assets/edgen_logo.svg b/edgen/src/assets/edgen_logo.svg deleted file mode 100644 index 4578702..0000000 --- a/edgen/src/assets/edgen_logo.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/edgen/src/assets/react.svg b/edgen/src/assets/react.svg deleted file mode 100644 index 6c87de9..0000000 --- a/edgen/src/assets/react.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/edgen/src/styles.css b/edgen/src/styles.css index f7de85b..a41bdfc 100644 --- a/edgen/src/styles.css +++ b/edgen/src/styles.css @@ -30,8 +30,8 @@ transition: 0.75s; } -.logo.tauri:hover { - filter: drop-shadow(0 0 2em #24c8db); +.logo:hover { + filter: drop-shadow(0 0 2em #FFD000); } .row { @@ -41,13 +41,12 @@ a { font-weight: 500; - color: #646cff; text-decoration: inherit; } -a:hover { +/* a:hover { color: #535bf2; -} +} */ h1 { text-align: center; @@ -71,11 +70,7 @@ button { cursor: pointer; } -button:hover { - border-color: #396cd8; -} button:active { - border-color: #396cd8; background-color: #e8e8e8; }