test

Author: Peterr181

.github/workflows/ci.yml

@@ -30,28 +30,40 @@ jobs:
           --health-retries 10
 
     steps:
+      # Step 1: Checkout code
       - name: Checkout code
         uses: actions/checkout@v2
         with:
           fetch-depth: 0 # Fetch all history for all branches and tags
 
-      # Set up Node.js environment
+      # Step 2: Set up Node.js environment
       - name: Set up Node.js
         uses: actions/setup-node@v2
         with:
           node-version: "16"
 
-      # Install server dependencies
+      # Step 3: Cache server dependencies
+      - name: Cache server dependencies
+        id: server-cache
+        uses: actions/cache@v2
+        with:
+          path: ./server/node_modules
+          key: ${{ runner.os }}-server-${{ hashFiles('./server/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-server-
+
+      # Step 4: Install server dependencies (if not cached)
       - name: Install server dependencies
         working-directory: ./server
         run: npm install
+        if: steps.server-cache.outputs.cache-hit != 'true'
 
-      # Start the Express backend
+      # Step 5: Start the Express backend
       - name: Start Express backend
         working-directory: ./server
         run: npm start & # Use '&' to run it in the background
 
-      # Wait for Express server to be ready
+      # Step 6: Wait for Express server to be ready
       - name: Wait for Express server to be ready
         run: |
           echo "Waiting for Express server to be ready..."
@@ -64,20 +76,17 @@ jobs:
             sleep 5
           done
 
-      # Install and test backend (server)
-      - name: Install and test server
-        working-directory: ./server
-        env:
-          PORT: ${{ secrets.PORT }}
-          USER: ${{ secrets.USER }}
-          HOST: 127.0.0.1
-          DATABASE: ${{ secrets.DATABASE }}
-          PASSWORD: ${{ secrets.PASSWORD }}
-          DBPORT: 33306 # Match the changed port
-          JWT_SECRET: ${{ secrets.JWT_SECRET }}
-        run: npm test
+      # Step 7: Cache client dependencies
+      - name: Cache client dependencies
+        id: client-cache
+        uses: actions/cache@v2
+        with:
+          path: ./client/node_modules
+          key: ${{ runner.os }}-client-${{ hashFiles('./client/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-client-
 
-      # Install and build frontend (client)
+      # Step 8: Install and build frontend (React client)
       - name: Install and build client
         working-directory: ./client
         env:
@@ -88,13 +97,24 @@ jobs:
         run: |
           npm install
           npm run build
-          mv ./dist ../server/public # Move built React files to the server's public directory
 
-      # Debug step: MySQL logs
+      # Step 9: Move frontend build to server/public directory
+      - name: Move frontend build to server/public
+        run: |
+          echo "Cleaning up existing public directory..."
+          rm -rf ./server/public # Clean the public directory
+          echo "Moving new build files to server/public..."
+          mv ./client/dist ./server/public
+
+      # Step 10: Verify frontend build in server/public
+      - name: Verify frontend build in server/public
+        run: ls -la ./server/public
+
+      # Step 11: Debug step: MySQL logs
       - name: MySQL Logs
         run: docker logs $(docker ps -q --filter "ancestor=mysql:8.0")
 
-      # Deploy to Heroku (only if on the main branch and build was successful)
+      # Step 12: Deploy to Heroku (frontend and backend together)
       - name: Deploy to Heroku
         if: github.ref == 'refs/heads/main' && success()
         env:

client/vite.config.ts

@@ -6,5 +6,7 @@ export default defineConfig({
   plugins: [react(), tsconfigPaths()],
   build: {
     sourcemap: true, // Enable source maps for easier debugging
+    outDir: "../server/public", // Output built files directly to server/public
+    emptyOutDir: true, // Clean the output directory before building
   },
 });

server/server.js

@@ -82,12 +82,6 @@ if (isProduction) {
   const clientPath = path.resolve(__dirname, "../client/dist");
   app.use(express.static(clientPath));
 
-  // Define the root route to serve the index.html file
-  app.get("/", (req, res) => {
-    res.sendFile(path.join(clientPath, "index.html"));
-  });
-
-  // Catch-all route for SPA
   app.get("*", (req, res) => {
     res.sendFile(path.join(clientPath, "index.html"));
   });