WIP: Separate app into workspaces

Signed-off-by: Johannes Loher <[email protected]>
TNG · Jun 30, 2024 · 150eab8 · 150eab8
1 parent 4e0ceff
commit 150eab8
Show file tree

Hide file tree

Showing 154 changed files with 16,916 additions and 26,698 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,16 +1,17 @@
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
 # dependencies
-/node_modules
+node_modules
 /.pnp
 .pnp.js
 
 # testing
 /coverage
 
 # production
-/build
-/build-server
+build
+dist
+*.tsbuildinfo
 
 # misc
 .DS_Store

diff --git a/.prettierignore b/.prettierignore
diff --git a/apps/client/.prettierignore b/apps/client/.prettierignore
@@ -0,0 +1 @@
+build
diff --git a/apps/client/package.json b/apps/client/package.json
@@ -0,0 +1,93 @@
+{
+  "name": "@eop/client",
+  "type": "module",
+  "version": "0.23.0",
+  "main": "src/client/index.tsx",
+  "scripts": {
+    "build": "react-scripts build",
+    "start": "react-scripts start",
+    "test": "react-scripts test",
+    "lint": "npm run eslint",
+    "fixlint": "npm run eslint -- --fix",
+    "eslint": "eslint --ext .js,.jsx,.ts,.tsx,.cjs .",
+    "format": "npm run prettier -- --write",
+    "checkformat": "npm run prettier -- --check",
+    "prettier": "prettier ."
+  },
+  "dependencies": {
+    "@eop/cornucopia-cards": "*",
+    "@eop/shared": "*",
+    "@fortawesome/free-solid-svg-icons": "^5.15.3",
+    "@fortawesome/react-fontawesome": "^0.2.0",
+    "bootstrap": "^4.6.0",
+    "jointjs": "^3.7.7",
+    "lodash": "^4.17.21",
+    "react": "^17.0.2",
+    "react-countdown-circle-timer": "^3.2.1",
+    "react-dom": "^17.0.2",
+    "react-helmet": "^6.1.0",
+    "react-map-interaction": "^2.1.0",
+    "react-nl2br": "^1.0.4",
+    "react-router-dom": "^5.3.1",
+    "reactstrap": "^8.10.1",
+    "reactstrap-confirm": "^1.3.2"
+  },
+  "devDependencies": {
+    "@eop/prettier-config": "*",
+    "@eop/typescript-config": "*",
+    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
+    "@testing-library/jest-dom": "^5.16.5",
+    "@testing-library/react": "^12.1.5",
+    "@testing-library/user-event": "^14.5.2",
+    "@types/backbone": "^1.4.19",
+    "@types/react": "^17.0.43",
+    "@types/react-dom": "^17.0.14",
+    "@types/react-helmet": "^6.1.11",
+    "@types/react-router-dom": "^5.3.3",
+    "nock": "^13.3.8",
+    "prettier": "^3.3.2",
+    "react-scripts": "^5.0.1",
+    "typescript": "^4.8.4"
+  },
+  "overrides": {
+    "autoprefixer": "10.4.5"
+  },
+  "eslintConfig": {
+    "extends": "react-app"
+  },
+  "browserslist": {
+    "production": [
+      ">0.2%",
+      "not dead",
+      "not op_mini all"
+    ],
+    "development": [
+      "last 1 chrome version",
+      "last 1 firefox version",
+      "last 1 safari version"
+    ]
+  },
+  "jest": {
+    "collectCoverageFrom": [
+      "src/**/*.{js,jsx,ts,tsx}",
+      "!<rootDir>/node_modules/",
+      "!src/serviceWorker.js",
+      "!src/components/board/board.ignoretest.js",
+      "!src/jointjs/shapes.js",
+      "!src/index.tsx"
+    ],
+    "coverageThreshold": {
+      "global": {
+        "branches": 5,
+        "functions": 5,
+        "lines": 5,
+        "statements": 5
+      }
+    },
+    "coverageReporters": [
+      "text",
+      "lcov"
+    ]
+  },
+  "private": true
+}
diff --git a/apps/client/prettier.config.js b/apps/client/prettier.config.js
@@ -0,0 +1,3 @@
+import config from '@eop/prettier-config';
+
+export default config;
diff --git a/public/favicon.ico → apps/client/public/favicon.ico b/public/favicon.ico → apps/client/public/favicon.ico
diff --git a/public/index.html → apps/client/public/index.html b/public/index.html → apps/client/public/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />

