Merge branch 'main' of ssh://[email protected]/rxx/dev_sandbox

rxqd · Apr 2, 2024 · 4fbd4b5 · 4fbd4b5
2 parents bfff263 + d3f8821
commit 4fbd4b5
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 5 deletions.
diff --git a/src/node/react/index.html b/src/node/react/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" data-theme="mine">
+<html lang="en" data-theme="mine_dark">
 
 <head>
   <meta charset="UTF-8" />

diff --git a/src/node/react/package.json b/src/node/react/package.json
@@ -30,7 +30,6 @@
   "engines": {
     "node": "=20.x"
   },
-  "packageManager": "[email protected]",
   "dependencies": {
     "@tanstack/react-router": "^1.26.1"
   }

diff --git a/src/node/react/src/components/BentoGrid/BentoGrid.tsx b/src/node/react/src/components/BentoGrid/BentoGrid.tsx
@@ -0,0 +1,27 @@
+export default function BentoGrid() {
+    return (
+        <div className="flex border rounded shadow w-90 h-40 my-2 mx-5 gap-0.5 bg-sky-300">
+            <div className="rounded flex-1 grow-2 flex flex-col gap-0.5 justify-evenly">
+                <div className="flex-1 bg-red-400">
+
+                </div>
+                <div className="flex-1 bg-green-400">
+
+                </div>
+                <div className="flex flex-1 gap-0.5">
+                    <div className="flex-1 bg-blue-400">
+
+                </div>
+                    <div className="flex-1 bg-green-800">
+
+                </div>
+                </div>
+            </div>
+            <div className="rounded flex-1 flex flex-col gap-0.5">
+                <div className="flex-1 bg-sky-600"></div>
+                <div className="flex-1 bg-gray-400"></div>
+
+            </div>
+        </div>
+    )
+}
diff --git a/src/node/react/src/components/NavLink.tsx b/src/node/react/src/components/NavLink.tsx
@@ -9,7 +9,7 @@ export default function NavLink({ children, to }: NavLinkProps) {
   return (
     <Link
       activeProps={{
-        className: "bg-accent"
+        className: "bg-accent transition-all duration-300 shadow"
       }}
       className="btn btn-ghost text-xl"
       to={to}>{children}</Link>

diff --git a/src/node/react/src/pages/HomePage.tsx b/src/node/react/src/pages/HomePage.tsx
@@ -1,8 +1,12 @@
 import Game from "@/components/TicTacToe/Game";
+import BentoGrid from "@/components/BentoGrid/BentoGrid";
 
 const HomePage = () => {
     return <>
         <Game />
+        <hr/>
+        <h2 className="text-center text-2xl mt-2">BentoGrid</h2>
+        <BentoGrid />
       </>
     }
 

diff --git a/src/node/react/tailwind.config.js b/src/node/react/tailwind.config.js
@@ -4,6 +4,13 @@ export default {
     "./index.html",
     "./src/**/*.{ts,tsx}",
   ],
+    theme: {
+        extend: {
+          flexGrow: {
+            2: '2'
+          }
+        }
+      },
   plugins: [require("daisyui")],
   daisyui: {
     themes: [
@@ -32,8 +39,6 @@ export default {
         },
 
       },
-      "coffee",
-      "dark"
     ],
   },
 }