diff --git a/components/Advantages.tsx b/components/Advantages.tsx index ddf867c..0947f0f 100644 --- a/components/Advantages.tsx +++ b/components/Advantages.tsx @@ -1,6 +1,6 @@ import { useTranslation } from 'next-i18next'; import Image from 'next/image'; -import { Row, Col } from 'reactstrap'; +import { Row, Col, Container } from 'reactstrap'; import ballotBox from '../public/urne.svg'; import email from '../public/email.svg'; import respect from '../public/respect.svg'; @@ -28,20 +28,22 @@ const AdvantagesRow = () => { }, ]; return ( - - {resources.map((item, i) => ( - - {item.alt} -

{item.name}

-

{item.desc}

- - ))} -
+ + + {resources.map((item, i) => ( + + {item.alt} +

{item.name}

+

{item.desc}

+ + ))} +
+
); }; diff --git a/components/Experience.tsx b/components/Experience.tsx index 70f0c26..fd1542b 100644 --- a/components/Experience.tsx +++ b/components/Experience.tsx @@ -12,47 +12,49 @@ const Experiencediv = () => {
{t('home.alt-icon-ballot')}
-

{t('home.experience-name')}

-
- - -
{t('home.experience-1-name')}
-

{t('home.experience-1-desc')}

- - -
{t('home.experience-2-name')}
-

{t('home.experience-2-desc')}

-

- -
- {t('home.alt-icon-ballot')} -
-
- - - -
+ + +
+ ); }; diff --git a/components/Logo.tsx b/components/Logo.tsx index b181d88..b34c2d7 100644 --- a/components/Logo.tsx +++ b/components/Logo.tsx @@ -1,4 +1,5 @@ import Image from 'next/image'; +import Link from 'next/link'; import { useTranslation } from 'next-i18next'; import { getUrl, RouteTypes } from '@services/routes'; import logoWithText from '../public/logos/logo.svg'; @@ -15,9 +16,9 @@ const Logo = ({ title = true, ...props }: LogoProps) => { const router = useRouter(); const src = title ? logoWithText : logo; return ( - + {t('logo.alt')} - + ); }; diff --git a/components/admin/CandidateModalSet.tsx b/components/admin/CandidateModalSet.tsx index 4e2ebd3..03b3888 100644 --- a/components/admin/CandidateModalSet.tsx +++ b/components/admin/CandidateModalSet.tsx @@ -48,6 +48,7 @@ const CandidateModal = ({ isOpen, position, toggle }) => { return; } if (names.includes(state.name)) { + alert('foo'); dispatchApp({ type: AppTypes.TOAST_ADD, status: 'error', @@ -137,7 +138,7 @@ const CandidateModal = ({ isOpen, position, toggle }) => { -
+
{ > {t('common.cancel')} - + { + // Since we disabled the button, the onCLick is supported by another component + } +
+ +
diff --git a/pages/_app.tsx b/pages/_app.tsx index bbf5566..a5b5326 100644 --- a/pages/_app.tsx +++ b/pages/_app.tsx @@ -12,6 +12,7 @@ function Application({ Component, pageProps }) { typeof window !== 'undefined' && window.location.origin ? window.location.origin : 'http://localhost'; + return ( <> diff --git a/public/locales/en/resource.json b/public/locales/en/resource.json index 6cc8d0b..fa270ce 100644 --- a/public/locales/en/resource.json +++ b/public/locales/en/resource.json @@ -157,7 +157,7 @@ "admin.confirm-question": "Question of your vote", "admin.confirm-candidates": "Candidates", "admin.confirm-submit": "Start the vote", - "admin.confirm-title": "Confirmer votre vote", + "admin.confirm-title": "Check your vote is correct", "admin.confirm-edit": "Save your modifications", "admin.success-election": "The vote has successfully been created!", "admin.success-emails": "The voting link has been sent by emails to the participants.",