Merge pull request #49 from hollow-leaf/refactor/updateTS

refactor: update ts & redirect home
hollow-leaf · Sep 15, 2023 · 9cac926 · 9cac926
2 parents f860f6e + 1b723c8
commit 9cac926
Show file tree

Hide file tree

Showing 29 changed files with 505 additions and 748 deletions.
diff --git a/apps/docs/.gitignore b/apps/docs/.gitignore
diff --git a/apps/docs/README.md b/apps/docs/README.md
diff --git a/apps/docs/next-env.d.ts b/apps/docs/next-env.d.ts
diff --git a/apps/docs/next.config.js b/apps/docs/next.config.js
diff --git a/apps/docs/package.json b/apps/docs/package.json
diff --git a/apps/docs/postcss.config.js b/apps/docs/postcss.config.js
diff --git a/apps/docs/src/app/layout.tsx b/apps/docs/src/app/layout.tsx
diff --git a/apps/docs/src/app/page.tsx b/apps/docs/src/app/page.tsx
diff --git a/apps/docs/src/styles/globals.css b/apps/docs/src/styles/globals.css
diff --git a/apps/docs/tailwind.config.js b/apps/docs/tailwind.config.js
diff --git a/apps/docs/tsconfig.json b/apps/docs/tsconfig.json
diff --git a/apps/web/.eslintrc.js b/apps/web/.eslintrc.js
diff --git a/apps/docs/.eslintrc.js → apps/web/eslint.config.js b/apps/docs/.eslintrc.js → apps/web/eslint.config.js
diff --git a/apps/web/next.config.js b/apps/web/next.config.js
@@ -6,7 +6,7 @@ module.exports = {
     unoptimized: true
   },
   basePath: '/tobi',
-  assetPrefix: './',
+  assetPrefix: '/tobi',
   webpack: config => {
     config.resolve.fallback = { fs: false, net: false, tls: false };
     return config;

diff --git a/apps/web/package.json b/apps/web/package.json
@@ -40,6 +40,6 @@
     "tailwind-config": "workspace:*",
     "tailwindcss": "^3.2.4",
     "tsconfig": "workspace:*",
-    "typescript": "^5.0.4"
+    "typescript": "^5.2.2"
   }
 }
diff --git a/apps/web/src/app/home/page.tsx b/apps/web/src/app/home/page.tsx
@@ -1,23 +1,14 @@
-import { Metadata } from "next";
-import { Button, Card } from "ui";
+'use client'
+
+import { useRouter } from 'next/navigation';
+import { useEffect } from 'react';
 
 export default function Home() {
-  return (
-    <div className="flex flex-col items-center justify-center">
-      <main className="mx-auto w-auto px-4 pt-16 pb-8 sm:pt-24 lg:px-8">
-        <h1 className="mx-auto text-center font-extrabold tracking-tight text-white space-y-8">
-            <span className="text-7xl sm:text-8xl lg:text-9xl xl:text-9xl">TOBI</span>
-            <span className="block bg-gradient-to-r from-brandred to-brandblue bg-clip-text text-transparent px-2 text-6xl sm:text-7xl lg:text-8xl xl:text-8xl">
-              All-Chain KYC Platform
-            </span>
-            <span className="block px-2 text-3xl sm:text-4xl lg:text-5xl xl:text-5xl space-x-2">
-              <span className="text-cat-orange500">T</span>oken
-              <span className="text-cat-orange500">O</span>ptimizing
-              <span className="text-cat-orange500">B</span>ridge
-              <span className="text-cat-orange500">I</span>ntelligence 
-            </span>
-        </h1>
-      </main>
-    </div>
-  );
+    const router = useRouter();
+
+    useEffect(() => {
+        router.push('/');
+    }, []);
+
+    return null
 }
