I'm tired

2024-09-18 03:03:31 +00:00 · 2023-03-23 13:03:34 +07:00 · 2023-03-23 13:03:34 +07:00 · 705430a11e
commit 705430a11e
parent b3baacb3e0
6 changed files with 80 additions and 75 deletions
--- a/package.json
+++ b/package.json
@ -19,7 +19,7 @@
    "@radix-ui/react-popover": "^1.0.5",
    "@radix-ui/react-tabs": "^1.0.3",
    "@rehooks/local-storage": "^2.4.4",
-    "@supabase/supabase-js": "^2.12.0",
+    "@supabase/supabase-js": "^2.12.1",
    "@tanstack/react-virtual": "3.0.0-beta.54",
    "@tauri-apps/api": "^1.2.0",
    "@uiw/react-markdown-preview": "^4.1.10",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@ -8,7 +8,7 @@ specifiers:
  '@radix-ui/react-popover': ^1.0.5
  '@radix-ui/react-tabs': ^1.0.3
  '@rehooks/local-storage': ^2.4.4
-  '@supabase/supabase-js': ^2.12.0
+  '@supabase/supabase-js': ^2.12.1
  '@tailwindcss/typography': ^0.5.9
  '@tanstack/react-virtual': 3.0.0-beta.54
  '@tauri-apps/api': ^1.2.0
@ -63,7 +63,7 @@ dependencies:
  '@radix-ui/react-popover': 1.0.5_zula6vjvt3wdocc4mwcxqa6nzi
  '@radix-ui/react-tabs': 1.0.3_biqbaboplfbrettd7655fr4n2y
  '@rehooks/local-storage': 2.4.4_react@18.2.0
-  '@supabase/supabase-js': 2.12.0
+  '@supabase/supabase-js': 2.12.1
  '@tanstack/react-virtual': 3.0.0-beta.54_react@18.2.0
  '@tauri-apps/api': 1.2.0
  '@uiw/react-markdown-preview': 4.1.10_zula6vjvt3wdocc4mwcxqa6nzi
@ -685,11 +685,6 @@ packages:
      { integrity: sha512-DZVbtY62kc3kkBtMHqwCOfXrT/hnoORy5BJ4+HU1IR59X0KWAOqsfzQPcUl/lQLlG7qXbe/fZ3r/emxtAl+sqg== }
    dev: false

-  /@noble/hashes/1.2.0:
-    resolution:
-      { integrity: sha512-FZfhjEDbT5GRswV3C6uvLPHMiVD6lQBmpoX5+eSiPaMTXte/IKqI5dykDxzZB/WBeK/CDuQRBWarPdi3FNY2zQ== }
-    dev: false
-
  /@noble/hashes/1.3.0:
    resolution:
      { integrity: sha512-ilHEACi9DwqJB0pw7kv+Apvh50jiiSyR/cQ3y4W7lOR5mhvn/50FLUfsnfJz0BDZtl/RR16kXvptiv6q1msYZg== }
@ -1210,11 +1205,11 @@ packages:
      '@scure/base': 1.1.1
    dev: false

-  /@scure/bip39/1.1.1:
+  /@scure/bip39/1.2.0:
    resolution:
-      { integrity: sha512-t+wDck2rVkh65Hmv280fYdVdY25J9YeEUIgn2LG1WM6gxFkGzcksoDiUkWVpVp3Oex9xGC68JU2dSbUfwZ2jPg== }
+      { integrity: sha512-SX/uKq52cuxm4YFXWFaVByaSHJh2w3BnokVSeUJVCv6K7WulT9u2BuNRBhuFl8vAuYnzx9bEu9WgpcNYTrYieg== }
    dependencies:
-      '@noble/hashes': 1.2.0
+      '@noble/hashes': 1.3.0
      '@scure/base': 1.1.1
    dev: false

@ -1265,9 +1260,9 @@ packages:
      - encoding
    dev: false

-  /@supabase/supabase-js/2.12.0:
+  /@supabase/supabase-js/2.12.1:
    resolution:
