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

Deployment prod #85

Merged
merged 112 commits into from
Oct 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
112 commits
Select commit Hold shift + click to select a range
ef9e20a
first step : component dashboardsection created needs to be highly re…
oumeimaelisbihani Apr 15, 2024
512d1bd
better layout + env.local + plotly WIP
oumeimaelisbihani Apr 17, 2024
b334fe4
real charts
oumeimaelisbihani Apr 18, 2024
83cb526
feat: add map land plan
Apr 19, 2024
41a54e5
fix: fix build
Apr 19, 2024
8502908
fix: format
Apr 19, 2024
84921c9
npx format
Apr 21, 2024
77ebb81
fix: add env example
Apr 21, 2024
314c3bb
feat: Home webdesign v2 (#8)
TCatinaud Apr 22, 2024
af93403
fix env.example
oumeimaelisbihani Apr 22, 2024
0782a35
antibiotic conso chart
oumeimaelisbihani Apr 22, 2024
a90253d
fix: use yarn for linting
gmguarino Apr 22, 2024
dc6a39c
remove: scaleway deployment
gmguarino Apr 22, 2024
f4e32dc
fix: lint
Apr 22, 2024
0b5f327
style + css on titles + traduction
oumeimaelisbihani Apr 23, 2024
4132084
changes in futur of farm land
oumeimaelisbihani Apr 23, 2024
40f7c1a
feat: update images
Apr 23, 2024
d7f5d80
feat: update home
Apr 23, 2024
0e36cad
feat: update dashboard page
Apr 23, 2024
eab68da
feat: rwd chart
Apr 23, 2024
f643f06
fix: change url
gmguarino Apr 22, 2024
f70cc27
Dashboard page (#10)
gmguarino Apr 24, 2024
ea91419
French version (#12)
gmguarino Apr 25, 2024
ec5d3a6
update explode message (#13)
TCatinaud Apr 25, 2024
9674dd7
Dashboard page (#14)
oumeimaelisbihani Apr 25, 2024
3b30fcd
last translation element dashboard page
oumeimaelisbihani Apr 25, 2024
367e7e3
Merge pull request #16 from dataforgoodfr/french-translation-part-2
oumeimaelisbihani Apr 25, 2024
21f8cfd
feat: home links (#15)
TCatinaud Apr 25, 2024
4648bd3
add: last english translation
gmguarino Apr 25, 2024
4ff3bc8
Merge branch 'main' into dev
gmguarino Apr 25, 2024
6f5acfe
fix: lint
gmguarino Apr 25, 2024
3bb4f03
feat(dashboard): init calculator component
May 15, 2024
f0f6bd2
feat(dashboard): calculator section
May 15, 2024
3708816
fix: lint
May 15, 2024
44f8754
fix(graph): page overflow with graph
May 15, 2024
72f6edf
Merge pull request #19 from dataforgoodfr/dashboard-calculator
Malena-Guallar May 21, 2024
d88cd42
Merge pull request #20 from dataforgoodfr/story-graph-overflow
Malena-Guallar May 21, 2024
206b104
fix: dashboard updates (#22)
Malena-Guallar May 22, 2024
510b801
feat: init change
May 22, 2024
d02a985
feat: change title and graph
May 22, 2024
0714668
Merge pull request #23 from dataforgoodfr/graph-title
Malena-Guallar May 22, 2024
bc84341
feat: add to act link
May 22, 2024
4c4d166
fix lint
May 22, 2024
ecd704a
Merge pull request #24 from dataforgoodfr/cta-to-act
Malena-Guallar May 23, 2024
f598aad
feat(dashboard): update summary links (#21)
TCatinaud May 24, 2024
47842c3
feat: Dashboard graphs meta (#27)
TCatinaud May 24, 2024
d7928cf
fix: updates home page (#26)
Malena-Guallar May 24, 2024
ada31fa
feat: delete unused components (#25)
TCatinaud May 24, 2024
69a87ac
feat: add graphs to frontend (#31)
gmguarino May 26, 2024
b2a4c33
fix: unnecessary linting (#32)
gmguarino May 27, 2024
bead088
feat: add I18n (#28)
TCatinaud May 29, 2024
74e94c9
feat: I18n dashboard (#33)
TCatinaud May 29, 2024
3e92870
feat: story anchors (#34)
TCatinaud May 30, 2024
306e453
feat: init MetaChart component (#35)
TCatinaud May 30, 2024
3998195
fix: first review (#37)
TCatinaud May 31, 2024
effa719
Meta graph v2 (#38)
TCatinaud May 31, 2024
e5593d8
feat: update csv call (#39)
TCatinaud May 31, 2024
8c11fa5
feat(about): init page (#40)
TCatinaud Jun 1, 2024
d417f45
feat(story): update images (#43)
TCatinaud Jun 6, 2024
f621e49
feat(act): update content (#44)
TCatinaud Jun 6, 2024
f80a286
feat: clean markup (#41)
TCatinaud Jun 7, 2024
26effd8
Update figures (#42)
gmguarino Jun 7, 2024
f6d29e6
fix: add end tag p in salmon consumption (#45)
TCatinaud Jun 7, 2024
7782a67
first adjustments dashboards
arogeau Jun 7, 2024
d052dfd
feat: 5 columns indicators RAS
arogeau Jun 10, 2024
340dc8c
Merge pull request #47 from dataforgoodfr/dashboard_update_antoine
arogeau Jun 10, 2024
fe25317
feat: update petition link (#48)
gmguarino Jun 10, 2024
0a47313
Text be the change section (#49)
gmguarino Jun 10, 2024
a7a2cea
feat: update petition link (#50)
TCatinaud Jun 11, 2024
5e76c21
feat: mise a jour finale des graphs json (#51)
sarahrieubland Jun 11, 2024
d15ba35
Feat: Dashboard with latest text (#53)
arogeau Jun 11, 2024
3b508f3
feat: remove alternatives link and resize columns (#57)
gmguarino Jun 12, 2024
a8f4319
feat: add links to download plotly screenshots (#54)
sarahrieubland Jun 12, 2024
f61f6c5
feat: fix html issue in RAS maps (#46)
sarahrieubland Jun 13, 2024
3d381f8
feat: Updated about FR (#56)
arogeau Jun 13, 2024
a5f68e9
feat: Updated about EN (#59)
arogeau Jun 13, 2024
56fbbd9
feat: update of dashboard EN (#55)
arogeau Jun 13, 2024
1890c6c
feat: update images from Paul (#58)
sarahrieubland Jun 13, 2024
c4eb866
feat: Fix abouts FR/EN (#61)
arogeau Jun 13, 2024
cec46ef
feat: fix evolution map png link (#62)
sarahrieubland Jun 14, 2024
82ee27b
feat: add alternative bloc in act page (#60)
TCatinaud Jun 14, 2024
2ecc06a
feat: correct animal welfare (#63)
sarahrieubland Jun 15, 2024
73f5549
commented linkedin section (#65)
gmguarino Jun 17, 2024
c1dd681
Update text (#64)
gmguarino Jun 17, 2024
de52d45
Act update content (#67)
TCatinaud Jun 17, 2024
74455d1
feat: fix dernieres choses (#66)
sarahrieubland Jun 18, 2024
5f810e5
fix: english wording (#68)
gmguarino Jun 18, 2024
1e5c8ad
Fix viz v1 (#69)
gmguarino Jun 18, 2024
7648706
fix link to conso section (#70)
gmguarino Jun 20, 2024
cda028d
feat: text and link to pdf about insect flours (#71)
arogeau Jun 20, 2024
89a926b
feat: update images (#72)
TCatinaud Jun 20, 2024
02cd4de
feat: update microplastic data
Aug 29, 2024
1a4e153
fix-graph-conso (#73)
sarahrieubland Sep 30, 2024
cf46b71
fix change alternatives to food choices (#74)
sarahrieubland Oct 7, 2024
00874e5
feat: update act button color (#76)
TCatinaud Oct 8, 2024
f22de03
feat: add «per year» mention (#77)
TCatinaud Oct 8, 2024
dcf2bef
Globally update content (#75)
TCatinaud Oct 9, 2024
bae3adf
Front review marketing (#78)
TCatinaud Oct 9, 2024
8e0b866
fix: correct social justice
gmguarino Oct 10, 2024
f23ce27
fix english version
gmguarino Oct 10, 2024
6547bcd
fix: methodologies
gmguarino Oct 10, 2024
824bd81
feat: parametrize act/eat image
gmguarino Oct 10, 2024
c349c43
fix: plural
gmguarino Oct 10, 2024
d58c6bc
feat: update act form link (#81)
TCatinaud Oct 10, 2024
6d4cd5b
feat: add legal notices page (#82)
TCatinaud Oct 10, 2024
3520a83
fix: social justice
gmguarino Oct 10, 2024
2b4bc42
fix: donate en
gmguarino Oct 10, 2024
9ffb41d
fix: remove images from "about" section
gmguarino Oct 10, 2024
92596c3
fix: remove unused import
gmguarino Oct 10, 2024
aede2a2
fixed: update wording (#84)
TCatinaud Oct 11, 2024
46141aa
rebase on main
gmguarino Oct 11, 2024
a003ff6
rebase on main 2
gmguarino Oct 11, 2024
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
7 changes: 3 additions & 4 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
# !STARTERCONF Duplicate this to .env.local
# !STARTERCONF Duplicate this to .env

# DEVELOPMENT TOOLS
# Ideally, don't add them to production deployment envs
# !STARTERCONF Change to true if you want to log data
NEXT_PUBLIC_SHOW_LOGGER="true"

NEXT_PUBLIC_PINKBOMBS_DATA_URL="https://pinkbombsfkynigjl-pinkbombs-data.functions.fnc.fr-par.scw.cloud/api/v1/secure/graphs"
#NEXT_PUBLIC_PINKBOMBS_DATA_URL="https://pinkbombsfkynigjl-pinkbombs-data.functions.fnc.fr-par.scw.cloud:8080/"
NEXT_PUBLIC_PINKBOMBS_DATA_API_KEY="pinkbombs"
export PINKBOMBS_DATA_URL=https://pinkbombsfkynigjl-pinkbombs-data.functions.fnc.fr-par.scw.cloud/api/v1/secure
export PINKBOMBS_DATA_API_KEY=pinkbombs
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ module.exports = {
"no-console": "warn",
"@typescript-eslint/explicit-module-boundary-types": "off",
"react/no-unescaped-entities": "off",
"@next/next/no-sync-scripts": "off",

"react/display-name": "off",
"react/jsx-curly-brace-presence": [
Expand Down
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,5 @@ yarn-error.log*
CHANGELOG.md

pnpm-lock.yaml

dashboard
12 changes: 7 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,15 @@ yarn dev

Open [http://localhost:3000](http://localhost:3000) with your browser to see the result. You can start editing the page by modifying `src/pages/index.tsx`.

### 4. Change defaults
### 4. Build and test

There are some things you need to change including title, urls, favicons, etc.
Run the followed command:

Find all comments with !STARTERCONF, then follow the guide.

Don't forget to change the package name in package.json
- Build the project: `yarn build`
- Launch linter: `yarn lint:strict`
- Launch Typecheck: `yarn typecheck`
- Launch Prettier: `yarn format:check`
- Launch Jest: `yarn test`

### 5. Commit Message Convention

Expand Down
52 changes: 52 additions & 0 deletions messages/en/components.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"components": {
"summary": {
"title": "page"
},
"edito": {
"link": "See more"
},
"shareLink": {
"blank": "new tab",
"twitter": "Twitter",
"linkedin": "Linkedin",
"website": "Website",
"email": "Email",
"newsletter": "Newsletter",
"instagram": "Instagram"
},
"chart": {
"loading": "Loading data.."
},
"calculator": {
"intro": "Here are the impacts of the salmon industry around the world since you opened this web page.",
"seconds": "seconds",
"second": "second"
},
"join": {
"main": {
"title": "Be the change.",
"intro": "Don't want to be part of this ecological and social disaster? Good news, solutions exist!",
"content": "<p><strong>Governments, businesses, and citizens can work together to be part of these solutions.</strong></p><ul><li><strong>Governments</strong> an regulate to abandon intensive farming of carnivorous fish - such as salmon and tuna - and to stop overfishing worldwide.</li> <li><strong>Businesses</strong> must commit to increasing plant-based options and developing low-trophic level aquaculture, such as algae and shellfish.</li><li> <strong>Individually,</strong> let's make the simple choice to exclude industrial salmon from our plates, in order to collectively accelerate the revolution towards a more plant-based food system that meets health, sustainability, and social justice imperatives.</li></ul>",
"act": "To reverse the trend and stop the disaster, urgent action is needed. We have levers for action!",
"link": "I act"
},
"alternatives": {
"title": "Food choices and their impact",
"intro": "What we choose to eat, sell, and produce has different impacts on the planet, people, and animals.",
"content": "<p>France, <strong>the largest European consumer</strong> and among the top 4 largest consumers of salmon in the world, bears a particular responsibility in shaping these choices.</p>",
"pdf": "https://raw.githubusercontent.com/dataforgoodfr/12_pinkbombs/main/download/Table_food_choices_simplified_en.pdf",
"data": "https://raw.githubusercontent.com/dataforgoodfr/12_pinkbombs/main/download/csv/foodchoices_text_7.csv.zip",
"artifact": "foodchoices_text_7.csv.zip",
"image": "https://raw.githubusercontent.com/dataforgoodfr/12_pinkbombs/main/download/graphs_image/foodchoices_7.png"
}
},
"metaChart": {
"source": "Main source",
"methodology": "Methodology",
"image": "Image",
"data": "Data",
"document": "PDF"
}
}
}
23 changes: 23 additions & 0 deletions messages/en/layout.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"layout": {
"top": "Back to top",
"nav": {
"title": "main",
"story": "Story",
"dashboard": "Dashboard",
"act": "To act",
"about": "About"
},
"footer": {
"allRight": "All rights reserved",
"and": "and",
"donation": "Donate",
"legalNotice": "Legal notices"
}
},
"siteConfig": {
"title": "Pinkbombs",
"description": "Analyzing the impact of Salmon on the Environment, Ecosystem, Health and Communities.",
"url": "https://pinkbombs-app.vercel.app"
}
}
135 changes: 135 additions & 0 deletions messages/en/pages/about.json

Large diffs are not rendered by default.

51 changes: 51 additions & 0 deletions messages/en/pages/act.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
{
"act": {
"meta": {
"title": "To act"
},
"title": "Good news: defusing the Pinkbombs is just a click away",
"company": {
"title": "I call on the responsible companies",
"content": "by sharing a pre-written information post that identifies them on Linkedin.",
"link": "Post on Linkedin",
"target": "https://www.linkedin.com/sharing/share-offsite/?url=https://pinkbombs.org/&text=Hey%20%40pure-salmon%2C%20en%20tant%20qu%27acteur%20majeur%20de%20l%27industrie%20du%20saumon%2C%20vous%20avez%20le%20pouvoir%20de%20changer%20vos%20pratiques%20et%20vous%20orienter%20vers%20proc%C3%A9d%C3%A9s%20plus%20%C3%A9thiques%20et%20respectueux%20de%20l%27environnement%20comme%20du%20saumon%20lui-m%C3%AAme.%0ASi%20vous%20voulez%20d%C3%A9couvrir%20la%20r%C3%A9alit%C3%A9%20de%20l%27industrie%20du%20saumon%2C%20allez%20visiter%20notre%20site%20%3A"
},
"territory": {
"title": "I say no to the salmon factory project on my territory",
"content": "The onshore salmon factory project called “Pure Salmon”, an initiative of the Singaporean investment fund 8F Asset Management, is under discussion near Bordeaux. Thanks to petitions signed by citizens, it was notably rejected in Pas-de-Calais and Brittany. Let's keep going!",
"link": "Sign the petition",
"target": "https://www.wesign.it/fr/environnement/non-a-lelevage-intensif-de-saumons-au-verdon-sur-mer"
},
"seastemik": {
"title": "I support Seastemik",
"content": "Seastemik is an association poum created in 2023 with the objective of accelerating our transition to a healthy Ocean. It raises awareness of the impacts of a food system that exploits the Ocean, supports citizen mobilizations, calls on politicians to get involved and supports the iodine revolution of companies by proposing positive solutions.<br />Every action counts! Join the wave of change and help Seastemik change the tide, for a <em>truly</em> living Ocean:",
"ctas": [
{
"label": "Donate on HelloAsso",
"target": "https://www.helloasso.com/associations/seastemik/formulaires/1"
},
{
"label": "Subscribe to the newsletter",
"target": "https://seastemik.org/newsletter"
},
{
"label": "Follow Seastemik",
"target": "https://seastemik.org/"
}
]
},
"eat": {
"title": "I leave salmon off my plate",
"content": "Ready to set out to leave salmon in the oceans and rivers? <br />What objective seems achievable to you? Leave it in our intention box to help the community grow!",
"link": "I'm participating",
"target": "https://forms.gle/5kNG7BDeZBQmq6vY9",
"image": "/images/act/no-eat-salmon.jpeg"
},
"report": {
"title": "Educate yourself and share to act better",
"content": "Reading and sharing Seastemik's report on the salmon industry helps deconstruct the distorted popular perception of salmon consumption. Enjoy reading!",
"link": "Read our report",
"target": "https://seastemik.org/publications"
}
}
}
Loading
Loading