Merge branch 'main' into color_blind_setting

Author: evanpelle

.gitignore

@@ -11,3 +11,5 @@ resources/.DS_Store
 .clinic/
 CLAUDE.md
 .idea/
+# this is autogenerated by script
+src/assets/

.husky/pre-commit

@@ -1,5 +1,6 @@
 #!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
+# Deprecated with husky v9
+#. "$(dirname -- "$0")/_/husky.sh"
 
 # Add PATH setup to ensure npx is found
 export PATH="/usr/local/bin:$HOME/.npm-global/bin:$HOME/.nvm/versions/node/$(node -v)/bin:$PATH"

Dockerfile

@@ -12,11 +12,12 @@ RUN --mount=type=cache,target=/root/.npm \
 
 # Copy only what's needed for build
 COPY tsconfig.json ./
-COPY tsconfig.jest.json ./
-COPY webpack.config.js ./
+COPY vite.config.ts ./
 COPY tailwind.config.js ./
 COPY postcss.config.js ./
 COPY eslint.config.js ./
+COPY index.html ./
+COPY scripts ./scripts
 COPY resources ./resources
 COPY proprietary ./proprietary
 COPY src ./src
@@ -93,4 +94,4 @@ ENV CF_CONFIG_PATH=/etc/cloudflared/config.yml
 ENV CF_CREDS_PATH=/etc/cloudflared/creds.json
 
 # Use the startup script as the entrypoint
-ENTRYPOINT ["/usr/local/bin/startup.sh"]
+ENTRYPOINT ["/usr/local/bin/startup.sh"]

eslint.config.js

@@ -26,10 +26,9 @@ export default [
           allowDefaultProject: [
             "__mocks__/fileMock.js",
             "eslint.config.js",
-            "jest.config.ts",
             "postcss.config.js",
             "tailwind.config.js",
-            "webpack.config.js",
+            "scripts/sync-assets.mjs",
           ],
         },
         tsconfigRootDir: import.meta.dirname,

src/client/index.html index.htmlsrc/client/index.html renamed to index.html

@@ -7,12 +7,8 @@
       content="width=device-width, initial-scale=1.0, user-scalable=no"
     />
     <title>OpenFront (ALPHA)</title>
-    <link rel="manifest" href="../../resources/manifest.json" />
-    <link
-      rel="icon"
-      type="image/x-icon"
-      href="../../resources/images/Favicon.svg"
-    />
+    <link rel="manifest" href="/manifest.json" />
+    <link rel="icon" type="image/x-icon" href="/images/Favicon.svg" />
 
     <!-- SEO -->
     <link rel="canonical" href="https://openfront.io/" />
@@ -119,6 +115,7 @@
         from {
           transform: translateY(-100%) rotate(0deg); /* Start off-screen */
         }
+
         to {
           transform: translateY(105vh) rotate(360deg); /* Fall completely out of view */
         }
@@ -338,7 +335,7 @@
       style="width: 80px; height: 80px; background-color: var(--primaryColor)"
     >
       <img
-        src="../../resources/images/SettingIconWhite.svg"
+        src="/images/SettingIconWhite.svg"
         alt="Settings"
         style="width: 72px; height: 72px"
       />
@@ -416,7 +413,7 @@
           >
             © OpenFront™ and Contributors
             <img
-              src="../../resources/icons/github-mark-white.svg"
+              src="/icons/github-mark-white.svg"
               alt="GitHub"
               width="20"
               height="20"
@@ -511,5 +508,6 @@ <h2 class="text-xl font-semibold mb-4">Select Language</h2>
       src="https://static.cloudflareinsights.com/beacon.min.js"
       data-cf-beacon='{"token": "03d93e6fefb349c28ee69b408fa25a13"}'
     ></script>
+    <script type="module" src="/src/client/Main.ts"></script>
   </body>
 </html>