-      { integrity: sha512-tHV4KqlPHuPt4uPu+nYwQTEp+mU7Qc0h42EyRW7rsAGGo8bmKIOGnZjyDDc5lxg0CW7OF5R5oMQWmtuuXZh00Q== }
+      { integrity: sha512-sni5tYUCjLd57xuFbL8iGP/hAq2rS/Bxh3StrGjO0v78bMcS+WPh6E/WV5SstvOrxS78RKI8fASm3jk8/UjVXA== }
    dependencies:
      '@supabase/functions-js': 2.1.0
      '@supabase/gotrue-js': 2.16.0
@ -1519,12 +1514,12 @@ packages:
      { integrity: sha512-RD0ivG1kEztNBdoAK7lekI9M+azSnitIn85h4iOiaLjaTrMjzslhaqCGaI4IyCJ1RljWiLCEu4jyrLLgqxBTew== }
    dependencies:
      '@types/prop-types': 15.7.5
-      '@types/scheduler': 0.16.2
+      '@types/scheduler': 0.16.3
      csstype: 3.1.1

-  /@types/scheduler/0.16.2:
+  /@types/scheduler/0.16.3:
    resolution:
-      { integrity: sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew== }
+      { integrity: sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ== }

  /@types/semver/7.3.13:
    resolution:
@ -2073,7 +2068,7 @@ packages:
    hasBin: true
    dependencies:
      caniuse-lite: 1.0.30001469
-      electron-to-chromium: 1.4.335
+      electron-to-chromium: 1.4.337
      node-releases: 2.0.10
      update-browserslist-db: 1.0.10_browserslist@4.21.5

@ -2493,9 +2488,9 @@ packages:
      { integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA== }
    dev: true

-  /electron-to-chromium/1.4.335:
+  /electron-to-chromium/1.4.337:
    resolution:
-      { integrity: sha512-l/eowQqTnrq3gu+WSrdfkhfNHnPgYqlKAwxz7MTOj6mom19vpEDHNXl6dxDxyTiYuhemydprKr/HCrHfgk+OfQ== }
+      { integrity: sha512-W8gdzXG86mVPoc56eM8YA+QiLxaAxJ8cmDjxZgfhLLWVvZQxyA918w5tX2JEWApZta45T1/sYcmFHTsTOUE3nw== }

  /emoji-regex/8.0.0:
    resolution:
@ -2902,7 +2897,7 @@ packages:
      imurmurhash: 0.1.4
      is-glob: 4.0.3
      is-path-inside: 3.0.3
-      js-sdsl: 4.3.0
+      js-sdsl: 4.4.0
      js-yaml: 4.1.0
      json-stable-stringify-without-jsonify: 1.0.1
      levn: 0.4.1
@ -3847,9 +3842,9 @@ packages:
      react: 18.2.0
    dev: false

-  /js-sdsl/4.3.0:
+  /js-sdsl/4.4.0:
    resolution:
-      { integrity: sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ== }
+      { integrity: sha512-FfVSdx6pJ41Oa+CF7RDaFmTnCaFhua+SNYQX74riGOpl96x+2jQCqEfQ2bnXu/5DPCqlRuiqyvTJM0Qjz26IVg== }
    dev: true

  /js-tokens/4.0.0:
@ -4704,7 +4699,7 @@ packages:
      '@noble/secp256k1': 1.7.1
      '@scure/base': 1.1.1
      '@scure/bip32': 1.2.0
-      '@scure/bip39': 1.1.1
+      '@scure/bip39': 1.2.0
      prettier: 2.8.6
    dev: false

--- a/src/pages/_app.tsx
+++ b/src/pages/_app.tsx
@ -1,7 +1,3 @@
-import DatabaseProvider from '@components/contexts/database';
-import RelayProvider from '@components/contexts/relay';
-
-import { useLocalStorage } from '@rehooks/local-storage';
 import { Provider } from 'jotai';
 import type { NextPage } from 'next';
 import type { AppProps } from 'next/app';
