refactor

freak-games-studio · Oct 16, 2024 · 2126163 · 2126163
1 parent 7b18c09
commit 2126163
Show file tree

Hide file tree

Showing 11 changed files with 47 additions and 1,048 deletions.
diff --git a/.github/workflows/gh-pages.yaml b/.github/workflows/gh-pages.yaml
@@ -5,47 +5,36 @@ on:
     branches:
       - master
 
+permissions:
+  id-token: write
+  contents: write
+
 jobs:
   cache-and-install:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Install Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 16
+        uses: actions/checkout@v4
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v2
-        id: pnpm-install
+        uses: pnpm/action-setup@v3
         with:
-          version: 8
-          run_install: false
-
-      - name: Get pnpm store directory
-        id: pnpm-cache
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
+          version: 9
 
-      - name: Setup pnpm cache
-        uses: actions/cache@v3
+      - name: Install Node.js
+        uses: actions/setup-node@v4
         with:
-          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-pnpm-store-
+          node-version: 20
+          cache: pnpm
 
       - name: Install dependencies
         run: pnpm install
 
-      - name: Build website
-        run: pnpm build:frontend
+      - name: Build apps and packages
+        run: pnpm build
 
       - name: Deploy to GitHub Pages
-        uses: JamesIves/github-pages-deploy-action@4.1.5
+        uses: JamesIves/github-pages-deploy-action@v4.5.0
         with:
           branch: gh-pages
-          folder: ./apps/frontend/dist
+          folder: dist
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -1,7 +1,6 @@
 {
   "recommendations": [
     "Vue.volar",
-    "Vue.vscode-typescript-vue-plugin",
     "dbaeumer.vscode-eslint"
   ]
 }
diff --git a/apps/frontend/index.html b/apps/frontend/index.html
@@ -6,7 +6,7 @@
     <title>Alchemy</title>
   </head>
   <body>
-    <div id="app"></div>
+    <div id="app" class="hidden"></div>
     <script type="module" src="/src/index.ts"></script>
   </body>
 </html>
diff --git a/apps/frontend/src/app.vue b/apps/frontend/src/app.vue
@@ -5,17 +5,7 @@ import AlchemyCounter from '@/components/alchemy-counter.vue'
 </script>
 
 <template>
-  <div class="app">
-    <alchemy-counter />
-    <alchemy-elements />
-    <alchemy-board />
-  </div>
+  <alchemy-counter />
+  <alchemy-elements />
+  <alchemy-board />
 </template>
-
-<style scoped>
-.app {
-  display: flex;
-  height: inherit;
-  width: inherit;
-}
-</style>
diff --git a/apps/frontend/src/assets/sprites.ts b/apps/frontend/src/assets/sprites.ts
@@ -137,8 +137,8 @@ import eclipse from './sprites/eclipse.webp'
 import edison from './sprites/edison.webp'
 import egg from './sprites/egg.webp'
 import egypt from './sprites/egypt.webp'
-import electricity from './sprites/electricity.webp'
 import electric_stingray from './sprites/electric_stingray.webp'
+import electricity from './sprites/electricity.webp'
 import email from './sprites/email.webp'
 import energy from './sprites/energy.webp'
 import ent from './sprites/ent.webp'
@@ -150,9 +150,9 @@ import feather from './sprites/feather.webp'
 import fern from './sprites/fern.webp'
 import finland from './sprites/finland.webp'
 import fire from './sprites/fire.webp'
+import fire_extinguisher from './sprites/fire_extinguisher.webp'
 import firefighter from './sprites/firefighter.webp'
 import firefly from './sprites/firefly.webp'
-import fire_extinguisher from './sprites/fire_extinguisher.webp'
 import fish from './sprites/fish.webp'
 import fisherman from './sprites/fisherman.webp'
 import flashlight from './sprites/flashlight.webp'
@@ -217,10 +217,10 @@ import hunter from './sprites/hunter.webp'
 import hut from './sprites/hut.webp'
 import hydrogen from './sprites/hydrogen.webp'
 import ice from './sprites/ice.webp'
+import ice_skate from './sprites/ice_skate.webp'
 import iceberg from './sprites/iceberg.webp'
 import icecream from './sprites/icecream.webp'
 import iceland from './sprites/iceland.webp'
-import ice_skate from './sprites/ice_skate.webp'
 import idea from './sprites/idea.webp'
 import igloo from './sprites/igloo.webp'
 import india from './sprites/india.webp'
@@ -279,8 +279,8 @@ import moon_rover from './sprites/moon_rover.webp'
 import mosquito from './sprites/mosquito.webp'
 import moss from './sprites/moss.webp'
 import motor from './sprites/motor.webp'
-import motorcycle from './sprites/motorcycle.webp'
 import motor_boat from './sprites/motor_boat.webp'
+import motorcycle from './sprites/motorcycle.webp'
 import mountain from './sprites/mountain.webp'
 import mouse from './sprites/mouse.webp'
 import mud from './sprites/mud.webp'
@@ -291,8 +291,8 @@ import needle from './sprites/needle.webp'
 import nessie from './sprites/nessie.webp'
 import nest from './sprites/nest.webp'
 import neuron from './sprites/neuron.webp'
-import newspaper from './sprites/newspaper.webp'
 import new_year from './sprites/new_year.webp'
