Merge branch 'main' into release-please--branches--main--components--…

…walkinwallet
fabianbormann · Aug 9, 2023 · 794605c · 794605c
2 parents b1b763d + d9d01e2
commit 794605c
Show file tree

Hide file tree

Showing 11 changed files with 3,965 additions and 1,666 deletions.
diff --git a/public/index.html → index.html b/public/index.html → index.html
@@ -2,7 +2,7 @@
 <html lang="en" class="notranslate" translate="no">
   <head>
     <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
+    <link rel="icon" href="/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="google" content="notranslate" />
     <meta name="theme-color" content="#12284b" />
@@ -11,12 +11,13 @@
       content="WalkInWallet enables you to visit NFT crypto wallets like visiting 3D galleries"
     />
     <meta name="keywords" content="NFT, Wallet, Gallery" />
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
+    <link rel="apple-touch-icon" href="/logo192.png" />
+    <link rel="manifest" href="/manifest.json" />
     <title>WalkInWallet | The NFT 3D Gallery App</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root"></div>
+    <script type="module" src="/src/index.tsx"></script>
   </body>
 </html>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,53 +1,42 @@
 {
   "name": "walkinwallet",
   "version": "1.3.0",
+  "type": "module",
   "license": "GPLv3",
+  "scripts": {
+    "start": "vite",
+    "build": "tsc && vite build",
+    "deploy": "firebase deploy",
+    "lint": ""
+  },
   "dependencies": {
     "@babylonjs/core": "^6.15.0",
     "@babylonjs/loaders": "^6.15.0",
     "@cardano-foundation/cardano-connect-with-wallet": "^0.2.4",
     "@emotion/react": "^11.10.5",
     "@emotion/styled": "^11.10.5",
     "@mui/icons-material": "^5.14.3",
-    "@mui/material": "^5.14.3",
+    "@mui/material": "^5.14.4",
     "axios": "^1.2.2",
     "axios-cache-interceptor": "^1.2.0",
     "babylonjs": "^6.15.0",
     "babylonjs-hook": "^0.1.1",
     "buffer": "^6.0.3",
     "react": "^18.2.0",
-    "react-blockies": "^1.4.1",
     "react-dom": "^18.2.0",
     "react-router-dom": "^6.14.2",
-    "react-scripts": "5.0.1",
     "seedrandom": "^3.0.5",
-    "typescript": "^4.9.4"
-  },
-  "scripts": {
-    "start": "react-scripts start",
-    "build": "react-scripts build",
-    "eject": "react-scripts eject",
-    "deploy": "firebase deploy",
-    "lint": ""
-  },
-  "browserslist": {
-    "production": [
-      ">0.2%",
-      "not dead",
-      "not op_mini all"
-    ],
-    "development": [
-      "last 1 chrome version",
-      "last 1 firefox version",
-      "last 1 safari version"
-    ]
+    "typescript": "^4.9.4",
+    "vite-tsconfig-paths": "^4.2.0"
   },
   "devDependencies": {
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@types/node": "^20.4.8",
     "@types/react": "^18.2.18",
     "@types/react-blockies": "^1.4.1",
     "@types/react-dom": "^18.2.7",
-    "@types/seedrandom": "^3.0.4"
+    "@types/seedrandom": "^3.0.4",
+    "@vitejs/plugin-react": "^4.0.4",
+    "vite": "^4.4.9"
   }
 }
diff --git a/src/3d/Scene.tsx b/src/3d/Scene.tsx
@@ -351,7 +351,7 @@ const MainScene = ({
     return () => {
       clearInterval(intervalId);
     };
-  });
+  }, []);
 
   useEffect(() => {
     if (typeof mainScene !== 'undefined' && typeof paintings !== 'undefined') {

diff --git a/src/components/Blockie.tsx b/src/components/Blockie.tsx
diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx
@@ -47,8 +47,10 @@ const Footer = () => {
           </IconButton>
           <IconButton
             href={
-              process.env.REACT_APP_VERSION
-                ? `https://github.com/fabianbormann/WalkInWallet/releases/tag/v${process.env.REACT_APP_VERSION}`
+              import.meta.env.REACT_APP_VERSION
+                ? `https://github.com/fabianbormann/WalkInWallet/releases/tag/v${
+                    import.meta.env.REACT_APP_VERSION
+                  }`
                 : 'https://github.com/fabianbormann/WalkInWallet'
             }
             target="_blank"

diff --git a/src/global/types.ts b/src/global/types.ts
@@ -118,11 +118,6 @@ export type HudInfos = {
   link: string;
 };
 
-export type BlockieProps = {
-  address: string;
-  scale?: number;
-};
-
 export type SceneProps = {
   gallery: Array<Room>;
   paintings: Array<Picture>;

diff --git a/src/pages/Welcome.tsx b/src/pages/Welcome.tsx
@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import Blockie from '../components/Blockie';
+import LoginIcon from '@mui/icons-material/Login';
 import { Link, useNavigate } from 'react-router-dom';
 import Footer from '../components/Footer';
 import { getEllipsisText } from '../helper';
@@ -152,7 +152,7 @@ const Welcome = () => {
                   alignItems: 'center',
                 }}
               >
-                <Blockie address="stake1u8yf3kcjaaa6hwp9jankxql49kyh2mu02q8454zxzkvzxgg6uhtm4" />
+                <LoginIcon color="secondary" />
                 <Box
                   sx={{
                     marginLeft: '16px',

diff --git a/tsconfig.json b/tsconfig.json
@@ -1,15 +1,16 @@
 {
   "compilerOptions": {
-    "target": "es5",
-    "lib": ["dom", "dom.iterable", "esnext", "ES2021.String"],
-    "allowJs": true,
-    "skipLibCheck": true,
-    "esModuleInterop": true,
+    "target": "ESNext",
+    "lib": ["dom", "dom.iterable", "esnext"],
+    "types": ["vite/client"],
+    "allowJs": false,
+    "skipLibCheck": false,
+    "esModuleInterop": false,
     "allowSyntheticDefaultImports": true,
     "strict": true,
     "forceConsistentCasingInFileNames": true,
     "noFallthroughCasesInSwitch": true,
-    "module": "esnext",
+    "module": "ESNext",
     "moduleResolution": "node",
     "resolveJsonModule": true,
     "isolatedModules": true,

diff --git a/vite-env.d.ts b/vite-env.d.ts
@@ -0,0 +1 @@
+/// <reference types="vite/client" />
diff --git a/vite.config.ts b/vite.config.ts
@@ -0,0 +1,14 @@
+import { defineConfig } from 'vite';
+import react from '@vitejs/plugin-react';
+import viteTsconfigPaths from 'vite-tsconfig-paths';
+
+export default defineConfig({
+  plugins: [react(), viteTsconfigPaths()],
+  server: {
+    port: 3000,
+    open: true,
+  },
+  build: {
+    outDir: 'build',
+  },
+});