From c032dbea1a700f1a3ad53dcc5483b44152f33538 Mon Sep 17 00:00:00 2001 From: reya Date: Wed, 23 Oct 2024 10:43:39 +0700 Subject: [PATCH] chore: clean up --- src-tauri/Cargo.lock | 73 +---- src-tauri/Cargo.toml | 2 - src-tauri/src/main.rs | 4 +- src/app.tsx | 5 +- src/components/user/provider.tsx | 2 +- src/routes/__root.tsx | 2 +- src/routes/_layout/index.tsx | 4 +- src/routes/settings.$id/general.lazy.tsx | 342 +++++++++++------------ src/routes/settings.$id/general.tsx | 30 +- tsconfig.json | 1 - 10 files changed, 195 insertions(+), 270 deletions(-) diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 45208974..2af1f637 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -17,7 +17,6 @@ dependencies = [ "keyring", "keyring-search", "linkify", - "log", "nostr-sdk", "regex", "reqwest", @@ -45,7 +44,6 @@ dependencies = [ "tauri-plugin-window-state", "tauri-specta", "tokio", - "tracing-subscriber", "url", ] @@ -3082,7 +3080,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] @@ -3609,16 +3607,6 @@ dependencies = [ "zbus 4.4.0", ] -[[package]] -name = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi", -] - [[package]] name = "num" version = "0.4.3" @@ -4005,12 +3993,6 @@ dependencies = [ "windows-sys 0.59.0", ] -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - [[package]] name = "page_size" version = "0.6.0" @@ -5334,15 +5316,6 @@ dependencies = [ "digest", ] -[[package]] -name = "sharded-slab" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" -dependencies = [ - "lazy_static", -] - [[package]] name = "share-picker" version = "0.1.0" @@ -6358,16 +6331,6 @@ dependencies = [ "syn 2.0.79", ] -[[package]] -name = "thread_local" -version = "1.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" -dependencies = [ - "cfg-if", - "once_cell", -] - [[package]] name = "tiff" version = "0.9.1" @@ -6643,32 +6606,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", - "valuable", -] - -[[package]] -name = "tracing-log" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" -dependencies = [ - "nu-ansi-term", - "sharded-slab", - "smallvec", - "thread_local", - "tracing-core", - "tracing-log", ] [[package]] @@ -6876,12 +6813,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - [[package]] name = "vcpkg" version = "0.2.15" @@ -7224,7 +7155,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 11ab19a9..a529d614 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -48,8 +48,6 @@ linkify = "0.10.0" regex = "1.10.4" keyring = { version = "3", features = ["apple-native", "windows-native"] } keyring-search = "1.2.0" -tracing-subscriber = "0.3.18" -log = "^0.4" [target.'cfg(target_os = "macos")'.dependencies] border = { git = "https://github.com/ahkohd/tauri-toolkit", branch = "v2" } diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 800b598b..f182f208 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -14,7 +14,6 @@ use commands::{ window::*, }; use common::{get_all_accounts, parse_event}; -use log::info; use nostr_sdk::prelude::{Profile as DatabaseProfile, *}; use serde::{Deserialize, Serialize}; use specta::Type; @@ -169,8 +168,8 @@ fn main() { .export(Typescript::default(), "../src/commands.gen.ts") .expect("Failed to export typescript bindings"); - let mut ctx = tauri::generate_context!(); let tauri_builder = tauri::Builder::default(); + let mut ctx = tauri::generate_context!(); tauri_builder .invoke_handler(builder.invoke_handler()) @@ -440,7 +439,6 @@ fn main() { while let Ok(notification) = notifications.recv().await { match notification { RelayPoolNotification::Message { relay_url, message } => { - info!(target: "relay_events", "message: {}", message.as_pretty_json()); if let RelayMessage::Auth { challenge } = message { match client.auth(challenge, relay_url.clone()).await { Ok(..) => { diff --git a/src/app.tsx b/src/app.tsx index 00b61914..71a25a2f 100644 --- a/src/app.tsx +++ b/src/app.tsx @@ -2,15 +2,14 @@ import { experimental_createPersister } from "@tanstack/query-persist-client-cor import { QueryClient, QueryClientProvider } from "@tanstack/react-query"; import { RouterProvider, createRouter } from "@tanstack/react-router"; import { type } from "@tauri-apps/plugin-os"; +import { createStore } from "@tauri-apps/plugin-store"; import { StrictMode } from "react"; import ReactDOM from "react-dom/client"; import { newQueryStorage } from "./commons"; import type { LumeEvent } from "./system"; -import "./app.css"; // global styles - -import { createStore } from "@tauri-apps/plugin-store"; import { routeTree } from "./routes.gen"; // auto generated file +import "./app.css"; // global styles const platform = type(); // @ts-expect-error, required: https://github.com/tauri-apps/plugins-workspace/pull/1860 diff --git a/src/components/user/provider.tsx b/src/components/user/provider.tsx index 59bfb5d4..02f08a92 100644 --- a/src/components/user/provider.tsx +++ b/src/components/user/provider.tsx @@ -1,5 +1,5 @@ -import type { Metadata } from "@/types"; import { useProfile } from "@/system"; +import type { Metadata } from "@/types"; import { type ReactNode, createContext, useContext } from "react"; const UserContext = createContext<{ diff --git a/src/routes/__root.tsx b/src/routes/__root.tsx index 09056444..313834f3 100644 --- a/src/routes/__root.tsx +++ b/src/routes/__root.tsx @@ -9,7 +9,7 @@ import { useEffect } from "react"; interface RouterContext { queryClient: QueryClient; platform: OsType; - accounts: string[]; + accounts?: string[]; } export const Route = createRootRouteWithContext()({ diff --git a/src/routes/_layout/index.tsx b/src/routes/_layout/index.tsx index c67745be..1cb6e3e7 100644 --- a/src/routes/_layout/index.tsx +++ b/src/routes/_layout/index.tsx @@ -1,3 +1,3 @@ -import { createFileRoute } from '@tanstack/react-router' +import { createFileRoute } from "@tanstack/react-router"; -export const Route = createFileRoute('/_layout/')() +export const Route = createFileRoute("/_layout/")(); diff --git a/src/routes/settings.$id/general.lazy.tsx b/src/routes/settings.$id/general.lazy.tsx index ed919bab..1d282639 100644 --- a/src/routes/settings.$id/general.lazy.tsx +++ b/src/routes/settings.$id/general.lazy.tsx @@ -1,189 +1,189 @@ -import { commands } from '@/commands.gen' -import { appSettings } from '@/commons' -import { Spinner } from '@/components' -import * as Switch from '@radix-ui/react-switch' -import { createLazyFileRoute } from '@tanstack/react-router' -import { useStore } from '@tanstack/react-store' -import { invoke } from '@tauri-apps/api/core' -import { message } from '@tauri-apps/plugin-dialog' -import { useCallback, useEffect, useState, useTransition } from 'react' +import { commands } from "@/commands.gen"; +import { appSettings } from "@/commons"; +import { Spinner } from "@/components"; +import * as Switch from "@radix-ui/react-switch"; +import { createLazyFileRoute } from "@tanstack/react-router"; +import { useStore } from "@tanstack/react-store"; +import { invoke } from "@tauri-apps/api/core"; +import { message } from "@tauri-apps/plugin-dialog"; +import { useCallback, useEffect, useState, useTransition } from "react"; -type Theme = 'auto' | 'light' | 'dark' +type Theme = "auto" | "light" | "dark"; -export const Route = createLazyFileRoute('/settings/$id/general')({ - component: Screen, -}) +export const Route = createLazyFileRoute("/settings/$id/general")({ + component: Screen, +}); function Screen() { - const [theme, setTheme] = useState(null) - const [isPending, startTransition] = useTransition() + const [theme, setTheme] = useState(null); + const [isPending, startTransition] = useTransition(); - const changeTheme = useCallback(async (theme: string) => { - if (theme === 'auto' || theme === 'light' || theme === 'dark') { - invoke('plugin:theme|set_theme', { - theme: theme, - }).then(() => setTheme(theme)) - } - }, []) + const changeTheme = useCallback(async (theme: string) => { + if (theme === "auto" || theme === "light" || theme === "dark") { + invoke("plugin:theme|set_theme", { + theme: theme, + }).then(() => setTheme(theme)); + } + }, []); - const updateSettings = () => { - startTransition(async () => { - const newSettings = JSON.stringify(appSettings.state) - const res = await commands.setUserSettings(newSettings) + const updateSettings = () => { + startTransition(async () => { + const newSettings = JSON.stringify(appSettings.state); + const res = await commands.setUserSettings(newSettings); - if (res.status === 'error') { - await message(res.error, { kind: 'error' }) - } + if (res.status === "error") { + await message(res.error, { kind: "error" }); + } - return - }) - } + return; + }); + }; - useEffect(() => { - invoke('plugin:theme|get_theme').then((data) => setTheme(data as Theme)) - }, []) + useEffect(() => { + invoke("plugin:theme|get_theme").then((data) => setTheme(data as Theme)); + }, []); - return ( -
-
-
-

- General -

-
- - - -
-
-
-

- Appearance -

-
-
-
-

Appearance

-

- Change app theme -

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

- Privacy & Performance -

-
- - - -
-
-
-
-
- -
-
- ) + return ( +
+
+
+

+ General +

+
+ + + +
+
+
+

+ Appearance +

+
+
+
+

Appearance

+

+ Change app theme +

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

+ Privacy & Performance +

+
+ + + +
+
+
+
+
+ +
+
+ ); } function Setting({ - label, - name, - description, + label, + name, + description, }: { - label: string - name: string - description: string + label: string; + name: string; + description: string; }) { - const state = useStore(appSettings, (state) => state[label]) + const state = useStore(appSettings, (state) => state[label]); - const toggle = useCallback(() => { - appSettings.setState((state) => { - return { - ...state, - [label]: !state[label], - } - }) - }, []) + const toggle = useCallback(() => { + appSettings.setState((state) => { + return { + ...state, + [label]: !state[label], + }; + }); + }, []); - return ( -
-
-

{name}

-

- {description} -

-
-
- toggle()} - className="relative h-7 w-12 shrink-0 cursor-default rounded-full bg-black/10 outline-none data-[state=checked]:bg-blue-500 dark:bg-white/10" - > - - -
-
- ) + return ( +
+
+

{name}

+

+ {description} +

+
+
+ toggle()} + className="relative h-7 w-12 shrink-0 cursor-default rounded-full bg-black/10 outline-none data-[state=checked]:bg-blue-500 dark:bg-white/10" + > + + +
+
+ ); } diff --git a/src/routes/settings.$id/general.tsx b/src/routes/settings.$id/general.tsx index 30f93391..1693d2cc 100644 --- a/src/routes/settings.$id/general.tsx +++ b/src/routes/settings.$id/general.tsx @@ -1,17 +1,17 @@ -import { commands } from '@/commands.gen' -import { appSettings } from '@/commons' -import { createFileRoute } from '@tanstack/react-router' +import { commands } from "@/commands.gen"; +import { appSettings } from "@/commons"; +import { createFileRoute } from "@tanstack/react-router"; -export const Route = createFileRoute('/settings/$id/general')({ - beforeLoad: async () => { - const res = await commands.getUserSettings() +export const Route = createFileRoute("/settings/$id/general")({ + beforeLoad: async () => { + const res = await commands.getUserSettings(); - if (res.status === 'ok') { - appSettings.setState((state) => { - return { ...state, ...res.data } - }) - } else { - throw new Error(res.error) - } - }, -}) + if (res.status === "ok") { + appSettings.setState((state) => { + return { ...state, ...res.data }; + }); + } else { + throw new Error(res.error); + } + }, +}); diff --git a/tsconfig.json b/tsconfig.json index 672d82df..fc223013 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -27,7 +27,6 @@ "noImplicitAny": false, "noUnusedParameters": true, "noFallthroughCasesInSwitch": true, - "strictNullChecks": false }, "include": [ "src"