hackforla

.github/workflows/deployFullstackToDockerHub.yaml

@@ -1,4 +1,5 @@
 # build and push a docker image from the latest push to "develop" branch
+# this script is not currently used, as the web app is running on Heroku
 on:
   push:
     branches:

.github/workflows/deployWebAPIOnlyToDockerHub.yaml

@@ -1,4 +1,6 @@
 # build and push a docker image from the latest push to "develop" branch
+# this script is not currently used, as the web app is running on Heroku
+
 on:
   push:
     branches:
@@ -25,4 +27,3 @@ jobs:
           tag_with_sha: true
           add_git_labels: true
           labels: description="Food Oasis",maintained="[email protected]"
-

.github/workflows/viteToHeroku.yml

@@ -0,0 +1,18 @@
+name: Deploy vite branch to foodoasisvite.herokuapp.com
+
+on:
+  push:
+    branches:
+      - vite
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: akhileshns/[email protected] # This is the action
+        with:
+          heroku_api_key: ${{secrets.HEROKU_API_KEY}}
+          heroku_app_name: "foodoasisvite" #Must be unique in Heroku
+          heroku_email: "[email protected]"
+          usedocker: true

client/package.json

@@ -1,7 +1,7 @@
 {
   "name": "foodoasis-client",
   "description": "React Client for Food Oasis",
-  "version": "1.0.85",
+  "version": "1.0.86",
   "author": "Hack for LA",
   "license": "GPL-2.0",
   "private": true,
@@ -30,7 +30,11 @@
     "debounce-fn": "^5.0.0",
     "formik": "^2.2.9",
     "js-file-download": "^0.4.12",
+<<<<<<< HEAD
     "mapbox-gl": "^3.2.0",
+=======
+    "mapbox-gl": "^3.8.0",
+>>>>>>> release-1.0.86
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-draggable": "^4.4.6",