Skip to content

Commit

Permalink
Release 1.5.4
Browse files Browse the repository at this point in the history
Changelog: 
- Amélioration de performance page campagne (affichage conditionel du tooltip) #601
- fix: computedResults are now always defined #628
- Supprimer le call inutile au serveur [NGC-812 NGC-911] #625
- Incubateur / Mentions Légales et Politique de confid [NGC-1010] #624
- Corrige couleur signe plus dans un bouton #620
- Bug / Ordre des questions (NGC-332) #614
- Empêche l'affichage de doublons dans la liste de campagnes #610
- Ajoute animation 404 #609
- Cache le helper nom de campagne pour les participants d'une campagne #608
- Utilise le composant Next pour ajouter le script ICO2 #606
- Corrige l'affichage du badge "Vous" sur les autres participants de groupes #605
- Modifie l'algo de classement amis #604
- Ajoute les nouvelles illustrations #602
- Définir les champs à migrer en prévision de la migration des simulations [NGC-970] #127
- Bug campagnes avec 2000+ participants [NGC-957] #130
- Ajoute une étape de décodage des slugs d'orga et de poll #124
  • Loading branch information
florianpanchout authored Jun 27, 2024
1 parent 8242b8b commit 930f19b
Show file tree
Hide file tree
Showing 234 changed files with 5,262 additions and 2,567 deletions.
5 changes: 5 additions & 0 deletions config/redirects.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,11 @@ const redirects = [
'/organisations/:orgaSlug/campagnes/campagne-1?isRedirectFromLegacy=true',
permanent: true,
},
{
source: '/ambassadeurs',
destination: '/nos-relais',
permanent: true,
},
]

module.exports = redirects
12 changes: 7 additions & 5 deletions next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const withBundleAnalyzer = require('@next/bundle-analyzer')({
enabled: process.env.ANALYZE === 'true',
})

const { withSentryConfig } = require('@sentry/nextjs')
// const { withSentryConfig } = require('@sentry/nextjs')

const redirects = require('./config/redirects.js')

Expand Down Expand Up @@ -90,7 +90,9 @@ const sentryConfig = [
},
]

module.exports = withSentryConfig(
withBundleAnalyzer(withMDX(nextConfig)),
...sentryConfig
)
// module.exports = withSentryConfig(
// withBundleAnalyzer(withMDX(nextConfig)),
// ...sentryConfig
// )

