wip

.gitignore

@@ -31,3 +31,4 @@ java/classes
 app/autotest
 app/localhost
 
+node_modules/

.vscode/tasks.json

@@ -0,0 +1,83 @@
+{
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "web-app",
+      "type": "shell",
+      "linux": {
+        "command": "${env:SHELL}"
+      },
+      "windows": {
+        "command": "pwsh"
+      },
+      "isBackground": true,
+      "options": {
+        "cwd": "${workspaceFolder}/packages/web-app"
+      },
+      "presentation": {
+        "echo": true,
+        "reveal": "never",
+        "focus": false,
+        "panel": "dedicated",
+        "showReuseMessage": false,
+        "clear": false,
+        "close": false
+      },
+      "runOptions": {
+        "runOn": "folderOpen"
+      }
+    },
+    {
+      "label": "native-app",
+      "type": "shell",
+      "linux": {
+        "command": "${env:SHELL}"
+      },
+      "windows": {
+        "command": "pwsh"
+      },
+      "isBackground": true,
+      "options": {
+        "cwd": "${workspaceFolder}/packages/native-app"
+      },
+      "presentation": {
+        "echo": true,
+        "reveal": "never",
+        "focus": false,
+        "panel": "dedicated",
+        "showReuseMessage": false,
+        "clear": false,
+        "close": false
+      },
+      "runOptions": {
+        "runOn": "folderOpen"
+      }
+    },
+    {
+      "label": "common",
+      "type": "shell",
+      "linux": {
+        "command": "${env:SHELL}"
+      },
+      "windows": {
+        "command": "pwsh"
+      },
+      "isBackground": true,
+      "options": {
+        "cwd": "${workspaceFolder}/packages/common"
+      },
+      "presentation": {
+        "echo": true,
+        "reveal": "never",
+        "focus": false,
+        "panel": "dedicated",
+        "showReuseMessage": false,
+        "clear": false,
+        "close": false
+      },
+      "runOptions": {
+        "runOn": "folderOpen"
+      }
+    }
+  ]
+}

package.json

@@ -0,0 +1,15 @@
+{
+  "private": true,
+  "scripts": {
+    "clean": "rimraf node_modules",
+    "clean:full": "yarn clean && cd packages/common && yarn clean && cd ../web-app && yarn clean && cd ../native-app && yarn clean"
+  },
+  "workspaces": {
+    "packages": [
+      "packages/common",
+      "packages/diplicity-common-internal",
+      "packages/web-app",
+      "packages/native-app"
+    ]
+  }
+}

packages/common/.gitignore

@@ -1,4 +1,5 @@
 node_modules
 dist
 lib
-yarn-error.log
+yarn-error.log
+.turbo

packages/common/jest.config.ts

@@ -0,0 +1,8 @@
+module.exports = {
+  roots: ["<rootDir>/src"],
+  transform: {
+    "^.+\\.tsx?$": "ts-jest",
+  },
+  testRegex: "(/__tests__/.*|(\\.|/)(test|spec))\\.tsx?$",
+  moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node"],
+};

packages/common/package.json

@@ -12,6 +12,7 @@
     "build": "yarn build:esm && yarn build:cjs",
     "build:esm": "tsc -p tsconfig.build.json",
     "build:cjs": "tsc -p tsconfig.build.json --module commonjs --outDir lib/cjs",
+    "clean": "rimraf node_modules",
     "lint": "eslint src/**/*.{ts,tsx} --max-warnings 0",
     "test": "jest --detectOpenHandles",
     "test-coverage": "jest --silent --detectOpenHandles --ci --coverage --coverageReporters=\"text\" --coverageReporters=\"text-summary\""
@@ -20,11 +21,11 @@
   "devDependencies": {
     "@reduxjs/toolkit": "^1.8.3",
     "@testing-library/react-hooks": "^7.0.2",
-    "@types/jest": "^27.4.1",
+    "@types/jest": "29.5.2",
     "@types/jquery": "^3.5.13",
     "@types/node": "^17.0.19",
-    "@types/react": "^17.0.39",
-    "@types/react-dom": "^17.0.11",
+    "@types/react": "^17.0.2",
+    "@types/react-dom": "^17.0.2",
     "@types/xmldom": "^0.1.31",
     "@typescript-eslint/eslint-plugin": "^5.12.1",
     "@typescript-eslint/parser": "^5.12.1",
@@ -105,4 +106,4 @@
     "xmldom": "^0.6.0",
     "yup": "^0.32.11"
   }
