From 0596c280a7e3a45f0de11f5a5350cfabec6d7cfd Mon Sep 17 00:00:00 2001 From: neil Date: Fri, 25 Nov 2022 16:55:21 +0800 Subject: [PATCH] #29 initial high fed navbar --- .gitignore | 3 +- packages/gui/package.json | 2 +- packages/gui/src-tauri/Cargo.toml | 2 +- packages/gui/src-tauri/tauri.conf.json | 35 +- packages/gui/src/+layout.ts | 2 - packages/gui/src/app.css | 2 +- .../gui/src/components/NavBar/NavBar.svelte | 173 ++++- packages/gui/src/routes/+layout.ts | 2 + packages/gui/static/images/bored-ape.png | Bin 0 -> 782102 bytes packages/gui/static/images/close.svg | 1 + packages/gui/static/images/expand.svg | 1 + packages/gui/static/images/minimize.svg | 1 + packages/gui/static/images/tea-icon.png | Bin 0 -> 49488 bytes packages/ui/tailwind.config.cjs | 2 + pnpm-lock.yaml | 722 ++++++++---------- 15 files changed, 516 insertions(+), 432 deletions(-) delete mode 100644 packages/gui/src/+layout.ts create mode 100644 packages/gui/src/routes/+layout.ts create mode 100644 packages/gui/static/images/bored-ape.png create mode 100644 packages/gui/static/images/close.svg create mode 100644 packages/gui/static/images/expand.svg create mode 100644 packages/gui/static/images/minimize.svg create mode 100644 packages/gui/static/images/tea-icon.png diff --git a/.gitignore b/.gitignore index 99600f9..f26a964 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ node_modules -yarn-error.log \ No newline at end of file +yarn-error.log +.DS_Store \ No newline at end of file diff --git a/packages/gui/package.json b/packages/gui/package.json index d548aab..1420723 100644 --- a/packages/gui/package.json +++ b/packages/gui/package.json @@ -14,12 +14,12 @@ "format": "prettier --plugin-search-dir . --write ." }, "devDependencies": { - "@tea/ui": "workspace:*", "@playwright/test": "1.25.0", "@sveltejs/adapter-auto": "next", "@sveltejs/adapter-static": "1.0.0-next.48", "@sveltejs/kit": "next", "@tauri-apps/cli": "1.2.0", + "@tea/ui": "workspace:*", "@typescript-eslint/eslint-plugin": "^5.27.0", "@typescript-eslint/parser": "^5.27.0", "autoprefixer": "^10.4.13", diff --git a/packages/gui/src-tauri/Cargo.toml b/packages/gui/src-tauri/Cargo.toml index 80bab4b..8e3c1b4 100644 --- a/packages/gui/src-tauri/Cargo.toml +++ b/packages/gui/src-tauri/Cargo.toml @@ -17,7 +17,7 @@ tauri-build = { version = "1.2.0", features = [] } [dependencies] serde_json = "1.0" serde = { version = "1.0", features = ["derive"] } -tauri = { version = "1.2.0", features = ["http-all", "shell-open"] } +tauri = { version = "1.2.0", features = ["http-all", "shell-open", "window-all"] } uuid = "1.2.1" futures = "0.3" diff --git a/packages/gui/src-tauri/tauri.conf.json b/packages/gui/src-tauri/tauri.conf.json index 4793441..99c4e1a 100644 --- a/packages/gui/src-tauri/tauri.conf.json +++ b/packages/gui/src-tauri/tauri.conf.json @@ -26,6 +26,38 @@ "open": true, "scope": [], "sidecar": false + }, + "window": { + "all": true, + "center": true, + "close": true, + "create": true, + "hide": true, + "maximize": true, + "minimize": true, + "print": true, + "requestUserAttention": true, + "setAlwaysOnTop": true, + "setCursorGrab": true, + "setCursorIcon": true, + "setCursorPosition": true, + "setCursorVisible": true, + "setDecorations": true, + "setFocus": true, + "setFullscreen": true, + "setIcon": true, + "setIgnoreCursorEvents": true, + "setMaxSize": true, + "setMinSize": true, + "setPosition": true, + "setResizable": true, + "setSize": true, + "setSkipTaskbar": true, + "setTitle": true, + "show": true, + "startDragging": true, + "unmaximize": true, + "unminimize": true } }, "bundle": { @@ -73,7 +105,8 @@ "height": 600, "resizable": true, "title": "gui", - "width": 800 + "width": 800, + "decorations": false } ] } diff --git a/packages/gui/src/+layout.ts b/packages/gui/src/+layout.ts deleted file mode 100644 index 9b6b3ca..0000000 --- a/packages/gui/src/+layout.ts +++ /dev/null @@ -1,2 +0,0 @@ -export const prerender = true -export const ssr = false \ No newline at end of file diff --git a/packages/gui/src/app.css b/packages/gui/src/app.css index a5d5b02..37a65e5 100644 --- a/packages/gui/src/app.css +++ b/packages/gui/src/app.css @@ -21,4 +21,4 @@ html { html { font-family: sono, sans-serif; } -} \ No newline at end of file +} diff --git a/packages/gui/src/components/NavBar/NavBar.svelte b/packages/gui/src/components/NavBar/NavBar.svelte index ef33d7e..2cf34dc 100644 --- a/packages/gui/src/components/NavBar/NavBar.svelte +++ b/packages/gui/src/components/NavBar/NavBar.svelte @@ -1,40 +1,163 @@ -