+import newspaper from './sprites/newspaper.webp'
 import nicola_tesla from './sprites/nicola_tesla.webp'
 import ninja from './sprites/ninja.webp'
 import nuclear_bomb from './sprites/nuclear_bomb.webp'
@@ -419,9 +419,9 @@ import statue from './sprites/statue.webp'
 import statue_of_liberty from './sprites/statue_of_liberty.webp'
 import steak from './sprites/steak.webp'
 import steam from './sprites/steam.webp'
-import steamship from './sprites/steamship.webp'
 import steam_boiler from './sprites/steam_boiler.webp'
 import steam_engine from './sprites/steam_engine.webp'
+import steamship from './sprites/steamship.webp'
 import stone from './sprites/stone.webp'
 import storm from './sprites/storm.webp'
 import sugar from './sprites/sugar.webp'
@@ -467,9 +467,9 @@ import vulture from './sprites/vulture.webp'
 import warrior from './sprites/warrior.webp'
 import watch from './sprites/watch.webp'
 import water from './sprites/water.webp'
-import watermelon from './sprites/watermelon.webp'
 import water_lily from './sprites/water_lily.webp'
 import water_strider from './sprites/water_strider.webp'
+import watermelon from './sprites/watermelon.webp'
 import wax from './sprites/wax.webp'
 import weapon from './sprites/weapon.webp'
 import werewolf from './sprites/werewolf.webp'
@@ -628,8 +628,8 @@ export const sprites: Record<string, string> = {
   edison,
   egg,
   egypt,
-  electricity,
   electric_stingray,
+  electricity,
   email,
   energy,
   ent,
@@ -641,9 +641,9 @@ export const sprites: Record<string, string> = {
   fern,
   finland,
   fire,
+  fire_extinguisher,
   firefighter,
   firefly,
-  fire_extinguisher,
   fish,
   fisherman,
   flashlight,
@@ -708,10 +708,10 @@ export const sprites: Record<string, string> = {
   hut,
   hydrogen,
   ice,
+  ice_skate,
   iceberg,
   icecream,
   iceland,
-  ice_skate,
   idea,
   igloo,
   india,
@@ -770,8 +770,8 @@ export const sprites: Record<string, string> = {
   mosquito,
   moss,
   motor,
-  motorcycle,
   motor_boat,
+  motorcycle,
   mountain,
   mouse,
   mud,
@@ -782,8 +782,8 @@ export const sprites: Record<string, string> = {
   nessie,
   nest,
   neuron,
-  newspaper,
   new_year,
+  newspaper,
   nicola_tesla,
   ninja,
   nuclear_bomb,
@@ -910,9 +910,9 @@ export const sprites: Record<string, string> = {
   statue_of_liberty,
   steak,
   steam,
-  steamship,
   steam_boiler,
   steam_engine,
+  steamship,
   stone,
   storm,
   sugar,
@@ -958,9 +958,9 @@ export const sprites: Record<string, string> = {
   warrior,
   watch,
   water,
-  watermelon,
   water_lily,
   water_strider,
+  watermelon,
   wax,
   weapon,
   werewolf,

diff --git a/apps/frontend/src/index.ts b/apps/frontend/src/index.ts
@@ -4,6 +4,6 @@ import '@/styles/splash-screen.scss'
 splashScreen.init()
 splashScreen.onInit(() => {
   const app = document.querySelector<HTMLElement>('#app')
-  if (app) app.style.display = 'block'
+  if (app) app.classList.remove('hidden')
   import('./main')
 })
diff --git a/apps/frontend/src/main.ts b/apps/frontend/src/main.ts
@@ -3,6 +3,6 @@ import { createPinia } from 'pinia'
 import App from './app.vue'
 import './styles/main.scss'
 
-createApp(App)
-  .use(createPinia())
-  .mount('#app')
+const app = createApp(App)
+app.use(createPinia())
+app.mount('#app')
diff --git a/apps/frontend/src/stores/use-sounds.ts b/apps/frontend/src/stores/use-sounds.ts
@@ -7,13 +7,13 @@ export const useSounds = defineStore('sounds', () => {
   freakGamesAudio.volume = 1
 
   const createAudio = new Audio(sounds.create)
-  createAudio.volume = 0.5
+  createAudio.volume = 0.4
 
   const createNewAudio = new Audio(sounds.create_new)
-  createNewAudio.volume = 0.5
+  createNewAudio.volume = 0.4
 
   const takingAudio = new Audio(sounds.taking)
-  takingAudio.volume = 0.7
+  takingAudio.volume = 0.6
 
   return {
     freakGamesAudio,

diff --git a/apps/frontend/src/styles/main.scss b/apps/frontend/src/styles/main.scss
@@ -51,14 +51,16 @@ body {
   text-rendering: optimizeLegibility;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-}
-
-body, html {
-  height: 100%;
+  height: 100dvh;
 }
 
 #app {
   height: inherit;
+  width: inherit;
+  display: flex;
+}
+
+.hidden {
   display: none;
 }
 

diff --git a/package.json b/package.json
@@ -4,9 +4,7 @@
   "private": true,
   "scripts": {
     "dev": "pnpm --filter=./apps/frontend run dev",
-    "_dev": "pnpm --filter=./apps/* run dev",
-    "build": "pnpm --filter=./apps/* run build",
-    "build:frontend": "pnpm --filter=./apps/frontend run build",
+    "build": "pnpm --filter=./apps/frontend run build",
     "lint": "pnpm --filter=./apps/* run lint"
   }
 }