From d20ee26e22842a2772950b3e4e74c139cf42b8e7 Mon Sep 17 00:00:00 2001
From: Ren Amamiya <123083837+reyamir@users.noreply.github.com>
Date: Mon, 9 Oct 2023 19:05:50 +0700
Subject: [PATCH] wip: add harmony color palette

---
 package.json          |  3 ++-
 pnpm-lock.yaml        | 15 +++++++++++----
 src-tauri/Cargo.lock  | 10 +++++-----
 src-tauri/src/main.rs |  2 +-
 tailwind.config.js    |  2 ++
 5 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index 78e40cd2..51a8dfbd 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "**/*.{ts, tsx, css, md, html, json}": "prettier --cache --write"
   },
   "dependencies": {
+    "@evilmartians/harmony": "^1.1.0",
     "@fontsource-variable/inter": "^5.0.13",
     "@getalby/sdk": "^2.4.0",
     "@nostr-dev-kit/ndk": "^1.3.2",
@@ -54,7 +55,7 @@
     "@tiptap/react": "^2.1.11",
     "@tiptap/starter-kit": "^2.1.11",
     "@tiptap/suggestion": "^2.1.11",
-    "@vidstack/react": "^1.1.8",
+    "@vidstack/react": "^1.1.9",
     "dayjs": "^1.11.10",
     "destr": "^2.0.1",
     "html-to-text": "^9.0.5",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index bec41fc0..226aa148 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -5,6 +5,9 @@ settings:
   excludeLinksFromLockfile: false
 
 dependencies:
+  '@evilmartians/harmony':
+    specifier: ^1.1.0
+    version: 1.1.0
   '@fontsource-variable/inter':
     specifier: ^5.0.13
     version: 5.0.13
@@ -114,8 +117,8 @@ dependencies:
     specifier: ^2.1.11
     version: 2.1.11(@tiptap/core@2.1.11)(@tiptap/pm@2.1.11)
   '@vidstack/react':
-    specifier: ^1.1.8
-    version: 1.1.8(@types/react@18.2.25)(react@18.2.0)
+    specifier: ^1.1.9
+    version: 1.1.9(@types/react@18.2.25)(react@18.2.0)
   dayjs:
     specifier: ^1.11.10
     version: 1.11.10
@@ -654,6 +657,10 @@ packages:
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
+  /@evilmartians/harmony@1.1.0:
+    resolution: {integrity: sha512-yci5pFdR26Boi5hElDkWME8Egp4xrhlKrlA1R1xknuvZV8QOjpIWIlZk/dvRZsY3QZulRVBthBMpBiDyq5kBCQ==}
+    dev: false
+
   /@floating-ui/core@1.5.0:
     resolution: {integrity: sha512-kK1h4m36DQ0UHGj5Ah4db7R0rHemTqqO0QLvUqi1/mUUp3LuAWbWxdxSIf/XsnH9VS6rRVPLJCncjRzUvyCLXg==}
     dependencies:
@@ -2773,8 +2780,8 @@ packages:
       eslint-visitor-keys: 3.4.3
     dev: true
 
-  /@vidstack/react@1.1.8(@types/react@18.2.25)(react@18.2.0):
-    resolution: {integrity: sha512-bwigitlnecYI2DtdMOr70RJ/T9fwxaUy+QZzlk7jYmLfKuTWCIr9IDLAjcIybzHALIYSxzRc6OoZTJicqew6TQ==}
+  /@vidstack/react@1.1.9(@types/react@18.2.25)(react@18.2.0):
+    resolution: {integrity: sha512-CYXhr0Hk/xTcYDVKy39J6VUIcJMCLzbfNe9upBQ096lnCpk3yEncsAUl73jTE3GzJ8yOPEQcdloFoJXbA4ekeg==}
     engines: {node: '>=18'}
     peerDependencies:
       '@types/react': ^18.0.0
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index fa0d9ecd..f0e089b7 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -1361,13 +1361,13 @@ dependencies = [
 
 [[package]]
 name = "embed-resource"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd0a2c9b742a980060d22545a7a83b573acd6b73045b9de6370c9530ce652f27"
+checksum = "f54cc3e827ee1c3812239a9a41dede7b4d7d5d5464faa32d71bd7cba28ce2cb2"
 dependencies = [
  "cc",
  "rustc_version",
- "toml 0.7.8",
+ "toml 0.8.2",
  "vswhom",
  "winreg 0.51.0",
 ]
@@ -5642,9 +5642,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.32.0"
+version = "1.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9"
+checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653"
 dependencies = [
  "backtrace",
  "bytes",
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index b1c4e055..1eeedf42 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -4,7 +4,7 @@
 )]
 
 use std::time::Duration;
-use tauri::{Manager, WindowEvent};
+use tauri::{Manager};
 use tauri_plugin_autostart::MacosLauncher;
 use tauri_plugin_sql::{Migration, MigrationKind};
 use webpage::{Webpage, WebpageOptions};
diff --git a/tailwind.config.js b/tailwind.config.js
index 098aecb7..c6ae24a9 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -1,10 +1,12 @@
 /** @type {import('tailwindcss').Config} */
+import harmonyPalette from '@evilmartians/harmony/tailwind';
 
 const defaultTheme = require('tailwindcss/defaultTheme');
 
 module.exports = {
   content: ['./src/**/*.{js,ts,jsx,tsx}', 'index.html'],
   theme: {
+    colors: harmonyPalette,
     extend: {
       colors: {
         // 'international orange'