Modernize the repository

.codeclimate.yml

@@ -1,3 +1,3 @@
 exclude_patterns:
-- "islanders-shared/__tests__/"
+- "islanders-shared/test/"
 - "islanders-shared/dist/"

.dockerignore

@@ -0,0 +1 @@
+node_modules/*

.github/workflows/build.yml

@@ -0,0 +1,14 @@
+name: Docker Image CI
+
+on:
+  push:
+
+jobs:
+  build_test_project:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v5
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Docker Compose Build
+        run: docker compose build

docker-compose.yaml

@@ -1,31 +1,36 @@
-version: "3.5"
 services:
-  mongo:
-    image: mongo
+  postgres:
+    image: postgres:15-alpine
     restart: unless-stopped
-    volumes:
-      - islanders-mongo-data:/data/db
     environment:
-      - MONGO_INITDB_DATABASE=islanders
+      - POSTGRES_DB=islanders
+      - POSTGRES_USER=islanders
+      - POSTGRES_PASSWORD=islanders
+    volumes:
+      - ./islanders-server/scripts/init.sql:/docker-entrypoint-initdb.d/init.sql:ro
     ports:
-      - 27017:27017
+      - 5432:5432
 
   islanders-server:
-    image: islanders/islanders-server:latest
+    build:
+      context: .
+      dockerfile: ./islanders-server/Dockerfile
+    env_file:
+      - ./islanders-server/.env
     restart: unless-stopped
     ports:
-      - 3000:3000
-    environment:
-      - MONGO_URL=mongo
-    links:
-      - mongo
+      - 3001:3001
+    depends_on:
+      - postgres
 
   islanders-client:
-    image: islanders/islanders-client:latest
+    build:
+      context: .
+      dockerfile: ./islanders-client/Dockerfile
+    env_file:
+      - ./islanders-client/.env
     restart: unless-stopped
     ports:
-      - 80:80
-
-
-volumes:
-  islanders-mongo-data:
+      - 3000:3000
+    depends_on:
+      - islanders-server

islanders-client-vue/.env.example

@@ -0,0 +1,4 @@
+NODE_ENV=development
+BASE_URL=http://localhost:3002/
+VUE_APP_SERVER_URL=http://localhost:3002
+VUE_APP_SERVERPORT=3002

islanders-client-vue/Dockerfile

@@ -0,0 +1,30 @@
+FROM oven/bun:1 AS builder
+
+WORKDIR /app
+
+COPY bun.lock package.json ./
+COPY islanders-client/package.json islanders-client/
+COPY islanders-server/package.json islanders-server/
+COPY islanders-shared/package.json islanders-shared/
+RUN bun install --frozen-lockfile
+
+COPY islanders-shared/lib ./islanders-shared/lib
+COPY islanders-client/babel.config.js ./islanders-client/babel.config.js
+COPY islanders-client/postcss.config.js ./islanders-client/postcss.config.js
+COPY islanders-client/tsconfig.json ./islanders-client/tsconfig.json
+COPY islanders-client/vue.config.ts ./islanders-client/vue.config.ts
+COPY islanders-client/.browserslistrc ./islanders-client/.browserslistrc
+COPY islanders-client/public ./islanders-client/public
+COPY islanders-client/src ./islanders-client/src
+
+WORKDIR /app/islanders-client
+RUN bun run build
+
+FROM nginx:alpine
+
+COPY islanders-client/default.conf /etc/nginx/conf.d/default.conf
+COPY --from=builder /app/islanders-client/dist /usr/share/nginx/html
+
+EXPOSE 80
+
+CMD ["nginx", "-g", "daemon off;"]

islanders-client-vue/README.md

@@ -0,0 +1,26 @@
+# islanders-client
+
+## Project setup
+```
+npm install
+```
+
+### Compiles and hot-reloads for development
+```
+npm run serve
+```
+
+### Compiles and minifies for production
+```
+npm run build
+```
+
+### Lints and fixes files
+```
+npm run lint
+```
+
+### Run your unit tests
+```
+npm run test:unit
+```

islanders-client/src/helpers/SpriteGenerators.ts → islanders-client-vue/src/helpers/SpriteGenerators.ts

@@ -1,6 +1,6 @@
 import { Sprite } from 'pixi.js';
 
-import { Tile } from '../../../islanders-shared/dist/Shared';
+import { Tile } from '../../../islanders-shared/lib/Shared';
 
 export function generateSprites(): { [s: string]: () => Sprite } {
   const tilePath = './img/tilesets/';

islanders-client/src/store/store.ts → islanders-client-vue/src/store/store.ts

@@ -8,7 +8,7 @@ import chat from './modules/chat';
 import game from './modules/game';
 import ui from './modules/ui';
 
-import { Result, SocketActions, success, toResultInstance, World } from '../../../islanders-shared/dist/Shared';
+import { Result, SocketActions, success, toResultInstance, World } from '../../../islanders-shared/lib/Shared';
 
 Vue.use(Vuex);
 
@@ -25,7 +25,7 @@ const mutationTree: MutationTree<State> = {};
 const host = `http://${process.env.VUE_APP_SERVER}:${process.env.VUE_APP_SERVERPORT}/`;
 
 const actionTree: ActionTree<unknown, unknown> = {
-  async createGame ({ commit }: ActionContext<unknown, unknown>, playerName: string) {
+  async createGame({ commit }: ActionContext<unknown, unknown>, playerName: string) {
     const { data }: { data: string } = await Axios.get(`${host}newgame`);
     const gameId = data;
 
@@ -37,7 +37,7 @@ const actionTree: ActionTree<unknown, unknown> = {
     commit('game/setPlayerName', playerName);
   },
 
-  async joinGame (
+  async joinGame(
     { commit }: ActionContext<unknown, unknown>,
     gameStartInfo: { gameId: string; playerName: string },
   ): Promise<void> {

islanders-client-vue/tsconfig.json

@@ -0,0 +1,28 @@
+{
+  "compilerOptions": {
+    "target": "ES2020",
+    "module": "ES2020",
+    "noImplicitAny": false,
+    "jsx": "preserve",
+    "importHelpers": true,
+    "moduleResolution": "node",
+    "experimentalDecorators": true,
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
+    "sourceMap": true,
+    "baseUrl": ".",
+    "types": ["webpack-env", "jest"],
+    "paths": {
+      "@/*": ["src/*"]
+    },
+    "lib": ["esnext", "dom", "dom.iterable", "scripthost"]
+  },
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.tsx",
+    "src/**/*.vue",
+    "tests/**/*.ts",
+    "tests/**/*.tsx", 
+    "src/main.js"  ],
+  "exclude": ["node_modules"]
+}

