Merge pull request #418 from frontendnetwork/staging

Staging → Main
frontendnetwork · Aug 15, 2023 · 3c754af · 3c754af
2 parents b767543 + c4ff184
commit 3c754af
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 7 deletions.
diff --git a/.env.development b/.env.development
@@ -0,0 +1 @@
+NEXT_PUBLIC_STAGING=true
diff --git a/.env.production b/.env.production
@@ -0,0 +1 @@
+NEXT_PUBLIC_STAGING=false
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -43,6 +43,9 @@ jobs:
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 
+      - name: Setup Production Env
+        run: cp .env.production .env
+
       - name: Build and push Docker image
         uses: docker/build-push-action@56932deb0a0db9d23e245320b1e45fec46b8d66f
         with:
@@ -79,6 +82,9 @@ jobs:
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 
+      - name: Setup Staging Env
+        run: cp .env.development .env
+
       - name: Build and push Docker image
         uses: docker/build-push-action@56932deb0a0db9d23e245320b1e45fec46b8d66f
         with:

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@ericblade/quagga2": "^1.8.2",
-    "@frontendnetwork/vegancheck": "1.1.26",
+    "@frontendnetwork/vegancheck": "^1.1.31",
     "@socialgouv/matomo-next": "^1.6.1",
     "@types/node": "20.4.5",
     "@types/react-dom": "18.2.7",

diff --git a/src/components/check.tsx b/src/components/check.tsx
@@ -64,7 +64,8 @@ const ProductSearch: React.FC = () => {
 
     setLoading(true);
     try {
-      const data = await VeganCheck.getProductByBarcode(barcode);
+      console.warn(process.env.NEXT_PUBLIC_STAGING);
+      const data = await VeganCheck.getProductByBarcode(barcode, process.env.NEXT_PUBLIC_STAGING === "true" ? true : false);
       setLoading(false);
       if (data.status === 200) {
         setResult(data.product);

diff --git a/src/components/ingredientscheck.tsx b/src/components/ingredientscheck.tsx
@@ -28,7 +28,7 @@ const IngredientsCheck = () => {
     const checkIngredients = async () => {
       setLoading(true);
       try {
-        const data = await VeganCheck.checkIngredientsList(ingredients.value);
+        const data = await VeganCheck.checkIngredientsList(ingredients.value, process.env.NEXT_PUBLIC_STAGING === "true" ? true : false);
         if (data.data.vegan === "false") {
           setVegan(false);
           setFlagged(data.data.flagged);