From c5b039dd89bf8313576afa622c6c2dbe92e05051 Mon Sep 17 00:00:00 2001 From: Elena Volpato Date: Wed, 30 Aug 2023 16:21:02 +0200 Subject: [PATCH 01/15] adds links(app and website) to the about section --- src/components/AboutDialog.tsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/components/AboutDialog.tsx b/src/components/AboutDialog.tsx index 3986ff7..19b875d 100644 --- a/src/components/AboutDialog.tsx +++ b/src/components/AboutDialog.tsx @@ -1,5 +1,5 @@ -import { DialogTitle, DialogContent, DialogContentText, Typography } +import { DialogTitle, DialogContent, DialogContentText, Typography, Link } from "@mui/material" //dialog box that opens with each element clicked @@ -26,9 +26,13 @@ export default function AboutDialog() { small-scale farmers, and ultimately reduce our contribution to global warming.

- + At the moment it is only available for Italian products. + + More about us in fuzue.tech +
More about the app here + From 5b57d26db6c74f37b0cbcf93410225210717ca10 Mon Sep 17 00:00:00 2001 From: Elena Volpato Date: Wed, 30 Aug 2023 16:21:23 +0200 Subject: [PATCH 02/15] adds links(app and website) to the contact section --- src/components/ContactDialog.tsx | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/src/components/ContactDialog.tsx b/src/components/ContactDialog.tsx index ac3d6e6..92f35b7 100644 --- a/src/components/ContactDialog.tsx +++ b/src/components/ContactDialog.tsx @@ -1,6 +1,8 @@ -import { DialogTitle, DialogContent, DialogContentText, Link, Typography } - from "@mui/material" +import { DialogTitle, DialogContent, DialogContentText, Link, Typography, Stack, Box } + from "@mui/material"; +import AlternateEmailIcon from '@mui/icons-material/AlternateEmail'; +import GitHubIcon from '@mui/icons-material/GitHub'; //dialog box that opens with each element clicked export default function ContactDialog() { @@ -10,12 +12,18 @@ export default function ContactDialog() { {"Contact"} - - You can talk to us via email and/or check our repository in github. -

- contact@fuzue.tech - Github -

