Merge pull request #634 from frontendnetwork/staging

Release
frontendnetwork · Feb 5, 2024 · c5e5bb0 · c5e5bb0
2 parents 65207af + 1de9a95
commit c5e5bb0
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 23 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -39,7 +39,7 @@ jobs:
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@dbef88086f6cef02e264edb7dbf63250c17cef6c
+        uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 
@@ -97,7 +97,7 @@ jobs:
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@dbef88086f6cef02e264edb7dbf63250c17cef6c
+        uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -13,8 +13,8 @@
   "dependencies": {
     "@ducanh2912/next-pwa": "^9.7.2",
     "@ericblade/quagga2": "^1.8.4",
-    "@frontendnetwork/veganify": "^1.1.49",
-    "@types/node": "20.11.0",
+    "@frontendnetwork/veganify": "^1.1.53",
+    "@types/node": "20.11.16",
     "@types/react-dom": "18.2.18",
     "eslint-config-sznm": "^2.0.2",
     "jest-worker": "^29.7.0",

diff --git a/src/components/check.tsx b/src/components/check.tsx
@@ -1,7 +1,7 @@
 import Veganify from "@frontendnetwork/veganify";
 import Image from "next/image";
 import { useTranslations } from "next-intl";
-import React, { useState, useEffect, useRef } from "react";
+import React, { useState, useEffect, useRef, FormEvent } from "react";
 
 import ModalWrapper from "@/components/elements/modalwrapper";
 import ShareButton from "@/components/elements/share";
@@ -43,7 +43,7 @@ const ProductSearch = () => {
   }, []);
 
   /* Submitting */
-  const handleSubmit = async (barcode: string, event?: React.FormEvent) => {
+  const handleSubmit = async (barcode: string, event?: FormEvent) => {
     event?.preventDefault();
     setShowTimeoutFinal(false);
     setShowTimeout(false);
@@ -60,8 +60,13 @@ const ProductSearch = () => {
       );
       setLoading(false);
       if (data.status === 200) {
-        setResult(data.product);
-        setSources(data.sources);
+
+        if ("product" in data) {
+          setResult(data.product);
+        }
+        if ("sources" in data) {
+          setSources(data.sources);
+        }
         setShowFound(true);
         setShowTimeout(false);
       } else if (data.status === 404) {
@@ -183,7 +188,9 @@ const ProductSearch = () => {
             onDetected={(barcode) => setBarcode(barcode)}
             handleSubmit={(barcode) => handleSubmit(barcode)}
           />
-          <label htmlFor="barcodeInput" className="hidden">{t("enterbarcode")}</label>
+          <label htmlFor="barcodeInput" className="hidden">
+            {t("enterbarcode")}
+          </label>
           <input
             type="number"
             name="barcode"
@@ -368,8 +375,8 @@ const ProductSearch = () => {
                       GNU FDL
                     </a>
                     .<br />
-                    &copy; Veganify Contributors and Hamed Montazeri,
-                    licensed under{" "}
+                    &copy; Veganify Contributors and Hamed Montazeri, licensed
+                    under{" "}
                     <a href="https://github.com/JokeNetwork/vegan-ingredients-api/blob/master/LICENSE">
                       MIT License
                     </a>

diff --git a/src/components/elements/container.tsx b/src/components/elements/container.tsx
@@ -11,7 +11,7 @@ interface ContainerProps {
   children: React.ReactNode;
 }
 
-export default function Container(props: ContainerProps) {
+export default function Container(props: Readonly<ContainerProps>) {
   const hasHeading = props.heading ? "true" : "false";
   const headingStyle = props.headingstyle ?? undefined;
 

diff --git a/src/components/ingredientscheck.tsx b/src/components/ingredientscheck.tsx
@@ -182,9 +182,9 @@ const IngredientsCheck = () => {
                     <span className="non-vegan icon-cancel"></span>
                   </div>
                 </div>
-                {flagged.map((item, index) => (
+                {flagged.map((item) => (
                   <div className="Grid" key={item}>
-                    <div className="Grid-cell description" key={index}>
+                    <div className="Grid-cell description" key={item}>
                       {item.charAt(0).toUpperCase() + item.slice(1)}
                     </div>
                     <div className="Grid-cell icons">

diff --git a/src/styles/_globals/_roots.scss b/src/styles/_globals/_roots.scss
@@ -2,7 +2,7 @@
 :root {
   font-size: 16px;
 
-  --bg-color: #141414;
+  --bg-color: #000;
   --fg-color: #ccc;
   --body-font: "MonaSans", Fallback, sans-serif;
   --body-fontweight: 400;