Merge pull request #26 from ossdaiict/aditya/feature

Aditya/feature

Author: vaishcodescape

.github/workflows/deploy.yml

@@ -2,7 +2,7 @@ name: Deploy to GitHub Pages
 
 on:
   push:
-    branches: [ main, master ]
+    branches: [ main, master, aditya/feature ]
   workflow_dispatch:
 
 # Grant GITHUB_TOKEN the permissions required to make a Pages deployment
@@ -18,41 +18,46 @@ concurrency:
   cancel-in-progress: false
 
 jobs:
-  build-and-deploy:
+  # Build job
+  build:
     runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '18'
+          cache: 'npm'
+          cache-dependency-path: './Slot-Booking-System-Frontend/package-lock.json'
+          
+      - name: Install dependencies
+        run: |
+          cd Slot-Booking-System-Frontend
+          npm ci
+          
+      - name: Build
+        run: |
+          cd Slot-Booking-System-Frontend
+          npm run build
+          
+      - name: Setup Pages
+        uses: actions/configure-pages@v4
+        
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: './Slot-Booking-System-Frontend/dist'
+
+  # Deploy job
+  deploy:
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
-    
+    runs-on: ubuntu-latest
+    needs: build
     steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-      
-    - name: Setup Node.js
-      uses: actions/setup-node@v4
-      with:
-        node-version: '18'
-        cache: 'npm'
-        cache-dependency-path: './Slot-Booking-System-Frontend/package-lock.json'
-        
-    - name: Install dependencies
-      run: |
-        cd Slot-Booking-System-Frontend
-        npm ci
-        
-    - name: Build
-      run: |
-        cd Slot-Booking-System-Frontend
-        npm run build
-        
-    - name: Setup Pages
-      uses: actions/configure-pages@v4
-      
-    - name: Upload artifact
-      uses: actions/upload-pages-artifact@v3
-      with:
-        path: './Slot-Booking-System-Frontend/dist'
-        
-    - name: Deploy to GitHub Pages
-      id: deployment
-      uses: actions/deploy-pages@v4
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

Slot-Booking-System-Frontend/vite.config.js

@@ -4,5 +4,5 @@ import tailwindcss from '@tailwindcss/vite'
 // https://vite.dev/config/
 export default defineConfig({
   plugins: [react(), tailwindcss()],
-  base: '/SLoP5.0-Slot-Booking-System/',
+  base: '/SLoP5.0-Slot-Booking-System/', // Commented out for local development
 })