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

Beta #73

Draft
wants to merge 46 commits into
base: develop
Choose a base branch
from
Draft

Beta #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
606348b
Grid: first steps
mbarrenechea Jun 17, 2024
6ab0881
Deckgl integrated. Not working
mbarrenechea Jun 18, 2024
2716bd6
h3 tile layer: datafilter first step
mbarrenechea Jun 18, 2024
7537107
h3 tile layer: datafilter sliders
mbarrenechea Jun 18, 2024
0470d53
H3 tiler: remove d3-color
mbarrenechea Jun 19, 2024
3db47ce
Grid: filters
mbarrenechea Jun 20, 2024
2ea8856
Eslint: fix
mbarrenechea Jun 20, 2024
0ce7090
Tests: fix t3-oss version
mbarrenechea Jun 20, 2024
3472065
Grid: authorization
mbarrenechea Aug 2, 2024
90e3305
Search: fix
mbarrenechea Aug 2, 2024
cc29387
Grid: render
mbarrenechea Aug 2, 2024
361a57e
Remove zoom limit
mbarrenechea Aug 2, 2024
71a5f5e
Grid: datasets and filters
mbarrenechea Aug 5, 2024
466adb9
Grid: filters sync
mbarrenechea Aug 6, 2024
694cd18
Grid: filters styles
mbarrenechea Aug 6, 2024
ddb993e
Grid: filters styles
mbarrenechea Aug 7, 2024
18db651
Search improvements
mbarrenechea Aug 7, 2024
746693d
Merge branch 'develop' of github.com:Vizzuality/amazonia-360 into grid
mbarrenechea Aug 8, 2024
3d87e88
Grid: improve performance
mbarrenechea Aug 9, 2024
7ebb1c2
Prettier
mbarrenechea Aug 12, 2024
6f429ba
Grid: performance improvements
mbarrenechea Sep 5, 2024
7d82244
Arcgis oauth app credentials (#68)
mbarrenechea Oct 28, 2024
c34c9c2
Grid: fix grid layer
mbarrenechea Oct 29, 2024
d05b232
Filters
mbarrenechea Oct 29, 2024
ad73e80
Grid: fix grid layer
mbarrenechea Oct 29, 2024
3b5753d
Grid: extent and highPrecision
mbarrenechea Oct 29, 2024
14e1d0e
Workaround: set 4 filters by default to allow changing between multip…
mbarrenechea Oct 29, 2024
178ef65
Fix: tests
mbarrenechea Oct 31, 2024
32843d5
Merge branch 'develop' of github.com:Vizzuality/amazonia-360 into beta
mbarrenechea Oct 31, 2024
b91b71a
Husky fix (#74)
mbarrenechea Oct 31, 2024
1166bbb
Contextual viewer (#75)
mbarrenechea Nov 4, 2024
bd2a5ae
Report grid (#77)
mbarrenechea Nov 6, 2024
6ace0ce
Feature/grid layout (#80)
mluena Nov 19, 2024
dfdc577
Layers (#81)
mbarrenechea Nov 20, 2024
195baee
H3 grid layer: fix
mbarrenechea Nov 21, 2024
6c80aba
Grid table (#83)
mbarrenechea Nov 25, 2024
5364cf9
Indicators: imagery chart (#84)
mbarrenechea Nov 26, 2024
f24de75
H3 Grid: placeholder (#85)
mbarrenechea Nov 27, 2024
1a1ad91
Report: panels typing
mbarrenechea Nov 27, 2024
a77fa1c
Grid highlight (#86)
mbarrenechea Nov 27, 2024
57947a1
Indicators: dynamic import ImageTileLayer instead of dynamic
mbarrenechea Nov 27, 2024
aae7427
Topics and indicators api (#87)
mluena Nov 28, 2024
cb1fee1
Report: Reset
mbarrenechea Nov 28, 2024
be3ae35
Feature/card controls (#89)
mluena Nov 28, 2024
e637b95
Filter by geometry (#90)
mbarrenechea Nov 28, 2024
e6c28fe
Grid: continuous input filters (#91)
mbarrenechea Dec 10, 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
Binary file modified .DS_Store
Binary file not shown.
2 changes: 2 additions & 0 deletions client/.env.test
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@ ARCGIS_CLIENT_SECRET=""
BASIC_AUTH_USER=amazonia360
BASIC_AUTH_PASSWORD=amazonia360
# BASIC_AUTH_PASSWORD=Amazonia360$MVP/2024

SESSION_SECRET=cat
2 changes: 2 additions & 0 deletions client/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,5 @@ yarn-error.log*
# typescript
*.tsbuildinfo
next-env.d.ts

.vscode
3 changes: 0 additions & 3 deletions client/.husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

# Client linting and type checking
# cd ./client && pnpm types && pnpm lint --fix && pnpm check-types && git add src/types/generated/
cd ./client && pnpm lint --fix && pnpm check-types && pnpm test
Expand Down
8 changes: 8 additions & 0 deletions client/.prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"semi": true,
"tabWidth": 2,
"printWidth": 100,
"singleQuote": false,
"plugins": ["prettier-plugin-tailwindcss"],
"tailwindFunctions": ["clsx"]
}
9 changes: 0 additions & 9 deletions client/.pretttier.js

This file was deleted.

2 changes: 1 addition & 1 deletion client/components.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
"components": "@/components",
"utils": "@/lib/utils"
}
}
}
4 changes: 1 addition & 3 deletions client/jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,7 @@ const config: Config = {
},

// An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
transformIgnorePatterns: [
"node_modules/(?!@arcgis|@esri|@stencil|query-string)",
],
transformIgnorePatterns: ["node_modules/(?!@arcgis|@esri|@stencil|query-string)"],

// An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them
// unmockedModulePathPatterns: undefined,
Expand Down
5 changes: 2 additions & 3 deletions client/next.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,15 @@ import "./src/env.mjs";
/** @type {import('next').NextConfig} */
const nextConfig = {
images: {
unoptimized: true,
remotePatterns: [
{
protocol: "https",
hostname: "js.arcgis.com",
},
],
},
experimental: {
missingSuspenseWithCSRBailout: false,
},
transpilePackages: ["@t3-oss/env-nextjs", "@t3-oss/env-core"],
};

export default nextConfig;
2 changes: 1 addition & 1 deletion client/orval.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ module.exports = {
},
},
input: {
target: "http://15.188.19.207:8000/openapi.json",
target: "https://dev.api.amazonia360.dev-vizzuality.com/openapi.json",
filters: {},
},
},
Expand Down
133 changes: 78 additions & 55 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,90 +9,113 @@
"lint": "next lint",
"check-types": "tsc",
"types": "orval --config ./orval.config.ts",
"prepare": "cd .. && husky install client/.husky",
"prepare": "cd .. && husky client/.husky",
"test": "jest",
"test:watch": "jest --watch"
},
"dependencies": {
"@arcgis/core": "^4.28.10",
"@radix-ui/react-alert-dialog": "^1.0.5",
"@radix-ui/react-checkbox": "^1.0.4",
"@radix-ui/react-collapsible": "^1.0.3",
"@radix-ui/react-dialog": "^1.0.5",
"@arcgis/core": "^4.30.9",
"@deck.gl/arcgis": "^9.0.33",
"@deck.gl/core": "^9.0.33",
"@deck.gl/extensions": "^9.0.33",
"@deck.gl/geo-layers": "^9.0.33",
"@deck.gl/layers": "^9.0.33",
"@dnd-kit/core": "^6.1.0",
"@dnd-kit/modifiers": "^7.0.0",
"@dnd-kit/sortable": "^8.0.0",
"@dnd-kit/utilities": "^3.2.2",
"@loaders.gl/arrow": "4.2.2",
"@loaders.gl/core": "^4.3.1",
"@radix-ui/react-alert-dialog": "^1.1.2",
"@radix-ui/react-checkbox": "^1.1.2",
"@radix-ui/react-collapsible": "^1.1.1",
"@radix-ui/react-dialog": "^1.1.2",
"@radix-ui/react-icons": "^1.3.0",
"@radix-ui/react-label": "^2.0.2",
"@radix-ui/react-popover": "^1.0.7",
"@radix-ui/react-radio-group": "^1.1.3",
"@radix-ui/react-scroll-area": "^1.0.5",
"@radix-ui/react-select": "^2.0.0",
"@radix-ui/react-slot": "^1.0.2",
"@radix-ui/react-label": "^2.1.0",
"@radix-ui/react-popover": "^1.1.2",
"@radix-ui/react-radio-group": "^1.2.1",
"@radix-ui/react-scroll-area": "^1.2.0",
"@radix-ui/react-select": "^2.1.2",
"@radix-ui/react-slider": "^1.2.1",
"@radix-ui/react-slot": "^1.1.0",
"@radix-ui/react-switch": "^1.1.1",
"@radix-ui/react-tabs": "1.0.4",
"@radix-ui/react-tooltip": "^1.0.7",
"@radix-ui/react-tooltip": "^1.1.3",
"@t3-oss/env-nextjs": "^0.7.3",
"@tailwindcss/typography": "^0.5.13",
"@tanstack/react-query": "^5.28.9",
"@tanstack/react-table": "^8.15.3",
"@tailwindcss/typography": "^0.5.15",
"@tanstack/react-query": "^5.59.16",
"@tanstack/react-table": "^8.20.5",
"@turf/bbox": "^7.1.0",
"@turf/helpers": "^7.1.0",
"@types/react-grid-layout": "^1.3.5",
"@visx/annotation": "^3.3.0",
"@visx/event": "3.3.0",
"@visx/group": "^3.3.0",
"@visx/hierarchy": "^3.3.0",
"@visx/legend": "^3.5.0",
"@visx/legend": "^3.10.3",
"@visx/responsive": "^3.10.2",
"@visx/scale": "^3.5.0",
"@visx/shape": "^3.5.0",
"@visx/tooltip": "3.3.0",
"@visx/vendor": "^3.5.0",
"axios": "^1.6.8",
"chroma-js": "^2.4.2",
"axios": "^1.7.7",
"chroma-js": "^2.6.0",
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.0",
"cmdk": "^0.2.1",
"html-react-parser": "^5.1.10",
"jotai": "^2.6.2",
"lucide-react": "0.371.0",
"next": "14.1.0",
"nuqs": "^1.17.0",
"clsx": "^2.1.1",
"cmdk": "^1.0.0",
"h3-js": "^4.1.0",
"html-react-parser": "^5.1.18",
"jotai": "^2.10.1",
"lucide-react": "0.395.0",
"next": "15.0.1",
"numeral": "^2.0.6",
"nuqs": "^1.20.0",
"pluralize": "^8.0.0",
"query-string": "^9.0.0",
"react": "^18",
"react-dom": "^18",
"react-icons": "^5.0.1",
"react-use-cookie": "^1.5.0",
"query-string": "^9.1.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-grid-layout": "^1.5.0",
"react-icons": "^5.3.0",
"react-resizable": "^3.0.5",
"react-resizable-box": "^2.1.0",
"react-use-cookie": "^1.6.1",
"react-window": "^1.8.10",
"react-world-flags": "^1.6.0",
"rooks": "^7.14.1",
"tailwind-merge": "^2.2.0",
"tailwind-merge": "^2.5.4",
"tailwindcss-animate": "^1.0.7",
"ts-deepmerge": "^7.0.0",
"zod": "^3.22.4"
"ts-deepmerge": "^7.0.1",
"zod": "^3.23.8"
},
"devDependencies": {
"@testing-library/jest-dom": "^6.4.5",
"@testing-library/react": "^15.0.7",
"@testing-library/jest-dom": "^6.6.2",
"@testing-library/react": "^16.0.1",
"@types/chroma-js": "^2.4.4",
"@types/jest": "^29.5.12",
"@types/node": "^20",
"@types/jest": "^29.5.14",
"@types/node": "^20.17.0",
"@types/numeral": "^2.0.5",
"@types/pluralize": "^0.0.33",
"@types/react": "^18",
"@types/react-dom": "^18",
"@types/react-world-flags": "^1.4.5",
"@typescript-eslint/eslint-plugin": "^6.19.0",
"@typescript-eslint/parser": "^6.19.0",
"autoprefixer": "^10.0.1",
"eslint": "^8",
"eslint-config-next": "14.1.0",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"@types/react-world-flags": "^1.6.0",
"@typescript-eslint/eslint-plugin": "^7.18.0",
"@typescript-eslint/parser": "^7.18.0",
"autoprefixer": "^10.4.20",
"eslint": "^8.57.1",
"eslint-config-next": "14.2.4",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.1.3",
"husky": "^8.0.3",
"eslint-plugin-prettier": "^5.2.1",
"husky": "^9.1.6",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"orval": "^6.26.0",
"postcss": "^8",
"prettier": "^3.2.4",
"prettier-plugin-tailwindcss": "^0.5.11",
"tailwindcss": "^3.3.0",
"ts-jest": "^29.1.2",
"orval": "^6.31.0",
"postcss": "^8.4.47",
"prettier": "^3.3.3",
"prettier-plugin-tailwindcss": "^0.6.8",
"tailwindcss": "^3.4.14",
"ts-jest": "^29.2.5",
"ts-node": "^10.9.2",
"typescript": "^5"
"typescript": "^5.6.3"
},
"packageManager": "[email protected]+sha256.b6fd0bfda555e7e584ad7e56b30c68b01d5a04f9ee93989f4b93ca8473c49c74"
}
Loading