Merge pull request #343 from Mindgamesnl/feature/vite

Feature/vite
Mindgamesnl · Aug 4, 2023 · c963aa9 · c963aa9
2 parents 6549dac + bb895c9
commit c963aa9
Show file tree

Hide file tree

Showing 150 changed files with 5,119 additions and 16,694 deletions.
diff --git a/.github/workflows/client.yml b/.github/workflows/client.yml
@@ -0,0 +1,24 @@
+name: Client lint and build
+
+on: [ push ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [ 20.* ]
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: Install stuff
+        run: npm i
+        working-directory: ./client
+      - run: npm run lint
+        working-directory: ./client
+      - run: npm run build
+        working-directory: ./client
diff --git a/.github/workflows/nodejs.yml.disabled b/.github/workflows/nodejs.yml.disabled
diff --git a/client/.eslintrc.json b/client/.eslintrc.json
@@ -0,0 +1,40 @@
+{
+  "env": {
+    "browser": true,
+    "node": true,
+    "jasmine": true,
+    "es6": true
+  },
+  "extends": [
+    "eslint:recommended",
+    "plugin:react/recommended",
+    "airbnb",
+    "airbnb/hooks"
+  ],
+  "parserOptions": {
+    "sourceType": "module",
+    "ecmaVersion": 2022
+  },
+  "rules": {
+    "react/prop-types": "off",
+    "space-before-blocks": "off",
+    "no-plusplus": "off",
+    "max-len": "off",
+    "import/no-cycle": "off",
+    "import/prefer-default-export": "off",
+    "class-methods-use-this": "off",
+    "no-param-reassign": "off",
+    "react/destructuring-assignment": "off",
+    "jsx-a11y/click-events-have-key-events": "off",
+    "no-use-before-define": "off",
+    "no-continue": "off",
+    "react/static-property-placement": "off"
+  },
+  "reportUnusedDisableDirectives": true,
+  "settings": {
+    "react": {
+      "pragma": "React",
+      "version": "detect"
+    }
+  }
+}
diff --git a/client/bump-minor.js b/client/bump-minor.js
@@ -1,4 +1,5 @@
-var fs = require('fs');
+import fs from "fs";
+
 console.log('Incrementing build number...');
 
 let fileName = 'src/metadata.json';

diff --git a/client/public/index.html → client/index.html b/client/public/index.html → client/index.html
@@ -7,21 +7,21 @@
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
     -->
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
-    <link rel="stylesheet" href="%PUBLIC_URL%/static.css" />
+    <link rel="manifest" href="manifest.json" />
+    <link rel="stylesheet" href="static.css" />
     <!--
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.
       Only files inside the `public` folder can be referenced from the HTML.
 
-      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
+      Unlike "/favicon.ico" or "favicon.ico", "favicon.ico" will
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
 
     <title>OpenAudioMc | Login</title>
-    <link href="%PUBLIC_URL%/assets/logo.png" rel="icon">
-    <link href="%PUBLIC_URL%/assets/logo.png" rel="image">
+    <link href="assets/logo.png" rel="icon">
+    <link href="assets/logo.png" rel="image">
     <meta name="msapplication-TileColor" content="#ffffff">
     <meta name="google" content="notranslate">
     <meta name="theme-color" content="#ffffff">
@@ -40,12 +40,10 @@
     <meta name="twitter:card" content="summary">
 
     <!-- Includes -->
-    <link rel="stylesheet" href="%PUBLIC_URL%/css/winter.css"/>
-    <link rel="stylesheet" href="%PUBLIC_URL%/css/tailwind.css"/>
+    <link rel="stylesheet" href="css/winter.css"/>
 
-    <script src="%PUBLIC_URL%/libs/socket.io.slim.js"></script>
-    <script src="%PUBLIC_URL%/libs/github.fetch.js"></script>
-    <script src="%PUBLIC_URL%/libs/HackTimer.min.js"></script>
+    <script src="libs/socket.io.slim.js"></script>
+    <script src="libs/HackTimer.min.js"></script>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
@@ -62,12 +60,13 @@
     -->
   </body>
 
-  <script src="%PUBLIC_URL%/libs/browser-source-map-support.js"></script>
-  <script>
-    //sourceMapSupport.install();
-  </script>
+<!--  <script src="libs/browser-source-map-support.js"></script>-->
+<!--  <script>-->
+<!--    //sourceMapSupport.install();-->
+<!--  </script>-->
 
   <!-- Cloudflare Web Analytics, remove this for custom installations -->
   <script defer src='https://static.cloudflareinsights.com/beacon.min.js' data-cf-beacon='{"token": "901b38df113d4f4ab9f3d29271786d3a"}'></script>
+  <script type="module" src='src/index.jsx'></script>
   <!-- End Cloudflare Web Analytics -->
 </html>