From 84921c9dec604196c01879d9972f421c203338ba Mon Sep 17 00:00:00 2001 From: Thomas Catinaud Taris Date: Sun, 21 Apr 2024 14:26:44 +0200 Subject: [PATCH] npx format --- .github/workflows/build-image.yaml | 26 +++--- src/app/about/page.tsx | 21 +++-- src/app/page.tsx | 137 +++++++++++++++++------------ src/components/layout/Footer.tsx | 2 +- src/components/links/shareLink.tsx | 4 +- tailwind.config.ts | 2 +- 6 files changed, 108 insertions(+), 84 deletions(-) diff --git a/.github/workflows/build-image.yaml b/.github/workflows/build-image.yaml index dc48c34c9..5a469d97c 100644 --- a/.github/workflows/build-image.yaml +++ b/.github/workflows/build-image.yaml @@ -4,23 +4,23 @@ on: workflow_dispatch: push: branches: - - main + - main jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - name: Login to Scaleway Container Registry - uses: docker/login-action@v3 - with: - username: nologin - password: ${{ secrets.SCALEWAY_SECRET_KEY }} - registry: ${{ secrets.SCALEWAY_CONTAINER_REGISTRY_ENDPOINT }} - - name: Build the Docker image - run: docker build -t ${{ secrets.SCALEWAY_CONTAINER_REGISTRY_ENDPOINT }}/webapp:latest --shm-size=2G . - - name: Push the Docker Image - run: docker push ${{ secrets.SCALEWAY_CONTAINER_REGISTRY_ENDPOINT }}/webapp:latest + - uses: actions/checkout@v4 + - name: Login to Scaleway Container Registry + uses: docker/login-action@v3 + with: + username: nologin + password: ${{ secrets.SCALEWAY_SECRET_KEY }} + registry: ${{ secrets.SCALEWAY_CONTAINER_REGISTRY_ENDPOINT }} + - name: Build the Docker image + run: docker build -t ${{ secrets.SCALEWAY_CONTAINER_REGISTRY_ENDPOINT }}/webapp:latest --shm-size=2G . + - name: Push the Docker Image + run: docker push ${{ secrets.SCALEWAY_CONTAINER_REGISTRY_ENDPOINT }}/webapp:latest deploy: runs-on: ubuntu-latest @@ -52,4 +52,4 @@ jobs: -e SCW_SECRET_KEY=${{ secrets.SCALEWAY_SECRET_KEY }} \ -e SCW_DEFAULT_ORGANIZATION_ID=${{ secrets.SCALEWAY_ORGANIZATION_ID }} \ scaleway/cli:latest container container update ${{ env.CONTAINER_ID }} \ - registry-image=${{ secrets.SCALEWAY_CONTAINER_REGISTRY_ENDPOINT }}/webapp:latest \ No newline at end of file + registry-image=${{ secrets.SCALEWAY_CONTAINER_REGISTRY_ENDPOINT }}/webapp:latest diff --git a/src/app/about/page.tsx b/src/app/about/page.tsx index 38c93eacd..1d49f2668 100644 --- a/src/app/about/page.tsx +++ b/src/app/about/page.tsx @@ -1,7 +1,7 @@ -'use client'; +"use client"; -import * as React from 'react'; -import '@/lib/env'; +import * as React from "react"; +import "@/lib/env"; const AboutPage = () => { return ( @@ -9,18 +9,21 @@ const AboutPage = () => { ); -} +}; export default AboutPage; const IntroSection = () => { return ( -
+
-

About

-

Pinkbombs

+

About

+

Pinkbombs

- +
- ) + ); }; diff --git a/src/app/page.tsx b/src/app/page.tsx index ba930afc8..6426c7ab7 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -1,15 +1,15 @@ "use client"; -import clsx from 'clsx'; -import Image from 'next/image'; -import Link from 'next/link'; -import * as React from 'react'; -import '@/lib/env'; +import clsx from "clsx"; +import Image from "next/image"; +import Link from "next/link"; +import * as React from "react"; +import "@/lib/env"; import "../styles/page.css"; -import Edito from '@/components/Edito'; -import IconCard from '@/components/IconCard'; +import Edito from "@/components/Edito"; +import IconCard from "@/components/IconCard"; /** * SVGR Support @@ -51,9 +51,11 @@ const IntroSection = () => { height={203} className="row-start-2 self-center justify-self-center w-24 sm:w-60 md:w-72 lg:w-[490px]" /> -

+

The salmon you eat, sell, produce... - kills wild salmon, starves people, contaminates food. + + kills wild salmon, starves people, contaminates food. +

); @@ -69,8 +71,11 @@ const BombSection = () => { height={467} className="row-start-2 self-center justify-self-center w-24 md:w-36 lg:w-[207px] max-h-full object-contain" /> - ); @@ -86,33 +91,34 @@ const ExplodeSection = () => { lg:bg-[url(/svg/explose.svg)] lg:w-[969px] lg:h-[829px] lg:bg-[length:727px_662px] 2xl:w-[1515px] 2xl:h-[1190px] 2xl:bg-[length:969px_829px] - '> -
  • - +
  • +
    • -
  • - +
    • -
  • - +
    • -
  • - +
    • @@ -123,11 +129,11 @@ const ExplodeSection = () => { const BioSection = () => { return ( ); }; @@ -135,10 +141,10 @@ const BioSection = () => { const HealthSection = () => { return ( ); }; @@ -146,11 +152,11 @@ const HealthSection = () => { const ClimateSection = () => { return ( ); }; @@ -158,23 +164,38 @@ const ClimateSection = () => { const SocialSection = () => { return ( ); }; const BeTheChangeSection = () => { return ( -
    -
    -

    Be the change .

    -
    -

    There are alternatives to salmon in our way of eating, selling, and producing.

    -
    -
    +
    +
    +

    + Be the change . +

    +
    +
    +

    + There are alternatives to salmon in our way of eating, selling, and + producing. +

    +
    +
    + +
    +
    + +
    ); }; @@ -183,7 +204,7 @@ const ActionSection = () => { return (
    -

    +

    Let's talk!

    diff --git a/src/components/layout/Footer.tsx b/src/components/layout/Footer.tsx index 91d50dbef..6fe6e3648 100644 --- a/src/components/layout/Footer.tsx +++ b/src/components/layout/Footer.tsx @@ -49,7 +49,7 @@ const Footer = () => (

    - All rights reserved
    © {currentYear} Seastemik et Data for Good + All rights reserved
    © {currentYear} Seastemik et Data for Good

    ); diff --git a/src/components/links/shareLink.tsx b/src/components/links/shareLink.tsx index 357c41eb4..b670ac3a3 100644 --- a/src/components/links/shareLink.tsx +++ b/src/components/links/shareLink.tsx @@ -12,8 +12,8 @@ const social: Record = { icon: "linkedin-logo", }, website: { - name: 'Website', - icon: 'globe', + name: "Website", + icon: "globe", }, }; diff --git a/tailwind.config.ts b/tailwind.config.ts index 130ebda94..3158e021e 100644 --- a/tailwind.config.ts +++ b/tailwind.config.ts @@ -38,7 +38,7 @@ export default { screens: { xs: "500px", "2xl": "1515px", - "3xl": "2000px" + "3xl": "2000px", }, keyframes: { flicker: {