Merge pull request #128 from ueckoken/dir-restruction

restruct frontend dir
ueckoken · Oct 18, 2022 · c135687 · c135687
2 parents 4aa2878 + 1f44076
commit c135687
Show file tree

Hide file tree

Showing 62 changed files with 3,392 additions and 188 deletions.
diff --git a/.github/workflows/deploy-frontend.yml b/.github/workflows/deploy-frontend.yml
@@ -2,7 +2,7 @@ name: Deploy WebRTC
 
 defaults:
   run:
-    working-directory: ./frontend/
+    working-directory: ./frontend/site
 
 on:
   push:
@@ -28,8 +28,8 @@ jobs:
       - name: Build
         uses: docker/build-push-action@v3
         with:
-          context: ./frontend
-          file: ./frontend/Dockerfile
+          context: ./frontend/site
+          file: ./frontend/site/Dockerfile
           platforms: linux/amd64
           push: true
           tags: ghcr.io/ueckoken/plarail2022-frontend:${{ env.IMAGE_TAG }}

diff --git a/.github/workflows/deploy-python-server.yml → .github/workflows/deploy-multicaster.yml b/.github/workflows/deploy-python-server.yml → .github/workflows/deploy-multicaster.yml
@@ -2,12 +2,12 @@ name: Deploy WebRTC python server
 
 defaults:
   run:
-    working-directory: ./frontend/videoCast
+    working-directory: ./backend/multicaster
 
 on:
   push:
     branches: [deployment]
-    paths: ["./frontend/videoCast/**"]
+    paths: ["./frontend/multicaster/**"]
 
 jobs:
   build:
@@ -30,8 +30,8 @@ jobs:
       - name: Build
         uses: docker/build-push-action@v3
         with:
-          context: ./frontend/videoCast
-          file: ./frontend/videoCast/Dockerfile.python
+          context: ./backend/multicaster
+          file: ./backend/multicaster/Dockerfile
           platforms: linux/amd64
           push: true
           tags: ghcr.io/ueckoken/plarail2022-frontend-python:${{ env.IMAGE_TAG }}

diff --git a/.github/workflows/deploy-sender.yml b/.github/workflows/deploy-sender.yml
@@ -2,7 +2,7 @@ name: Deploy WebRTC sender
 
 defaults:
   run:
-    working-directory: ./frontend/
+    working-directory: ./frontend/momo_sender
 
 on:
   push:
@@ -29,8 +29,8 @@ jobs:
       - name: Build
         uses: docker/build-push-action@v3
         with:
-          context: ./frontend/videoCast/
-          file: ./frontend/videoCast/Dockerfile.sender
+          context: ./frontend/momo_sender/
+          file: ./frontend/momo_sender/Dockerfile
           platforms: linux/amd64
           push: true
           tags: ghcr.io/ueckoken/plarail2022-webrtc-sender:${{ env.IMAGE_TAG }}

diff --git a/.github/workflows/deploy-testing-receiver.yml b/.github/workflows/deploy-testing-receiver.yml
@@ -2,7 +2,7 @@ name: Deploy WebRTC receiver testing
 
 defaults:
   run:
-    working-directory: ./frontend/
+    working-directory: ./frontend/skyway_receiver
 
 on:
   push:
@@ -30,8 +30,8 @@ jobs:
       - name: Build
         uses: docker/build-push-action@v3
         with:
-          context: ./frontend/videoCast/
-          file: ./frontend/videoCast/Dockerfile.receiver
+          context: ./frontend/skyway_receiver/
+          file: ./frontend/skyway_receiver/Dockerfile
           platforms: linux/amd64
           push: true
           tags: ghcr.io/ueckoken/plarail2022-receiver-test:${{ env.IMAGE_TAG }}

diff --git a/.github/workflows/format_frontend.yml → .github/workflows/format.yml b/.github/workflows/format_frontend.yml → .github/workflows/format.yml
@@ -3,6 +3,7 @@ on:
   push:
     paths:
       - "frontend/**/*"
+      - "backend/multicaster/*"
     branches-ignore:
       - "main"
       - "deployment"
@@ -13,15 +14,15 @@ jobs:
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: "frontend/"
+        working-directory: "frontend/site"
     steps:
       - name: checkout
         uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version-file: ./frontend/.nvmrc
+          node-version-file: ./frontend/site/.nvmrc
           cache: yarn
-          cache-dependency-path: ./frontend/yarn.lock
+          cache-dependency-path: ./frontend/site/yarn.lock
       - run: yarn install --frozen-lockfile
       - run: yarn fmt
       - name: Count changes