diff --git a/public/logo.png → apps/client/public/logo.png b/public/logo.png → apps/client/public/logo.png
diff --git a/public/manifest.json → apps/client/public/manifest.json b/public/manifest.json → apps/client/public/manifest.json
diff --git a/src/client/components/banner/banner.css → apps/client/src/components/banner/banner.css b/src/client/components/banner/banner.css → apps/client/src/components/banner/banner.css
diff --git a/src/client/components/banner/banner.test.tsx → ...ent/src/components/banner/banner.test.tsx b/src/client/components/banner/banner.test.tsx → ...ent/src/components/banner/banner.test.tsx
diff --git a/src/client/components/banner/banner.tsx → apps/client/src/components/banner/banner.tsx b/src/client/components/banner/banner.tsx → apps/client/src/components/banner/banner.tsx
diff --git a/src/client/components/board/board.css → apps/client/src/components/board/board.css b/src/client/components/board/board.css → apps/client/src/components/board/board.css
diff --git a/src/client/components/board/board.test.tsx → ...lient/src/components/board/board.test.tsx b/src/client/components/board/board.test.tsx → ...lient/src/components/board/board.test.tsx
@@ -1,13 +1,17 @@
-import React from 'react';
+import {
+  API_PORT,
+  DEFAULT_GAME_MODE,
+  DEFAULT_TURN_DURATION,
+  ModelType,
+} from '@eop/shared';
 import { render, screen } from '@testing-library/react';
-import Board from './board';
-import { DEFAULT_TURN_DURATION, ModelType } from '../../../utils/constants';
-import { DEFAULT_GAME_MODE } from '../../../utils/GameMode';
-import type { GameState } from '../../../game/gameState';
-import type { Ctx } from 'boardgame.io';
+import React from 'react';
 import nock from 'nock';
 
-import { API_PORT } from '../../../utils/serverConfig';
+import Board from './board';
+
+import type { GameState } from '@eop/shared';
+import type { Ctx } from 'boardgame.io';
 
 const baseUrl = `${window.location.protocol}//${window.location.hostname}:${API_PORT}`;
 

diff --git a/src/client/components/board/board.tsx → apps/client/src/components/board/board.tsx b/src/client/components/board/board.tsx → apps/client/src/components/board/board.tsx
@@ -1,24 +1,24 @@
+import { API_PORT, getDealtCard, ModelType, SPECTATOR } from '@eop/shared';
 import type { BoardProps as BoardgameIOBoardProps } from 'boardgame.io/react';
 import React, { FC, useCallback, useEffect, useState } from 'react';
-import Model from '../model/model';
+import request from 'superagent';
+
+import Banner from '../banner/banner';
 import Deck from '../deck/deck';
+import Imprint from '../footer/imprint';
+import Privacy from '../footer/privacy';
+import ImageModel from '../imagemodel/imagemodel';
+import LicenseAttribution from '../license/licenseAttribution';
+import Model from '../model/model';
+import PrivacyEnhancedModel from '../privacyEnhancedModel/privacyEnhancedModel';
 import Sidebar from '../sidebar/sidebar';
+import Status from '../status/status';
 import Threatbar from '../threatbar/threatbar';
-import ImageModel from '../imagemodel/imagemodel';
 import Timer from '../timer/timer';
+
 import './board.css';
-import request from 'superagent';
-import Status from '../status/status';
-import { getDealtCard } from '../../../utils/utils';
-import { ModelType, SPECTATOR } from '../../../utils/constants';
-import LicenseAttribution from '../license/licenseAttribution';
-import { API_PORT } from '../../../utils/serverConfig';
-import PrivacyEnhancedModel from '../privacyEnhancedModel/privacyEnhancedModel';
-import Imprint from '../footer/imprint';
-import Privacy from '../footer/privacy';
-import Banner from '../banner/banner';
-import type { GameState } from '../../../game/gameState';
-import type { ThreatDragonModel } from '../../../types/ThreatDragonModel';
+
+import type { GameState, ThreatDragonModel } from '@eop/shared';
 
 type BoardProps = Pick<
   BoardgameIOBoardProps<GameState>,