module.exports = withBundleAnalyzer(withMDX(nextConfig))
15 changes: 9 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,16 @@
},
"dependencies": {
"@babel/runtime": "^7.23.1",
"@incubateur-ademe/nosgestesclimat": "2.5.2",
"@incubateur-ademe/legal-pages-react": "^0.2.0",
"@incubateur-ademe/nosgestesclimat": "2.5.3-rc.1",
"@mdx-js/loader": "^3.0.0",
"@mdx-js/react": "^3.0.0",
"@next/bundle-analyzer": "^14.1.0",
"@next/mdx": "^14.0.2",
"@publicodes/react-ui": "^1.2.0",
"@publicodes/tools": "^1.1.2",
"@sentry/nextjs": "^7.80.0",
"@sentry/react": "^7.80.0",
"@publicodes/react-ui": "^1.3.3",
"@publicodes/tools": "^1.2.0",
"@sentry/nextjs": "^8.10.0",
"@sentry/react": "^8.10.0",
"@tanstack/react-query": "^5.28.4",
"axios": "^1.6.8",
"dayjs": "^1.11.10",
Expand All @@ -56,7 +57,7 @@
"next-i18n-router": "^4.1.1",
"postcss": "8.4.36",
"process": "^0.11.10",
"publicodes": "1.1.1",
"publicodes": "1.3.3",
"qrcode.react": "^3.1.0",
"ramda": "^0.29.1",
"react": "18.2.0",
Expand All @@ -70,6 +71,7 @@
"react-select": "^5.8.0",
"react-tooltip": "^5.26.3",
"react-verification-input": "^4.1.0",
"react-wavify": "^1.11.0",
"recharts": "^2.12.3",
"tailwind-merge": "^2.2.2",
"tailwindcss": "3.4.1",
Expand Down Expand Up @@ -113,6 +115,7 @@
"eslint-plugin-jsx-a11y": "^6.8.0",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react-hooks": "^4.6.0",
"glob": "^10.4.1",
"json-stable-stringify": "^1.1.0",
"postcss-loader": "^8.1.0",
"prettier": "^3.1.0",
Expand Down
Binary file modified public/images/ambassadeurs/CNED.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/ambassadeurs/Grandpoitiers.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/ambassadeurs/Grenoble.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/ambassadeurs/La Poste.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/ambassadeurs/TF1 info.jpg
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/ambassadeurs/ac.png
Binary file not shown.
Binary file removed public/images/ambassadeurs/acaclimat.png
Binary file not shown.
Binary file added public/images/ambassadeurs/academieduclimat.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/ambassadeurs/avenir.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/ambassadeurs/avenir_bon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/ambassadeurs/bnp.png
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/ambassadeurs/bnpp.jpg
Binary file not shown.
Binary file removed public/images/ambassadeurs/bon pote.png
Binary file not shown.
Binary file added public/images/ambassadeurs/bonpote.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/ambassadeurs/bpce.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/ambassadeurs/chaville.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/ambassadeurs/citiz.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/ambassadeurs/climates.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/ambassadeurs/code-climat.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/ambassadeurs/covea.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/ambassadeurs/ecofrugal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/ambassadeurs/ecolucide.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/ambassadeurs/france_info.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/ambassadeurs/france_inter.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/ambassadeurs/gabriele.png
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/ambassadeurs/gpso.png
Diff not rendered.
Binary file modified public/images/ambassadeurs/greenly.png
Binary file added public/images/ambassadeurs/he.png
96 changes: 96 additions & 0 deletions public/images/ambassadeurs/illu-cinema.svg

Large diffs are not rendered by default.

Binary file modified public/images/ambassadeurs/je veux aider.png
Binary file added public/images/ambassadeurs/jeuneengage.png
Binary file modified public/images/ambassadeurs/la rochelle.png
Binary file added public/images/ambassadeurs/leboncoin.png
Binary file added public/images/ambassadeurs/lyon.png
Binary file modified public/images/ambassadeurs/mpp.png
Binary file added public/images/ambassadeurs/omaj.png
Binary file added public/images/ambassadeurs/paris-ouest.png
Binary file added public/images/ambassadeurs/poste.png
Binary file removed public/images/ambassadeurs/silicet.png
Diff not rendered.
Binary file added public/images/ambassadeurs/silicetbidule.png
Binary file added public/images/ambassadeurs/sncf-voyageurs.png
Binary file modified public/images/ambassadeurs/sogood.png
Binary file added public/images/ambassadeurs/steply.png
Binary file modified public/images/ambassadeurs/ucl.png
Binary file modified public/images/ambassadeurs/vendredi.png
Binary file added public/images/ambassadeurs/ville-nantes.png
Binary file added public/images/ambassadeurs/wagner.png
Binary file added public/images/ambassadeurs/yami.png
96 changes: 96 additions & 0 deletions public/images/illustrations/at-the-cinema.svg

Large diffs are not rendered by default.

95 changes: 95 additions & 0 deletions public/images/illustrations/children-holding-hand.svg

Large diffs are not rendered by default.

80 changes: 80 additions & 0 deletions public/images/illustrations/delivering-mail.svg

Large diffs are not rendered by default.

60 changes: 60 additions & 0 deletions public/images/illustrations/father-and-son-in-the-train.svg

Large diffs are not rendered by default.

72 changes: 72 additions & 0 deletions public/images/illustrations/girl-cooking.svg

Large diffs are not rendered by default.

49 changes: 49 additions & 0 deletions public/images/illustrations/girl-holding-earth.svg

Large diffs are not rendered by default.

75 changes: 75 additions & 0 deletions public/images/illustrations/girl-reading-newspaper.svg

Large diffs are not rendered by default.

51 changes: 51 additions & 0 deletions public/images/illustrations/girl-thinking.svg

Large diffs are not rendered by default.

117 changes: 117 additions & 0 deletions public/images/illustrations/mother-and-son-on-bike.svg

Large diffs are not rendered by default.

116 changes: 116 additions & 0 deletions public/images/illustrations/people-playing.svg

Large diffs are not rendered by default.

63 changes: 63 additions & 0 deletions public/images/illustrations/people-raising-arm.svg

Large diffs are not rendered by default.

104 changes: 104 additions & 0 deletions public/images/illustrations/people-with-paperboard.svg

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions public/images/misc/404_bonhomme.svg
34 changes: 0 additions & 34 deletions sentry.client.config.ts

This file was deleted.

17 changes: 0 additions & 17 deletions sentry.edge.config.ts

This file was deleted.

19 changes: 0 additions & 19 deletions sentry.server.config.ts

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export async function generateMetadata() {
})
}

