Skip to content

Commit

Permalink
Countries data
Browse files Browse the repository at this point in the history
  • Loading branch information
mbarrenechea committed Oct 23, 2023
1 parent 5a0f57a commit d2159a8
Show file tree
Hide file tree
Showing 8 changed files with 112 additions and 61 deletions.
12 changes: 12 additions & 0 deletions client/src/containers/home/index.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,22 @@
"use client";

import { useGetCountries } from "@/types/generated/country";

const Home = (): JSX.Element => {
const { data: countriesData } = useGetCountries({
"pagination[pageSize]": 100,
});

return (
<div className="flex h-full overflow-auto">
<div className="p-5">
<h1 className="text-3xl">Explore datasets</h1>

<ul className="mt-5">
{countriesData?.data?.data?.map((country) => (
<li key={country.id}>{country.attributes?.name}</li>
))}
</ul>
</div>
</div>
);
Expand Down
2 changes: 1 addition & 1 deletion client/src/containers/navigation/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const Navigation = (): JSX.Element => {
<ul className="w-full text-xs">
<li className="py-5 text-center">
<Link className="flex flex-col items-center justify-center gap-1" href="/">
<Image alt="CCSA Logo" width={72} height={59} src="/logo.svg" />
<Image priority alt="CCSA Logo" width={72} height={59} src="/logo.svg" />
</Link>
</li>
<li className="py-5 text-center">
Expand Down
2 changes: 1 addition & 1 deletion client/src/services/api/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export const API = <T>(
...config,
...options,
cancelToken: source.token,
}).then(({ data }) => data);
});

// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
Expand Down
8 changes: 4 additions & 4 deletions client/src/types/generated/strapi.schemas.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1324,10 +1324,10 @@ export interface DatasetRequest {
export type CountryResponseMeta = { [key: string]: any };

export interface Country {
bbox: unknown;
bbox?: unknown;
createdAt?: string;
createdBy?: CountryCreatedBy;
geometry: unknown;
geometry?: unknown;
iso3: string;
name: string;
publishedAt?: string;
Expand Down Expand Up @@ -1550,8 +1550,8 @@ export interface CountryListResponse {
}

export type CountryRequestData = {
bbox: unknown;
geometry: unknown;
bbox?: unknown;
geometry?: unknown;
iso3: string;
name: string;
};
Expand Down
24 changes: 24 additions & 0 deletions cms/config/sync/user-role.public.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,30 @@
"description": "Default role given to unauthenticated user.",
"type": "public",
"permissions": [
{
"action": "api::country.country.find"
},
{
"action": "api::country.country.findOne"
},
{
"action": "api::dataset.dataset.find"
},
{
"action": "api::dataset.dataset.findOne"
},
{
"action": "api::layer.layer.find"
},
{
"action": "api::layer.layer.findOne"
},
{
"action": "api::project.project.find"
},
{
"action": "api::project.project.findOne"
},
{
"action": "plugin::users-permissions.auth.callback"
},
Expand Down
4 changes: 2 additions & 2 deletions cms/src/api/country/content-types/country/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
},
"geometry": {
"type": "json",
"required": true
"required": false
},
"bbox": {
"type": "json",
"required": true
"required": false
}
}
}
4 changes: 2 additions & 2 deletions cms/types/generated/contentTypes.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -376,8 +376,8 @@ export interface ApiCountryCountry extends Schema.CollectionType {
attributes: {
name: Attribute.String & Attribute.Required & Attribute.Unique;
iso3: Attribute.String & Attribute.Required & Attribute.Unique;
geometry: Attribute.JSON & Attribute.Required;
bbox: Attribute.JSON & Attribute.Required;
geometry: Attribute.JSON;
bbox: Attribute.JSON;
createdAt: Attribute.DateTime;
updatedAt: Attribute.DateTime;
publishedAt: Attribute.DateTime;
Expand Down
117 changes: 66 additions & 51 deletions cms/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2924,8 +2924,8 @@ __metadata:
linkType: hard

"@strapi/ui-primitives@npm:^1.12.2":
version: 1.12.2
resolution: "@strapi/ui-primitives@npm:1.12.2"
version: 1.13.0
resolution: "@strapi/ui-primitives@npm:1.13.0"
dependencies:
"@radix-ui/number": ^1.0.1
"@radix-ui/primitive": ^1.0.1
Expand All @@ -2947,11 +2947,11 @@ __metadata:
"@radix-ui/react-use-previous": ^1.0.1
"@radix-ui/react-visually-hidden": ^1.0.3
aria-hidden: ^1.2.3
react-remove-scroll: ^2.5.6
react-remove-scroll: ^2.5.7
peerDependencies:
react: ^17.0.0 || ^18.0.0
react-dom: ^17.0.0 || ^18.0.0
checksum: 6661c65fca1d38d23e3b104e629a0a80d293f9a4d066b6d343faeef31f6afa007799dfe8290270480a842565cb8786e09554ded9b83ca62a21f8798ff4ab256b
checksum: 47ee65b6e63a16f1e788d169a601a6e740767198d1299e88248cdb7854085893ae09d037ef2efd41eefafa3c7ea925707fecd89aa72d33ae814a66fa80c48e2b
languageName: node
linkType: hard

Expand Down Expand Up @@ -3120,14 +3120,14 @@ __metadata:
linkType: hard

"@types/express-serve-static-core@npm:*, @types/express-serve-static-core@npm:^4.17.33":
version: 4.17.38
resolution: "@types/express-serve-static-core@npm:4.17.38"
version: 4.17.39
resolution: "@types/express-serve-static-core@npm:4.17.39"
dependencies:
"@types/node": "*"
"@types/qs": "*"
"@types/range-parser": "*"
"@types/send": "*"
checksum: 22d057c9e890ead9cf7518afb0a41d378bf265d850be6a3f7c0294e6a7b43812aec3a8ce29aabfc8027024563136e917b0f2311b4f74250921c84ceca15b11a2
checksum: 4227b96a53f0cf19d01fdb77a74252660f8e70650b79167e591b04c66ec9c7330d0a00038939415f96664a67312b21798bbac150fe81bf613380849b96546c37
languageName: node
linkType: hard

Expand Down Expand Up @@ -3337,13 +3337,13 @@ __metadata:
linkType: hard

"@types/react@npm:*, @types/react@npm:16 || 17 || 18":
version: 18.2.29
resolution: "@types/react@npm:18.2.29"
version: 18.2.31
resolution: "@types/react@npm:18.2.31"
dependencies:
"@types/prop-types": "*"
"@types/scheduler": "*"
csstype: ^3.0.2
checksum: 3d09ac61a683fa976512a28ac175b9d823f0368adc5fb2abf53f64ab030e8ad866a201a8029f92ff48246c8e326f7517ebe165f976ecb412627c65c6f9a7c9d3
checksum: b11be8e39174d3303e308461400889e353e422d22b01d09795b2c35b7b99d5351716503d9ec5c58e4c2c871249603fa52840d45a34fb5901dd7a26e06129c716
languageName: node
linkType: hard

Expand Down Expand Up @@ -4541,12 +4541,13 @@ __metadata:
linkType: hard

"call-bind@npm:^1.0.0":
version: 1.0.2
resolution: "call-bind@npm:1.0.2"
version: 1.0.5
resolution: "call-bind@npm:1.0.5"
dependencies:
function-bind: ^1.1.1
get-intrinsic: ^1.0.2
checksum: f8e31de9d19988a4b80f3e704788c4a2d6b6f3d17cfec4f57dc29ced450c53a49270dc66bf0fbd693329ee948dd33e6c90a329519aef17474a4d961e8d6426b0
function-bind: ^1.1.2
get-intrinsic: ^1.2.1
set-function-length: ^1.1.1
checksum: 449e83ecbd4ba48e7eaac5af26fea3b50f8f6072202c2dd7c5a6e7a6308f2421abe5e13a3bbd55221087f76320c5e09f25a8fdad1bab2b77c68ae74d92234ea5
languageName: node
linkType: hard

Expand Down Expand Up @@ -4592,9 +4593,9 @@ __metadata:
linkType: hard

"caniuse-lite@npm:^1.0.30001541":
version: 1.0.30001551
resolution: "caniuse-lite@npm:1.0.30001551"
checksum: ffdee85b1c130cbebf0aa978ba839f3525f8e304855ba9bf0fbefaac8dd8c40051a7e19ac84a7cf4ba026410abcbe6f8b45560b22ee417c52daecaf955108e65
version: 1.0.30001553
resolution: "caniuse-lite@npm:1.0.30001553"
checksum: 45d6a2a3c3a098c8093a4c8883fceafb4bbf59d96f6fd5bb381ba4581d07eecbe0ede4f55383f0d49374154ff6a808bd90fbe32b17ccd1738034d2579787b33c
languageName: node
linkType: hard

Expand Down Expand Up @@ -5287,9 +5288,9 @@ __metadata:
linkType: hard

"core-js-pure@npm:^3.23.3, core-js-pure@npm:^3.30.2":
version: 3.33.0
resolution: "core-js-pure@npm:3.33.0"
checksum: d47084a4de9a0cef9779eccd3ac9f435cf9fd7aa71794150cd4c6b305036bcc392d94766d4a7b6456bdd08faba7752d55c2ec40185bda161c3563081c9fa1e17
version: 3.33.1
resolution: "core-js-pure@npm:3.33.1"
checksum: 8accbdf5449b5e8c368a0a3569f281ef6ad3369c023766fe4f4cd8336af671852f0fa123a0172cd47b193b7d522d72eb01bd0c5c1620f0bac21150a91c2f72a1
languageName: node
linkType: hard

Expand Down Expand Up @@ -5613,7 +5614,7 @@ __metadata:
languageName: node
linkType: hard

"define-data-property@npm:^1.0.1":
"define-data-property@npm:^1.0.1, define-data-property@npm:^1.1.1":
version: 1.1.1
resolution: "define-data-property@npm:1.1.1"
dependencies:
Expand Down Expand Up @@ -5985,9 +5986,9 @@ __metadata:
linkType: hard

"electron-to-chromium@npm:^1.4.535":
version: 1.4.559
resolution: "electron-to-chromium@npm:1.4.559"
checksum: 020388642361ee08744256d3e56842d28611b0ba5967897cba574e08abb6ad851c03626393f326cbb85e65318ee85afd240a5dbf1e72f3fb04f3050243146228
version: 1.4.563
resolution: "electron-to-chromium@npm:1.4.563"
checksum: 50512b9662688291b1c4e921def7206bab1ebd57f5bf5bdbb7961842ae69b4baad5df1293084b62ea07686c578e42ed17546434d7c9102960914240770921a5b
languageName: node
linkType: hard

Expand Down Expand Up @@ -7075,7 +7076,7 @@ __metadata:
languageName: node
linkType: hard

"function-bind@npm:^1.1.1":
"function-bind@npm:^1.1.2":
version: 1.1.2
resolution: "function-bind@npm:1.1.2"
checksum: 2b0ff4ce708d99715ad14a6d1f894e2a83242e4a52ccfcefaee5e40050562e5f6dafc1adbb4ce2d4ab47279a45dc736ab91ea5042d843c3c092820dfe032efb1
Expand Down Expand Up @@ -7112,15 +7113,15 @@ __metadata:
languageName: node
linkType: hard

"get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.1":
version: 1.2.1
resolution: "get-intrinsic@npm:1.2.1"
"get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.1, get-intrinsic@npm:^1.2.2":
version: 1.2.2
resolution: "get-intrinsic@npm:1.2.2"
dependencies:
function-bind: ^1.1.1
has: ^1.0.3
function-bind: ^1.1.2
has-proto: ^1.0.1
has-symbols: ^1.0.3
checksum: 5b61d88552c24b0cf6fa2d1b3bc5459d7306f699de060d76442cce49a4721f52b8c560a33ab392cf5575b7810277d54ded9d4d39a1ea61855619ebc005aa7e5f
hasown: ^2.0.0
checksum: 447ff0724df26829908dc033b62732359596fcf66027bc131ab37984afb33842d9cd458fd6cecadfe7eac22fd8a54b349799ed334cf2726025c921c7250e7417
languageName: node
linkType: hard

Expand Down Expand Up @@ -7495,11 +7496,11 @@ __metadata:
linkType: hard

"has-property-descriptors@npm:^1.0.0":
version: 1.0.0
resolution: "has-property-descriptors@npm:1.0.0"
version: 1.0.1
resolution: "has-property-descriptors@npm:1.0.1"
dependencies:
get-intrinsic: ^1.1.1
checksum: a6d3f0a266d0294d972e354782e872e2fe1b6495b321e6ef678c9b7a06a40408a6891817350c62e752adced73a94ac903c54734fee05bf65b1905ee1368194bb
get-intrinsic: ^1.2.2
checksum: 2bcc6bf6ec6af375add4e4b4ef586e43674850a91ad4d46666d0b28ba8e1fd69e424c7677d24d60f69470ad0afaa2f3197f508b20b0bb7dd99a8ab77ffc4b7c4
languageName: node
linkType: hard

Expand Down Expand Up @@ -7572,13 +7573,6 @@ __metadata:
languageName: node
linkType: hard

"has@npm:^1.0.3":
version: 1.0.4
resolution: "has@npm:1.0.4"
checksum: 8a11ba062e0627c9578a1d08285401e39f1d071a9692ddf793199070edb5648b21c774dd733e2a181edd635bf6862731885f476f4ccf67c998d7a5ff7cef2550
languageName: node
linkType: hard

"hash.js@npm:^1.0.0, hash.js@npm:^1.0.3":
version: 1.1.7
resolution: "hash.js@npm:1.1.7"
Expand All @@ -7589,6 +7583,15 @@ __metadata:
languageName: node
linkType: hard

"hasown@npm:^2.0.0":
version: 2.0.0
resolution: "hasown@npm:2.0.0"
dependencies:
function-bind: ^1.1.2
checksum: 6151c75ca12554565098641c98a40f4cc86b85b0fd5b6fe92360967e4605a4f9610f7757260b4e8098dd1c2ce7f4b095f2006fe72a570e3b6d2d28de0298c176
languageName: node
linkType: hard

"he@npm:^1.2.0":
version: 1.2.0
resolution: "he@npm:1.2.0"
Expand Down Expand Up @@ -8284,11 +8287,11 @@ __metadata:
linkType: hard

"is-core-module@npm:^2.13.0":
version: 2.13.0
resolution: "is-core-module@npm:2.13.0"
version: 2.13.1
resolution: "is-core-module@npm:2.13.1"
dependencies:
has: ^1.0.3
checksum: 053ab101fb390bfeb2333360fd131387bed54e476b26860dc7f5a700bbf34a0ec4454f7c8c4d43e8a0030957e4b3db6e16d35e1890ea6fb654c833095e040355
hasown: ^2.0.0
checksum: 256559ee8a9488af90e4bad16f5583c6d59e92f0742e9e8bb4331e758521ee86b810b93bae44f390766ffbc518a0488b18d9dab7da9a5ff997d499efc9403f7c
languageName: node
linkType: hard

Expand Down Expand Up @@ -10355,9 +10358,9 @@ __metadata:
linkType: hard

"object-inspect@npm:^1.9.0":
version: 1.13.0
resolution: "object-inspect@npm:1.13.0"
checksum: 21353e910a3079466cb44adca71d8bef15bd8b87e518eb68bb33d82c5c70b83193993edce432cc92268f7dd02c4a8ab338663a011844367d0bd0559f6dde1fed
version: 1.13.1
resolution: "object-inspect@npm:1.13.1"
checksum: 7d9fa9221de3311dcb5c7c307ee5dc011cdd31dc43624b7c184b3840514e118e05ef0002be5388304c416c0eb592feb46e983db12577fc47e47d5752fbbfb61f
languageName: node
linkType: hard

Expand Down Expand Up @@ -11723,7 +11726,7 @@ __metadata:
languageName: node
linkType: hard

"react-remove-scroll@npm:^2.5.6":
"react-remove-scroll@npm:^2.5.6, react-remove-scroll@npm:^2.5.7":
version: 2.5.7
resolution: "react-remove-scroll@npm:2.5.7"
dependencies:
Expand Down Expand Up @@ -12556,6 +12559,18 @@ __metadata:
languageName: node
linkType: hard

"set-function-length@npm:^1.1.1":
version: 1.1.1
resolution: "set-function-length@npm:1.1.1"
dependencies:
define-data-property: ^1.1.1
get-intrinsic: ^1.2.1
gopd: ^1.0.1
has-property-descriptors: ^1.0.0
checksum: c131d7569cd7e110cafdfbfbb0557249b538477624dfac4fc18c376d879672fa52563b74029ca01f8f4583a8acb35bb1e873d573a24edb80d978a7ee607c6e06
languageName: node
linkType: hard

"set-value@npm:^2.0.0, set-value@npm:^2.0.1":
version: 2.0.1
resolution: "set-value@npm:2.0.1"
Expand Down

0 comments on commit d2159a8

Please sign in to comment.