Settings, major refactor

m1guelpf · Aug 6, 2023 · a72f2c3 · a72f2c3
1 parent 2ee69e3
commit a72f2c3
Show file tree

Hide file tree

Showing 26 changed files with 1,000 additions and 178 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -25,13 +25,7 @@ thiserror = "1.0.44"
 
 [dependencies.tauri]
 version = "1.4"
-features = [
-    "macos-private-api",
-    "system-tray",
-    "config-toml",
-    "global-shortcut",
-    "notification",
-]
+features = ["window-start-dragging", "macos-private-api", "system-tray", "config-toml", "global-shortcut", "notification", "dialog"]
 
 [features]
 custom-protocol = ["tauri/custom-protocol"]

diff --git a/Tauri.toml b/Tauri.toml
@@ -28,6 +28,7 @@ decorations = false
 
 [tauri.allowlist]
 all = false
+window = { startDragging = true }
 
 [tauri.system-tray]
 iconAsTemplate = true

diff --git a/frontend/index.html b/frontend/index.html
@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="en" class="overflow-hidden">
+<html lang="en" class="overscroll-none">
 	<head>
 		<meta charset="UTF-8" />
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />

diff --git a/frontend/package.json b/frontend/package.json
@@ -11,13 +11,18 @@
 	},
 	"dependencies": {
 		"@primer/octicons-react": "^19.5.0",
+		"@radix-ui/react-switch": "^1.0.3",
 		"@tauri-apps/api": "^1.4.0",
+		"class-variance-authority": "^0.7.0",
+		"clsx": "^2.0.0",
 		"framer-motion": "^10.15.0",
 		"react": "^18.2.0",
-		"react-dom": "^18.2.0"
+		"react-dom": "^18.2.0",
+		"tailwind-merge": "^1.14.0"
 	},
 	"devDependencies": {
 		"@tauri-apps/cli": "^1.4.0",
+		"@types/node": "^20.4.8",
 		"@types/react": "^18.2.15",
 		"@types/react-dom": "^18.2.7",
 		"@vitejs/plugin-react": "^4.0.3",