Merge deploy to main (#2)

* Add user/email

* Update imports

* Prettify

* Remove log statement

---------

Co-authored-by: --global <--global>

.github/workflows/deploy.yml

@@ -29,5 +29,7 @@ jobs:
 
             - name: Deploy
               run: |
-                git remote set-url origin https://aglgit:${{ secrets.ACCESS_TOKEN }}@github.com/aglgit/voltorb-flip.git
-                npm run deploy
+                  git config user.name "Andreas L"
+                  git config user.email "[email protected]"
+                  git remote set-url origin https://aglgit:${{ secrets.ACCESS_TOKEN }}@github.com/aglgit/voltorb-flip.git
+                  npm run deploy

src/board/boardCalculator.ts

@@ -1,4 +1,4 @@
-import { Tile, TileSum } from "../types/tiles";
+import { Tile, TileSum } from "@src/types/tiles";
 
 class BoardCalculator {
     public calculateRowSums(grid: Tile[][]): [TileSum[], TileSum[]] {
@@ -22,7 +22,6 @@ class BoardCalculator {
                 }
             }
         }
-        console.log(rowSums, colSums);
         return [rowSums, colSums];
     }
 

src/board/boardContainer.ts

@@ -1,8 +1,8 @@
 import BoardCalculator from "./boardCalculator";
 import BoardGenerator from "./boardGenerator";
-import { LEVELS } from "../types/levels";
-import { Tile, TileSum } from "../types/tiles";
-import { BOARD_SIZE } from "../types/constants";
+import { BOARD_SIZE } from "@src/types/constants";
+import { LEVELS } from "@src/types/levels";
+import { Tile, TileSum } from "@src/types/tiles";
 
 class BoardContainer {
     boardGenerator: BoardGenerator;

src/board/boardGenerator.ts

@@ -1,5 +1,5 @@
-import { LevelData } from "../types/levels";
-import { Tile } from "../types/tiles";
+import { LevelData } from "@src/types/levels";
+import { Tile } from "@src/types/tiles";
 
 class BoardGenerator {
     public generateBoard(levelData: LevelData, boardSize: number): Tile[][] {

tests/boardCalculator.test.ts

@@ -1,6 +1,6 @@
 import { expect, test } from "vitest";
-import BoardCalculator from "@/board/boardCalculator";
-import { TileSum } from "@/types/tiles";
+import BoardCalculator from "@src/board/boardCalculator";
+import { TileSum } from "@src/types/tiles";
 
 const boardCalculator: BoardCalculator = new BoardCalculator();
 

tests/boardGenerator.test.ts

@@ -1,7 +1,7 @@
 import { expect, test } from "vitest";
-import BoardGenerator from "@/board/boardGenerator";
-import { BOARD_SIZE } from "@/types/constants";
-import { LEVELS } from "@/types/levels";
+import BoardGenerator from "@src/board/boardGenerator";
+import { BOARD_SIZE } from "@src/types/constants";
+import { LEVELS } from "@src/types/levels";
 
 const boardGenerator: BoardGenerator = new BoardGenerator();
 

tsconfig.json

@@ -30,8 +30,8 @@
         // "moduleResolution": "node10",                     /* Specify how TypeScript looks up a file from a given module specifier. */
         "baseUrl": "." /* Specify the base directory to resolve non-relative module names. */,
         "paths": {
-            "@/*": ["src/*"]
-        },                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
+            "@src/*": ["src/*"]
+        } /* Specify a set of entries that re-map imports to additional lookup locations. */,
         // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
         // "typeRoots": [],                                  /* Specify multiple folders that act like './node_modules/@types'. */
         // "types": [],                                      /* Specify type package names to be included without being referenced in a source file. */

vite.config.ts

@@ -7,7 +7,7 @@ export default defineConfig({
     base: "/voltorb-flip/",
     resolve: {
         alias: {
-            "@": "/src"
-        }
+            "@src": "/src",
+        },
     },
 });

vitest.config.ts

@@ -1,4 +1,4 @@
-import path from 'path';
+import path from "path";
 import { configDefaults, defineConfig } from "vitest/config";
 
 export default defineConfig({
@@ -8,7 +8,7 @@ export default defineConfig({
     },
     resolve: {
         alias: {
-          '@': path.resolve(__dirname, './src')
+            "@src": path.resolve(__dirname, "./src"),
         },
-      },
+    },
 });