Merge pull request #24 from MuhammadAslam-K/aslam-dev

Add Firebase workflow files

.firebaserc

@@ -0,0 +1,5 @@
+{
+  "projects": {
+    "default": "bookat-87c98"
+  }
+}

.github/workflow/main.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: "14"
+          node-version: "18"
 
       - name: Install Dependencies
         run: npm install

.github/workflows/firebase-hosting-merge.yml

@@ -0,0 +1,20 @@
+# This file was auto-generated by the Firebase CLI
+# https://github.com/firebase/firebase-tools
+
+name: Deploy to Firebase Hosting on merge
+'on':
+  push:
+    branches:
+      - master
+jobs:
+  build_and_deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - run: npm ci && npm run build
+      - uses: FirebaseExtended/action-hosting-deploy@v0
+        with:
+          repoToken: '${{ secrets.GITHUB_TOKEN }}'
+          firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_BOOKAT_87C98 }}'
+          channelId: live
+          projectId: bookat-87c98

.github/workflows/firebase-hosting-pull-request.yml

@@ -0,0 +1,17 @@
+# This file was auto-generated by the Firebase CLI
+# https://github.com/firebase/firebase-tools
+
+name: Deploy to Firebase Hosting on PR
+'on': pull_request
+jobs:
+  build_and_preview:
+    if: '${{ github.event.pull_request.head.repo.full_name == github.repository }}'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - run: npm ci && npm run build
+      - uses: FirebaseExtended/action-hosting-deploy@v0
+        with:
+          repoToken: '${{ secrets.GITHUB_TOKEN }}'
+          firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_BOOKAT_87C98 }}'
+          projectId: bookat-87c98

firebase.json

@@ -0,0 +1,16 @@
+{
+  "hosting": {
+    "public": "dist",
+    "ignore": [
+      "firebase.json",
+      "**/.*",
+      "**/node_modules/**"
+    ],
+    "rewrites": [
+      {
+        "source": "**",
+        "destination": "/index.html"
+      }
+    ]
+  }
+}

src/pages/driver/addInfo/AddPersonlInfoPage.tsx

@@ -1,10 +1,14 @@
+import Navbar from "../../../components/driver/common/Navbar"
+import DriverFooter from "../../../components/driver/common/DriverFooter"
 import AddPersonalInfo from "../../../components/driver/AddPersonalAndVehicleInfo/AddPersonalInfo"
 
 function AddPersonlInfoPage() {
     return (
-        <>
+        <div className="bg-gray-100">
+            <Navbar />
             <AddPersonalInfo />
-        </>
+            <DriverFooter />
+        </div>
     )
 }
 

src/pages/driver/addInfo/AddVehicleInfoPage.tsx

@@ -1,10 +1,14 @@
+import Navbar from "../../../components/driver/common/Navbar"
+import DriverFooter from "../../../components/driver/common/DriverFooter"
 import AddVehicleInfo from '../../../components/driver/AddPersonalAndVehicleInfo/AddVehicleInfo'
 
 function AddVehicleInfoPage() {
     return (
-        <>
+        <div className="bg-gray-100">
+            <Navbar />
             <AddVehicleInfo />
-        </>
+            <DriverFooter />
+        </div>
     )
 }