-}
+}

packages/native-app/common/data/data.service.types.ts → packages/common/src/data/data.service.types.ts

@@ -10,11 +10,11 @@ export interface ApiResponse<TObj> {
   Links?: Link[] | null;
 }
 
-type Edge = {
-  Flags: {
-    [key: string]: boolean;
-  };
-};
+// type Edge = {
+//   Flags: {
+//     [key: string]: boolean;
+//   };
+// };
 
 type Link = {
   Rel: string;

packages/common/src/hooks/__tests__/usePageLoad.unit.test.tsx

@@ -1,5 +1,5 @@
 import { renderHook } from "@testing-library/react-hooks";
-import { PageName, uiActions } from "../../store";
+import { uiActions } from "../../store";
 import usePageLoad, { useLazyPageLoad } from "../usePageLoad";
 
 const mockUseDispatch = jest.fn();
@@ -13,11 +13,11 @@ describe("usePageLoad", () => {
     mockUseDispatch.mockClear();
   });
   test("Dispatches page load action", () => {
-    renderHook(() => usePageLoad(PageName.CreateGame));
-    expect(mockUseDispatch).toBeCalledWith(uiActions.pageLoad(PageName.CreateGame));
+    renderHook(() => usePageLoad("CreateGame"));
+    expect(mockUseDispatch).toBeCalledWith(uiActions.pageLoad("CreateGame"));
   });
   test("Doesn't dispatch on re-render", () => {
-    const result = renderHook(() => usePageLoad(PageName.CreateGame));
+    const result = renderHook(() => usePageLoad("CreateGame"));
     result.rerender();
     expect(mockUseDispatch).toBeCalledTimes(1);
   });
@@ -28,12 +28,12 @@ describe("useLazyPageLoad", () => {
     mockUseDispatch.mockClear();
   });
   test("Doesn't dispatch when not called", () => {
-    renderHook(() => useLazyPageLoad(PageName.CreateGame));
+    renderHook(() => useLazyPageLoad("CreateGame"));
     expect(mockUseDispatch).not.toBeCalled();
   });
   test("Dispatches page load action when called", () => {
-    const { result } = renderHook(() => useLazyPageLoad(PageName.CreateGame));
+    const { result } = renderHook(() => useLazyPageLoad("CreateGame"));
     result.current();
-    expect(mockUseDispatch).toBeCalledWith(uiActions.pageLoad(PageName.CreateGame));
+    expect(mockUseDispatch).toBeCalledWith(uiActions.pageLoad("CreateGame"));
   });
 });

packages/common/src/hooks/index.ts

@@ -1,9 +1,12 @@
-export { default as useCreateGame } from "./useCreateGame";
-export { default as useCreateOrderMenu } from "./useCreateOrderMenu";
+export { default as useCreateGameForm } from "./useCreateGameForm";
+// export { default as useCreateOrderMenu } from "./useCreateOrderMenu";
 export { default as useFeedbackWrapper } from "./useFeedbackWrapper";
-export { default as useGameCard } from "./useGameCard";
-export { default as useGameList } from "./useGameList";
-export { default as useMap } from "./useMap";
+export { default as useGameDetailView } from "./useGameDetailView";
+export { default as useGameInfoView } from "./useGameInfoView";
+export { default as useGameListView } from "./useGameListView";
+export { default as useMapComponentView } from "./useMapComponentView";
 export { default as useOrders } from "./useOrders";
 export { default as usePageLoad, useLazyPageLoad } from "./usePageLoad";
 export { default as usePhaseSelector } from "./usePhaseSelector";
+export { default as usePlayerInfoView } from "./usePlayerInfoView";
+export { default as useVariantInfoView } from "./useVariantInfoView";