Merge branch 'main' of https://github.com/Game-as-a-Service/citadels-…

…game into frontend/CreateRoom
Game-as-a-Service · Dec 20, 2023 · a447af8 · a447af8
2 parents 10d598e + a5a166b
commit a447af8
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 40 deletions.
diff --git a/.github/workflows/frontend_pr_cd_job.yml b/.github/workflows/frontend_pr_cd_job.yml
@@ -7,42 +7,46 @@ on:
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-
-    - name: Set up Node.js
-      uses: actions/setup-node@v2
-      with:
-        node-version: 18
-
-    - name: Move to workspace
-      run: |
-        mv packages/frontend $GITHUB_WORKSPACE
-
-    - name: Deploy to Server
-      uses: easingthemes/ssh-deploy@main
-      env:
-        SSH_PRIVATE_KEY: ${{ secrets.PRIVATE_KEY }}
-        REMOTE_HOST: ${{ secrets.HOST }}
-        REMOTE_USER: ${{ secrets.USERNAME }}
-        TARGET: ${{ secrets.TARGET_DIR }}
-
-    - name: Executing remote ssh commands using ssh key
-      uses: appleboy/ssh-action@master
-      with:
-        host: ${{ secrets.HOST }}
-        username: ${{ secrets.USERNAME }}
-        key: ${{ secrets.PRIVATE_KEY }}
-        port: ${{ secrets.PORT }}
-        script: |
-                cd ~/citadels/frontend
-                sudo docker stop react-container
-                sudo docker rm react-container
-                sudo docker rmi react-image
-                sudo docker build --no-cache -t react-image .
-                sudo docker run --name react-container -d -p 3001:3001 react-image
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: 18
+
+      - name: Set environment variable
+        run: echo "NODE_ENV=development" >> $GITHUB_ENV
+
+      - name: Display environment variable
+        run: echo "NODE_ENV=${NODE_ENV}"
+
+      - name: Move to workspace
+        run: |
+          mv packages/frontend $GITHUB_WORKSPACE
+
+      - name: Deploy to Server
+        uses: easingthemes/ssh-deploy@main
+        env:
+          SSH_PRIVATE_KEY: ${{ secrets.PRIVATE_KEY }}
+          REMOTE_HOST: ${{ secrets.HOST }}
+          REMOTE_USER: ${{ secrets.USERNAME }}
+          TARGET: ${{ secrets.TARGET_DIR }}
 
+      - name: Executing remote ssh commands using ssh key
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.HOST }}
+          username: ${{ secrets.USERNAME }}
+          key: ${{ secrets.PRIVATE_KEY }}
+          port: ${{ secrets.PORT }}
+          script: |
+            cd ~/citadels/frontend
+            sudo docker stop react-container
+            sudo docker rm react-container
+            sudo docker rmi react-image
+            sudo docker build --no-cache -t react-image .
+            sudo docker run --name react-container -d -p 3001:3001 react-image
diff --git a/packages/frontend/js/api/index.ts b/packages/frontend/js/api/index.ts
@@ -1,10 +1,17 @@
 import axiosInstance from '../common/axiosInstance'
 import { CreateRoom, SpecificRoom } from '../common/types'
-const url =
-  process.env.NODE_ENV === 'development'
-    ? 'https://001f08b9-acb7-4c3a-a54f-a9254b7e8e55.mock.pstmn.io'
-    : ''
-const axios = axiosInstance(url)
+type Domain = {
+  development: string
+  production: string
+}
+const domain: Domain = {
+  development: 'https://001f08b9-acb7-4c3a-a54f-a9254b7e8e55.mock.pstmn.io',
+  production: 'https://104.155.239.183'
+}
+
+const env = process.env.NODE_ENV === 'production' ? 'production' : 'development'
+
+const axios = axiosInstance(domain[env])
 
 export type RoomList = {
   totalRooms: number

diff --git a/packages/frontend/package.json b/packages/frontend/package.json
@@ -6,6 +6,7 @@
   "scripts": {
     "test": "cypress run",
     "dev": "webpack-dev-server --hot --progress --mode development",
+    "prod": "webpack --mode production",
     "format": "prettier . --write --ignore-unknown",
     "cypress:open": "cypress open",
     "cypress:run": "cypress run"