+ + Contact us via email, visit + our website +  or check out our repository in github. + + + contact@fuzue.tech + + + + GitHub Repo + From d967f753f5abdff46d05f07b492aef5e1ede56a7 Mon Sep 17 00:00:00 2001 From: Elena Volpato Date: Wed, 30 Aug 2023 16:23:25 +0200 Subject: [PATCH 03/15] changes text color to a more visible one (darker gray) --- src/components/AboutDialog.tsx | 2 +- src/components/ContactDialog.tsx | 2 +- src/components/ContributeDialog.tsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/AboutDialog.tsx b/src/components/AboutDialog.tsx index 19b875d..84ed2bc 100644 --- a/src/components/AboutDialog.tsx +++ b/src/components/AboutDialog.tsx @@ -10,7 +10,7 @@ export default function AboutDialog() { {"About the app"} - +

This project was developed to address a genuine challenge: determining the availability of fruits and vegetables in a new diff --git a/src/components/ContactDialog.tsx b/src/components/ContactDialog.tsx index 92f35b7..076efbb 100644 --- a/src/components/ContactDialog.tsx +++ b/src/components/ContactDialog.tsx @@ -8,7 +8,7 @@ import GitHubIcon from '@mui/icons-material/GitHub'; export default function ContactDialog() { return ( <> - + {"Contact"} diff --git a/src/components/ContributeDialog.tsx b/src/components/ContributeDialog.tsx index db90dc3..08c047c 100644 --- a/src/components/ContributeDialog.tsx +++ b/src/components/ContributeDialog.tsx @@ -5,7 +5,7 @@ import { DialogTitle, DialogContent, DialogContentText, Link } export default function ContributeDialog() { return ( <> - + {"Contribute"} From 61511f60cec0aefa8a5336e50dac93cb5fc53973 Mon Sep 17 00:00:00 2001 From: Elena Volpato Date: Wed, 30 Aug 2023 16:26:41 +0200 Subject: [PATCH 04/15] standarized the links --- src/components/AboutDialog.tsx | 4 ++-- src/components/ContributeDialog.tsx | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/components/AboutDialog.tsx b/src/components/AboutDialog.tsx index 84ed2bc..2616b9b 100644 --- a/src/components/AboutDialog.tsx +++ b/src/components/AboutDialog.tsx @@ -30,8 +30,8 @@ export default function AboutDialog() { At the moment it is only available for Italian products. - More about us in fuzue.tech -
More about the app here + More about us in fuzue.tech +
More about the app here diff --git a/src/components/ContributeDialog.tsx b/src/components/ContributeDialog.tsx index 08c047c..1793f9d 100644 --- a/src/components/ContributeDialog.tsx +++ b/src/components/ContributeDialog.tsx @@ -5,17 +5,17 @@ import { DialogTitle, DialogContent, DialogContentText, Link } export default function ContributeDialog() { return ( <> - + {"Contribute"} - - This is an open source project, that means you can clone this repository, write issues, make your own changes and submit your own pull requests. -

For this, use our  - - github Page. - -

+ + This is an open source project, that means you can clone this repository, write issues, make your own changes and submit your own pull requests. +

For this, use our  + + github page + . +

From 36a1a376da7f2ae5274b6d41dbf8ed0762a4c01f Mon Sep 17 00:00:00 2001 From: Elena Volpato Date: Wed, 30 Aug 2023 16:28:39 +0200 Subject: [PATCH 05/15] changes text of contact dialog to a darker gray --- src/components/ContactDialog.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/ContactDialog.tsx b/src/components/ContactDialog.tsx index 076efbb..2db8588 100644 --- a/src/components/ContactDialog.tsx +++ b/src/components/ContactDialog.tsx @@ -8,11 +8,11 @@ import GitHubIcon from '@mui/icons-material/GitHub'; export default function ContactDialog() { return ( <> - + {"Contact"} - + Contact us via email, visit our website  or check out our repository in github. From 262fc47ad5349847d749dce67a63ea453af7ae03 Mon Sep 17 00:00:00 2001 From: Elena Volpato Date: Thu, 31 Aug 2023 17:33:51 +0200 Subject: [PATCH 06/15] adds translation to italian to SideBarList Component --- public/locales/en/translation.json | 3 +++ public/locales/it/translation.json | 3 +++ src/components/SideBarList.tsx | 11 +++++++---- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json index b32f7a8..d78dd54 100644 --- a/public/locales/en/translation.json +++ b/public/locales/en/translation.json @@ -12,6 +12,9 @@ "FoodPage_inSeasonText": "Currently in season", "FoodPage_checkMonths": "Check below when it's best to buy it.", "FoodPage_monthsInSeason": "Months in season", + "SideBarList_aboutApp": "About the app", + "SideBarList_contribute": "Contribute", + "SideBarList_contact": "Contact us", "backButton": "back", "month_0": "January", "month_1": "February", diff --git a/public/locales/it/translation.json b/public/locales/it/translation.json index 3e50fbe..61c8580 100644 --- a/public/locales/it/translation.json +++ b/public/locales/it/translation.json @@ -12,6 +12,9 @@ "FoodPage_inSeasonText": "Attualmente è in stagione", "FoodPage_checkMonths": "controllate qui sotto quando è meglio acquistarlo.", "FoodPage_monthsInSeason": "Mesi di stagione", + "SideBarList_aboutApp": "Informazione sull'app", + "SideBarList_contribute": "Contribuisci", + "SideBarList_contact": "Contattaci", "backButton": "indietro", "month_0": "Gennaio", "month_1": "Febbraio", diff --git a/src/components/SideBarList.tsx b/src/components/SideBarList.tsx index 2fd0fd4..f2d5bd0 100644 --- a/src/components/SideBarList.tsx +++ b/src/components/SideBarList.tsx @@ -1,3 +1,4 @@ +import { useTranslation } from "react-i18next"; import SelectLang from "./SelectLang"; /* MUI IMPORTS */ import { @@ -9,6 +10,8 @@ import { } from "@mui/material"; export default function SideBarList(props: any) { + const { t } = useTranslation(); + return ( - SEASONAL FOOD 🇮🇹 + SEASON FOOD 🇮🇹 props.handleClickOpen("about")}> - about the app + {t("SideBarList_aboutApp")} props.handleClickOpen("contribute")}> - contribute + {t("SideBarList_contribute")} props.handleClickOpen("contact")}> - contact us + {t("SideBarList_contact")} From 6be71c70c6f7fa27020cc3504fc530afae9e6b03 Mon Sep 17 00:00:00 2001 From: Elena Volpato Date: Thu, 31 Aug 2023 17:40:14 +0200 Subject: [PATCH 07/15] adds translation to SideBarDialog component --- public/locales/en/translation.json | 1 + public/locales/it/translation.json | 1 + src/components/SideBarDialog.tsx | 4 +++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json index d78dd54..dda1bf9 100644 --- a/public/locales/en/translation.json +++ b/public/locales/en/translation.json @@ -15,6 +15,7 @@ "SideBarList_aboutApp": "About the app", "SideBarList_contribute": "Contribute", "SideBarList_contact": "Contact us", + "SideBarDialog_close": "Close", "backButton": "back", "month_0": "January", "month_1": "February", diff --git a/public/locales/it/translation.json b/public/locales/it/translation.json index 61c8580..9de51e0 100644 --- a/public/locales/it/translation.json +++ b/public/locales/it/translation.json @@ -15,6 +15,7 @@ "SideBarList_aboutApp": "Informazione sull'app", "SideBarList_contribute": "Contribuisci", "SideBarList_contact": "Contattaci", + "SideBarDialog_close": "Chiudi", "backButton": "indietro", "month_0": "Gennaio", "month_1": "Febbraio", diff --git a/src/components/SideBarDialog.tsx b/src/components/SideBarDialog.tsx index 743c39d..71223ed 100644 --- a/src/components/SideBarDialog.tsx +++ b/src/components/SideBarDialog.tsx @@ -2,6 +2,7 @@ import { Dialog, DialogActions, Button } from "@mui/material"; import AboutDialog from "./AboutDialog"; import ContactDialog from "./ContactDialog"; import ContributeDialog from "./ContributeDialog"; +import { useTranslation } from "react-i18next"; //dialog box that opens with each element clicked @@ -10,6 +11,7 @@ export default function SideBarDialog(props: { dialogType: string; handleClose: () => void; }) { + const { t } = useTranslation(); const renderDialog = (anchor: string) => { if (anchor === "about") { return ; @@ -25,7 +27,7 @@ export default function SideBarDialog(props: { {renderDialog(props.dialogType)} From d510c491135bc763825abe8366969f9c10aba9e1 Mon Sep 17 00:00:00 2001 From: Elena Volpato Date: Thu, 31 Aug 2023 17:42:11 +0200 Subject: [PATCH 08/15] adds translation to SelectLang component --- public/locales/en/translation.json | 1 + public/locales/it/translation.json | 1 + src/components/SelectLang.tsx | 5 +++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json index dda1bf9..0f3f2b4 100644 --- a/public/locales/en/translation.json +++ b/public/locales/en/translation.json @@ -16,6 +16,7 @@ "SideBarList_contribute": "Contribute", "SideBarList_contact": "Contact us", "SideBarDialog_close": "Close", + "SelectLang_Text": "Language", "backButton": "back", "month_0": "January", "month_1": "February", diff --git a/public/locales/it/translation.json b/public/locales/it/translation.json index 9de51e0..1f4ce06 100644 --- a/public/locales/it/translation.json +++ b/public/locales/it/translation.json @@ -16,6 +16,7 @@ "SideBarList_contribute": "Contribuisci", "SideBarList_contact": "Contattaci", "SideBarDialog_close": "Chiudi", + "SelectLang_Text": "Lingua", "backButton": "indietro", "month_0": "Gennaio", "month_1": "Febbraio", diff --git a/src/components/SelectLang.tsx b/src/components/SelectLang.tsx index d9ef297..dadbfd3 100644 --- a/src/components/SelectLang.tsx +++ b/src/components/SelectLang.tsx @@ -9,7 +9,8 @@ import { import { useTranslation } from "react-i18next"; export default function SelectLang() { - const { i18n } = useTranslation(); + const { t, i18n } = useTranslation(); + const langs = { en: { nativeName: "English" }, @@ -18,7 +19,7 @@ export default function SelectLang() { return ( - Language + {t("SelectLang_Text")}