Merge branch 'main' into development

CHANGELOG.md

@@ -10,9 +10,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - [added various key shortcuts across the entire app (#2)](https://github.com/Timtam/hitster/issues/2)
+- [added a how to play section on the welcome page (#11)](https://github.com/Timtam/hitster/issues/11)
 
 ### Changed
 
+- [restyled the slot selector UI to look much nicer for sighted folk (#13)](https://github.com/Timtam/hitster/issues/13)
 - updated Rust to 1.83
 - added and fixed some hits
 

client/package.json

@@ -4,6 +4,10 @@
     "version": "0.1.0",
     "type": "module",
     "scripts": {
+        "yaml-sort": "run-script-os",
+        "yaml-sort:win32": "for %f in (src/locale/*.yml) do npx yaml-sort --indent 4 -i \"src/locale/%f\"",
+        "yaml-sort:default": "for file in src/locale/*.yml; do npx yaml-sort --indent 4 -i \"src/locale/$file\"; done",
+        "format": "npm run yaml-sort && npx prettier --write .",
         "dev": "vite",
         "build": "tsc && vite build",
         "build-dev": "tsc && vite build --sourcemap true --minify false",
@@ -17,7 +21,6 @@
         "@uidotdev/usehooks": "^2.4.1",
         "boolify-string": "^2.0.2",
         "bootstrap": "^5.3.3",
-        "classnames": "^2.5.1",
         "deepcopy": "^2.1.0",
         "detect-browser": "^5.3.0",
         "howler": "^2.2.4",
@@ -45,6 +48,7 @@
         "@eslint/compat": "^1.2.4",
         "@eslint/eslintrc": "^3.2.0",
         "@eslint/js": "^9.16.0",
+        "@modyfi/vite-plugin-yaml": "^1.1.0",
         "@types/boolify-string": "^0.0.32",
         "@types/howler": "^2.2.11",
         "@types/react": "^18.2.56",
@@ -54,16 +58,24 @@
         "@typescript-eslint/eslint-plugin": "^8.18.0",
         "@typescript-eslint/parser": "^8.18.0",
         "@vitejs/plugin-react-swc": "^3.5.0",
+        "cli-glob": "^0.1.0",
         "eslint": "^9.16.0",
         "eslint-plugin-react-hooks": "^5.1.0",
         "eslint-plugin-react-refresh": "^0.4.5",
         "globals": "^15.13.0",
         "prettier": "^3.2.5",
         "prettier-plugin-organize-imports": "^4.1.0",
+        "run-script-os": "^1.1.6",
         "typescript": "^5.2.2",
         "vite": "^6.0.3",
         "vite-plugin-checker": "^0.8.0",
         "vite-plugin-filter-replace": "^0.1.13",
-        "vite-tsconfig-paths": "^5.1.4"
+        "vite-tsconfig-paths": "^5.1.4",
+        "yaml-sort": "^2.1.0"
+    },
+    "overrides": {
+        "@modyfi/vite-plugin-yaml": {
+            "vite": "$vite"
+        }
     }
 }

client/src/i18n.ts

@@ -1,8 +1,8 @@
 import i18n from "i18next"
 import LanguageDetector from "i18next-browser-languagedetector"
 import { initReactI18next } from "react-i18next"
-import de from "./locale/de.json"
-import en from "./locale/en.json"
+import de from "./locale/de.yml"
+import en from "./locale/en.yml"
 
 i18n.use(LanguageDetector)
     .use(initReactI18next)
@@ -12,7 +12,7 @@ i18n.use(LanguageDetector)
             escapeValue: false,
         },
         resources: {
-            en: { ...en },
-            de: { ...de },
+            en: { translation: { ...en } },
+            de: { translation: { ...de } },
         }, // Where we're gonna put translations' files
     })