Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: first review #90

Merged
merged 6 commits into from
Oct 17, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 52 additions & 0 deletions public/images/background-bombs.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
40 changes: 39 additions & 1 deletion public/images/dataforgood.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions public/images/salmon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/images/seastemik.avif
Binary file not shown.
26 changes: 26 additions & 0 deletions public/images/seastemik.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
99 changes: 47 additions & 52 deletions src/app/[locale]/page.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"use client";

import clsx from "clsx";
import Image from "next/image";

Check warning on line 4 in src/app/[locale]/page.tsx

View workflow job for this annotation

GitHub Actions / ⬣ ESLint, ʦ TypeScript, 💅 Prettier, and 🃏 Test

'Image' is defined but never used
import Link from "next/link";
import { useTranslations } from "next-intl";
import * as React from "react";
Expand Down Expand Up @@ -38,11 +38,8 @@
const t = useTranslations("story");

return (
<section className="flex p-6 lg:p-12 min-h-[300px] h-screen text-red1 bg-darkblue1">
<section className="flex p-6 lg:p-12 min-h-[300px] h-screen text-red2 bg-darkblue1 bg-[url('/images/background-bombs.svg')] bg-[length:800px_400px] sm:bg-[length:1000px_500px] lg:bg-cover bg-no-repeat bg-center">
<div className="grid grid-rows-[1fr, auto, 1fr] w-full">
<div className="row-start-2 self-center justify-self-center px-6 max-w-[766px] max-h-full object-contain">
<Image src="/images/bombs.svg" alt="" width={766} height={616} />
</div>
<div className="row-start-3 self-end items-left flex gap-2 items-end">
<p className={clsx("h1", "max-w-[1500px] mx-auto w-full")}>
{t("bomb")}
Expand All @@ -57,57 +54,55 @@
const t = useTranslations("story");

return (
<section className="flex items-center justify-center p-6 lg:p-12 lg:pt-24 lg:pb-48 2xl:py-24 text-red1 bg-darkblue1 min-h-screen">
<div className="relative">
<p className="mb-6 md:mb-12 mx-auto text-xl xl:absolute xl:left-[310px] xl:bottom-[100px] 3xl:left-[600px] 3xl:bottom-[200px] xl:max-w-96 text-center text-white">
{t("explode.intro")}
</p>
<ul
className="
grid grid-cols-1 xs:grid-cols-2 gap-8 list-none bg-no-repeat bg-center
<section className="flex flex-col items-center justify-center p-6 lg:p-12 lg:pt-24 lg:pb-48 2xl:py-24 text-red2 bg-darkblue1 min-h-screen">
<h2 className="h1 mb-12 lg:mb-24 max-w-[1500px] mx-auto">
{t("explode.intro")}
</h2>
<ul
className="
grid grid-cols-1 xs:grid-cols-2 gap-8 list-none bg-no-repeat bg-center relative
xs:bg-[url(/images/explose-small.svg)] xs:bg-[length:438px_320px]
xl:bg-[url(/images/explose.svg)]
xl:w-[969px] xl:h-[829px] xl:bg-[length:727px_662px]
3xl:w-[1515px] 3xl:h-[1190px] 3xl:bg-[length:969px_829px]
"
>
<li className="xl:absolute xl:-left-[20px] xl:top-[180px] 3xl:left-[112px] 3xl:top-[330px]">
<IconCard
icon="/images/storytelling/icon-social.svg"
title={t("explode.social.title")}
content={t("explode.social.content")}
/>
</li>
<li className="xl:absolute xl:left-[120px] xl:bottom-[20px] 3xl:left-[242px] 3xl:bottom-[180px]">
<IconCard
icon="/images/storytelling/icon-climate.svg"
title={t("explode.climat.title")}
content={t("explode.climat.content")}
/>
</li>
<li className="xl:absolute xl:-right-[150px] xl:top-[50px] 3xl:-right-[100px] 3xl:top-[160px]">
<IconCard
icon="/images/storytelling/icon-health.svg"
title={t("explode.health.title")}
content={t("explode.health.content")}
/>
</li>
<li className="xl:absolute xl:-right-[140px] xl:bottom-[140px] 3xl:-right-[80px] 3xl:bottom-[360px]">
<IconCard
icon="/images/storytelling/icon-biodiversity.svg"
title={t("explode.biodiversity.title")}
content={t("explode.biodiversity.content")}
/>
</li>
<li className="xl:absolute xl:right-[100px] xl:-bottom-[120px] 3xl:right-[340px] 3xl:bottom-[10px]">
<IconCard
icon="/images/storytelling/icon-animals.svg"
title={t("explode.animals.title")}
content={t("explode.animals.content")}
/>
</li>
</ul>
</div>
>
<li className="xl:absolute xl:-left-[20px] xl:top-[180px] 3xl:left-[112px] 3xl:top-[330px]">
<IconCard
icon="/images/storytelling/icon-social.svg"
title={t("explode.social.title")}
content={t("explode.social.content")}
/>
</li>
<li className="xl:absolute xl:left-[120px] xl:bottom-[20px] 3xl:left-[242px] 3xl:bottom-[180px]">
<IconCard
icon="/images/storytelling/icon-climate.svg"
title={t("explode.climat.title")}
content={t("explode.climat.content")}
/>
</li>
<li className="xl:absolute xl:-right-[150px] xl:top-[50px] 3xl:-right-[100px] 3xl:top-[160px]">
<IconCard
icon="/images/storytelling/icon-health.svg"
title={t("explode.health.title")}
content={t("explode.health.content")}
/>
</li>
<li className="xl:absolute xl:-right-[140px] xl:bottom-[140px] 3xl:-right-[80px] 3xl:bottom-[360px]">
<IconCard
icon="/images/storytelling/icon-biodiversity.svg"
title={t("explode.biodiversity.title")}
content={t("explode.biodiversity.content")}
/>
</li>
<li className="xl:absolute xl:right-[100px] xl:-bottom-[120px] 3xl:right-[340px] 3xl:bottom-[10px]">
<IconCard
icon="/images/storytelling/icon-animals.svg"
title={t("explode.animals.title")}
content={t("explode.animals.content")}
/>
</li>
</ul>
</section>
);
};
Expand Down Expand Up @@ -195,7 +190,7 @@
const t = useTranslations("story");

