Skip to content

Commit

Permalink
feat/makeshift_gui (#48)
Browse files Browse the repository at this point in the history
* feat: added makeshit gui

* feat: aded "show" system tray icon

* fix: unsed vars in App.tsx
  • Loading branch information
francis2tm authored Feb 8, 2024
1 parent 2c74a2d commit 766dbe4
Show file tree
Hide file tree
Showing 11 changed files with 25 additions and 53 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions edgen/public/EdgenAI_dark_colored.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 0 additions & 6 deletions edgen/public/tauri.svg

This file was deleted.

1 change: 0 additions & 1 deletion edgen/public/vite.svg

This file was deleted.

2 changes: 2 additions & 0 deletions edgen/src-tauri/src/gui.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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()
Expand Down
3 changes: 1 addition & 2 deletions edgen/src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@
"resizable": true,
"title": "Edgen",
"width": 800,
"height": 600,
"visible": false
"height": 600
}
],
"systemTray": {
Expand Down
23 changes: 14 additions & 9 deletions edgen/src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,19 +1,24 @@

import "./App.css";

import edgenLogo from "./assets/edgen_logo.svg"

function App() {

return (
<div className="container">
<h1>Welcome to Edgen!</h1>

<div>
<img src={edgenLogo} className="logo edgen" alt="Edgen logo" />
<a href="https://chat.edgen.co" target="_blank">
<img
src="/EdgenAI_dark_colored.svg"
className="logo"
alt="EdgenChat"
/>
</a>
</div>

<p>GUI coming soon</p>
<p>
Edgen is now <strong>running</strong>! Start chatting now with
EdgenChat.
</p>
<a className="logo" href="https://chat.edgen.co" target="_blank">
<button>EdgenChat</button>
</a>
</div>
);
}
Expand Down
1 change: 1 addition & 0 deletions edgen/src/assets/KEEP
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

23 changes: 0 additions & 23 deletions edgen/src/assets/edgen_logo.svg

This file was deleted.

1 change: 0 additions & 1 deletion edgen/src/assets/react.svg

This file was deleted.

13 changes: 4 additions & 9 deletions edgen/src/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -41,13 +41,12 @@

a {
font-weight: 500;
color: #646cff;
text-decoration: inherit;
}

a:hover {
/* a:hover {
color: #535bf2;
}
} */

h1 {
text-align: center;
Expand All @@ -71,11 +70,7 @@ button {
cursor: pointer;
}

button:hover {
border-color: #396cd8;
}
button:active {
border-color: #396cd8;
background-color: #e8e8e8;
}

Expand Down

0 comments on commit 766dbe4

Please sign in to comment.