add - nettoayge & refacto du layout

feature/page-admin
Eric 4 years ago
parent 811c6d362b
commit 769d441270

@ -1,76 +0,0 @@
import React from "react";
import Image from 'next/image';
import style from '../styles/Content.module.css';
import Link from "next/link";
import feuilleGauche from '../public/images/feuilleGauche.webp'
import feuilleDroite from '../public/images/feuilleBasDroite.webp'
import cadeau from '../public/images/cadeau.webp'
import jeuConcours from '../public/images/jeuconcours.webp'
import footerGrass from '../public/images/footer_image.webp'
type Props = {
children?: React.ReactNode;
};
const Content = ({ children }: Props) => {
return (
<>
<div className={`${style['masthead']} d-flex justify-content-center align-items-center text-center`}>
<div className={`${style['feuilleGauche']}`}>
<Image
src={feuilleGauche}
alt="thetiptop feuille Gauche"
layout="responsive"
className={`${style['rotatingSlow']}`}
/>
</div>
<div className={`${style['feuilleDroite']}`}>
<Image
src={feuilleDroite}
alt="thetiptop feuille Droite"
layout="responsive"
className={`${style['rotatingSlow']}`}
/>
</div>
<div className={`${style['jeuConcours']}`}>
<Image
src={jeuConcours}
alt="thetiptop jeu Concours"
layout="responsive"
className={`${style['zoomInOutCadeau']}`}
/>
</div>
<div className={`${style['cadeau']}`}>
<Image
src={cadeau}
alt="thetiptop cadeau"
layout="responsive"
className={`${style['zoomInOutJeuConcours']}`}
/>
</div>
<div className="container align-items-center d-flex flex-column">
{children}
</div>
<div className={`${style['footerGrass']}`}>
<Image
src={footerGrass}
alt="thetiptop feuille Gauche"
layout="responsive"
// className={`${style['footerGrass']}`}
/>
</div>
</div>
</>
);
};
export default Content;