return (
<section className="p-6 lg:px-12 lg:pt-36 lg:pb-64 text-red1 bg-darkblue1">
<section className="p-6 lg:px-12 lg:pt-36 lg:pb-64 text-red2 bg-darkblue1">
<div className="max-w-[1500px] mx-auto">
<h3 className={clsx("h3", "mb-4 lg:mb-6 max-w-5xl m-auto text-center")}>
{t("industry.title")}
Expand Down Expand Up @@ -230,7 +225,7 @@
/>
<div className="flex justify-center">
<Link
className="inline-flex justify-center gap-4 mt-6 lg:mt-12 p-4 min-w-40 lg:text-2xl text-red1 bg-darkblue1 font-secondary uppercase rounded-xl tracking-widest border-2 font-bold border-red1 hover:bg-red1 hover:text-darkblue1 transition-all ease-in-out duration-100"
className="inline-flex justify-center mt-6 lg:mt-12 p-4 lg:text-xl text-white bg-red1 font-secondary uppercase rounded-xl tracking-widest border-2 border-red1 hover:bg-darkblue1 hover:text-red1 transition-all ease-in-out duration-100"
href="/to-act"
>
{t("industry.link")}
Expand Down
4 changes: 2 additions & 2 deletions src/components/IntroBlock.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ const IntroBlock = ({
>
<div className="grid grid-rows-[1fr, auto, 1fr] w-full max-w-[1500px] mx-auto">
{image && (
<div className="row-start-2 self-center justify-self-center px-6 max-w-[490px]">
<Image src="/images/salmon.svg" alt="" width={490} height={203} />
<div className="row-start-2 self-center justify-self-center px-6 max-w-[700px]">
<Image src="/images/salmon.svg" alt="" width={700} height={203} />
</div>
)}
<div className="row-start-3 self-end items-left flex flex-wrap gap-2 items-end">
Expand Down
7 changes: 4 additions & 3 deletions src/components/JoinBlock.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
ssr: false,
});

import PrimaryButton from "@/components/buttons/PrimaryButton";
import MetaChart from "@/components/MetaChart";

Check warning on line 11 in src/components/JoinBlock.tsx

View workflow job for this annotation

GitHub Actions / ⬣ ESLint, ʦ TypeScript, 💅 Prettier, and 🃏 Test

Run autofix to sort these imports!
import MainLink from "@/components/links/MainLink";

type JoinBlockProps = {
className?: string;
Expand Down Expand Up @@ -106,9 +106,10 @@

<p className="h3 mt-6 xl:mt-10">{t(`join.${baseText}.act`)}</p>

<PrimaryButton
<MainLink
href="/to-act"
content={t(`join.${baseText}.link`)}
mode="base"
label={t(`join.${baseText}.link`)}
className="mt-6 xl:mt-10"
/>
</div>
Expand Down
6 changes: 5 additions & 1 deletion src/components/TitleBlock.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ const TitleBlock = ({
<div
{...rest}
id={id}
className={clsx(className, "p-6 md:p-12 text-red1 bg-pink1", spaceY)}
className={clsx(
className,
"p-6 md:p-12 md:pt-24 text-red1 bg-gradient-to-b from-pink1 to-white",
spaceY,
)}
>
<h2 className="h2 max-w-[1500px] mx-auto w-full">{title}</h2>
</div>
Expand Down
57 changes: 25 additions & 32 deletions src/components/layout/Footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,14 @@ const Footer = () => {
<div className="max-w-[1500px] mx-auto">
<div className="flex flex-wrap gap-6 lg:gap-12 lg:pt-12">
<div className="flex flex-col w-full max-w-72">
<div className="flex place-items-center h-[100px]">
<Image
loading="lazy"
src="/images/seastemik.avif"
width={100}
height={100}
alt=""
className="object-contain"
/>
</div>
<p className="h4 md:mb-4">Seastemik</p>
<Image
loading="lazy"
src="/images/seastemik.svg"
width={170}
height={100}
alt="Seastemik"
className="object-contain md:mb-4"
/>
<ShareLink href="https://seastemik.org/" name="Seastemik" />
<ShareLink
type="linkedin"
Expand All @@ -48,17 +45,14 @@ const Footer = () => {
</div>

<div className="flex flex-col w-full max-w-72">
<div className="h-[100px]">
<Image
loading="lazy"
src="/images/dataforgood.svg"
width={100}
height={100}
alt=""
className="object-contain"
/>
</div>
<p className="h4 md:mb-4">Data for Good</p>
<Image
loading="lazy"
src="/images/dataforgood.svg"
width={150}
height={100}
alt="Data for Good"
className="object-contain md:mb-4"
/>
<ShareLink href="https://dataforgood.fr/" name="Data for Good" />
<ShareLink
type="twitter"
Expand All @@ -77,21 +71,20 @@ const Footer = () => {
/>
</div>

<div className="self-end lg:ml-auto w-full md:w-auto">
<MainLink
label={t("footer.donation")}
href="https://www.helloasso.com/associations/seastemik/formulaires/1"
mode="base"
className="mb-4"
isBlank
/>
<div className="self-top lg:ml-auto w-full md:w-auto">
<Image
loading="lazy"
src="/images/pinkbomb-seastemik-dataforgood.svg"
width={400}
width={300}
height={100}
alt=""
className="object-contain"
className="object-contain mb-4"
/>
<MainLink
label={t("footer.donation")}
href="https://www.helloasso.com/associations/seastemik/formulaires/1"
mode="base"
isBlank
/>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/layout/Navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const Navbar = () => {
/to-act/.test(pathname) ? "bg-yellow1" : "bg-pink1",
)}
>
<div className="flex flex-wrap items-center justify-between gap-6 px-6 lg:px-12 py-3 lg:py-6">
<div className="flex flex-wrap items-center justify-between gap-6 px-6 lg:px-12 py-3 lg:py-6 max-w-[1596px] mx-auto">
<Link href="/">
<Image
src="/images/pinkbombs.svg"
Expand Down
Loading
Loading