From e6f146274bb21621f3c6f0cd83f40466c794f716 Mon Sep 17 00:00:00 2001 From: Aster Bandis Date: Tue, 11 Jul 2023 15:41:46 +0300 Subject: [PATCH 1/4] Just reorder two lines --- public/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/index.html b/public/index.html index 60611b6..81839d7 100644 --- a/public/index.html +++ b/public/index.html @@ -1,10 +1,10 @@ - + + - From c790e55d886d507f417a29409121675cfe8a4e8d Mon Sep 17 00:00:00 2001 From: Aster Bandis Date: Tue, 11 Jul 2023 16:22:28 +0300 Subject: [PATCH 2/4] Flexbox edits --- src/components/introduction/Introduction.module.css | 7 +++++++ src/components/languageSelector.js | 2 +- src/components/languageSelector.module.css | 7 +++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/components/introduction/Introduction.module.css b/src/components/introduction/Introduction.module.css index f715178..5a9f695 100644 --- a/src/components/introduction/Introduction.module.css +++ b/src/components/introduction/Introduction.module.css @@ -41,6 +41,13 @@ } } +@media screen and (orientation: portrait) +{ + .leftColumn { + flex-basis: fit-content !important; + } +} + .downloadColumn{ max-width: 185px; } diff --git a/src/components/languageSelector.js b/src/components/languageSelector.js index 9e2b7d7..a771401 100644 --- a/src/components/languageSelector.js +++ b/src/components/languageSelector.js @@ -22,7 +22,7 @@ const LanguageSelector = () => { i18n.changeLanguage(e.target.value) } return ( - + { Object.entries(languagesTranslation).map(([key, value]) => ) diff --git a/src/components/languageSelector.module.css b/src/components/languageSelector.module.css index b57eaf3..7b23273 100644 --- a/src/components/languageSelector.module.css +++ b/src/components/languageSelector.module.css @@ -1,3 +1,10 @@ .selectedButton { box-shadow: 5px 10px #EBF0EB; + width: 15% } + +@media screen and (max-width: 640px) { + .selectedButton { + width: 15%; + } +} \ No newline at end of file From 1a02dcfa890b873f4265e951ef35abb88d9f3ca2 Mon Sep 17 00:00:00 2001 From: Aster Bandis Date: Tue, 11 Jul 2023 17:10:01 +0300 Subject: [PATCH 3/4] Add width to left column --- src/components/introduction/Introduction.module.css | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/components/introduction/Introduction.module.css b/src/components/introduction/Introduction.module.css index 5a9f695..b3dbd18 100644 --- a/src/components/introduction/Introduction.module.css +++ b/src/components/introduction/Introduction.module.css @@ -23,6 +23,7 @@ @media screen and (min-width: 640px) { .leftColumn{ margin-left: 5rem !important; + width: 100%; } .languageRow{ height: 20%; @@ -41,12 +42,6 @@ } } -@media screen and (orientation: portrait) -{ - .leftColumn { - flex-basis: fit-content !important; - } -} .downloadColumn{ max-width: 185px; From b1dd239ccd92d1b6cc3ec79a1f6b2279dc7d37f6 Mon Sep 17 00:00:00 2001 From: Aster Bandis <68644945+bandisast@users.noreply.github.com> Date: Wed, 24 Jan 2024 21:08:11 +0200 Subject: [PATCH 4/4] Add delete-account page for compliance to google play standards --- src/App.js | 2 + src/components/deleteAccount/deleteAccount.js | 101 ++++++++++++++++++ .../deleteAccount/deleteAccount.module.css | 39 +++++++ 3 files changed, 142 insertions(+) create mode 100644 src/components/deleteAccount/deleteAccount.js create mode 100644 src/components/deleteAccount/deleteAccount.module.css diff --git a/src/App.js b/src/App.js index e018b79..159349f 100644 --- a/src/App.js +++ b/src/App.js @@ -5,6 +5,7 @@ import createHistory from 'history/createBrowserHistory'; import ReactGA from 'react-ga'; import Introduction from './components/introduction/Introduction'; import HelpUs from './components/helpUs/helpUs'; +import DeleteAccount from './components/deleteAccount/deleteAccount' const history = createHistory() ReactGA.initialize('G-1BK09BE5RZ'); @@ -25,6 +26,7 @@ function App() { + diff --git a/src/components/deleteAccount/deleteAccount.js b/src/components/deleteAccount/deleteAccount.js new file mode 100644 index 0000000..e052095 --- /dev/null +++ b/src/components/deleteAccount/deleteAccount.js @@ -0,0 +1,101 @@ +import React from 'react'; +import Container from 'react-bootstrap/Container'; +import Row from 'react-bootstrap/Row'; +import Stack from 'react-bootstrap/Stack'; +import Col from 'react-bootstrap/Col'; +import { useTranslation } from 'react-i18next'; +import classes from './deleteAccount.module.css'; +import { Discord, Facebook, Instagram } from 'react-bootstrap-icons'; + + + +const DeleteAccount = () => { + const { t, i18n } = useTranslation(); + + return ( +
+ + + + + +

+ {t('landingpage.appTitle')} +

+

+ Delete my account +

+

+ To delete your Plante account, please follow next steps: +

+ +
    +
  • Open the app on Android
    • +
  • Open your profile (bottom-right)
    • +
  • Open App Settings (top-right)
    • +
  • Click "Help and feedback"
    • +
  • Click "Delete my account"
    • +
  • Follow the displayed instructions
    • +
+ +

+ Your account will be deleted immediately. +

+ +

+ Please note that while this action will erase all of your personal information, the products and stores that you have created in the app will not be deleted, since they're stored on the servers of Open Food Facts and Open Street Map projects (without any of your personal information). +

+ + + + Get it on Google Play + + + Download on the App Store + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ ); +}; + +export default DeleteAccount; diff --git a/src/components/deleteAccount/deleteAccount.module.css b/src/components/deleteAccount/deleteAccount.module.css new file mode 100644 index 0000000..0dba442 --- /dev/null +++ b/src/components/deleteAccount/deleteAccount.module.css @@ -0,0 +1,39 @@ +.planteTitle{ + font-weight: 900; +} + +.marginTop{ + margin-top: 6rem !important; +} + +.downloadButton { + height: 50px; + width: auto; +} + +.socialMediaTitle { + font-weight: 800; + font-size: 50; +} + +.socialMediaIcon{ + height: 24px; + width: 24px; + color: #326243; +} + +.socialMediaMargin{ + margin-top: 3rem !important; +} + +@media screen and (min-width: 640px) { + .leftColumn{ + margin-left: 5rem !important; + } + .languageRow{ + min-height: 20%; + } + +} + +