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

Dashboard page #7

Closed
wants to merge 35 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
b424e41
first step : component dashboardsection created needs to be highly re…
oumeimaelisbihani Apr 15, 2024
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
8b8eec5
Merge branch 'dashboard-page' of github.com:dataforgoodfr/12_pinkbomb…
Malena-Guallar Apr 24, 2024
508fd41
feat: update home styles + open graph image
Apr 24, 2024
5c51b77
ancres and WIP components
oumeimaelisbihani Apr 24, 2024
43ebb3e
feat: Added graphs to home page + join block
Malena-Guallar Apr 24, 2024
ca34ae0
biodiversity - Introduction - companies OK
oumeimaelisbihani Apr 24, 2024
f0b8d6d
src for customdashboard
oumeimaelisbihani Apr 24, 2024
475fdfe
Merge branch 'update_graph' into dashboard-page
Malena-Guallar Apr 24, 2024
e2d1595
fix: dynamic load plotly
gmguarino Apr 24, 2024
9dc654c
add: apiPath variable to call ras-map
gmguarino Apr 24, 2024
85fd4b7
Fix: Infinite loop (#9)
gmguarino Apr 24, 2024
3cb3c3e
end of dashboard section
oumeimaelisbihani Apr 25, 2024
4baad19
fix: explode text lpace
Apr 25, 2024
9d81bfc
map RAS
oumeimaelisbihani Apr 25, 2024
dab8aa3
RAS map fix
oumeimaelisbihani Apr 25, 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
6 changes: 5 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,8 @@
# 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="false"
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"
84 changes: 42 additions & 42 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,74 +4,74 @@ module.exports = {
es2021: true,
node: true,
},
plugins: ['@typescript-eslint', 'simple-import-sort', 'unused-imports'],
plugins: ["@typescript-eslint", "simple-import-sort", "unused-imports"],
extends: [
'eslint:recommended',
'next',
'next/core-web-vitals',
'plugin:@typescript-eslint/recommended',
'prettier',
"eslint:recommended",
"next",
"next/core-web-vitals",
"plugin:@typescript-eslint/recommended",
"prettier",
],
rules: {
'no-unused-vars': 'off',
'no-console': 'warn',
'@typescript-eslint/explicit-module-boundary-types': 'off',
'react/no-unescaped-entities': 'off',
"no-unused-vars": "off",
"no-console": "warn",
"@typescript-eslint/explicit-module-boundary-types": "off",
"react/no-unescaped-entities": "off",

'react/display-name': 'off',
'react/jsx-curly-brace-presence': [
'warn',
{ props: 'never', children: 'never' },
"react/display-name": "off",
"react/jsx-curly-brace-presence": [
"warn",
{ props: "never", children: "never" },
],

//#region //*=========== Unused Import ===========
'@typescript-eslint/no-unused-vars': 'off',
'unused-imports/no-unused-imports': 'warn',
'unused-imports/no-unused-vars': [
'warn',
"@typescript-eslint/no-unused-vars": "off",
"unused-imports/no-unused-imports": "warn",
"unused-imports/no-unused-vars": [
"warn",
{
vars: 'all',
varsIgnorePattern: '^_',
args: 'after-used',
argsIgnorePattern: '^_',
vars: "all",
varsIgnorePattern: "^_",
args: "after-used",
argsIgnorePattern: "^_",
},
],
//#endregion //*======== Unused Import ===========

//#region //*=========== Import Sort ===========
'simple-import-sort/exports': 'warn',
'simple-import-sort/imports': [
'warn',
"simple-import-sort/exports": "warn",
"simple-import-sort/imports": [
"warn",
{
groups: [
// ext library & side effect imports
['^@?\\w', '^\\u0000'],
["^@?\\w", "^\\u0000"],
// {s}css files
['^.+\\.s?css$'],
["^.+\\.s?css$"],
// Lib and hooks
['^@/lib', '^@/hooks'],
["^@/lib", "^@/hooks"],
// static data
['^@/data'],
["^@/data"],
// components
['^@/components', '^@/container'],
["^@/components", "^@/container"],
// zustand store
['^@/store'],
["^@/store"],
// Other imports
['^@/'],
["^@/"],
// relative paths up until 3 level
[
'^\\./?$',
'^\\.(?!/?$)',
'^\\.\\./?$',
'^\\.\\.(?!/?$)',
'^\\.\\./\\.\\./?$',
'^\\.\\./\\.\\.(?!/?$)',
'^\\.\\./\\.\\./\\.\\./?$',
'^\\.\\./\\.\\./\\.\\.(?!/?$)',
"^\\./?$",
"^\\.(?!/?$)",
"^\\.\\./?$",
"^\\.\\.(?!/?$)",
"^\\.\\./\\.\\./?$",
"^\\.\\./\\.\\.(?!/?$)",
"^\\.\\./\\.\\./\\.\\./?$",
"^\\.\\./\\.\\./\\.\\.(?!/?$)",
],
['^@/types'],
["^@/types"],
// other that didnt fit in
['^'],
["^"],
],
},
],
Expand Down
2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ liberapay: # Replace with a single Liberapay username
issuehunt: # Replace with a single IssueHunt username
otechie: # Replace with a single Otechie username
lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
custom: ['https://saweria.co/theodorusclarence']
custom: ["https://saweria.co/theodorusclarence"]
2 changes: 1 addition & 1 deletion .github/issue-branch.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# https://github.com/robvanderleek/create-issue-branch#option-2-configure-github-action

# ex: i4-lower_camel_upper
branchName: 'i${issue.number}-${issue.title,}'
branchName: "i${issue.number}-${issue.title,}"
branches:
- label: epic
skip: true
Expand Down
55 changes: 0 additions & 55 deletions .github/workflows/build-image.yaml

This file was deleted.

8 changes: 4 additions & 4 deletions .github/workflows/issue-autolink.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'Issue Autolink'
name: "Issue Autolink"
on:
pull_request:
types: [opened]
Expand All @@ -11,6 +11,6 @@ jobs:
steps:
- uses: tkt-actions/[email protected]
with:
repo-token: '${{ secrets.GITHUB_TOKEN }}'
branch-prefix: 'i'
resolve: 'true'
repo-token: "${{ secrets.GITHUB_TOKEN }}"
branch-prefix: "i"
resolve: "true"
20 changes: 8 additions & 12 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,28 +17,24 @@ jobs:
- name: ⬇️ Checkout repo
uses: actions/checkout@v2

- name: 🤌 Setup pnpm
uses: pnpm/action-setup@v2
with:
version: 8

- name: ⎔ Setup node
uses: actions/setup-node@v3
with:
node-version: 20
cache: 'pnpm'
node-version: 18

- name: 📥 Download deps
run: pnpm install --frozen-lockfile
uses: u0reo/npm-install@fix/restore-failure
with:
useRollingCache: true

- name: 🔬 Lint
run: pnpm run lint:strict
run: yarn lint:strict

- name: 🔎 Type check
run: pnpm run typecheck
run: yarn typecheck

- name: 💅 Prettier check
run: pnpm run format:check
run: yarn format:check

- name: 🃏 Run jest
run: pnpm run test
run: yarn test
2 changes: 1 addition & 1 deletion .prettierrc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module.exports = {
arrowParens: 'always',
arrowParens: "always",
singleQuote: true,
jsxSingleQuote: true,
tabWidth: 2,
Expand Down
6 changes: 3 additions & 3 deletions .vscode/css.code-snippets
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"body": [
"/* #region /**=========== ${1} =========== */",
"$0",
"/* #endregion /**======== ${1} =========== */"
]
}
"/* #endregion /**======== ${1} =========== */",
],
},
}
Loading