islanders-client/.env.example

@@ -0,0 +1,2 @@
+SERVER_PORT=3001
+PORT=3000

islanders-client/.gitignore

@@ -0,0 +1,23 @@
+node_modules
+
+# Output
+.output
+.vercel
+.netlify
+.wrangler
+/.svelte-kit
+/build
+
+# OS
+.DS_Store
+Thumbs.db
+
+# Env
+.env
+.env.*
+!.env.example
+!.env.test
+
+# Vite
+vite.config.js.timestamp-*
+vite.config.ts.timestamp-*

islanders-client/.npmrc

@@ -0,0 +1 @@
+engine-strict=true

islanders-client/.prettierignore

@@ -0,0 +1,9 @@
+# Package Managers
+package-lock.json
+pnpm-lock.yaml
+yarn.lock
+bun.lock
+bun.lockb
+
+# Miscellaneous
+/static/

islanders-client/.prettierrc

@@ -0,0 +1,16 @@
+{
+	"useTabs": true,
+	"singleQuote": true,
+	"trailingComma": "none",
+	"printWidth": 100,
+	"plugins": ["prettier-plugin-svelte", "prettier-plugin-tailwindcss"],
+	"overrides": [
+		{
+			"files": "*.svelte",
+			"options": {
+				"parser": "svelte"
+			}
+		}
+	],
+	"tailwindStylesheet": "./src/app.css"
+}