From c3590f174198b1dcd32fa7e6fbaac3b075092d9b Mon Sep 17 00:00:00 2001 From: samcro24 Date: Mon, 27 May 2024 09:11:51 +0300 Subject: [PATCH 1/6] Fix notification subscription button on My Account (Mobile) #1783 --- src/components/client/auth/profile/MyNotificationsTab.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/components/client/auth/profile/MyNotificationsTab.tsx b/src/components/client/auth/profile/MyNotificationsTab.tsx index fc73de12b..b270c799d 100644 --- a/src/components/client/auth/profile/MyNotificationsTab.tsx +++ b/src/components/client/auth/profile/MyNotificationsTab.tsx @@ -61,6 +61,8 @@ const Root = styled('div')(({ theme }) => ({ [`& .${classes.statusBoxRow}`]: { display: 'flex', justifyContent: 'space-between', + flexWrap:'wrap', + gap:20, alignItems: 'center', padding: theme.spacing(0, 2), }, From a413f08477bdbe0b388a0880c0cdb1d0a16a0065 Mon Sep 17 00:00:00 2001 From: samcro24 Date: Mon, 27 May 2024 09:42:25 +0300 Subject: [PATCH 2/6] Test --- README.md | 2 + public/locales/bg/beneficiary.json | 2 +- public/locales/bg/validation.json | 2 +- public/locales/en/bank-transactions.json | 49 +++++++++---------- public/locales/en/validation.json | 2 +- .../auth/profile/MyNotificationsTab.tsx | 4 +- 6 files changed, 31 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index 0fdc4f17c..f7d05de21 100644 --- a/README.md +++ b/README.md @@ -100,7 +100,9 @@ Watch releases of this repository to be notified about future updates: ## Contributors ✨ + [![All Contributors](https://img.shields.io/badge/all_contributors-77-orange.svg?style=flat-square)](#contributors-) + Please check [contributors guide](https://github.com/podkrepi-bg/frontend/blob/master/CONTRIBUTING.md) for: diff --git a/public/locales/bg/beneficiary.json b/public/locales/bg/beneficiary.json index d7047fd9a..c145dc094 100644 --- a/public/locales/bg/beneficiary.json +++ b/public/locales/bg/beneficiary.json @@ -37,7 +37,7 @@ "company-select": "Изберете ЮЛНЦ или", "create-new": "създайте нов", "person-label": "Потребител", - "company-label": "ЮЛНЦ", + "company-label": "ЮЛНЦ" } }, "actions": "Действия", diff --git a/public/locales/bg/validation.json b/public/locales/bg/validation.json index a8bb33df0..b510072c6 100644 --- a/public/locales/bg/validation.json +++ b/public/locales/bg/validation.json @@ -24,4 +24,4 @@ "payment-reference": "Невалиден формат на кода за плащане", "eik-invalid": "Невалидно ЕИК", "help-us-improve": "Съгласявам се да се свържете с мен за подобрение на платформата." -} \ No newline at end of file +} diff --git a/public/locales/en/bank-transactions.json b/public/locales/en/bank-transactions.json index 1e6146cfb..fdc23badd 100644 --- a/public/locales/en/bank-transactions.json +++ b/public/locales/en/bank-transactions.json @@ -1,27 +1,26 @@ { - "all": "All bank transactions", - "bank-transactions": "Bank transactions", - "transaction-date": "Transaction date", - "amount": "Amount", - "currency": "Currency", - "donation-status": "Donation status", - "id": "Trnsaction ID", - "bank-name": "Bank name", + "all": "All bank transactions", + "bank-transactions": "Bank transactions", + "transaction-date": "Transaction date", + "amount": "Amount", + "currency": "Currency", + "donation-status": "Donation status", + "id": "Trnsaction ID", + "bank-name": "Bank name", + "type": "Type", + "description": "Description", + "cta": { + "download": "Download", + "status": "Donation status", "type": "Type", - "description": "Description", - "cta": { - "download": "Download", - "status": "Donation status", - "type": "Type", - "from": "From", - "to": "To", - "apply-ref-heading": "Apply ref heading", - "apply-ref": "Apply ref", - "edit": "Edit", - "start-sync": "Start sync" - }, - "matched-ref": "Matched ref", - "payment-ref": "Payment ref", - "rerun-dates": "Repeat bank sync" - } - \ No newline at end of file + "from": "From", + "to": "To", + "apply-ref-heading": "Apply ref heading", + "apply-ref": "Apply ref", + "edit": "Edit", + "start-sync": "Start sync" + }, + "matched-ref": "Matched ref", + "payment-ref": "Payment ref", + "rerun-dates": "Repeat bank sync" +} diff --git a/public/locales/en/validation.json b/public/locales/en/validation.json index 73d78913e..2e10d857d 100644 --- a/public/locales/en/validation.json +++ b/public/locales/en/validation.json @@ -24,4 +24,4 @@ "payment-reference": "Invalid payment code format", "eik-invalid": "Invalid EIK", "help-us-improve": "I agree to be contacted to help improve the platform." -} \ No newline at end of file +} diff --git a/src/components/client/auth/profile/MyNotificationsTab.tsx b/src/components/client/auth/profile/MyNotificationsTab.tsx index b270c799d..3a8ecb168 100644 --- a/src/components/client/auth/profile/MyNotificationsTab.tsx +++ b/src/components/client/auth/profile/MyNotificationsTab.tsx @@ -61,8 +61,8 @@ const Root = styled('div')(({ theme }) => ({ [`& .${classes.statusBoxRow}`]: { display: 'flex', justifyContent: 'space-between', - flexWrap:'wrap', - gap:20, + flexWrap: 'wrap', + gap: 20, alignItems: 'center', padding: theme.spacing(0, 2), }, From 137569ac24eeac8a6d188a099a5a127e227738e4 Mon Sep 17 00:00:00 2001 From: samcro24 Date: Mon, 27 May 2024 10:58:45 +0300 Subject: [PATCH 3/6] fix misplaced --- .../auth/profile/MyNotificationsTab.tsx | 43 +++++++++++-------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/src/components/client/auth/profile/MyNotificationsTab.tsx b/src/components/client/auth/profile/MyNotificationsTab.tsx index 3a8ecb168..cab62f7ec 100644 --- a/src/components/client/auth/profile/MyNotificationsTab.tsx +++ b/src/components/client/auth/profile/MyNotificationsTab.tsx @@ -17,6 +17,7 @@ const classes = { smallText: `${PREFIX}-smallText`, boxTitle: `${PREFIX}-boxTitle`, statusBoxRow: `${PREFIX}-statusBoxRow`, + statusBoxBtnStatus: `${PREFIX}-statusBoxBtnStatus`, notificationsBox: `${PREFIX}-notificationBox`, statusBtn: `${PREFIX}-statusBtn`, statusActive: `${PREFIX}-statusActive`, @@ -66,6 +67,12 @@ const Root = styled('div')(({ theme }) => ({ alignItems: 'center', padding: theme.spacing(0, 2), }, + [`& .${classes.statusBoxBtnStatus}`]:{ + display:'flex', + alignItems: 'center', + gap: 20, + flexWrap:'wrap', + }, [`& .${classes.statusActive}`]: { color: 'green', }, @@ -114,23 +121,25 @@ export default function MyNotificationsTab() { {t('profile:myNotifications.status-msg')} - - {user?.user.newsletter - ? t('profile:myNotifications.status.active') - : t('profile:myNotifications.status.inactive')} - - + + + {user?.user.newsletter + ? t('profile:myNotifications.status.active') + : t('profile:myNotifications.status.inactive')} + + + {user?.user.newsletter && ( From 7b41ebdb1f9f8f82daa6f5ffc915a89d65b116d8 Mon Sep 17 00:00:00 2001 From: samcro24 Date: Mon, 27 May 2024 17:01:01 +0300 Subject: [PATCH 4/6] formated with yarn lint fixed issue#1783 --- src/components/client/auth/profile/MyNotificationsTab.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/client/auth/profile/MyNotificationsTab.tsx b/src/components/client/auth/profile/MyNotificationsTab.tsx index cab62f7ec..ba994e552 100644 --- a/src/components/client/auth/profile/MyNotificationsTab.tsx +++ b/src/components/client/auth/profile/MyNotificationsTab.tsx @@ -67,11 +67,11 @@ const Root = styled('div')(({ theme }) => ({ alignItems: 'center', padding: theme.spacing(0, 2), }, - [`& .${classes.statusBoxBtnStatus}`]:{ - display:'flex', + [`& .${classes.statusBoxBtnStatus}`]: { + display: 'flex', alignItems: 'center', gap: 20, - flexWrap:'wrap', + flexWrap: 'wrap', }, [`& .${classes.statusActive}`]: { color: 'green', From 95cab485cdbd04198db9847f0ca02d45a3286ca1 Mon Sep 17 00:00:00 2001 From: samcro24 Date: Wed, 29 May 2024 07:07:17 +0300 Subject: [PATCH 5/6] yarn lint format issue1783 --- src/components/client/irregularity/steps/Greeting.tsx | 2 -- src/components/client/layout/Footer/Footer.styled.tsx | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/components/client/irregularity/steps/Greeting.tsx b/src/components/client/irregularity/steps/Greeting.tsx index d850a1567..661bafa1e 100644 --- a/src/components/client/irregularity/steps/Greeting.tsx +++ b/src/components/client/irregularity/steps/Greeting.tsx @@ -4,8 +4,6 @@ import { useTranslation } from 'next-i18next' import { Grid, Typography } from '@mui/material' import Subtitle from '../helpers/Subtitle' -import Link from 'components/common/Link' -import { routes } from 'common/routes' const greetingStyles = { fontWeight: 'bold', diff --git a/src/components/client/layout/Footer/Footer.styled.tsx b/src/components/client/layout/Footer/Footer.styled.tsx index 2be5e2134..eab858056 100644 --- a/src/components/client/layout/Footer/Footer.styled.tsx +++ b/src/components/client/layout/Footer/Footer.styled.tsx @@ -20,7 +20,7 @@ export const Root = styled('footer')(() => ({ }, })) -export const FooterWrapper = styled(Grid)(() => ({ +export const FooterWrapper = styled(Grid)(({ theme }) => ({ margin: theme.spacing(5), })) From 67d56746d307526f0f8f0da6f51941cde31ece51 Mon Sep 17 00:00:00 2001 From: samcro24 Date: Wed, 29 May 2024 23:10:35 +0300 Subject: [PATCH 6/6] remove theme from Footer.styled.tsx --- src/components/client/layout/Footer/Footer.styled.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/client/layout/Footer/Footer.styled.tsx b/src/components/client/layout/Footer/Footer.styled.tsx index eab858056..2be5e2134 100644 --- a/src/components/client/layout/Footer/Footer.styled.tsx +++ b/src/components/client/layout/Footer/Footer.styled.tsx @@ -20,7 +20,7 @@ export const Root = styled('footer')(() => ({ }, })) -export const FooterWrapper = styled(Grid)(({ theme }) => ({ +export const FooterWrapper = styled(Grid)(() => ({ margin: theme.spacing(5), }))