Merge pull request #3 from ShivangNagta/triman

Triman
ShivangNagta · Jul 7, 2024 · d003b41 · d003b41
2 parents 9cfd23e + 3898755
commit d003b41
Show file tree

Hide file tree

Showing 10 changed files with 725 additions and 17 deletions.
diff --git a/app/package-lock.json b/app/package-lock.json
diff --git a/app/package.json b/app/package.json
@@ -10,8 +10,10 @@
     "preview": "vite preview"
   },
   "dependencies": {
+    "framer-motion": "^11.2.13",
     "react": "^18.3.1",
-    "react-dom": "^18.3.1"
+    "react-dom": "^18.3.1",
+    "react-router-dom": "^6.24.1"
   },
   "devDependencies": {
     "@types/react": "^18.3.3",
@@ -24,6 +26,6 @@
     "eslint-plugin-react-refresh": "^0.4.7",
     "postcss": "^8.4.38",
     "tailwindcss": "^3.4.4",
-    "vite": "^5.3.1"
+    "vite": "^5.3.3"
   }
 }
diff --git a/app/src/App.jsx b/app/src/App.jsx
@@ -1,10 +1,13 @@
+import MandelbrotFractal from "./Mandelbot"
+import Blockchain from "./blockchain"
+import TransactionMine from "./transactionMine"
+import BlockMine from "./blockMine"
 import MandelbrotFractal from "./components/Mandelbrot.jsx"
 import JigsawGame from './components/Jigsaw.jsx';
 
 export default function App() {
     return (
         <div>
-            <MandelbrotFractal />          
         </div>
     )
 }
diff --git a/app/src/Blockchain.css b/app/src/Blockchain.css
@@ -0,0 +1,6 @@
+@import url('https://fonts.googleapis.com/css2?family=Press+Start+2P&display=swap');
+
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+
diff --git a/app/src/Scripts/vignetteCypher.js b/app/src/Scripts/vignetteCypher.js