From df52705fd21c825b2d02e1f263a9c9dee9b52a87 Mon Sep 17 00:00:00 2001 From: Triston Date: Thu, 4 Apr 2024 23:24:34 -0500 Subject: [PATCH 01/18] (feat): hide native title bar and impliment custom titlebar --- index.html | 56 +++++ src-tauri/Cargo.lock | 433 +++++++++++++++++++++----------------- src-tauri/Cargo.toml | 3 +- src-tauri/src/main.rs | 22 +- src-tauri/tauri.conf.json | 19 +- src/styles.css | 35 ++- 6 files changed, 362 insertions(+), 206 deletions(-) diff --git a/index.html b/index.html index 5052478..8eaaebe 100644 --- a/index.html +++ b/index.html @@ -7,6 +7,62 @@ +
+
+ + + + + +
+
+ + + + +
+
+ + + + + +
+
+
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index f573828..a518b5a 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -58,9 +58,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.80" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" +checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" [[package]] name = "atk" @@ -83,20 +83,20 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.2.0", + "system-deps 6.2.2", ] [[package]] name = "autocfg" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ "addr2line", "cc", @@ -127,9 +127,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "block" @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "brotli" -version = "3.4.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" +checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -179,15 +179,15 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.15.3" +version = "3.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea184aa71bb362a1157c896979544cc23974e08fd265f29ea96b59f0b4a555b" +checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" [[package]] name = "bytemuck" -version = "1.14.3" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" +checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" [[package]] name = "byteorder" @@ -197,9 +197,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "cairo-rs" @@ -222,7 +222,7 @@ checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" dependencies = [ "glib-sys", "libc", - "system-deps 6.2.0", + "system-deps 6.2.2", ] [[package]] @@ -237,9 +237,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.88" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02f341c093d19155a6e41631ce5971aac4e9a868262212153124c15fa22d1cdc" +checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" [[package]] name = "cesu8" @@ -285,9 +285,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.34" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" +checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" dependencies = [ "android-tzdata", "iana-time-zone", @@ -306,8 +306,24 @@ dependencies = [ "block", "cocoa-foundation", "core-foundation", - "core-graphics", - "foreign-types", + "core-graphics 0.22.3", + "foreign-types 0.3.2", + "libc", + "objc", +] + +[[package]] +name = "cocoa" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" +dependencies = [ + "bitflags 1.3.2", + "block", + "cocoa-foundation", + "core-foundation", + "core-graphics 0.23.2", + "foreign-types 0.5.0", "libc", "objc", ] @@ -373,7 +389,20 @@ dependencies = [ "bitflags 1.3.2", "core-foundation", "core-graphics-types", - "foreign-types", + "foreign-types 0.3.2", + "libc", +] + +[[package]] +name = "core-graphics" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types 0.5.0", "libc", ] @@ -474,7 +503,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -484,7 +513,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad291aa74992b9b7a7e88c38acbbf6ad7e107f1d90ee8775b7bc1fc3394f485c" dependencies = [ "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -508,7 +537,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -519,7 +548,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -605,14 +634,14 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "embed-resource" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bde55e389bea6a966bd467ad1ad7da0ae14546a5bc794d16d1e55e7fca44881" +checksum = "c6985554d0688b687c5cb73898a34fbe3ad6c24c58c238a4d91d5e840670ee9d" dependencies = [ "cc", "memchr", "rustc_version", - "toml 0.8.10", + "toml 0.8.12", "vswhom", "winreg", ] @@ -650,9 +679,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" [[package]] name = "fdeflate" @@ -707,7 +736,28 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" dependencies = [ - "foreign-types-shared", + "foreign-types-shared 0.1.1", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared 0.3.1", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", ] [[package]] @@ -716,6 +766,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + [[package]] name = "form_urlencoded" version = "1.2.1" @@ -775,7 +831,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -846,7 +902,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.2.0", + "system-deps 6.2.2", ] [[package]] @@ -863,7 +919,7 @@ dependencies = [ "libc", "pango-sys", "pkg-config", - "system-deps 6.2.0", + "system-deps 6.2.2", ] [[package]] @@ -877,7 +933,7 @@ dependencies = [ "gobject-sys", "libc", "pkg-config", - "system-deps 6.2.0", + "system-deps 6.2.2", ] [[package]] @@ -889,22 +945,21 @@ dependencies = [ "gdk-sys", "glib-sys", "libc", - "system-deps 6.2.0", + "system-deps 6.2.2", "x11", ] [[package]] name = "generator" -version = "0.7.6" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b25e5b3e733153bcab35ee4671b46604b42516163cae442d1601cb716f2ac5" +checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" dependencies = [ "cc", - "cfg-if", "libc", "log", "rustversion", - "windows 0.53.0", + "windows 0.48.0", ] [[package]] @@ -971,7 +1026,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.2.0", + "system-deps 6.2.2", "winapi", ] @@ -1017,7 +1072,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" dependencies = [ "libc", - "system-deps 6.2.0", + "system-deps 6.2.2", ] [[package]] @@ -1035,8 +1090,8 @@ dependencies = [ "aho-corasick", "bstr", "log", - "regex-automata 0.4.5", - "regex-syntax 0.8.2", + "regex-automata 0.4.6", + "regex-syntax 0.8.3", ] [[package]] @@ -1047,7 +1102,7 @@ checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" dependencies = [ "glib-sys", "libc", - "system-deps 6.2.0", + "system-deps 6.2.2", ] [[package]] @@ -1088,7 +1143,7 @@ dependencies = [ "gobject-sys", "libc", "pango-sys", - "system-deps 6.2.0", + "system-deps 6.2.2", ] [[package]] @@ -1132,6 +1187,12 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.3.9" @@ -1160,13 +1221,13 @@ dependencies = [ [[package]] name = "http" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", - "itoa 1.0.10", + "itoa 1.0.11", ] [[package]] @@ -1186,7 +1247,7 @@ dependencies = [ "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core 0.52.0", + "windows-core", ] [[package]] @@ -1234,7 +1295,7 @@ dependencies = [ "globset", "log", "memchr", - "regex-automata 0.4.5", + "regex-automata 0.4.6", "same-file", "walkdir", "winapi-util", @@ -1265,9 +1326,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.5" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown 0.14.3", @@ -1300,9 +1361,9 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "javascriptcore-rs" @@ -1349,9 +1410,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "js-sys" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -1376,6 +1437,7 @@ dependencies = [ "serde_json", "tauri", "tauri-build", + "window-vibrancy", ] [[package]] @@ -1405,23 +1467,19 @@ checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libredox" -version = "0.0.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "libc", - "redox_syscall", ] [[package]] name = "line-wrap" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" -dependencies = [ - "safemem", -] +checksum = "dd1bc4d24ad230d21fb898d1116b1801d7adfc449d42026475862ab48b11e70e" [[package]] name = "linux-raw-sys" @@ -1506,15 +1564,15 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memoffset" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] @@ -1559,9 +1617,9 @@ dependencies = [ [[package]] name = "new_debug_unreachable" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" [[package]] name = "nodrop" @@ -1706,7 +1764,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.2.0", + "system-deps 6.2.2", ] [[package]] @@ -1848,7 +1906,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -1880,9 +1938,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -1898,12 +1956,12 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "plist" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5699cc8a63d1aa2b1ee8e12b9ad70ac790d65788cd36101fa37f87ea46c4cef" +checksum = "d9d34169e64b3c7a80c8621a48adaf44e0cf62c78a9b25dd9dd35f1881a17cf9" dependencies = [ "base64 0.21.7", - "indexmap 2.2.5", + "indexmap 2.2.6", "line-wrap", "quick-xml", "serde", @@ -1983,9 +2041,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] @@ -2106,9 +2164,9 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ "getrandom 0.2.12", "libredox", @@ -2117,14 +2175,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.3" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.5", - "regex-syntax 0.8.2", + "regex-automata 0.4.6", + "regex-syntax 0.8.3", ] [[package]] @@ -2138,13 +2196,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax 0.8.3", ] [[package]] @@ -2155,9 +2213,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "rustc-demangle" @@ -2176,11 +2234,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.31" +version = "0.38.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "errno", "libc", "linux-raw-sys", @@ -2199,12 +2257,6 @@ version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" -[[package]] -name = "safemem" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" - [[package]] name = "same-file" version = "1.0.6" @@ -2272,17 +2324,17 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] name = "serde_json" -version = "1.0.114" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" dependencies = [ - "indexmap 2.2.5", - "itoa 1.0.10", + "indexmap 2.2.6", + "itoa 1.0.11", "ryu", "serde", ] @@ -2295,7 +2347,7 @@ checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -2309,15 +2361,15 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.6.1" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15d167997bd841ec232f5b2b8e0e26606df2e7caa4c31b95ea9ca52b200bd270" +checksum = "ee80b0e361bbf88fd2f6e242ccd19cfda072cb0faa6ae694ecee08199938569a" dependencies = [ "base64 0.21.7", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.2.5", + "indexmap 2.2.6", "serde", "serde_derive", "serde_json", @@ -2327,14 +2379,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.6.1" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "865f9743393e638991566a8b7a479043c2c8da94a33e0a31f18214c9cae0a64d" +checksum = "6561dc161a9224638a31d876ccdfefbc1df91d3f3a8342eddb35f055d48c7655" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -2412,9 +2464,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "soup2" @@ -2504,9 +2556,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.52" +version = "2.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" dependencies = [ "proc-macro2", "quote", @@ -2528,29 +2580,29 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.2.0" +version = "6.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" dependencies = [ "cfg-expr 0.15.7", - "heck 0.4.1", + "heck 0.5.0", "pkg-config", - "toml 0.8.10", - "version-compare 0.1.1", + "toml 0.8.12", + "version-compare 0.2.0", ] [[package]] name = "tao" -version = "0.16.7" +version = "0.16.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d22205b267a679ca1c590b9f178488d50981fc3e48a1b91641ae31593db875ce" +checksum = "26a794e476ce829420b58059f4ac23c2b991dab2ee552be740f931aea95ae9c8" dependencies = [ "bitflags 1.3.2", "cairo-rs", "cc", - "cocoa", + "cocoa 0.24.1", "core-foundation", - "core-graphics", + "core-graphics 0.22.3", "crossbeam-channel", "dispatch", "gdk", @@ -2621,7 +2673,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f078117725e36d55d29fafcbb4b1e909073807ca328ae8deb8c0b3843aac0fed" dependencies = [ "anyhow", - "cocoa", + "cocoa 0.24.1", "dirs-next", "dunce", "embed_plist", @@ -2748,7 +2800,7 @@ version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "067c56fc153b3caf406d7cd6de4486c80d1d66c0f414f39e94cb2f5543f6445f" dependencies = [ - "cocoa", + "cocoa 0.24.1", "gtk", "percent-encoding", "rand 0.8.5", @@ -2833,22 +2885,22 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" [[package]] name = "thiserror" -version = "1.0.57" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -2868,7 +2920,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" dependencies = [ "deranged", - "itoa 1.0.10", + "itoa 1.0.11", "num-conv", "powerfmt", "serde", @@ -2909,9 +2961,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.36.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "bytes", @@ -2942,14 +2994,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.10" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" +checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.6", + "toml_edit 0.22.9", ] [[package]] @@ -2967,7 +3019,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.2.5", + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", @@ -2976,11 +3028,11 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.6" +version = "0.22.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" +checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" dependencies = [ - "indexmap 2.2.5", + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", @@ -3006,7 +3058,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -3110,9 +3162,9 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] name = "uuid" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" dependencies = [ "getrandom 0.2.12", ] @@ -3131,9 +3183,9 @@ checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b" [[package]] name = "version-compare" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" [[package]] name = "version_check" @@ -3185,9 +3237,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -3195,24 +3247,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3220,22 +3272,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "webkit2gtk" @@ -3281,7 +3333,7 @@ dependencies = [ "pango-sys", "pkg-config", "soup2-sys", - "system-deps 6.2.0", + "system-deps 6.2.2", ] [[package]] @@ -3353,6 +3405,19 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "window-vibrancy" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af6abc2b9c56bd95887825a1ce56cde49a2a97c07e28db465d541f5098a2656c" +dependencies = [ + "cocoa 0.25.0", + "objc", + "raw-window-handle", + "windows-sys 0.52.0", + "windows-version", +] + [[package]] name = "windows" version = "0.39.0" @@ -3369,12 +3434,11 @@ dependencies = [ [[package]] name = "windows" -version = "0.53.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efc5cf48f83140dcaab716eeaea345f9e93d0018fb81162753a3f76c3397b538" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-core 0.53.0", - "windows-targets 0.52.4", + "windows-targets 0.48.5", ] [[package]] @@ -3396,16 +3460,6 @@ dependencies = [ "windows-targets 0.52.4", ] -[[package]] -name = "windows-core" -version = "0.53.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dcc5b895a6377f1ab9fa55acedab1fd5ac0db66ad1e6c7f47e28a22e446a5dd" -dependencies = [ - "windows-result", - "windows-targets 0.52.4", -] - [[package]] name = "windows-implement" version = "0.39.0" @@ -3422,15 +3476,6 @@ version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ee5e275231f07c6e240d14f34e1b635bf1faa1c76c57cfd59a5cdb9848e4278" -[[package]] -name = "windows-result" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd19df78e5168dfb0aedc343d1d1b8d422ab2db6756d2dc3fef75035402a3f64" -dependencies = [ - "windows-targets 0.52.4", -] - [[package]] name = "windows-sys" version = "0.42.0" @@ -3685,9 +3730,9 @@ dependencies = [ [[package]] name = "winreg" -version = "0.51.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "937f3df7948156640f46aacef17a70db0de5917bda9c92b0f751f3a955b588fc" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" dependencies = [ "cfg-if", "windows-sys 0.48.0", @@ -3701,8 +3746,8 @@ checksum = "6ad85d0e067359e409fcb88903c3eac817c392e5d638258abfb3da5ad8ba6fc4" dependencies = [ "base64 0.13.1", "block", - "cocoa", - "core-graphics", + "cocoa 0.24.1", + "core-graphics 0.22.3", "crossbeam-channel", "dunce", "gdk", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 8d59c64..09f117a 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -11,9 +11,10 @@ edition = "2021" tauri-build = { version = "1", features = [] } [dependencies] -tauri = { version = "1", features = [ "fs-read-file", "fs-create-dir", "fs-exists", "fs-write-file", "path-all", "shell-open"] } +tauri = { version = "1", features = [ "macos-private-api", "window-unmaximize", "window-show", "window-minimize", "window-hide", "window-start-dragging", "window-maximize", "window-unminimize", "window-close", "fs-read-file", "fs-create-dir", "fs-exists", "fs-write-file", "path-all", "shell-open"] } serde = { version = "1", features = ["derive"] } serde_json = "1" +window-vibrancy = "0.4.0" [features] # This feature is used for production builds or when a dev server is not specified, DO NOT REMOVE!! diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 523550d..9fff6e2 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -1,15 +1,25 @@ // Prevents additional console window on Windows in release, DO NOT REMOVE!! #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] -// Learn more about Tauri commands at https://tauri.app/v1/guides/features/command -#[tauri::command] -fn greet(name: &str) -> String { - format!("Hello, {}! You've been greeted from Rust!", name) -} +use tauri::Manager; +use window_vibrancy::{apply_vibrancy, NSVisualEffectMaterial}; fn main() { tauri::Builder::default() - .invoke_handler(tauri::generate_handler![greet]) + .setup(|app| { + let window = app.get_window("main").unwrap(); + + #[cfg(target_os = "macos")] + apply_vibrancy(&window, NSVisualEffectMaterial::HudWindow, None, Some(16.0)) + .expect("Unsupported platform! 'apply_vibrancy' is only supported on macOS"); + + #[cfg(target_os = "windows")] + apply_blur(&window, Some((18, 18, 18, 125))) + .expect("Unsupported platform! 'apply_blur' is only supported on Windows"); + + Ok(()) + }) + // .invoke_handler(tauri::generate_handler![greet]) .run(tauri::generate_context!()) .expect("error while running tauri application"); } diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 8d4e952..242f2ee 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -18,7 +18,15 @@ "open": true }, "window": { - "all": false + "all": false, + "close": true, + "hide": true, + "show": true, + "maximize": true, + "minimize": true, + "unmaximize": true, + "unminimize": true, + "startDragging": true }, "fs": { "all": false, @@ -32,13 +40,16 @@ "all": true } }, + "macOSPrivateApi": true, "windows": [ { "title": "KlectrRadio", - "width": 300, + "width": 1200, "height": 600, - "decorations": true, - "resizable": true + "decorations": false, + "resizable": true, + "min-width": 800, + "min-height": 600 } ], "security": { diff --git a/src/styles.css b/src/styles.css index f5d8c5e..646d6f9 100644 --- a/src/styles.css +++ b/src/styles.css @@ -9,10 +9,43 @@ -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; -webkit-text-size-adjust: 100%; - /* background-color: #000022dd; */ @apply bg-gray-100 mt-6; } +html, +body { + margin: 0 !important; +} + +body { + @apply flex flex-col; +} + .paper { @apply bg-white rounded-lg; } + +.titlebar { + height: 20px; + user-select: none; + display: flex; + justify-content: flex-start; + gap: 8px; + position: fixed; + top: 0; + left: 0; + right: 0; + padding: 10px; +} +.titlebar-button { + display: inline-flex; + justify-content: center; + align-items: center; + width: 15px; + height: 15px; +} +.titlebar-button:hover { + border-radius: 100%; + background: #5bbec3; + cursor: pointer; +} -- 2.43.0 From 47be8b066527c9508d809534593c999597f84352 Mon Sep 17 00:00:00 2001 From: Triston Date: Thu, 4 Apr 2024 23:25:04 -0500 Subject: [PATCH 02/18] (feat): rewrite ui layout, keeping old code as backup --- src/App.tsx | 60 +++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 51 insertions(+), 9 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index 4dc46f3..fdcc505 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,9 +1,6 @@ -import { Route, Router, useEffect } from "kaioken" -import Main from "./pages/Main" +import { useEffect } from "kaioken" import { useStorage } from "./hooks/storageStores" import { useStationsStore } from "./hooks/stationStores" -import Add from "./pages/Add" -import Player from "./pages/Player" export function App() { const { getStationsFile } = useStorage() @@ -16,11 +13,56 @@ export function App() { }, []) return ( - - - - - +
+
+
+ +
+
+

Music

+
    +
  • + + + + + + + + + + Radio +
    • +
+
+
+ +
+
+ + + {/* Right Section __________*/} +
+
+
+

Music Player

+
+
+
+

Popular

+
+
+
+
+

Local Radio

+
+
+

Recommended For You

+
+
+
+
+
) } -- 2.43.0 From 929b8eb719ebd4f443eb064a7565c3cbda987632 Mon Sep 17 00:00:00 2001 From: Triston Date: Sat, 6 Apr 2024 01:28:33 -0500 Subject: [PATCH 03/18] (feat): update ui styles and layout --- src-tauri/tauri.conf.json | 6 ++--- src/App.tsx | 57 ++++++++++++++++++++++++++++++++------- src/styles.css | 5 ++-- 3 files changed, 53 insertions(+), 15 deletions(-) diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 242f2ee..f05cea8 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -44,12 +44,12 @@ "windows": [ { "title": "KlectrRadio", - "width": 1200, + "width": 800, "height": 600, "decorations": false, "resizable": true, - "min-width": 800, - "min-height": 600 + "minWidth": 800, + "minHeight": 600 } ], "security": { diff --git a/src/App.tsx b/src/App.tsx index fdcc505..facc067 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -13,15 +13,17 @@ export function App() { }, []) return ( -
-
+
+ + {/* Left Section __________*/} +

Music

    -
  • +
  • @@ -35,27 +37,62 @@ export function App() {
-
- -
+
{/* Right Section __________*/} -
+
-
-

Music Player

+ + {/* Music Player __________*/} +
+
+ station art +
+

Camden to Chinatown

+

Loafy Building, Raimu

+
+
+ +
+
+ + + +
+ +
+

0:40

+ +

1:44

+
+
+ +
+ + + + + +
-
+ + {/* Popular Section __________*/} +

Popular

+ + {/* Bottom Section __________*/}
+ {/* Local Radio __________*/}

Local Radio

+ + {/* Recommended Radio __________*/}

Recommended For You

diff --git a/src/styles.css b/src/styles.css index 646d6f9..2d04baf 100644 --- a/src/styles.css +++ b/src/styles.css @@ -26,7 +26,7 @@ body { } .titlebar { - height: 20px; + height: 30px; user-select: none; display: flex; justify-content: flex-start; @@ -35,7 +35,8 @@ body { top: 0; left: 0; right: 0; - padding: 10px; + padding: 5px; + cursor: grab; } .titlebar-button { display: inline-flex; -- 2.43.0 From c79eb89e469cd800e890d60cdc7c67f20cd6a3f4 Mon Sep 17 00:00:00 2001 From: Triston Date: Sun, 7 Apr 2024 11:40:58 -0500 Subject: [PATCH 04/18] (feat): abstract music player to own component --- src/App.tsx | 35 ++------------ src/components/index.ts | 1 + src/components/music_player/index.tsx | 68 +++++++++++++++++++++++++++ 3 files changed, 72 insertions(+), 32 deletions(-) create mode 100644 src/components/index.ts create mode 100644 src/components/music_player/index.tsx diff --git a/src/App.tsx b/src/App.tsx index facc067..d717b68 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,6 +1,7 @@ import { useEffect } from "kaioken" import { useStorage } from "./hooks/storageStores" import { useStationsStore } from "./hooks/stationStores" +import { MusicPlayer } from "./components/music_player" export function App() { const { getStationsFile } = useStorage() @@ -13,7 +14,7 @@ export function App() { }, []) return ( -
+
{/* Left Section __________*/}
@@ -46,37 +47,7 @@ export function App() {
{/* Music Player __________*/} -
-
- station art -
-

Camden to Chinatown

-

Loafy Building, Raimu

-
-
- -
-
- - - -
- -
-

0:40

- -

1:44

-
-
- -
- - - - - -
-
+ {/* Popular Section __________*/}
diff --git a/src/components/index.ts b/src/components/index.ts new file mode 100644 index 0000000..c1ca153 --- /dev/null +++ b/src/components/index.ts @@ -0,0 +1 @@ +export * from "./music_player" diff --git a/src/components/music_player/index.tsx b/src/components/music_player/index.tsx new file mode 100644 index 0000000..816fab9 --- /dev/null +++ b/src/components/music_player/index.tsx @@ -0,0 +1,68 @@ +function MusicPlayer() { + return ( +
+
+ station art +
+

Camden to Chinatown

+

Loafy Building, Raimu

+
+
+ +
+
+ + + +
+ +
+

0:40

+ +

1:44

+
+
+ +
+ + + + + +
+
+ ) +} + +export default MusicPlayer -- 2.43.0 From 66eee63a9c301c1fd3f8095226184312985f3521 Mon Sep 17 00:00:00 2001 From: Triston Date: Sun, 7 Apr 2024 11:41:44 -0500 Subject: [PATCH 05/18] (feat): remove custom window header --- index.html | 56 --------------------------------------- src-tauri/Cargo.toml | 2 +- src-tauri/tauri.conf.json | 11 +------- src/styles.css | 28 +------------------- 4 files changed, 3 insertions(+), 94 deletions(-) diff --git a/index.html b/index.html index 8eaaebe..5052478 100644 --- a/index.html +++ b/index.html @@ -7,62 +7,6 @@ -
-
- - - - - -
-
- - - - -
-
- - - - - -
-
-
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 09f117a..13b3094 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -11,7 +11,7 @@ edition = "2021" tauri-build = { version = "1", features = [] } [dependencies] -tauri = { version = "1", features = [ "macos-private-api", "window-unmaximize", "window-show", "window-minimize", "window-hide", "window-start-dragging", "window-maximize", "window-unminimize", "window-close", "fs-read-file", "fs-create-dir", "fs-exists", "fs-write-file", "path-all", "shell-open"] } +tauri = { version = "1", features = [ "macos-private-api", "fs-read-file", "fs-create-dir", "fs-exists", "fs-write-file", "path-all", "shell-open"] } serde = { version = "1", features = ["derive"] } serde_json = "1" window-vibrancy = "0.4.0" diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index f05cea8..e72cfce 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -18,15 +18,7 @@ "open": true }, "window": { - "all": false, - "close": true, - "hide": true, - "show": true, - "maximize": true, - "minimize": true, - "unmaximize": true, - "unminimize": true, - "startDragging": true + "all": false }, "fs": { "all": false, @@ -46,7 +38,6 @@ "title": "KlectrRadio", "width": 800, "height": 600, - "decorations": false, "resizable": true, "minWidth": 800, "minHeight": 600 diff --git a/src/styles.css b/src/styles.css index 2d04baf..6f74517 100644 --- a/src/styles.css +++ b/src/styles.css @@ -9,7 +9,7 @@ -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; -webkit-text-size-adjust: 100%; - @apply bg-gray-100 mt-6; + @apply bg-gray-100; } html, @@ -24,29 +24,3 @@ body { .paper { @apply bg-white rounded-lg; } - -.titlebar { - height: 30px; - user-select: none; - display: flex; - justify-content: flex-start; - gap: 8px; - position: fixed; - top: 0; - left: 0; - right: 0; - padding: 5px; - cursor: grab; -} -.titlebar-button { - display: inline-flex; - justify-content: center; - align-items: center; - width: 15px; - height: 15px; -} -.titlebar-button:hover { - border-radius: 100%; - background: #5bbec3; - cursor: pointer; -} -- 2.43.0 From ce18d3a9b166630c24ca3d0ec7d6a65266598a80 Mon Sep 17 00:00:00 2001 From: Triston Date: Sun, 7 Apr 2024 11:47:31 -0500 Subject: [PATCH 06/18] (feat): abstract local radio --- src/components/local_radio/index.tsx | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 src/components/local_radio/index.tsx diff --git a/src/components/local_radio/index.tsx b/src/components/local_radio/index.tsx new file mode 100644 index 0000000..ae577a9 --- /dev/null +++ b/src/components/local_radio/index.tsx @@ -0,0 +1,7 @@ +export function LocalRadio() { + return ( +
+

Local Radio

+
+ ) +} -- 2.43.0 From 20c508c5129397fe1ad34834877d2c0cf10b562b Mon Sep 17 00:00:00 2001 From: Triston Date: Sun, 7 Apr 2024 11:49:46 -0500 Subject: [PATCH 07/18] (feat): fix export in music player --- src/components/music_player/index.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/music_player/index.tsx b/src/components/music_player/index.tsx index 816fab9..b6c0783 100644 --- a/src/components/music_player/index.tsx +++ b/src/components/music_player/index.tsx @@ -1,4 +1,4 @@ -function MusicPlayer() { +export function MusicPlayer() { return (
Date: Sun, 7 Apr 2024 11:49:56 -0500 Subject: [PATCH 08/18] (feat): abstract navigation --- src/components/navigation/index.tsx | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 src/components/navigation/index.tsx diff --git a/src/components/navigation/index.tsx b/src/components/navigation/index.tsx new file mode 100644 index 0000000..ad10f56 --- /dev/null +++ b/src/components/navigation/index.tsx @@ -0,0 +1,18 @@ +export function Navigation() { + return ( +
    +
  • + + + + + + + + + + Radio +
    • +
+ ) +} -- 2.43.0 From 4e9bb74114770cd7e0c06e319169a908bb47fdda Mon Sep 17 00:00:00 2001 From: Triston Date: Sun, 7 Apr 2024 11:50:11 -0500 Subject: [PATCH 09/18] (feat): abstract popular card --- src/components/popular/index.tsx | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 src/components/popular/index.tsx diff --git a/src/components/popular/index.tsx b/src/components/popular/index.tsx new file mode 100644 index 0000000..d7020d9 --- /dev/null +++ b/src/components/popular/index.tsx @@ -0,0 +1,10 @@ +export function Popular() { + return ( +
+
+

Popular

+
+
+ ) +} + -- 2.43.0 From fb2cda5e9ccc5231e8d24c71d53a94a7a4e73bf0 Mon Sep 17 00:00:00 2001 From: Triston Date: Sun, 7 Apr 2024 11:50:25 -0500 Subject: [PATCH 10/18] (feat): abstract recommended radio card --- src/components/recommended_radio/index.tsx | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 src/components/recommended_radio/index.tsx diff --git a/src/components/recommended_radio/index.tsx b/src/components/recommended_radio/index.tsx new file mode 100644 index 0000000..c909269 --- /dev/null +++ b/src/components/recommended_radio/index.tsx @@ -0,0 +1,7 @@ +export function RecommendedRadio() { + return ( +
+

Recommended For You

+
+ ) +} -- 2.43.0 From 769a3a64fef402e4c9f34c8563cfa73f11aaa6c1 Mon Sep 17 00:00:00 2001 From: Triston Date: Sun, 7 Apr 2024 11:50:42 -0500 Subject: [PATCH 11/18] (feat): export main components from components dir --- src/components/index.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/components/index.ts b/src/components/index.ts index c1ca153..2770c45 100644 --- a/src/components/index.ts +++ b/src/components/index.ts @@ -1 +1,5 @@ export * from "./music_player" +export * from "./popular" +export * from "./navigation" +export * from "./local_radio" +export * from "./recommended_radio" -- 2.43.0 From 58d1c335b819c215022e01351ecc6a449b3e0ac6 Mon Sep 17 00:00:00 2001 From: Triston Date: Sun, 7 Apr 2024 11:51:08 -0500 Subject: [PATCH 12/18] (feat): replace elements with relevant components --- src/App.tsx | 39 +++++---------------------------------- 1 file changed, 5 insertions(+), 34 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index d717b68..02b80c7 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,7 +1,7 @@ import { useEffect } from "kaioken" import { useStorage } from "./hooks/storageStores" import { useStationsStore } from "./hooks/stationStores" -import { MusicPlayer } from "./components/music_player" +import { MusicPlayer, Popular, LocalRadio, RecommendedRadio, Navigation } from "./components" export function App() { const { getStationsFile } = useStorage() @@ -23,20 +23,7 @@ export function App() {

Music

-
    -
  • - - - - - - - - - - Radio -
    • -
+
@@ -45,28 +32,12 @@ export function App() { {/* Right Section __________*/}
- - {/* Music Player __________*/} - - {/* Popular Section __________*/} -
-
-

Popular

-
-
- + {/* Bottom Section __________*/}
- {/* Local Radio __________*/} -
-

Local Radio

-
- - {/* Recommended Radio __________*/} -
-

Recommended For You

-
+ +
-- 2.43.0 From 37294489a821caccf88874f0fb6fb510e01a55b3 Mon Sep 17 00:00:00 2001 From: Triston Date: Sun, 7 Apr 2024 13:03:42 -0500 Subject: [PATCH 13/18] (feat): fix some of the music player styles --- src/App.tsx | 6 ++++-- src/components/music_player/index.tsx | 27 +++++++++++++-------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index 02b80c7..7175343 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -17,20 +17,22 @@ export function App() {
{/* Left Section __________*/} -
+
+

Music

+
{/* Right Section __________*/} -
+
diff --git a/src/components/music_player/index.tsx b/src/components/music_player/index.tsx index b6c0783..17f7838 100644 --- a/src/components/music_player/index.tsx +++ b/src/components/music_player/index.tsx @@ -1,26 +1,24 @@ export function MusicPlayer() { return ( -
-
+
+
station art -
-

Camden to Chinatown

-

Loafy Building, Raimu

+ +
+

Camden to Chinatown

+

Loafy Building, Raimu

-
+
@@ -43,8 +41,9 @@ export function MusicPlayer() {
-
+
-- 2.43.0 From aeefde761a4f51e4023a216cc05c05f49fa724da Mon Sep 17 00:00:00 2001 From: Triston Date: Wed, 24 Apr 2024 18:15:57 -0400 Subject: [PATCH 14/18] style: add widths and heights to various components --- src/App.tsx | 13 +++++++------ src/styles.css | 10 +++++----- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index 7175343..93ce06d 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,7 +1,7 @@ import { useEffect } from "kaioken" import { useStorage } from "./hooks/storageStores" import { useStationsStore } from "./hooks/stationStores" -import { MusicPlayer, Popular, LocalRadio, RecommendedRadio, Navigation } from "./components" +import { Popular, Navigation } from "./components" export function App() { const { getStationsFile } = useStorage() @@ -32,14 +32,15 @@ export function App() { {/* Right Section __________*/} -
+
- + {/**/} {/* Bottom Section __________*/} -
- - + +
+ {/**/} + {/**/}
diff --git a/src/styles.css b/src/styles.css index 6f74517..ce9c071 100644 --- a/src/styles.css +++ b/src/styles.css @@ -13,12 +13,12 @@ } html, -body { +body, +#root { margin: 0 !important; -} - -body { - @apply flex flex-col; + overlay: hidden; + max-width: 100vw; + max-height: 100vh; } .paper { -- 2.43.0 From 46a8a807885463e59740ad671e85fa21b20460ed Mon Sep 17 00:00:00 2001 From: Triston Date: Wed, 24 Apr 2024 18:16:37 -0400 Subject: [PATCH 15/18] feat: add dummy data and properly style the popular section --- src/components/popular/index.tsx | 61 ++++++++++++++++++++++++++++++-- 1 file changed, 59 insertions(+), 2 deletions(-) diff --git a/src/components/popular/index.tsx b/src/components/popular/index.tsx index d7020d9..d733ba6 100644 --- a/src/components/popular/index.tsx +++ b/src/components/popular/index.tsx @@ -1,10 +1,67 @@ export function Popular() { return ( -
-
+
+

Popular

+
+ {dummyData.map(x => ( +
+ +

{x.title}

+ {x.location} +
+ ))} +
) } +const dummyData = [ + { + location: 'Florida, USA', + title: '93.3 FLZ', + image: 'https://thispersondoesnotexist.com' + }, + { + location: 'Florida, USA', + title: '93.3 FLZ', + image: 'https://thispersondoesnotexist.com' + }, + { + location: 'Florida, USA', + title: '93.3 FLZ', + image: 'https://thispersondoesnotexist.com' + }, + { + location: 'Florida, USA', + title: '93.3 FLZ', + image: 'https://thispersondoesnotexist.com' + }, + { + location: 'Florida, USA', + title: '93.3 FLZ', + image: 'https://thispersondoesnotexist.com' + }, + { + location: 'Florida, USA', + title: '93.3 FLZ', + image: 'https://thispersondoesnotexist.com' + }, + { + location: 'Florida, USA', + title: '93.3 FLZ', + image: 'https://thispersondoesnotexist.com' + }, + { + location: 'Florida, USA', + title: '93.3 FLZ', + image: 'https://thispersondoesnotexist.com' + }, + { + location: 'Florida, USA', + title: '93.3 FLZ', + image: 'https://thispersondoesnotexist.com' + }, +] + -- 2.43.0 From 609dd9ad9c4d75742b4af9112280f7145aa45620 Mon Sep 17 00:00:00 2001 From: Triston Date: Wed, 24 Apr 2024 18:26:11 -0400 Subject: [PATCH 16/18] build(packages): update kaioken and vite-plugin-kaioken --- bun.lockb | Bin 173810 -> 173842 bytes package.json | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bun.lockb b/bun.lockb index d15dd9b6b61d11d009ec242b6d4a0bc44d97528a..6b33c85c89c392121a555b5dc4da44c076f78574 100755 GIT binary patch delta 12156 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 delta 12196 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 diff --git a/package.json b/package.json index 9c9a9f7..1c9054c 100644 --- a/package.json +++ b/package.json @@ -14,8 +14,8 @@ }, "dependencies": { "@tauri-apps/api": "^1", - "kaioken": "^0.10.5", - "vite-plugin-kaioken": "^0.0.7" + "kaioken": "^0.17.0", + "vite-plugin-kaioken": "^0.3.9" }, "devDependencies": { "@tauri-apps/cli": "^1", -- 2.43.0 From 8c7a270f30c74199ea8cb33f5758a0e1dca1cb59 Mon Sep 17 00:00:00 2001 From: Triston Date: Wed, 24 Apr 2024 18:27:05 -0400 Subject: [PATCH 17/18] revert: uncomment other components --- src/App.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index 93ce06d..ac79a28 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,7 +1,7 @@ import { useEffect } from "kaioken" import { useStorage } from "./hooks/storageStores" import { useStationsStore } from "./hooks/stationStores" -import { Popular, Navigation } from "./components" +import { Popular, Navigation, LocalRadio, RecommendedRadio, MusicPlayer } from "./components" export function App() { const { getStationsFile } = useStorage() @@ -34,13 +34,13 @@ export function App() { {/* Right Section __________*/}
- {/**/} + {/* Bottom Section __________*/} -
- {/**/} - {/**/} +
+ +
-- 2.43.0 From 1c2f4e9b9a9f3202f176ca5a48cd8c5dbb300724 Mon Sep 17 00:00:00 2001 From: Triston Date: Wed, 24 Apr 2024 19:53:25 -0400 Subject: [PATCH 18/18] feat: add dummy data and fill out component --- src/App.tsx | 2 +- src/components/local_radio/index.tsx | 87 +++++++++++++++++++++- src/components/music_player/index.tsx | 2 +- src/components/recommended_radio/index.tsx | 60 ++++++++++++++- 4 files changed, 146 insertions(+), 5 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index ac79a28..a34443d 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -38,7 +38,7 @@ export function App() { {/* Bottom Section __________*/} -
+
diff --git a/src/components/local_radio/index.tsx b/src/components/local_radio/index.tsx index ae577a9..27c924c 100644 --- a/src/components/local_radio/index.tsx +++ b/src/components/local_radio/index.tsx @@ -1,7 +1,90 @@ export function LocalRadio() { return ( -
-

Local Radio

+
+

Local Radio

+ +
+ {dummyData.map(x => ( +
+ +

{x.title}

+
+ ))} +
) } + +const dummyData = [ + { + location: 'Florida, USA', + title: '93.3 FLZ', + image: 'https://thispersondoesnotexist.com' + }, + { + location: 'Florida, USA', + title: '93.3 FLZ', + image: 'https://thispersondoesnotexist.com' + }, + { + location: 'Florida, USA', + title: '93.3 FLZ', + image: 'https://thispersondoesnotexist.com' + }, + { + location: 'Florida, USA', + title: '93.3 FLZ', + image: 'https://thispersondoesnotexist.com' + }, + { + location: 'Florida, USA', + title: '93.3 FLZ', + image: 'https://thispersondoesnotexist.com' + }, + { + location: 'Florida, USA', + title: '93.3 FLZ', + image: 'https://thispersondoesnotexist.com' + }, + { + location: 'Florida, USA', + title: '93.3 FLZ', + image: 'https://thispersondoesnotexist.com' + }, + { + location: 'Florida, USA', + title: '93.3 FLZ', + image: 'https://thispersondoesnotexist.com' + }, + { + location: 'Florida, USA', + title: '93.3 FLZ', + image: 'https://thispersondoesnotexist.com' + }, + { + location: 'Florida, USA', + title: '93.3 FLZ', + image: 'https://thispersondoesnotexist.com' + }, + { + location: 'Florida, USA', + title: '93.3 FLZ', + image: 'https://thispersondoesnotexist.com' + }, + { + location: 'Florida, USA', + title: '93.3 FLZ', + image: 'https://thispersondoesnotexist.com' + }, + { + location: 'Florida, USA', + title: '93.3 FLZ', + image: 'https://thispersondoesnotexist.com' + }, + { + location: 'Florida, USA', + title: '93.3 FLZ', + image: 'https://thispersondoesnotexist.com' + } +] + diff --git a/src/components/music_player/index.tsx b/src/components/music_player/index.tsx index 17f7838..e6ac5b5 100644 --- a/src/components/music_player/index.tsx +++ b/src/components/music_player/index.tsx @@ -1,6 +1,6 @@ export function MusicPlayer() { return ( -
+
+

Recommended For You

+ +
+ {dummyData.map(x => ( +
+ +

{x.title}

+
+ ))} +
) } + +const dummyData = [ + { + location: 'Florida, USA', + title: '93.3 FLZ', + image: 'https://thispersondoesnotexist.com' + }, + { + location: 'Florida, USA', + title: '93.3 FLZ', + image: 'https://thispersondoesnotexist.com' + }, + { + location: 'Florida, USA', + title: '93.3 FLZ', + image: 'https://thispersondoesnotexist.com' + }, + { + location: 'Florida, USA', + title: '93.3 FLZ', + image: 'https://thispersondoesnotexist.com' + }, + { + location: 'Florida, USA', + title: '93.3 FLZ', + image: 'https://thispersondoesnotexist.com' + }, + { + location: 'Florida, USA', + title: '93.3 FLZ', + image: 'https://thispersondoesnotexist.com' + }, + { + location: 'Florida, USA', + title: '93.3 FLZ', + image: 'https://thispersondoesnotexist.com' + }, + { + location: 'Florida, USA', + title: '93.3 FLZ', + image: 'https://thispersondoesnotexist.com' + }, + { + location: 'Florida, USA', + title: '93.3 FLZ', + image: 'https://thispersondoesnotexist.com' + }, +] + -- 2.43.0