Merge branch 'dev' into main

outsung · Jan 27, 2021 · a132cec · a132cec
2 parents 50a14f7 + 9fd7da8
commit a132cec
Show file tree

Hide file tree

Showing 20 changed files with 1,353 additions and 231 deletions.
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -32,6 +32,7 @@ jobs:
         run: npm run build
         env:
           NODE_ENV: production
+          REACT_APP_API_URL: ${{ secrets.REACT_APP_API_URL }}
 
       - name: C) Setup assets
         run: |

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -33,6 +33,7 @@ jobs:
         run: npm run build
         env:
           NODE_ENV: production
+          REACT_APP_API_URL: ${{ secrets.REACT_APP_API_URL }}
 
       - name: C) Setup assets
         run: mkdir -p ./deploy

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -16,6 +16,7 @@
     "@types/react": "^16.14.2",
     "@types/react-dom": "^16.9.10",
     "@types/react-router-dom": "^5.1.6",
+    "@types/socket.io-client": "^1.4.35",
     "@types/styled-components": "^5.1.7",
     "eslint-config-airbnb": "^18.2.1",
     "eslint-config-prettier": "^7.1.0",
@@ -28,6 +29,7 @@
     "react-router-dom": "^5.2.0",
     "react-scripts": "4.0.1",
     "react-three-fiber": "^5.3.11",
+    "socket.io-client": "^2.3.0",
     "styled-components": "^5.2.1",
     "three": "^0.124.0",
     "typescript": "^4.1.3",
@@ -47,6 +49,16 @@
       "react-app/jest"
     ],
     "rules": {
+      "@typescript-eslint/no-unused-vars": [
+        2,
+        {
+          "args": "none"
+        }
+      ],
+      "react/no-array-index-key": 0,
+      "no-underscore-dangle" : 0,
+      "react/jsx-no-bind": 0,
+      "no-alert": 0,
       "no-restricted-globals": 0,
       "no-param-reassign": 0,
       "jsx-a11y/media-has-caption": 0,

diff --git a/public/index.html b/public/index.html
@@ -1,6 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
+    <base href="/" />
+
     <meta charset="utf-8" />
     <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
@@ -30,6 +32,7 @@
     <script src="https://cdn.jsdelivr.net/npm/@mediapipe/camera_utils/camera_utils.js" crossorigin="anonymous"></script>
     <script src="https://cdn.jsdelivr.net/npm/@mediapipe/hands/hands.js" crossorigin="anonymous"></script>
 
+    <script src="/socket.io/socket.io.js"></script>
     <!-- Start Single Page Apps for GitHub Pages -->
     <script type="text/javascript">
       // Single Page Apps for GitHub Pages