From 7e61931fdb0d5b4c664190a9316f562aa0a77dda Mon Sep 17 00:00:00 2001 From: Owen Rees Date: Tue, 27 Jun 2023 22:43:55 +0200 Subject: [PATCH 1/5] english about section --- .github/workflows/cypress.yml | 8 +-- README-fr.md | 2 +- README.md | 6 +- TODO | 1 - app/layout.tsx | 7 +- app/page.tsx | 3 + app/qui-sommes-nous/page.tsx | 99 +++++++++++++++++++++++++++- components/Footer.tsx | 2 +- components/HamburgerMenu.tsx | 3 + components/Layout.tsx | 3 +- components/TournamentMap.tsx | 2 + cypress.config.ts | 2 + cypress/e2e/links.cy.ts | 2 + cypress/support/commands.ts | 2 + cypress/support/component-index.html | 2 + cypress/support/component.ts | 11 ++-- lib/sendMail.ts | 3 +- 17 files changed, 132 insertions(+), 26 deletions(-) diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml index e5e2261..0f7b626 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/cypress.yml @@ -13,11 +13,11 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 - + - name: Cache npm and NextJs build uses: actions/cache@v3 with: - # See here for caching with `yarn` https://github.com/actions/cache/blob/main/examples#node---yarn or you can leverage caching with actions/setup-node https://github.com/actions/setup-node + # See here for caching with `yarn` https://github.com/actions/cache/blob/main/examples#node---yarn, or you can leverage caching with actions/setup-node https://github.com/actions/setup-node path: | ~/.npm ${{ github.workspace }}/.next/cache @@ -26,7 +26,7 @@ jobs: # If source files changed but packages didn't, rebuild from a prior cache. restore-keys: | ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}- - + - name: Cypress run # Uses the official Cypress GitHub action https://github.com/cypress-io/github-action uses: cypress-io/github-action@v4 @@ -37,7 +37,7 @@ jobs: build: npm run build start: npm start wait-on: echo ${{ env.NEXT_PUBLIC_URL }}# Waits for above - # Records to Cypress Cloud + # Records to Cypress Cloud # https://docs.cypress.io/guides/cloud/projects#Set-up-a-project-to-record record: true parallel: true # Runs test in parallel using settings above diff --git a/README-fr.md b/README-fr.md index 1d7fb5f..b532155 100644 --- a/README-fr.md +++ b/README-fr.md @@ -1,4 +1,4 @@ -

Echecs France

+

Echecs France

[![en](https://img.shields.io/badge/lang-en-blue.svg?style=for-the-badge)](https://github.com/TheRealOwenRees/echecsfrance/blob/main/README.md) diff --git a/README.md b/README.md index 5da9a6c..c760b11 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -

Echecs France

+

Echecs France

[![fr](https://img.shields.io/badge/lang-fr-blue.svg?style=for-the-badge)](https://github.com/TheRealOwenRees/echecsfrance/blob/main/README-fr.md) @@ -20,11 +20,11 @@ and is deployed on [Vercel](https://vercel.com/) ## Dependencies - [Leaflet](https://leafletjs.com/) - a Javascript library for interactive maps -- [Nodemailer](https://nodemailer.com/about/) - a module for Node.js applications to allow easy as cake email sending +- [Nodemailer](https://nodemailer.com/) - a module for Node.js applications to allow easy as cake email sending ## Contributions Contributions are encouraged. Please open an issue to discuss your ideas. -Add your code into a feature branch such as `feature/feature-name`. We utilise a [Github Flow](https://www.gitkraken.com/learn/git/best-practices/git-branch-strategy#github-flow-considerations) branching strategy. +Add your code into a feature branch such as `feature/feature-name`. We utilise a [GitHub Flow](https://www.gitkraken.com/learn/git/best-practices/git-branch-strategy#github-flow-considerations) branching strategy. Please see the [TODO](https://github.com/TheRealOwenRees/echecsfrance/blob/main/TODO) file for a list of suggestions. diff --git a/TODO b/TODO index c00ca79..d0449fc 100644 --- a/TODO +++ b/TODO @@ -14,7 +14,6 @@ PAGES ---------------------------------------------------------------- DESIGN CHANGES -//TODO success and error messages into french - mailer //TODO font size on mobile screen //TODO mobile navbar is creeping into the page by a few pixels when hidden - move it to the right a bit. It is easier to see in light mode. I cant see this on Linux //TODO logo for navbar and favicon diff --git a/app/layout.tsx b/app/layout.tsx index 1e52a4a..bc99daa 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -2,6 +2,7 @@ import { Analytics } from "@vercel/analytics/react"; import "./globals.css"; import { Inter } from "next/font/google"; +import { ReactNode } from "react"; const inter = Inter({ subsets: ["latin"] }); @@ -11,11 +12,7 @@ export const metadata = { keywords: "echecs, France, tournoi, tournois, FFE, carte", }; -export default function RootLayout({ - children, -}: { - children: React.ReactNode; -}) { +export default function RootLayout({ children }: { children: ReactNode }) { return ( diff --git a/app/page.tsx b/app/page.tsx index 1f60bcd..9744d03 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -1,9 +1,12 @@ +// noinspection HttpUrlsUsage,HtmlUnknownTarget + import Link from "next/link"; import Image from "next/image"; import Layout from "@/components/Layout"; import bgImage from "@/public/images/map-bg.jpg"; export default function Home() { + // noinspection HtmlUnknownTarget return (
diff --git a/app/qui-sommes-nous/page.tsx b/app/qui-sommes-nous/page.tsx index aac9bba..8d6e90d 100644 --- a/app/qui-sommes-nous/page.tsx +++ b/app/qui-sommes-nous/page.tsx @@ -1,11 +1,11 @@ +import Link from "next/link"; import Layout from "@/components/Layout"; export default function About() { return (
-
-
+

- Prochainement + This project was first started in early 2022 as a means to visualise + where chess tournaments were taking place in France. Having moved to + France in 2019, I did not know my way around the country and wanted + to know which tournaments were happening near me.

+

+ The project was shelved until Spring 2023 when it was given a new + lease of life. Rebuilt from the ground up,{" "} + + Echecs France + {" "} + is now open source and open to contributions. +

+

+ I will be setting up a donation link if you wish to help cover some + of the costs of running this website. After costs, and remaining + funds will put back into the chess community by means of sponsoring + events or by donations. +

+

+ Credits +

+

+ This project is what it is thanks to the contributions of the wider + community. In particular I would like to thank the following for + their contributions so far: +

    +
  • Alvaro
    • +
  • Flo
    • +
+

+

+ Tech Blurb +

+

+ + Echecs France + {" "} + is built on the following tech stack: +

    +
  • + + NextJS + +
    • +
  • + + Typescript + +
    • +
  • + + Tailwind + +
    • +
  • + + MongoDB + +
    • +
+

+

+ with the following core dependencies: +

    +
  • + + Leaflet + +
    • +
  • + + Nodemailer + +
    • +
+

+

+ For more information and details on how to contribute, please visit + our{" "} + + GitHub repository + +

+ .
diff --git a/components/Footer.tsx b/components/Footer.tsx index 3df5be8..f4723ea 100644 --- a/components/Footer.tsx +++ b/components/Footer.tsx @@ -4,7 +4,7 @@ import { FaGithub, FaRegEnvelope } from "react-icons/fa"; export default function Footer() { return (