@@ -38,19 +39,19 @@ jobs:
           git push
         if: steps.changes.outputs.count > 0
 
-  prettier-videocast:
+  prettier-momo-sender:
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: "frontend/videoCast"
+        working-directory: "frontend/momo_sender"
     steps:
       - name: checkout
         uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version-file: ./frontend/videoCast/.nvmrc
+          node-version-file: ./frontend/momo_sender/.nvmrc
           cache: npm
-          cache-dependency-path: ./frontend/videoCast/package-lock.json
+          cache-dependency-path: ./frontend/momo_sender/package-lock.json
       - run: npm ci
       - run: npm run fmt
       - uses: EndBug/add-and-commit@v9
@@ -59,19 +60,40 @@ jobs:
           author_email: [email protected]
           message: format by prettier
 
-  black-videoCast:
+  prettier-skyway-receiver:
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: "frontend/videoCast"
+        working-directory: "frontend/skyway_receiver"
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version-file: ./frontend/skyway_receiver/.nvmrc
+          cache: npm
+          cache-dependency-path: ./frontend/skyway_receiver/package-lock.json
+      - run: npm ci
+      - run: npm run fmt
+      - uses: EndBug/add-and-commit@v9
+        with:
+          author_name: format BOT
+          author_email: [email protected]
+          message: format by prettier
+
+  black-multicaster:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: "backend/multicaster"
     steps:
       - name: checkout
         uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: "3.10"
           cache: pip
-          cache-dependency-path: ./frontend/videoCast/requirements-dev.txt
+          cache-dependency-path: ./backend/multicaster/requirements-dev.txt
       - run: pip install -r requirements-dev.txt
       - run: black .
       - uses: EndBug/add-and-commit@v9

diff --git a/.github/workflows/test-frontend.yml b/.github/workflows/test-frontend.yml
@@ -2,7 +2,7 @@ name: Frontend build and test
 
 defaults:
   run:
-    working-directory: ./frontend
+    working-directory: ./frontend/site
 
 on: push
 
@@ -14,13 +14,13 @@ jobs:
       - uses: actions/cache@v3
         with:
           path: |
-            ${{ github.workspace }}/frontend/.next/cache
-          key: ${{ runner.os }}-nextjs-${{ hashFiles('./frontend/**/yarn.lock') }}-${{ hashFiles('./frontend/**.[jt]s', './frontend/**.[jt]sx') }}
+            ${{ github.workspace }}/frontend/site/.next/cache
+          key: ${{ runner.os }}-nextjs-${{ hashFiles('./frontend/site/**/yarn.lock') }}-${{ hashFiles('./frontend/site/**.[jt]s', './frontend/site/**.[jt]sx') }}
       - uses: actions/setup-node@v3
         with:
-          node-version-file: ./frontend/.nvmrc
+          node-version-file: ./frontend/site/.nvmrc
           cache: yarn
-          cache-dependency-path: ./frontend/yarn.lock
+          cache-dependency-path: ./frontend/site/yarn.lock
       - name: dependency-install
         run: yarn install --frozen-lockfile --immutable
       - name: lint

diff --git a/.github/workflows/test-receiver-sender.yml → .github/workflows/test-sender.yml b/.github/workflows/test-receiver-sender.yml → .github/workflows/test-sender.yml
@@ -1,8 +1,8 @@
-name: WebRTC receiver and sender build test
+name: WebRTC sender build test
 
 defaults:
   run:
-    working-directory: ./frontend/videoCast
+    working-directory: ./frontend/momo_sender
 
 on: push
 
@@ -13,9 +13,9 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version-file: ./frontend/videoCast/.nvmrc
+          node-version-file: ./frontend/momo_sender/.nvmrc
           cache: npm
-          cache-dependency-path: ./frontend/videoCast/package-lock.json
+          cache-dependency-path: ./frontend/momo_sender/package-lock.json
       - name: dependency-install
         run: npm ci
       - name: build

diff --git a/.github/workflows/test-testing-receiver.yml b/.github/workflows/test-testing-receiver.yml
@@ -0,0 +1,22 @@
+name: WebRTC receiver build test
+
+defaults:
+  run:
+    working-directory: ./frontend/skyway_receiver
+
+on: push
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version-file: ./frontend/skyway_receiver/.nvmrc
+          cache: npm
+          cache-dependency-path: ./frontend/skyway_receiver/package-lock.json
+      - name: dependency-install
+        run: npm ci
+      - name: build
+        run: npm run build