@ -21,14 +17,5 @@ type AppPropsWithLayout = AppProps & {
 export default function MyApp({ Component, pageProps }: AppPropsWithLayout) {
  // Use the layout defined at the page level, if available
  const getLayout = Component.getLayout ?? ((page) => page);
-  // Get relays from localstorage
-  const [relays] = useLocalStorage('relays');
-
-  return (
-    <Provider>
-      <DatabaseProvider>
-        <RelayProvider relays={relays}>{getLayout(<Component {...pageProps} />)}</RelayProvider>
-      </DatabaseProvider>
-    </Provider>
-  );
+  return <Provider>{getLayout(<Component {...pageProps} />)}</Provider>;
 }
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@ -1,35 +1,26 @@
 import BaseLayout from '@layouts/base';

+import { getActiveAccount } from '@utils/storage';
+
 import LumeSymbol from '@assets/icons/Lume';
-import { useLocalStorage } from '@rehooks/local-storage';
+
 import { useRouter } from 'next/router';
-import { JSXElementConstructor, ReactElement, ReactFragment, ReactPortal, useEffect, useRef, useState } from 'react';
+import { JSXElementConstructor, ReactElement, ReactFragment, ReactPortal, useEffect } from 'react';

 export default function Page() {
  const router = useRouter();

-  const [currentUser]: object[] = useLocalStorage('current-user');
-  const [loading, setLoading] = useState(true);
-  const timer = useRef(null);
-
  useEffect(() => {
-    if (currentUser) {
-      timer.current = setTimeout(() => {
-        setLoading(false);
-        router.push('/newsfeed/following');
-      }, 1000);
-    } else {
-      timer.current = setTimeout(() => {
-        setLoading(false);
-        router.push('/onboarding');
-      }, 1000);
-    }
-
-    // clean up
-    return () => {
-      clearTimeout(timer.current);
-    };
-  }, [currentUser, router]);
+    getActiveAccount()
+      .then((res: any[]) => {
+        if (res.length > 0) {
+          router.push('/newsfeed/following');
+        } else {
+          router.push('/onboarding');
+        }
+      })
+      .catch(console.error);
+  }, [router]);

  return (
    <div className="relative h-full overflow-hidden">
@ -47,21 +38,19 @@ export default function Page() {
          </div>
        </div>
        <div className="absolute bottom-16 left-1/2 -translate-x-1/2 transform">
-          {loading && (
-            <svg
-              className="h-5 w-5 animate-spin text-black dark:text-white"
-              xmlns="http://www.w3.org/2000/svg"
-              fill="none"
-              viewBox="0 0 24 24"
-            >
-              <circle className="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" strokeWidth="4"></circle>
-              <path
-                className="opacity-75"
-                fill="currentColor"
-                d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
-              ></path>
-            </svg>
-          )}
+          <svg
+            className="h-5 w-5 animate-spin text-black dark:text-white"
+            xmlns="http://www.w3.org/2000/svg"
+            fill="none"
+            viewBox="0 0 24 24"
+          >
+            <circle className="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" strokeWidth="4"></circle>
+            <path
+              className="opacity-75"
+              fill="currentColor"
+              d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
+            ></path>
+          </svg>
        </div>
      </div>
    </div>
--- a/src/stores/user.tsx
+++ b/src/stores/user.tsx
@ -0,0 +1,3 @@
+import { atom } from 'jotai';
+
+export const currentUser = atom({});
--- a/src/utils/storage.tsx
+++ b/src/utils/storage.tsx
@ -0,0 +1,31 @@
+import Database from 'tauri-plugin-sql-api';
+
+let db: null | Database = null;
+
+// connect database (sqlite)
+// path: tauri::api::path::BaseDirectory::App
+export async function connect(): Promise<Database> {
+  if (db) {
+    return db;
+  }
+  db = await Database.load('sqlite:lume.db');
+  return db;
+}
+
+// get all relays
+export async function getAllRelays() {
+  const db = await connect();
+  return await db.select('SELECT relay_url FROM relays WHERE relay_status = "1"');
+}
+
+// get active account
+export async function getActiveAccount() {
+  const db = await connect();
+  return await db.select(`SELECT * FROM accounts LIMIT 1`);
+}
+
+// get all follows by account id
+export async function getAllFollowsByID(id: string) {
+  const db = await connect();
+  return await db.select(`SELECT pubkey FROM follows WHERE account = "${id}"`);
+}