MieuxVoter
/
mvfront-react
mirror of https://github.com/MieuxVoter/mvfront-react
4
1
Fork 0
Code Issues Releases Wiki Polls Activity

merge

Browse Source
pull/89/head
Pierre-Louis Guhur 1 year ago
parent d1617ea76e
commit 4d12430476
5 changed files with 76 additions and 58 deletions
Show Stats Download Patch File Download Diff File

38
components/Experience.tsx
Unescape View File

@ -1,12 +1,17 @@
import {MAJORITY_JUDGMENT_LINK} from '@services/constants';
import {useTranslation} from 'next-i18next';
import { MAJORITY_JUDGMENT_LINK } from '@services/constants';
import { useTranslation } from 'next-i18next';
import Image from 'next/image';
import {Row, Col, Button, Container} from 'reactstrap';
import { Row, Col, Button, Container } from 'reactstrap';
import arrowRight from '../public/arrow-white.svg';
import { faArrowRight } from '@fortawesome/free-solid-svg-icons';
import { useTranslation } from 'next-i18next';
import Image from 'next/image';
import { Row, Col, Container } from 'reactstrap';
import Button from '@components/Button';
import vote from '../public/vote.svg';
const Experiencediv = () => {
const {t} = useTranslation('resource');
const { t } = useTranslation('resource');
return (
<div className="sectionTwodivTwo mt-4">
<div className="w-100 justify-content-center d-flex">
@ -33,16 +38,21 @@ const Experiencediv = () => {
</Row>
</Container>
<div className="d-flex w-100 justify-content-center mt-5">
<a href={MAJORITY_JUDGMENT_LINK} target="_blank" rel="noreferrer noopener">
<Button color="primary" className="p-4 fs-5">
{t('home.experience-call-to-action')}
<Image
src={arrowRight}
width={22}
height={22}
alt="icon arrow right"
/>
</Button></a>
<a
href={MAJORITY_JUDGMENT_LINK}
target="_blank"
rel="noreferrer noopener"
>
<Button
color="primary py-3"
outline={false}
type="submit"
icon={faArrowRight}
position="right"
>
{t('home.experience-call-to-action')}
</Button>
</a>
</div>
</div>
);

31
components/layouts/Footer.tsx
Unescape View File

@ -1,37 +1,42 @@
import Link from 'next/link';
import {useTranslation} from 'next-i18next';
import {Button, Row, Col} from 'reactstrap';
import { useTranslation } from 'next-i18next';
import { Button, Row, Col } from 'reactstrap';
import Logo from '@components/Logo';
import LanguageSelector from '@components/layouts/LanguageSelector';
import {useAppContext} from '@services/context';
import {BETTER_VOTE_LINK, MAJORITY_JUDGMENT_LINK, NEWS_LINK, PAYPAL, WHO_WE_ARE_LINK} from '@services/constants';
import { useAppContext } from '@services/context';
import {
MAJORITY_JUDGMENT_LINK,
NEWS_LINK,
PAYPAL,
WHO_WE_ARE_LINK,
} from '@services/constants';
const Footer = () => {
const {t} = useTranslation();
const { t } = useTranslation();
const [app, _] = useAppContext();
if (app.fullPage) {return null;}
if (app.fullPage) {
return null;
}
const menu = [
{
component: <Logo title={false} />,
},
{
component:
component: (
<a
href={MAJORITY_JUDGMENT_LINK}
target="_blank"
rel="noopener noreferrer"
>
{t('menu.majority-judgment')}</a>,
{t('menu.majority-judgment')}
</a>
),
},
{
component: (
<a
href={WHO_WE_ARE_LINK}
target="_blank"
rel="noopener noreferrer"
>
<a href={WHO_WE_ARE_LINK} target="_blank" rel="noopener noreferrer">
{t('menu.whoarewe')}
</a>
),

46
pages/index.tsx
Unescape View File

@ -4,13 +4,15 @@ import Image from 'next/image';
import { GetStaticProps } from 'next';
import { serverSideTranslations } from 'next-i18next/serverSideTranslations';
import { useTranslation } from 'next-i18next';
import { Container, Row, Col, Button, Input } from 'reactstrap';
import { Container, Row, Col, Input } from 'reactstrap';
import Logo from '@components/Logo';
import Share from '@components/Share';
import AdvantagesRow from '@components/Advantages';
import ExperienceRow from '@components/Experience';
import Button from '@components/Button';
import { CREATE_ELECTION } from '@services/routes';
import arrowRight from '../public/arrow-white.svg';
import { faArrowRight } from '@fortawesome/free-solid-svg-icons';
export const getStaticProps: GetStaticProps = async ({ locale }) => ({
props: {
@ -49,19 +51,14 @@ const StartForm = () => {
</Row>
<Row>
<Link href={{ pathname: CREATE_ELECTION, query: { name: name } }}>
<Button color="secondary" outline={true} type="submit">
<Row className="justify-content-md-center p-2">
<Col className="col-auto">{t('home.start')}</Col>
<Col className="col-auto d-flex">
<Image
src={arrowRight}
width={22}
height={22}
alt={t('home.start')}
className="align-self-center"
/>
</Col>
</Row>
<Button
color="secondary py-3"
outline={true}
type="submit"
icon={faArrowRight}
position="right"
>
{t('home.start')}
</Button>
</Link>
</Row>
@ -104,19 +101,14 @@ const StartForm = () => {
className="d-grid w-100"
href={{ pathname: CREATE_ELECTION, query: { name: name } }}
>
<Button color="secondary" outline={true} type="submit">
<Row className="justify-content-md-center p-2">
<Col className="col-auto">{t('home.start')}</Col>
<Col className="col-auto d-flex">
<Image
src={arrowRight}
width={22}
height={22}
alt={t('home.start')}
className="align-self-center"
/>
</Col>
</Row>
<Button
color="secondary py-3"
outline={true}
type="submit"
icon={faArrowRight}
position="right"
>
{t('home.start')}
</Button>
</Link>
</form>

6
styles/scss/_app.scss
Unescape View File

@ -419,8 +419,7 @@ ol.result > li {
outline: none;
}
a,
a:hover {
a, a:hover {
text-decoration: none;
}
@ -431,3 +430,6 @@ a:hover {
.no-shadow {
box-shadow: unset !important;
}

13
styles/scss/_button.scss
Unescape View File

@ -43,11 +43,15 @@
margin: auto;
}
*.btn[class*='-secondary'] {
/* width: fit-content;*/
background-color: transparent;
border-color: white;
color: white;
}
.btn-outline-secondary:hover {
background-color: white;
border-color: $mv-blue-color;
color: $mv-blue-color;
}
*.btn[class*='-primary'] {
border: 2px solid $mv-blue-color;
box-shadow: 0px 5px 0px #7a64f9;
@ -56,12 +60,15 @@
background-color: #4a2fef;
border: 2px solid #4a2fef;
}
.btn:not([class*='btn-outline-']):hover {
/* .btn:not([class*='btn-outline-']):hover {
background-color: rgb(255, 255, 255, 0.2);
color: inherit;
border-color: inherit;
border-width: 2px;
box-shadow: unset;
}*/
.btn-primary:hover {
filter: brightness(150%);
}
.btn.btn-danger:hover {
color: map.get($theme-colors, 'danger');
@ -91,3 +98,5 @@ gap: 16px;
background: #FF3E37!important;
box-shadow: 0px 4px 0px #FFCAC8;
}

Write Preview
Loading…
Cancel
Save