export default function AProposPage() {
export default async function AProposPage() {
return (
<>
<PasserTestBanner />
Expand Down

This file was deleted.

67 changes: 42 additions & 25 deletions src/app/(layout-with-navigation)/(pages-statiques)/contact/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import Card from '@/design-system/layout/Card'
import Title from '@/design-system/layout/Title'
import { getServerTranslation } from '@/helpers/getServerTranslation'
import { getMetadataObject } from '@/helpers/metadata/getMetadataObject'
import Image from 'next/image'
import Script from 'next/script'

export async function generateMetadata() {
Expand All @@ -18,33 +19,49 @@ export async function generateMetadata() {
})
}

export default function Contact() {
export default async function Contact() {
const { t } = await getServerTranslation()

return (
<div className="pb-4">
<Title
title={
<span className="flex items-center">
<Trans>Contact</Trans>

<MailIcon className="ml-3 fill-primary-500" />
</span>
}
/>

<p>
<Trans>
N'hésitez pas à consulter notre{' '}
<Link href="/questions-frequentes">FAQ</Link> avant de nous écrire,
vous y trouverez sans doute la réponse à votre question !
</Trans>
</p>

<p>
<Trans>
Pour toute autre remarque ou question, vous pouvez nous envoyer un
message via le formulaire de contact ci-dessous.
</Trans>
</p>
<div className="flex flex-wrap gap-8 pb-8 md:flex-nowrap">
<div>
<Title
title={
<span className="flex items-center">
<Trans>Contact</Trans>

<MailIcon className="ml-3 fill-primary-500" />
</span>
}
/>

<p>
<Trans>
N'hésitez pas à consulter notre{' '}
<Link href="/questions-frequentes">FAQ</Link> avant de nous
écrire, vous y trouverez sans doute la réponse à votre question !
</Trans>
</p>

<p>
<Trans>
Pour toute autre remarque ou question, vous pouvez nous envoyer un
message via le formulaire de contact ci-dessous.
</Trans>
</p>
</div>

<Image
className="self-start"
src="/images/illustrations/delivering-mail.svg"
width="300"
height="400"
alt={t(
'Personne sur un vélo récupérant du courrier dans une boîte aux lettres'
)}
/>
</div>
<Card>
<iframe
data-tally-src="https://tally.so/embed/w59G1Z?alignLeft=1&hideTitle=1&transparentBackground=1&dynamicHeight=1"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
import MDXContent from '@/components/mdx/MDXContent'
import { getServerTranslation } from '@/helpers/getServerTranslation'
import { getMetadataObject } from '@/helpers/metadata/getMetadataObject'
import MentionsLegalesEn from '@/locales/pages/en/mentions-legales.mdx'
import MentionsLegalesEs from '@/locales/pages/es/mentions-legales.mdx'
import MentionsLegalesFr from '@/locales/pages/fr/mentions-legales.mdx'
import { LegalNotice } from '@incubateur-ademe/legal-pages-react/LegalNotice'

export async function generateMetadata() {
const { t } = await getServerTranslation()
Expand All @@ -17,10 +14,18 @@ export async function generateMetadata() {
export default function MentionsLegalesPage() {
return (
<div className="markdown">
<MDXContent
contentEn={MentionsLegalesEn}
contentFr={MentionsLegalesFr}
contentEs={MentionsLegalesEs}
<LegalNotice
includeBetaGouv
siteName="Nos Gestes Climat"
siteUrl={process.env.NEXT_PUBLIC_SITE_URL!}
licenceUrl="https://github.com/incubateur-ademe/nosgestesclimat-site-nextjs/blob/main/LICENSE"
privacyPolicyUrl="/politique-de-confidentialite"
siteHost={{
name: 'Vercel Inc.',
address: '440 N Barranca Ave #4133<br/>Covina, CA 91723',
country: 'États-Unis',
email: 'privacy@vercel.com',
}}
/>
</div>
)
Expand Down
Loading

0 comments on commit 930f19b

Please sign in to comment.