From 31bacc2646b6df2bc1cae85a075c6e1f4a2e1ff2 Mon Sep 17 00:00:00 2001
From: reya <123083837+reyamir@users.noreply.github.com>
Date: Mon, 24 Jun 2024 11:09:32 +0700
Subject: [PATCH] chore: remove unused code
---
apps/desktop2/src/app.tsx | 22 ++------
apps/desktop2/src/components/balance.tsx | 41 ---------------
.../src/components/note/mentions/note.tsx | 4 +-
apps/desktop2/src/routes/$account.tsx | 9 ++--
apps/desktop2/src/routes/__root.tsx | 10 ----
.../src/routes/auth/$account.backup.tsx | 35 +++----------
.../src/routes/auth/create-profile.tsx | 15 +++---
.../routes/events/-components/replyList.tsx | 50 -------------------
apps/desktop2/src/routes/settings.tsx | 15 ++----
packages/system/src/commands.ts | 8 +--
10 files changed, 31 insertions(+), 178 deletions(-)
delete mode 100644 apps/desktop2/src/components/balance.tsx
delete mode 100644 apps/desktop2/src/routes/events/-components/replyList.tsx
diff --git a/apps/desktop2/src/app.tsx b/apps/desktop2/src/app.tsx
index 8a511086..400421c8 100644
--- a/apps/desktop2/src/app.tsx
+++ b/apps/desktop2/src/app.tsx
@@ -1,30 +1,18 @@
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import { RouterProvider, createRouter } from "@tanstack/react-router";
-import React, { StrictMode } from "react";
+import { StrictMode } from "react";
import ReactDOM from "react-dom/client";
-import { I18nextProvider } from "react-i18next";
-import "./app.css";
-import { type } from "@tauri-apps/plugin-os";
-import i18n from "./locale";
import { routeTree } from "./router.gen"; // auto generated file
-
-const queryClient = new QueryClient();
-const os = await type();
+import "./app.css";
// Set up a Router instance
+const queryClient = new QueryClient();
const router = createRouter({
routeTree,
- context: {
- queryClient,
- platform: os,
- },
+ context: { queryClient },
Wrap: ({ children }) => {
return (
-
-
- {children}
-
-
+ {children}
);
},
});
diff --git a/apps/desktop2/src/components/balance.tsx b/apps/desktop2/src/components/balance.tsx
deleted file mode 100644
index 44e27de9..00000000
--- a/apps/desktop2/src/components/balance.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import { User } from "@/components/user";
-import { NostrAccount } from "@lume/system";
-import { getBitcoinDisplayValues } from "@lume/utils";
-import { useEffect, useMemo, useState } from "react";
-
-export function Balance({ account }: { account: string }) {
- const [balance, setBalance] = useState(0);
- const value = useMemo(() => getBitcoinDisplayValues(balance), [balance]);
-
- useEffect(() => {
- async function getBalance() {
- const val = await NostrAccount.getBalance();
- setBalance(val);
- }
-
- getBalance();
- }, []);
-
- return (
-
-
-
-
- Your balance
-
-
- ₿ {value.bitcoinFormatted}
-
-
-
-
-
-
-
-
-
- );
-}
diff --git a/apps/desktop2/src/components/note/mentions/note.tsx b/apps/desktop2/src/components/note/mentions/note.tsx
index d4cbaaca..ece78c0d 100644
--- a/apps/desktop2/src/components/note/mentions/note.tsx
+++ b/apps/desktop2/src/components/note/mentions/note.tsx
@@ -1,6 +1,5 @@
import { LumeWindow, useEvent } from "@lume/system";
import { LinkIcon } from "@lume/icons";
-import { useTranslation } from "react-i18next";
import { cn } from "@lume/utils";
import { User } from "@/components/user";
import { Spinner } from "@lume/ui";
@@ -12,7 +11,6 @@ export function MentionNote({
eventId: string;
openable?: boolean;
}) {
- const { t } = useTranslation();
const { isLoading, isError, data } = useEvent(eventId);
if (isLoading) {
@@ -26,7 +24,7 @@ export function MentionNote({
if (isError || !data) {
return (
- {t("note.error")}
+ Event not found with your current relay set
);
}
diff --git a/apps/desktop2/src/routes/$account.tsx b/apps/desktop2/src/routes/$account.tsx
index 3a879817..3fd8e889 100644
--- a/apps/desktop2/src/routes/$account.tsx
+++ b/apps/desktop2/src/routes/$account.tsx
@@ -8,18 +8,21 @@ import { Link } from "@tanstack/react-router";
import { Menu, MenuItem } from "@tauri-apps/api/menu";
import { getCurrent } from "@tauri-apps/api/window";
import { message } from "@tauri-apps/plugin-dialog";
+import { type } from "@tauri-apps/plugin-os";
import { useCallback, useEffect, useMemo, useState } from "react";
export const Route = createFileRoute("/$account")({
beforeLoad: async () => {
const accounts = await NostrAccount.getAccounts();
- return { accounts };
+ const os = await type();
+
+ return { accounts, os };
},
component: Screen,
});
function Screen() {
- const { platform } = Route.useRouteContext();
+ const { os } = Route.useRouteContext();
return (
@@ -27,7 +30,7 @@ function Screen() {
data-tauri-drag-region
className={cn(
"flex h-11 shrink-0 items-center justify-between pr-2",
- platform === "macos" ? "ml-2 pl-20" : "pl-4",
+ os === "macos" ? "ml-2 pl-20" : "pl-4",
)}
>
diff --git a/apps/desktop2/src/routes/__root.tsx b/apps/desktop2/src/routes/__root.tsx
index a00431c2..d7a11f7a 100644
--- a/apps/desktop2/src/routes/__root.tsx
+++ b/apps/desktop2/src/routes/__root.tsx
@@ -1,19 +1,9 @@
-import type { Settings } from "@lume/system";
import { Spinner } from "@lume/ui";
import type { QueryClient } from "@tanstack/react-query";
import { Outlet, createRootRouteWithContext } from "@tanstack/react-router";
-import type { Platform } from "@tauri-apps/plugin-os";
interface RouterContext {
- // System
queryClient: QueryClient;
- // App info
- platform?: Platform;
- locale?: string;
- // Settings
- settings?: Settings;
- // Accounts
- accounts?: string[];
}
export const Route = createRootRouteWithContext()({
diff --git a/apps/desktop2/src/routes/auth/$account.backup.tsx b/apps/desktop2/src/routes/auth/$account.backup.tsx
index 752b5773..6699aa44 100644
--- a/apps/desktop2/src/routes/auth/$account.backup.tsx
+++ b/apps/desktop2/src/routes/auth/$account.backup.tsx
@@ -7,7 +7,6 @@ import { invoke } from "@tauri-apps/api/core";
import { writeText } from "@tauri-apps/plugin-clipboard-manager";
import { message } from "@tauri-apps/plugin-dialog";
import { useState } from "react";
-import { useTranslation } from "react-i18next";
export const Route = createFileRoute("/auth/$account/backup")({
component: Screen,
@@ -15,20 +14,18 @@ export const Route = createFileRoute("/auth/$account/backup")({
function Screen() {
const { account } = Route.useParams();
- const { t } = useTranslation();
+ const navigate = useNavigate();
const [key, setKey] = useState(null);
const [passphase, setPassphase] = useState("");
const [copied, setCopied] = useState(false);
const [loading, setLoading] = useState(false);
- const [confirm, setConfirm] = useState({ c1: false, c2: false, c3: false });
-
- const navigate = useNavigate();
+ const [confirm, setConfirm] = useState({ c1: false, c2: false });
const submit = async () => {
try {
if (key) {
- if (!confirm.c1 || !confirm.c2 || !confirm.c3) {
+ if (!confirm.c1 || !confirm.c2) {
return await message("You need to confirm before continue", {
title: "Backup",
kind: "info",
@@ -137,7 +134,7 @@ function Screen() {
className="text-sm leading-none text-neutral-800 dark:text-neutral-200"
htmlFor="confirm1"
>
- {t("backup.confirm1")}
+ I will make sure keep it safe and not sharing with anyone.
@@ -157,27 +154,7 @@ function Screen() {
className="text-sm leading-none text-neutral-800 dark:text-neutral-200"
htmlFor="confirm2"
>
- {t("backup.confirm2")}
-
-
-
-
- setConfirm((state) => ({ ...state, c3: !state.c3 }))
- }
- className="flex items-center justify-center rounded-md outline-none appearance-none size-6 bg-neutral-100 dark:bg-white/10 dark:hover:bg-white/20"
- id="confirm3"
- >
-
-
-
-
-
@@ -191,7 +168,7 @@ function Screen() {
disabled={loading}
className="inline-flex items-center justify-center w-full font-semibold text-white bg-blue-500 rounded-lg h-11 shrink-0 hover:bg-blue-600 disabled:opacity-50"
>
- {loading ? : t("global.continue")}
+ {loading ? : "Continue"}
diff --git a/apps/desktop2/src/routes/auth/create-profile.tsx b/apps/desktop2/src/routes/auth/create-profile.tsx
index 5cfe70be..03dea685 100644
--- a/apps/desktop2/src/routes/auth/create-profile.tsx
+++ b/apps/desktop2/src/routes/auth/create-profile.tsx
@@ -7,21 +7,18 @@ import { createFileRoute, useNavigate } from "@tanstack/react-router";
import { message } from "@tauri-apps/plugin-dialog";
import { useState } from "react";
import { useForm } from "react-hook-form";
-import { useTranslation } from "react-i18next";
export const Route = createFileRoute("/auth/create-profile")({
- component: Screen,
loader: async () => {
const account = await NostrAccount.createAccount();
return account;
},
+ component: Screen,
});
function Screen() {
const account = Route.useLoaderData();
const navigate = useNavigate();
-
- const { t } = useTranslation();
const { register, handleSubmit } = useForm();
const [picture, setPicture] = useState("");
@@ -87,7 +84,7 @@ function Screen() {
>
);
}}
diff --git a/packages/system/src/commands.ts b/packages/system/src/commands.ts
index 89b9fe15..e8f3a99c 100644
--- a/packages/system/src/commands.ts
+++ b/packages/system/src/commands.ts
@@ -4,7 +4,7 @@
/** user-defined commands **/
export const commands = {
-async getRelays() : Promise
> {
+async getRelays() : Promise> {
try {
return { status: "ok", data: await TAURI_INVOKE("get_relays") };
} catch (e) {
@@ -12,7 +12,7 @@ try {
else return { status: "error", error: e as any };
}
},
-async connectRelay(relay: string) : Promise> {
+async connectRelay(relay: string) : Promise> {
try {
return { status: "ok", data: await TAURI_INVOKE("connect_relay", { relay }) };
} catch (e) {
@@ -20,7 +20,7 @@ try {
else return { status: "error", error: e as any };
}
},
-async removeRelay(relay: string) : Promise> {
+async removeRelay(relay: string) : Promise> {
try {
return { status: "ok", data: await TAURI_INVOKE("remove_relay", { relay }) };
} catch (e) {
@@ -28,7 +28,7 @@ try {
else return { status: "error", error: e as any };
}
},
-async getBootstrapRelays() : Promise> {
+async getBootstrapRelays() : Promise> {
try {
return { status: "ok", data: await TAURI_INVOKE("get_bootstrap_relays") };
} catch (e) {