Merge pull request #104 from karrotmvp/develop

Develop
karrotmvp · Nov 23, 2021 · dc7f9e1 · dc7f9e1
2 parents 4cd6051 + 4e62b9f
commit dc7f9e1
Show file tree

Hide file tree

Showing 104 changed files with 4,274 additions and 2,555 deletions.
diff --git a/.github/workflows/develop-deploy.yml b/.github/workflows/develop-deploy.yml
@@ -23,6 +23,7 @@ jobs:
           echo REACT_APP_BASE_URL=${{secrets.REACT_APP_BASE_URL}} >> .env
           echo REACT_APP_APP_ID=${{secrets.REACT_APP_APP_ID}} >> .env
           echo REACT_APP_MINI_PRESET=${{secrets.REACT_APP_MINI_PRESET}} >> .env
+          echo REACT_APP_MINI_INSTALLATION_URL=${{secrets.REACT_APP_MINI_INSTALLATION_URL}} >> .env
           echo REACT_APP_FIREBASE_API_KEY=${{secrets.REACT_APP_FIREBASE_API_KEY}} >> .env
           echo REACT_APP_FIREBASE_AUTH_DOMAIN=${{secrets.REACT_APP_FIREBASE_AUTH_DOMAIN}} >> .env
           echo REACT_APP_FIREBASE_PROJECT_ID=${{secrets.REACT_APP_FIREBASE_PROJECT_ID}} >> .env
@@ -35,7 +36,7 @@ jobs:
         run: npm install
 
       - name: Build
-        run: npm run build
+        run: CI=false npm run build
 
       - name: Deploy to S3
         uses: jakejarvis/s3-sync-action@master

diff --git a/.github/workflows/main-deploy.yml b/.github/workflows/main-deploy.yml
@@ -23,6 +23,7 @@ jobs:
           echo REACT_APP_BASE_URL=${{secrets.REACT_APP_BASE_URL_PRODUCTION}} >> .env
           echo REACT_APP_APP_ID=${{secrets.REACT_APP_APP_ID_PRODUCTION}} >> .env
           echo REACT_APP_MINI_PRESET=${{secrets.REACT_APP_MINI_PRESET_PRODUCTION}} >> .env
+          echo REACT_APP_MINI_INSTALLATION_URL=${{secrets.REACT_APP_MINI_INSTALLATION_URL_PRODUCTION}} >> .env
           echo REACT_APP_FIREBASE_API_KEY=${{secrets.REACT_APP_FIREBASE_API_KEY_PRODUCTION}} >> .env
           echo REACT_APP_FIREBASE_AUTH_DOMAIN=${{secrets.REACT_APP_FIREBASE_AUTH_DOMAIN_PRODUCTION}} >> .env
           echo REACT_APP_FIREBASE_PROJECT_ID=${{secrets.REACT_APP_FIREBASE_PROJECT_ID_PRODUCTION}} >> .env

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -12,6 +12,8 @@
     "@karrotmarket/mini": "^0.12.0",
     "@reduxjs/toolkit": "^1.6.1",
     "axios": "^0.22.0",
+    "body-scroll-lock": "^4.0.0-beta.0",
+    "date-fns": "^2.25.0",
     "firebase": "^9.1.2",
     "framer-motion": "^4.1.17",
     "polished": "^4.1.3",
@@ -23,7 +25,10 @@
     "react-redux": "^7.2.5",
     "react-router-dom": "^5.3.0",
     "react-swipeable": "^6.2.0",
+    "react-toastify": "^8.1.0",
     "redux-thunk": "^2.3.0",
+    "sass": "^1.43.4",
+    "swiper": "^7.3.0",
     "use-debounce": "^7.0.0"
   },
   "scripts": {
@@ -54,6 +59,7 @@
   },
   "devDependencies": {
     "@openapitools/openapi-generator-cli": "^2.4.13",
+    "@types/body-scroll-lock": "^3.1.0",
     "@types/react": "^17.0.30",
     "@types/react-dom": "^17.0.9",
     "@types/react-modal": "^3.12.1",