diff --git a/apps/web/src/app/layout.tsx b/apps/web/src/app/layout.tsx
@@ -28,7 +28,7 @@ export default function RootLayout({
           <ClientOnly>
             <Header />
           </ClientOnly>
-          <div className="grow bg-cat-base overflow-y-auto" style={{ height: 'calc(100vh - 108px)' }}>{children}</div>
+          <main className="grow bg-cat-base overflow-y-auto" style={{ height: 'calc(100vh - 108px)' }}>{children}</main>
         </WagmiProvider>
       </body>
     </html>

diff --git a/apps/web/src/app/market/page.tsx b/apps/web/src/app/market/page.tsx
@@ -53,7 +53,7 @@ export default function Market() {
                         </p>
                     </div>
                     {mounted
-                        ? <div className="mb-10 grid xl-[1320px] xl:grid-cols-4 lg:grid-cols-3 md:grid-cols-2 grid-cols-1 justify-items-center">
+                        ? <div className="mb-10 grid xl-[1320px] xl:grid-cols-4 lg:grid-cols-3 md:grid-cols-2 grid-cols-1 gap-6 justify-items-center m-2">
                             {models.map((model: any, index: number) => {
                                 const [name, url, uploadType, price] = model
                                 return (

diff --git a/apps/web/src/app/page.tsx b/apps/web/src/app/page.tsx
@@ -0,0 +1,23 @@
+import { Metadata } from "next";
+import { Button, Card } from "ui";
+
+export default function Page() {
+  return (
+    <div className="flex flex-col items-center justify-center">
+      <main className="mx-auto w-auto px-4 pt-16 pb-8 sm:pt-24 lg:px-8">
+        <h1 className="mx-auto text-center font-extrabold tracking-tight text-white space-y-8">
+          <span className="text-7xl sm:text-8xl lg:text-9xl xl:text-9xl">TOBI</span>
+          <span className="block bg-gradient-to-r from-brandred to-brandblue bg-clip-text text-transparent px-2 text-6xl sm:text-7xl lg:text-8xl xl:text-8xl">
+            All-Chain KYC Platform
+          </span>
+          <span className="block px-2 text-3xl sm:text-4xl lg:text-5xl xl:text-5xl space-x-2">
+            <span className="text-cat-orange500">T</span>oken
+            <span className="text-cat-orange500">O</span>ptimizing
+            <span className="text-cat-orange500">B</span>ridge
+            <span className="text-cat-orange500">I</span>ntelligence
+          </span>
+        </h1>
+      </main>
+    </div>
+  );
+}
diff --git a/apps/web/src/app/vote/page.tsx b/apps/web/src/app/vote/page.tsx
@@ -136,7 +136,7 @@ export default function Vote() {
                                         : null
                                     }
                                 </div>
-                                <div className="mb-10 grid xl-[1320px] xl:grid-cols-4 lg:grid-cols-3 md:grid-cols-2 grid-cols-1 justify-items-center">
+                                <div className="mb-10 grid xl-[1320px] xl:grid-cols-4 lg:grid-cols-3 md:grid-cols-2 grid-cols-1 gap-6 justify-items-center m-2">
                                     {proposals.map((proposal: any, index: number) => {
                                         const [name, creator, acceptCount, denyCount, endTime] = proposal
                                         let status = "Open"

diff --git a/apps/web/src/components/Card/ModelWeightCard.tsx b/apps/web/src/components/Card/ModelWeightCard.tsx
@@ -29,7 +29,7 @@ const ModelWeightCard = (props: ModelWeightCardProps) => {
 
     return (
         <div
-            className=" card bg-gradient-to-r from-[#585a9d] to-[#919dc9] w-[300px] shadow-[0_3px_10px_rgb(0,0,0,0.2)] mt-3 "
+            className=" card bg-gradient-to-r from-[#585a9d] to-[#919dc9] w-[300px] shadow-[0_3px_10px_rgb(0,0,0,0.2)]"
         >
             <div className="card-body gap-4">
                 <div className="flex flex-row items-center mb-2 space-x-3">

diff --git a/apps/web/src/components/Card/ProposalCard.tsx b/apps/web/src/components/Card/ProposalCard.tsx
@@ -55,7 +55,7 @@ const ProposalCard = (props: ProposalCard) => {
 
     return (
         <div
-            className=" card text-white bg-base-100 border-white border-solid border-2 w-[300px] p-2 shadow-[0_3px_10px_rgb(0,0,0,0.2)] mt-3 cursor-pointer "
+            className=" card text-white bg-base-100 border-white border-solid border-2 w-[300px] p-2 shadow-[0_3px_10px_rgb(0,0,0,0.2)] cursor-pointer "
         >
             <div className="card-body">
                 <div className="flex items-center mb-2">

diff --git a/apps/web/src/components/NavBar/Header.tsx b/apps/web/src/components/NavBar/Header.tsx
@@ -11,7 +11,7 @@ const Header: React.FC = () => {
     <header className='bg-cat-crust p-2 flex items-center justify-between '>
       <div className='navbar bg-base-500'>
         <div className='navbar-start'>
-          <Link href={'/home'}>
+          <Link href={'/'}>
             <Image
               alt='Tobi'
               src='/tobi/tobi.png'
@@ -21,7 +21,7 @@ const Header: React.FC = () => {
             />
           </Link>
           <ul className='menu menu-horizontal px-1 text-xl lg:flex'>
-            <li><Link href={'/home'}>Home</Link></li>
+            <li><Link href={'/'}>Home</Link></li>
             <li><Link href={'/vote'}>Vote</Link></li>
             <li><Link href={'/market'}>Market</Link></li>
           </ul>

diff --git a/.eslintrc.js → eslint.config.js b/.eslintrc.js → eslint.config.js
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
     "format": "prettier --write \"**/*.{ts,tsx,md}\""
   },
   "devDependencies": {
-    "eslint": "^7.32.0",
+    "eslint": "^8.48.0",
     "eslint-config-custom": "workspace:*",
     "prettier": "^2.7.1",
     "prettier-plugin-tailwindcss": "^0.1.11",

diff --git a/packages/eslint-config-custom/package.json b/packages/eslint-config-custom/package.json
@@ -4,9 +4,9 @@
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "eslint-config-next": "^13.4.1",
+    "eslint-config-next": "^13.4.19",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-react": "7.28.0",
+    "eslint-plugin-react": "7.33.2",
     "eslint-config-turbo": "^1.9.3"
   },
   "publishConfig": {

diff --git a/packages/helper/package.json b/packages/helper/package.json
@@ -20,7 +20,7 @@
     "ts-node": "^10.9.1",
     "tsconfig": "workspace:*",
     "tsup": "^6.1.3",
-    "typescript": "^5.0.4"
+    "typescript": "^5.2.2"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -21,13 +21,13 @@
   "devDependencies": {
     "@types/react": "^18.2.5",
     "daisyui": "^3.5.1",
-    "eslint": "^7.32.0",
+    "eslint": "^8.48.0",
     "eslint-config-custom": "workspace:*",
     "postcss": "^8.4.20",
     "react": "^18.2.0",
     "tailwind-config": "workspace:*",
     "tsconfig": "workspace:*",
     "tsup": "^6.1.3",
-    "typescript": "^5.0.4"
+    "typescript": "^5.2.2"
   }
 }