Merge pull request #138 from SELab-2/development

Merging dev into main

Author: TomAlard

.github/workflows/deployment.yml

@@ -42,9 +42,10 @@ jobs:
       - name: Build react frontend with yarn
         run: yarn build
         working-directory: ./frontend
-      - name: Copy react build files to production folder
-        run: cp -R out/ /home/selab2/production/
-        working-directory: ./frontend
+      - name: Copy react files to production folder
+        run: cp -R frontend/ /home/selab2/production/
+      - name: Run the react app
+        run: sudo -E /home/selab2/production/start_frontend.sh
 
       - name: Set up JDK ${{ matrix.java-version }}
         uses: actions/setup-java@v2

frontend/package.json

@@ -2,7 +2,7 @@
   "private": true,
   "scripts": {
     "dev": "next dev",
-    "build": "next build && next export",
+    "build": "next build",
     "start": "next start",
     "lint": "yarn run eslint . --ext .js,.jsx,.ts,.tsx",
     "prettier:check": "yarn prettier --check .",