diff --git a/...components/copybutton/copybutton.test.tsx → ...components/copybutton/copybutton.test.tsx b/...components/copybutton/copybutton.test.tsx → ...components/copybutton/copybutton.test.tsx
diff --git a/...ient/components/copybutton/copybutton.tsx → .../src/components/copybutton/copybutton.tsx b/...ient/components/copybutton/copybutton.tsx → .../src/components/copybutton/copybutton.tsx
diff --git a/...t/components/dealtcard/dealtcard.test.tsx → ...c/components/dealtcard/dealtcard.test.tsx b/...t/components/dealtcard/dealtcard.test.tsx → ...c/components/dealtcard/dealtcard.test.tsx
@@ -1,7 +1,8 @@
+import { DEFAULT_GAME_MODE } from '@eop/shared';
 import React from 'react';
 import ReactDOM from 'react-dom';
+
 import DealtCard from './dealtcard';
-import { DEFAULT_GAME_MODE } from '../../../utils/GameMode';
 
 it('renders without crashing', () => {
   const div = document.createElement('div');

diff --git a/...client/components/dealtcard/dealtcard.tsx → ...nt/src/components/dealtcard/dealtcard.tsx b/...client/components/dealtcard/dealtcard.tsx → ...nt/src/components/dealtcard/dealtcard.tsx
@@ -1,6 +1,7 @@
+import { GameMode, getCardCssClass } from '@eop/shared';
 import type React from 'react';
-import { GameMode, getCardCssClass } from '../../../utils/GameMode';
-import type { Card } from '../../../utils/cardDefinitions';
+
+import type { Card } from '@eop/shared';
 
 interface DealtCardProps {
   gameMode: GameMode;

diff --git a/src/client/components/deck/deck.test.tsx → .../client/src/components/deck/deck.test.tsx b/src/client/components/deck/deck.test.tsx → .../client/src/components/deck/deck.test.tsx
@@ -1,8 +1,8 @@
+import { DEFAULT_START_SUIT, GameMode } from '@eop/shared';
 import React from 'react';
 import ReactDOM from 'react-dom';
+
 import Deck from './deck';
-import { GameMode } from '../../../utils/GameMode';
-import { DEFAULT_START_SUIT } from '../../../utils/constants';
 
 it('renders without crashing', () => {
   const div = document.createElement('div');

diff --git a/src/client/components/deck/deck.tsx → apps/client/src/components/deck/deck.tsx b/src/client/components/deck/deck.tsx → apps/client/src/components/deck/deck.tsx
@@ -1,7 +1,7 @@
+import { GameMode, getCardCssClass, getValidMoves } from '@eop/shared';
+
 import type React from 'react';
-import { getValidMoves } from '../../../utils/utils';
-import { GameMode, getCardCssClass } from '../../../utils/GameMode';
-import type { Card, Suit } from '../../../utils/cardDefinitions';
+import type { Card, Suit } from '@eop/shared';
 
 interface DeckProps {
   suit?: Suit;

diff --git a/...ts/downloadbutton/downloadbutton.test.tsx → ...ts/downloadbutton/downloadbutton.test.tsx b/...ts/downloadbutton/downloadbutton.test.tsx → ...ts/downloadbutton/downloadbutton.test.tsx
diff --git a/...ponents/downloadbutton/downloadbutton.tsx → ...ponents/downloadbutton/downloadbutton.tsx b/...ponents/downloadbutton/downloadbutton.tsx → ...ponents/downloadbutton/downloadbutton.tsx
@@ -1,8 +1,8 @@
-import React, { FC, ReactNode, useState } from 'react';
-import { Button } from 'reactstrap';
+import { API_PORT } from '@eop/shared';
 import { faDownload, faTimes } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { API_PORT } from '../../../utils/serverConfig';
+import React, { FC, ReactNode, useState } from 'react';
+import { Button } from 'reactstrap';
 import type { PlayerID } from 'boardgame.io';
 
 type DownloadButtonProps = {

diff --git a/src/client/components/footer/footer.css → apps/client/src/components/footer/footer.css b/src/client/components/footer/footer.css → apps/client/src/components/footer/footer.css
diff --git a/src/client/components/footer/footer.test.tsx → ...ent/src/components/footer/footer.test.tsx b/src/client/components/footer/footer.test.tsx → ...ent/src/components/footer/footer.test.tsx
diff --git a/src/client/components/footer/footer.tsx → apps/client/src/components/footer/footer.tsx b/src/client/components/footer/footer.tsx → apps/client/src/components/footer/footer.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import type { FC } from 'react';
-import packageJson from '../../../../package.json';
+import packageJson from '../../../package.json';
 import { faHeart } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import Imprint from './imprint';

diff --git a/...client/components/footer/imprint.test.tsx → ...nt/src/components/footer/imprint.test.tsx b/...client/components/footer/imprint.test.tsx → ...nt/src/components/footer/imprint.test.tsx
diff --git a/src/client/components/footer/imprint.tsx → .../client/src/components/footer/imprint.tsx b/src/client/components/footer/imprint.tsx → .../client/src/components/footer/imprint.tsx
diff --git a/...client/components/footer/privacy.test.tsx → ...nt/src/components/footer/privacy.test.tsx b/...client/components/footer/privacy.test.tsx → ...nt/src/components/footer/privacy.test.tsx
diff --git a/src/client/components/footer/privacy.tsx → .../client/src/components/footer/privacy.tsx b/src/client/components/footer/privacy.tsx → .../client/src/components/footer/privacy.tsx
diff --git a/...ient/components/imagemodel/imagemodel.css → .../src/components/imagemodel/imagemodel.css b/...ient/components/imagemodel/imagemodel.css → .../src/components/imagemodel/imagemodel.css
@@ -6,4 +6,4 @@ div.deselect {
   position: absolute;
   height: 100%;
   width: 100%;
-}
+}
diff --git a/...ient/components/imagemodel/imagemodel.tsx → .../src/components/imagemodel/imagemodel.tsx b/...ient/components/imagemodel/imagemodel.tsx → .../src/components/imagemodel/imagemodel.tsx
@@ -1,8 +1,7 @@
 import React, { FC, useCallback, useEffect, useState } from 'react';
 import './imagemodel.css';
 import { MapInteractionCSS } from 'react-map-interaction';
-import { asyncSetTimeout } from '../../../utils/utils';
-import { API_PORT } from '../../../utils/serverConfig';
+import { API_PORT, asyncSetTimeout } from '@eop/shared';
 import type { PlayerID } from 'boardgame.io';
 
 type ImageModelProps = {
@@ -11,16 +10,16 @@ type ImageModelProps = {
   matchID: string;
 };
 
+const apiBase =
+  process.env.NODE_ENV === 'production'
+    ? '/api'
+    : `${window.location.protocol}//${window.location.hostname}:${API_PORT}`;
+
 const ImageModel: FC<ImageModelProps> = ({
   playerID,
   credentials,
   matchID,
 }) => {
-  const apiBase =
-    process.env.NODE_ENV === 'production'
-      ? '/api'
-      : `${window.location.protocol}//${window.location.hostname}:${API_PORT}`;
-
   const [imgSrc, setImgSrc] = useState<string | undefined>(undefined);
 
   const updateImage = useCallback(async () => {

diff --git a/...nt/components/leaderboard/leaderboard.css → ...rc/components/leaderboard/leaderboard.css b/...nt/components/leaderboard/leaderboard.css → ...rc/components/leaderboard/leaderboard.css
diff --git a/...mponents/leaderboard/leaderboard.test.tsx → ...mponents/leaderboard/leaderboard.test.tsx b/...mponents/leaderboard/leaderboard.test.tsx → ...mponents/leaderboard/leaderboard.test.tsx
@@ -1,7 +1,8 @@
+import { DEFAULT_GAME_MODE } from '@eop/shared';
+import { render, screen } from '@testing-library/react';
 import React from 'react';
+
 import Leaderboard from './leaderboard';
-import { DEFAULT_GAME_MODE } from '../../../utils/GameMode';
-import { render, screen } from '@testing-library/react';
 
 describe('Leaderboard', () => {
   it('renders without crashing', () => {

diff --git a/...nt/components/leaderboard/leaderboard.tsx → ...rc/components/leaderboard/leaderboard.tsx b/...nt/components/leaderboard/leaderboard.tsx → ...rc/components/leaderboard/leaderboard.tsx
@@ -1,14 +1,13 @@
+import { getCardDisplayName, Card as EOPCard } from '@eop/shared';
 import type { PlayerID } from 'boardgame.io';
 import React from 'react';
 import type { FC } from 'react';
 import { Badge, Card, CardHeader, Table } from 'reactstrap';
-import {
-  getCardDisplayName,
-  Card as EOPCard,
-} from '../../../utils/cardDefinitions';
-import type { GameMode } from '../../../utils/GameMode';
+
 import './leaderboard.css';
 
+import type { GameMode } from '@eop/shared';
+
 type LeaderboardProps = {
   scores: number[];
   names: string[];

diff --git a/apps/client/src/components/license/licenseAttribution.css b/apps/client/src/components/license/licenseAttribution.css
@@ -0,0 +1,7 @@
+.license-attribution {
+  text-align: center;
+  font-size: 70%;
+  position: fixed;
+  bottom: 0;
+  right: 0;
+}
diff --git a/...nents/license/licenseAttribution.test.tsx → ...nents/license/licenseAttribution.test.tsx b/...nents/license/licenseAttribution.test.tsx → ...nents/license/licenseAttribution.test.tsx
@@ -1,6 +1,7 @@
+import { GameMode } from '@eop/shared';
 import { render, screen } from '@testing-library/react';
 import React from 'react';
-import { GameMode } from '../../../utils/GameMode';
+
 import LicenseAttribution from './licenseAttribution';
 
 describe('licence attribution', () => {

diff --git a/...components/license/licenseAttribution.tsx → ...components/license/licenseAttribution.tsx b/...components/license/licenseAttribution.tsx → ...components/license/licenseAttribution.tsx
@@ -1,5 +1,6 @@
+import { GameMode } from '@eop/shared';
 import type React from 'react';
-import { GameMode } from '../../../utils/GameMode';
+
 import './licenseAttribution.css';
 
 interface LicenseAttributionProps {

diff --git a/src/client/components/logo/logo.test.tsx → .../client/src/components/logo/logo.test.tsx b/src/client/components/logo/logo.test.tsx → .../client/src/components/logo/logo.test.tsx
diff --git a/src/client/components/logo/logo.tsx → apps/client/src/components/logo/logo.tsx b/src/client/components/logo/logo.tsx → apps/client/src/components/logo/logo.tsx
diff --git a/src/client/components/model/model.css → apps/client/src/components/model/model.css b/src/client/components/model/model.css → apps/client/src/components/model/model.css
diff --git a/src/client/components/model/model.tsx → apps/client/src/components/model/model.tsx b/src/client/components/model/model.tsx → apps/client/src/components/model/model.tsx
@@ -1,13 +1,17 @@
-import React, { FC, useCallback, useEffect, useState } from 'react';
+import classnames from 'classnames';
 import * as joint from 'jointjs';
+import React, { FC, useCallback, useEffect, useState } from 'react';
+import { Nav, NavItem, NavLink } from 'reactstrap';
+import Helmet from 'react-helmet';
+
 import 'jointjs/dist/joint.css';
+
 import '../../jointjs/joint-tm.css';
 import '../../jointjs/shapes';
-import { Nav, NavItem, NavLink } from 'reactstrap';
-import classnames from 'classnames';
+
 import './model.css';
-import Helmet from 'react-helmet';
-import type { ThreatDragonModel } from '../../../types/ThreatDragonModel';
+
+import type { ThreatDragonModel } from '@eop/shared';
 
 const SCROLL_SPEED = 1000;
 

diff --git a/...acyEnhancedModel/privacyEnhancedModel.css → ...acyEnhancedModel/privacyEnhancedModel.css b/...acyEnhancedModel/privacyEnhancedModel.css → ...acyEnhancedModel/privacyEnhancedModel.css
diff --git a/...hancedModel/privacyEnhancedModel.test.tsx → ...hancedModel/privacyEnhancedModel.test.tsx b/...hancedModel/privacyEnhancedModel.test.tsx → ...hancedModel/privacyEnhancedModel.test.tsx
diff --git a/...acyEnhancedModel/privacyEnhancedModel.tsx → ...acyEnhancedModel/privacyEnhancedModel.tsx b/...acyEnhancedModel/privacyEnhancedModel.tsx → ...acyEnhancedModel/privacyEnhancedModel.tsx
diff --git a/src/client/components/sidebar/sidebar.css → ...client/src/components/sidebar/sidebar.css b/src/client/components/sidebar/sidebar.css → ...client/src/components/sidebar/sidebar.css
diff --git a/...lient/components/sidebar/sidebar.test.tsx → ...t/src/components/sidebar/sidebar.test.tsx b/...lient/components/sidebar/sidebar.test.tsx → ...t/src/components/sidebar/sidebar.test.tsx
@@ -1,9 +1,9 @@
+import { DEFAULT_GAME_MODE, GameState, ModelType } from '@eop/shared';
+import { render, screen } from '@testing-library/react';
 import React from 'react';
+
 import Sidebar from './sidebar';
-import { DEFAULT_GAME_MODE } from '../../../utils/GameMode';
-import { render, screen } from '@testing-library/react';
-import type { GameState } from '../../../game/gameState';
-import { ModelType } from '../../../utils/constants';
+
 import type { Ctx } from 'boardgame.io';
 
 describe('Sidebar', () => {