@ -15,7 +15,7 @@ const layoutStyle = {
const Layout = ({ children }: Props) => const Layout = ({ children }: Props) =>
<div style={layoutStyle}> <div style={layoutStyle}>
<NavBar /> <NavBar />
<Content children={children} /> {children}
<Footer /> <Footer />
</div> </div>

@ -1,6 +1,6 @@
import type { NextApiRequest, NextApiResponse } from 'next' import type { NextApiRequest, NextApiResponse } from 'next'
import { getSession } from 'next-auth/react'; import { getSession } from 'next-auth/react';
import prisma from '../../../lib/prisma' import prisma from '../../../../lib/prisma'
// DELETE /api/post/:id // DELETE /api/post/:id

@ -1,5 +1,5 @@
import type { NextApiRequest, NextApiResponse } from 'next' import type { NextApiRequest, NextApiResponse } from 'next'
import prisma from '../../../lib/prisma' import prisma from '../../../../lib/prisma'
import { getSession } from 'next-auth/react' import { getSession } from 'next-auth/react'

@ -1,5 +1,5 @@
import type { NextApiRequest, NextApiResponse } from 'next' import type { NextApiRequest, NextApiResponse } from 'next'
import prisma from '../../../lib/prisma' import prisma from '../../../../lib/prisma'
import { getSession } from 'next-auth/react' import { getSession } from 'next-auth/react'

@ -1,6 +1,6 @@
import type { NextApiRequest, NextApiResponse } from 'next' import type { NextApiRequest, NextApiResponse } from 'next'
import { getSession } from 'next-auth/react'; import { getSession } from 'next-auth/react';
import prisma from '../../../lib/prisma' import prisma from '../../../../lib/prisma'
// PUT /api/publish/:id // PUT /api/publish/:id
export default async function handle(req: NextApiRequest, res: NextApiResponse) { export default async function handle(req: NextApiRequest, res: NextApiResponse) {

@ -1,5 +1,5 @@
import React, { useState } from "react"; import React, { useState } from "react";
import Layout from "../components/Layout"; import Layout from "../../components/Layout";
import Router from "next/router"; import Router from "next/router";
const Draft = () => { const Draft = () => {

@ -1,9 +1,9 @@
import React from "react"; import React from "react";
import { GetServerSideProps } from "next"; import { GetServerSideProps } from "next";
import Layout from "../components/Layout"; import Layout from "../../components/Layout";
import Post, { PostProps } from "../components/Post"; import Post, { PostProps } from "../../components/Post";
import { useSession, getSession } from "next-auth/react"; import { useSession, getSession } from "next-auth/react";
import prisma from '../lib/prisma' import prisma from '../../lib/prisma'
export const getServerSideProps: GetServerSideProps = async ({ req, res }) => { export const getServerSideProps: GetServerSideProps = async ({ req, res }) => {
@ -33,8 +33,8 @@ type Props = {
drafts: PostProps[]; drafts: PostProps[];
}; };
const Drafts = (props : Props) => { const Drafts = (props: Props) => {
const {data: session}= useSession(); const { data: session } = useSession();
if (!session) { if (!session) {
return ( return (

@ -1,10 +1,10 @@
import React from "react"; import React from "react";
import { GetServerSideProps } from "next"; import { GetServerSideProps } from "next";
import ReactMarkdown from "react-markdown"; import ReactMarkdown from "react-markdown";
import Layout from "../../components/Layout"; import Layout from "../../../components/Layout";
import Router from "next/router"; import Router from "next/router";
import { PostProps } from "../../components/Post"; import { PostProps } from "../../../components/Post";
import prisma from '../../lib/prisma' import prisma from '../../../lib/prisma'
import { useSession } from "next-auth/react"; import { useSession } from "next-auth/react";
@ -38,7 +38,7 @@ async function deletePost(id: number): Promise<void> {
await Router.push("/") await Router.push("/")
} }
const Post = (props : PostProps) => { const Post = (props: PostProps) => {
const { data: session, status } = useSession(); const { data: session, status } = useSession();
if (status === 'loading') { if (status === 'loading') {
return <div>Authenticating ...</div>; return <div>Authenticating ...</div>;

@ -1,10 +1,10 @@
import React, { useState } from "react"; import React, { useState } from "react";
import { GetServerSideProps } from "next"; import { GetServerSideProps } from "next";
import Layout from "../components/Layout"; import Layout from "../../components/Layout";
import { useSession, getSession } from "next-auth/react"; import { useSession, getSession } from "next-auth/react";
import prisma from '../lib/prisma' import prisma from '../../lib/prisma'
import Router from "next/router"; import Router from "next/router";
import { ProfileProps } from "../types/profile"; import { ProfileProps } from "../../types/profile";
import { Resolver, SubmitHandler } from "react-hook-form"; import { Resolver, SubmitHandler } from "react-hook-form";

@ -130,47 +130,56 @@ const MainPage = ({ csrfToken }: Props) => {
<link rel="preconnect" href="https://fonts.googleapis.com" /> <link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossOrigin="" /> <link rel="preconnect" href="https://fonts.gstatic.com" crossOrigin="" />
</Head> </Head>
<div className={`${style['bloc-content']} col-12 col-lg-6`}>
<h1 className="fw-light">Connexion</h1> <div className={`${style['masthead']} d-flex justify-content-center align-items-center text-center`}>
<div className="container align-items-center d-flex flex-column">
<SiGnuprivacyguard size={50} />
<form onSubmit={handleSubmit(onMailSubmit)}>
<div className="form-group mx-auto my-3 w-100">
<input <div className={`${style['bloc-content']} col-12 col-lg-6`}>
type="email" id="email" name="email" <h1 className="fw-light">Connexion</h1>
className={`mb-3 form-control ${errors.email ? 'is-invalid' : ''}`}
placeholder="Email..." <SiGnuprivacyguard size={50} />
{...register("email")} <form onSubmit={handleSubmit(onMailSubmit)}>
/> <div className="form-group mx-auto my-3 w-100">
<div className="d-grid"> <input
<button type="submit" className="btn d-grid btn-primary"> type="email" id="email" name="email"
Se connecter avec mon email className={`mb-3 form-control ${errors.email ? 'is-invalid' : ''}`}
</button> placeholder="Email..."
</div> {...register("email")}
</div> />
<hr /> <div className="d-grid">
<div className="d-grid"> <button type="submit" className="btn d-grid btn-primary">
<button onClick={connexionWithGoogle} type="button" className={`btn btn-primary ${style.loginButton}`} style={{ backgroundColor: "#dd4b39" }}> Se connecter avec mon email
<span className={style.logo}><AiOutlineGoogle /></span>Se connecter avec google </button>
</button> </div>
</div> </div>
<div className="form-group"> <hr />
<label <div className="d-grid">
htmlFor="acceptTerms" <button onClick={connexionWithGoogle} type="button" className={`btn btn-primary ${style.loginButton}`} style={{ backgroundColor: "#dd4b39" }}>
className="form-check-label" <span className={style.logo}><AiOutlineGoogle /></span>Se connecter avec google
> </button>
J'ai lu et j'accepte les </div>
conditions <div className="form-group">
</label> <label
<input htmlFor="acceptTerms"
type="checkbox" className="form-check-label"
className={`form-check-input ${errors.acceptTerms ? 'is-invalid' : ''}`} >
{...register("acceptTerms")} J'ai lu et j'accepte les
name="acceptTerms" conditions
/> </label>
</div> <input
</form> type="checkbox"
</div > className={`form-check-input ${errors.acceptTerms ? 'is-invalid' : ''}`}
{...register("acceptTerms")}
name="acceptTerms"
/>
</div>
</form>
</div >
</div>
</div>
</>) </>)
}; };

@ -10,8 +10,8 @@ import { yupResolver } from "@hookform/resolvers/yup";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
import Router from "next/router"; import Router from "next/router";
import Section from '../components/Section';
import style from '../styles/index.module.css'; import style from '../styles/Index.module.css';
import rotatingLeftImage from '../public/images/coffret-degustation-mousselines-individuelles-n3-PhotoRoom.webp'; import rotatingLeftImage from '../public/images/coffret-degustation-mousselines-individuelles-n3-PhotoRoom.webp';
import rotatingRightImage from '../public/images/coffret-the-PhotoRoom.webp'; import rotatingRightImage from '../public/images/coffret-the-PhotoRoom.webp';
@ -23,6 +23,7 @@ import feuilleDroite from '../public/images/feuilleBasDroite.webp'
import unAnDeThe from '../public/images/unandethé.webp' import unAnDeThe from '../public/images/unandethé.webp'
import sablier from '../public/images/sablier.webp' import sablier from '../public/images/sablier.webp'
import cadeau from '../public/images/cadeau.webp' import cadeau from '../public/images/cadeau.webp'
import footerGrass from '../public/images/footer_image.webp'
import jeuConcours from '../public/images/jeuconcours.webp' import jeuConcours from '../public/images/jeuconcours.webp'
import { GetServerSideProps } from "next"; import { GetServerSideProps } from "next";
@ -108,31 +109,75 @@ const MainPage = () => {
<link rel="preconnect" href="https://fonts.gstatic.com" crossOrigin="" /> <link rel="preconnect" href="https://fonts.gstatic.com" crossOrigin="" />
</Head> </Head>
<div className={`${style['bloc-content']} col-12 col-lg-6`}> <div className={`${style['masthead']} d-flex justify-content-center align-items-center text-center`}>
<div className={`${style['imageWrapper']}`}> <div className={`${style['feuilleGauche']}`}>
<Image <Image
src={testerCodeCadeau} src={feuilleGauche}
alt="thetiptop navigation logo" alt="thetiptop feuille Gauche"
layout="responsive" layout="responsive"
className={`${style['rotatingImage']}`} className={`${style['rotatingSlow']}`}
/> />
</div> </div>
<form onSubmit={handleSubmit(onSubmit)}> <div className={`${style['feuilleDroite']}`}>
<div className="form-group mx-auto my-3 w-100"> <Image
<input type="text" src={feuilleDroite}
id="codeInput" aria-describedby="codeHelp" alt="thetiptop feuille Droite"
placeholder="A293049430..." layout="responsive"
{...register('codeCadeau')} className={`${style['rotatingSlow']}`}
className={`form-control ${errors.codeCadeau ? 'is-invalid' : ''}`} />
</div>
/> <div className={`${style['jeuConcours']}`}>
<small id="codeHelp" className="form-text text-muted">Code à usage unique</small> <Image
<div className="invalid-feedback alert alert-danger">{errors.codeCadeau?.message}</div> src={jeuConcours}
alt="thetiptop jeu Concours"
layout="responsive"
className={`${style['zoomInOutCadeau']}`}
/>
</div>
<div className={`${style['cadeau']}`}>
<Image
src={cadeau}
alt="thetiptop cadeau"
layout="responsive"
className={`${style['zoomInOutJeuConcours']}`}
/>
</div>
<div className="container align-items-center d-flex flex-column">
<div className={`${style['bloc-content']} col-12 col-lg-6`}>
<div className={`${style['imageWrapper']}`}>
<Image
src={testerCodeCadeau}
alt="thetiptop navigation logo"
layout="responsive"
className={`${style['rotatingImage']}`}
/>
</div>
<form onSubmit={handleSubmit(onSubmit)}>
<div className="form-group mx-auto my-3 w-100">
<input type="text"
id="codeInput" aria-describedby="codeHelp"
placeholder="A293049430..."
{...register('codeCadeau')}
className={`form-control ${errors.codeCadeau ? 'is-invalid' : ''}`}
/>
<small id="codeHelp" className="form-text text-muted">Code à usage unique</small>
<div className="invalid-feedback alert alert-danger">{errors.codeCadeau?.message}</div>
</div>
<div className="form-group mx-auto my-3 w-100">
<button type="submit" className={`${style['aButton']} btn btn-primary`}>Découvrir mon cadeau !</button>
</div>
</form>
</div> </div>
<div className="form-group mx-auto my-3 w-100"> <div className={`${style['footerGrass']}`}>
<button type="submit" className={`${style['aButton']} btn btn-primary`}>Découvrir mon cadeau !</button> <Image
src={footerGrass}
alt="thetiptop feuille Gauche"
layout="responsive"
// className={`${style['footerGrass']}`}
/>
</div> </div>
</form> </div>
</div> </div>
</> </>
); );

@ -44,15 +44,22 @@ const VerifyRequest = () => {
<link rel="preconnect" href="https://fonts.googleapis.com" /> <link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossOrigin="" /> <link rel="preconnect" href="https://fonts.gstatic.com" crossOrigin="" />
</Head> </Head>
<div className={`${style['bloc-content']} col-12 col-lg-6`}>
<h1 className="fw-light">Un email a été envoyé</h1> <div className={`${style['masthead']} d-flex justify-content-center align-items-center text-center`}>
<GrValidate size={100} /> <div className="container align-items-center d-flex flex-column">
<div className="d-grid mt-4">
<button onClick={() => Router.push("/")} type="button" className={`btn btn-primary`}>
Cliquez ici si vous n'êtes pas rediriger à l'accueil <div className={`${style['bloc-content']} col-12 col-lg-6`}>
</button> <h1 className="fw-light">Un email a été envoyé</h1>
<GrValidate size={100} />
<div className="d-grid mt-4">
<button onClick={() => Router.push("/")} type="button" className={`btn btn-primary`}>
Cliquez ici si vous n'êtes pas rediriger à l'accueil
</button>
</div>
</div >
</div> </div>
</div > </div>
</>) </>)
}; };

@ -12,3 +12,51 @@
.imageWrapper { .imageWrapper {
display: block; display: block;
} }
.masthead {
--aButton-base-padding: 0px;
--aButton-grow-padding: 5px;
}
.masthead {
background-image: url('/images/pageprincipale.webp');
background-size: cover;
background-position: 50% 50%;
background-repeat: no-repeat;
padding-top: 5vh;
height: 90vh;
position: relative;
}
.masthead .aButton {
position: relative;
}
.masthead .aButton:after {
content: "";
position: absolute;
/* border:1px solid black; */
border-radius: 0.375rem;
display: none;
left: var(--aButton-base-padding);
top: var(--aButton-base-padding);
width: calc(100% + var(--aButton-base-padding));
height: calc(100% + var(--aButton-base-padding));
}
.masthead .aButton:hover:after {
display: block;
animation: 0.7s linear infinite alternate expand;
}
@keyframes expand {
to {
left: calc(var(--aButton-base-padding) - var(--aButton-grow-padding));
top: calc(var(--aButton-base-padding) - var(--aButton-grow-padding));
width: calc(100% + var(--aButton-base-padding) + 2 * var(--aButton-grow-padding));
height: calc(100% + var(--aButton-base-padding) + 2 * var(--aButton-grow-padding));
border: 3px solid var(--color3);
}
}

@ -1,252 +0,0 @@
.masthead {
--aButton-base-padding: 0px;
--aButton-grow-padding: 5px;
}
.masthead {
background-image: url('/images/pageprincipale.webp');
background-size: cover;
background-position: 50% 50%;
background-repeat: no-repeat;
padding-top: 5vh;
height: 90vh;
position: relative;
}
.footerGrass {
position: absolute;
background-image: url('/image/footer_image.webp');
background-repeat: repeat-x;
background-size: contain;
width: 100vw;
/* animation: moveLeftRight 2s infinite; */
position: absolute;
bottom: -20px;
}
@keyframes moveLeftRight {
0%,
100% {
left: 10%;
}
50% {
right: 0;
}
}
.bloc-content {
padding: 10vh;
border-radius: 10px;
background-image: url('/images/codebackground.webp');
background-position: 50% 50%;
background-repeat: no-repeat;
background-size: contain;
/* animation: zoomInOut 3s ease-in-out infinite; */
z-index: 8888
}
.zoomInOutCadeau {
animation: zoomInOut 1s ease-in-out infinite;
}
.zoomInOutJeuConcours {
animation: zoomInOut 1.1s ease-in-out infinite;
}
.rotatingImage {
animation: 1s ease-in-out infinite alternate rotation;
}
.rotatingSlow {
animation: 4s ease-in-out infinite alternate rotation;
}
.blinking {
animation: blinking 1s infinite;
}
@keyframes zoomInOut {
0% {
transform: scale(1, 1);
}
50% {
transform: scale(1.05, 1.05);
}
to {
transform: scale(1, 1);
}
}
@keyframes rotation {
0% {
transform: rotate(2deg);
}
50% {
transform: rotate(-2deg);
}
to {
transform: rotate(2deg);
}
}
@keyframes blinking {
0%,
50%,
100% {
opacity: 1;
}
25%,
75% {
opacity: 0;
}
}
.zoom-in-out-box {
animation: zoom-in-zoom-out 1s ease infinite;
}
.imageWrapper {
display: block;
}
.masthead .aButton {
position: relative;
}
.masthead .aButton:after {
content: "";
position: absolute;
/* border:1px solid black; */
border-radius: 0.375rem;
display: none;
left: var(--aButton-base-padding);
top: var(--aButton-base-padding);
width: calc(100% + var(--aButton-base-padding));
height: calc(100% + var(--aButton-base-padding));
}
.masthead .aButton:hover:after {
display: block;
animation: 0.7s linear infinite alternate expand;
}
@keyframes expand {
to {
left: calc(var(--aButton-base-padding) - var(--aButton-grow-padding));
top: calc(var(--aButton-base-padding) - var(--aButton-grow-padding));
width: calc(100% + var(--aButton-base-padding) + 2 * var(--aButton-grow-padding));
height: calc(100% + var(--aButton-base-padding) + 2 * var(--aButton-grow-padding));
border: 3px solid var(--color3);
}
}
.productToGain {
background-color: var(--color1);
width: 20vw;
height: 20vw;
border-radius: 50%;
padding: 10px;
position: relative;
}
@media (min-width: 992px) {
.productToGain {
width: 13vw;
height: 13vw;
}
}
/*mobile*/
@media only screen and (max-width: 767px) {
.feuilleGauche {
position: absolute;
top: 0px;
left: 0px;
z-index: 9000;
width: 25vw;
}
.feuilleDroite {
position: absolute;
bottom: 0px;
right: 0px;
z-index: 9000;
width: 25vw;
}
.cadeau {
position: absolute;
bottom: 0px;
left: 0px;
z-index: 9000;
}
.jeuConcours {
position: absolute;
top: 0px;
right: 0px;
z-index: 9000;
}
.footerGrass {
position: absolute;
background-image: url('/image/footer_image.webp');
background-size: contain;
width: 100vw;
bottom: -10px;
}
}
/*grand écran*/
@media only screen and (min-width: 767px) {
.feuilleGauche {
position: absolute;
top: 1px;
left: 1px;
z-index: 9000;
width: 25vw;
}
.feuilleDroite {
position: absolute;
bottom: 15px;
right: 15px;
z-index: 9000;
width: 25vw;
}
.cadeau {
position: absolute;
bottom: 0px;
left: 0px;
z-index: 9000;
}
.jeuConcours {
position: absolute;
top: 15px;
right: 15px;
z-index: 9000;
}
}

@ -1,3 +1,43 @@
.masthead {
--aButton-base-padding: 0px;
--aButton-grow-padding: 5px;
}
.masthead {
background-image: url('/images/pageprincipale.webp');
background-size: cover;
background-position: 50% 50%;
background-repeat: no-repeat;
padding-top: 5vh;
height: 90vh;
position: relative;
}
.footerGrass {
position: absolute;
background-image: url('/image/footer_image.webp');
background-repeat: repeat-x;
background-size: contain;
width: 100vw;
/* animation: moveLeftRight 2s infinite; */
position: absolute;
bottom: -20px;
}
@keyframes moveLeftRight {
0%,
100% {
left: 10%;
}
50% {
right: 0;
}
}
.bloc-content { .bloc-content {
padding: 10vh; padding: 10vh;
border-radius: 10px; border-radius: 10px;
@ -26,6 +66,10 @@
animation: 4s ease-in-out infinite alternate rotation; animation: 4s ease-in-out infinite alternate rotation;
} }
.blinking {
animation: blinking 1s infinite;
}
@keyframes zoomInOut { @keyframes zoomInOut {
0% { 0% {
transform: scale(1, 1); transform: scale(1, 1);
@ -77,3 +121,132 @@
.imageWrapper { .imageWrapper {
display: block; display: block;
} }
.masthead .aButton {
position: relative;
}
.masthead .aButton:after {
content: "";
position: absolute;
/* border:1px solid black; */
border-radius: 0.375rem;
display: none;
left: var(--aButton-base-padding);
top: var(--aButton-base-padding);
width: calc(100% + var(--aButton-base-padding));
height: calc(100% + var(--aButton-base-padding));
}
.masthead .aButton:hover:after {
display: block;
animation: 0.7s linear infinite alternate expand;
}
@keyframes expand {
to {
left: calc(var(--aButton-base-padding) - var(--aButton-grow-padding));
top: calc(var(--aButton-base-padding) - var(--aButton-grow-padding));
width: calc(100% + var(--aButton-base-padding) + 2 * var(--aButton-grow-padding));
height: calc(100% + var(--aButton-base-padding) + 2 * var(--aButton-grow-padding));
border: 3px solid var(--color3);
}
}
.productToGain {
background-color: var(--color1);
width: 20vw;
height: 20vw;
border-radius: 50%;
padding: 10px;
position: relative;
}
@media (min-width: 992px) {
.productToGain {
width: 13vw;
height: 13vw;
}
}
/*mobile*/
@media only screen and (max-width: 767px) {
.feuilleGauche {
position: absolute;
top: 0px;
left: 0px;
z-index: 9000;
width: 25vw;
}
.feuilleDroite {
position: absolute;
bottom: 0px;
right: 0px;
z-index: 9000;
width: 25vw;
}
.cadeau {
position: absolute;
bottom: 0px;
left: 0px;
z-index: 9000;
}
.jeuConcours {
position: absolute;
top: 0px;
right: 0px;
z-index: 9000;
}
.footerGrass {
position: absolute;
background-image: url('/image/footer_image.webp');
background-size: contain;
width: 100vw;
bottom: -10px;
}
}
/*grand écran*/
@media only screen and (min-width: 767px) {
.feuilleGauche {
position: absolute;
top: 1px;
left: 1px;
z-index: 9000;
width: 25vw;
}
.feuilleDroite {
position: absolute;
bottom: 15px;
right: 15px;
z-index: 9000;
width: 25vw;
}
.cadeau {
position: absolute;
bottom: 0px;
left: 0px;
z-index: 9000;
}
.jeuConcours {
position: absolute;
top: 15px;
right: 15px;
z-index: 9000;
}
}
Loading…
Cancel
Save