Feature - Deployment + Comment Removal

bettersg · Dec 22, 2023 · d284e66 · d284e66
1 parent 0422ea6
commit d284e66
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 32 deletions.
diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml
@@ -3,20 +3,20 @@
 
 name: Deploy to Firebase Hosting on merge
 "on":
-    push:
-        branches:
-            - main
+  push:
+    branches:
+      - main
 jobs:
-    build_and_deploy:
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v2
-            - name: npm install & Next Build and Export
-              working-directory: ./client
-              run: npm install && npm run out
-            # - uses: FirebaseExtended/action-hosting-deploy@v0
-            #   with:
-            #       repoToken: "${{ secrets.GITHUB_TOKEN }}"
-            #       firebaseServiceAccount: "${{ secrets.FIREBASE_SERVICE_ACCOUNT_RECYCLEGOWHERE }}"
-            #       channelId: live
-            #       projectId: recyclegowhere
+  build_and_deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: npm install & Next Build and Export
+        working-directory: ./client
+        run: npm install && npm run out
+      - uses: FirebaseExtended/action-hosting-deploy@v0
+        with:
+          repoToken: "${{ secrets.GITHUB_TOKEN }}"
+          firebaseServiceAccount: "${{ secrets.FIREBASE_SERVICE_ACCOUNT_RECYCLEGOWHERE }}"
+          channelId: live
+          projectId: recyclegowhere
diff --git a/.github/workflows/firebase-hosting-pull-request.yml b/.github/workflows/firebase-hosting-pull-request.yml
@@ -4,16 +4,16 @@
 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@v2
-            - name: npm install & Next Build and Export
-              working-directory: ./client
-              run: npm install && npm run out
-            # - uses: FirebaseExtended/action-hosting-deploy@v0
-            #   with:
-            #       repoToken: "${{ secrets.GITHUB_TOKEN }}"
-            #       firebaseServiceAccount: "${{ secrets.FIREBASE_SERVICE_ACCOUNT_RECYCLEGOWHERE }}"
-            #       projectId: recyclegowhere
+  build_and_preview:
+    if: "${{ github.event.pull_request.head.repo.full_name == github.repository }}"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: npm install & Next Build and Export
+        working-directory: ./client
+        run: npm install && npm run out
+      - uses: FirebaseExtended/action-hosting-deploy@v0
+        with:
+          repoToken: "${{ secrets.GITHUB_TOKEN }}"
+          firebaseServiceAccount: "${{ secrets.FIREBASE_SERVICE_ACCOUNT_RECYCLEGOWHERE }}"
+          projectId: recyclegowhere
diff --git a/client/spa-pages/components/MapPage.tsx b/client/spa-pages/components/MapPage.tsx
@@ -213,7 +213,6 @@ const MapInner = ({ setPage }: Props) => {
 
 	// Handle the changing of location in this page itself
 	const handleChangedLocation = (itemEntry: (TItemSelection | TEmptyItem)[]) => {
-		console.log(itemEntry);
 		const locations = getNearbyFacilities(
 			itemEntry as TItemSelection[],
 			address,
@@ -631,7 +630,7 @@ export const checkboxChange = (
 		updatedOptions = selectedOptions.filter((option) => option.value !== e.target.value);
 	}
 	return { updatedItemState, updatedOptions };
-}
+};
 
 const CustomMultiValueLabel = (props: any) => {
 	const { getItemCategory } = useSheetyData();

diff --git a/client/utils.ts b/client/utils.ts
@@ -109,7 +109,6 @@ export const getNearbyFacilities = (
 	});
 
 	const route = dijkstra(allFacilities, address, userCats);
-	console.log(route.complete);
 	return {
 		results: res,
 		facilitiesList: allFacilityIds,