From 9d6d5d657f6e509da7b4ee1b06e8086488a677a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa?= Date: Tue, 1 Oct 2024 14:41:09 +0200 Subject: [PATCH 1/8] viweport update --- client/src/app/(auth)/signin/page.tsx | 1 + client/src/app/(auth)/signup/page.tsx | 1 + .../src/app/(dashboard)/dashboard/(profile)/[[...id]]/page.tsx | 1 + .../app/(dashboard)/dashboard/collaborators/[[...id]]/page.tsx | 1 + .../dashboard/datasets/changes-to-approve/[id]/page.tsx | 1 + .../src/app/(dashboard)/dashboard/datasets/edit/[id]/page.tsx | 1 + client/src/app/(dashboard)/dashboard/datasets/new/page.tsx | 1 + .../app/(dashboard)/dashboard/other-tools/[[...id]]/page.tsx | 1 + .../src/app/(dashboard)/dashboard/projects/[[...id]]/page.tsx | 1 + client/src/app/(password)/reset-password/page.tsx | 1 + client/src/app/(password)/update-password/page.tsx | 3 ++- client/src/app/layout.tsx | 1 + 12 files changed, 13 insertions(+), 1 deletion(-) diff --git a/client/src/app/(auth)/signin/page.tsx b/client/src/app/(auth)/signin/page.tsx index b2021344..1809848b 100644 --- a/client/src/app/(auth)/signin/page.tsx +++ b/client/src/app/(auth)/signin/page.tsx @@ -5,6 +5,7 @@ import Signin from "@/components/forms/signin"; export const metadata: Metadata = { title: "Sign in | Caribbean Climate smart map", description: "Generated by create next app", + viewport: "width=1000, initial-scale=1", }; export default function SigninPage() { diff --git a/client/src/app/(auth)/signup/page.tsx b/client/src/app/(auth)/signup/page.tsx index d0b2a91f..3484de72 100644 --- a/client/src/app/(auth)/signup/page.tsx +++ b/client/src/app/(auth)/signup/page.tsx @@ -5,6 +5,7 @@ import Signup from "@/components/forms/signup"; export const metadata: Metadata = { title: "Sign up | Caribbean Climate smart map", description: "Caribbean Climate smart map", + viewport: "width=1000, initial-scale=1", }; export default function SignupPage() { diff --git a/client/src/app/(dashboard)/dashboard/(profile)/[[...id]]/page.tsx b/client/src/app/(dashboard)/dashboard/(profile)/[[...id]]/page.tsx index 4b98f4de..6a681317 100644 --- a/client/src/app/(dashboard)/dashboard/(profile)/[[...id]]/page.tsx +++ b/client/src/app/(dashboard)/dashboard/(profile)/[[...id]]/page.tsx @@ -5,6 +5,7 @@ import DashboardContent from "@/containers/dashboard"; export const metadata: Metadata = { title: "Dashboard | Caribbean Climate smart map", description: "Generated by create next app", + viewport: "width=1000, initial-scale=1", }; export default function DashboardPage() { diff --git a/client/src/app/(dashboard)/dashboard/collaborators/[[...id]]/page.tsx b/client/src/app/(dashboard)/dashboard/collaborators/[[...id]]/page.tsx index 08fd1c18..340ec358 100644 --- a/client/src/app/(dashboard)/dashboard/collaborators/[[...id]]/page.tsx +++ b/client/src/app/(dashboard)/dashboard/collaborators/[[...id]]/page.tsx @@ -5,6 +5,7 @@ import CollaboratorsForm from "@/containers/collaborators/form"; export const metadata: Metadata = { title: "Create new collaborator | Caribbean Climate smart map", description: "Generated by create next app", + viewport: "width=1000, initial-scale=1", }; export default function CollaboratorPage() { diff --git a/client/src/app/(dashboard)/dashboard/datasets/changes-to-approve/[id]/page.tsx b/client/src/app/(dashboard)/dashboard/datasets/changes-to-approve/[id]/page.tsx index e370e2c0..9ba5b3b8 100644 --- a/client/src/app/(dashboard)/dashboard/datasets/changes-to-approve/[id]/page.tsx +++ b/client/src/app/(dashboard)/dashboard/datasets/changes-to-approve/[id]/page.tsx @@ -28,6 +28,7 @@ import { export const metadata: Metadata = { title: "Changes to approve | Caribbean Climate smart map", description: "Generated by create next app", + viewport: "width=1000, initial-scale=1", }; export default async function ChangesToApprovePage({ params }: { params: { id: number } }) { diff --git a/client/src/app/(dashboard)/dashboard/datasets/edit/[id]/page.tsx b/client/src/app/(dashboard)/dashboard/datasets/edit/[id]/page.tsx index 689a8202..89d23475 100644 --- a/client/src/app/(dashboard)/dashboard/datasets/edit/[id]/page.tsx +++ b/client/src/app/(dashboard)/dashboard/datasets/edit/[id]/page.tsx @@ -23,6 +23,7 @@ import { export const metadata: Metadata = { title: "Edit dataset form | Caribbean Climate smart map", description: "Generated by create next app", + viewport: "width=1000, initial-scale=1", }; export default async function EditDatasetPage({ params }: { params: { id: number } }) { diff --git a/client/src/app/(dashboard)/dashboard/datasets/new/page.tsx b/client/src/app/(dashboard)/dashboard/datasets/new/page.tsx index 143a7e2f..7070b588 100644 --- a/client/src/app/(dashboard)/dashboard/datasets/new/page.tsx +++ b/client/src/app/(dashboard)/dashboard/datasets/new/page.tsx @@ -16,6 +16,7 @@ import { export const metadata: Metadata = { title: "New dataset form | Caribbean Climate smart map", description: "Generated by create next app", + viewport: "width=1000, initial-scale=1", }; export default function NewDatasetPage() { diff --git a/client/src/app/(dashboard)/dashboard/other-tools/[[...id]]/page.tsx b/client/src/app/(dashboard)/dashboard/other-tools/[[...id]]/page.tsx index d59149d6..822e1435 100644 --- a/client/src/app/(dashboard)/dashboard/other-tools/[[...id]]/page.tsx +++ b/client/src/app/(dashboard)/dashboard/other-tools/[[...id]]/page.tsx @@ -5,6 +5,7 @@ import ToolForm from "@/containers/other-tools/form"; export const metadata: Metadata = { title: "Create / edit a tool | Caribbean Climate smart map", description: "Generated by create next app", + viewport: "width=1000, initial-scale=1", }; export default function OtherToolsFormPage() { diff --git a/client/src/app/(dashboard)/dashboard/projects/[[...id]]/page.tsx b/client/src/app/(dashboard)/dashboard/projects/[[...id]]/page.tsx index e21f9c66..3905b40e 100644 --- a/client/src/app/(dashboard)/dashboard/projects/[[...id]]/page.tsx +++ b/client/src/app/(dashboard)/dashboard/projects/[[...id]]/page.tsx @@ -5,6 +5,7 @@ import ProjectForm from "@/containers/projects/form"; export const metadata: Metadata = { title: "Create / edit a project | Caribbean Climate smart map", description: "Generated by create next app", + viewport: "width=1000, initial-scale=1", }; export default function NewProjectsPage() { diff --git a/client/src/app/(password)/reset-password/page.tsx b/client/src/app/(password)/reset-password/page.tsx index b465ea26..bdd9391a 100644 --- a/client/src/app/(password)/reset-password/page.tsx +++ b/client/src/app/(password)/reset-password/page.tsx @@ -5,6 +5,7 @@ import ResetPassword from "@/components/forms/reset-password"; export const metadata: Metadata = { title: "Reset Password | Caribbean Climate smart map", description: "Generated by create next app", + viewport: "width=1000, initial-scale=1", }; export default function ResetPasswordPage() { diff --git a/client/src/app/(password)/update-password/page.tsx b/client/src/app/(password)/update-password/page.tsx index 936de8b1..8598ac50 100644 --- a/client/src/app/(password)/update-password/page.tsx +++ b/client/src/app/(password)/update-password/page.tsx @@ -3,8 +3,9 @@ import { Metadata } from "next"; import PasswordUpdate from "@/components/forms/password-update"; export const metadata: Metadata = { - title: "Reset Password | Caribbean Climate smart map", + title: "Update Password | Caribbean Climate smart map", description: "Generated by create next app", + viewport: "width=1000, initial-scale=1", }; export default function UpdatePasswordPage() { diff --git a/client/src/app/layout.tsx b/client/src/app/layout.tsx index 0f819bd0..37204acc 100644 --- a/client/src/app/layout.tsx +++ b/client/src/app/layout.tsx @@ -29,6 +29,7 @@ import LayoutProviders from "./layout-providers"; export const metadata: Metadata = { title: { template: "%s | CCSA", default: "CCSA" }, description: "Caribbean Climate smart map", + viewport: "width=1000, initial-scale=1", }; export default async function RootLayout({ children }: PropsWithChildren) { From ab2b54a8371ea45ec22ba3a7117e6885da6cca18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa?= Date: Wed, 2 Oct 2024 12:09:33 +0200 Subject: [PATCH 2/8] new field for reviewers --- client/src/types/generated/strapi.schemas.ts | 22 +++++++++++++++++++ .../collaborator-edit-suggestion/schema.json | 3 +++ .../content-types/collaborator/schema.json | 5 ++++- .../dataset-edit-suggestion/schema.json | 3 +++ .../project-edit-suggestion/schema.json | 3 +++ cms/types/generated/contentTypes.d.ts | 3 +++ 6 files changed, 38 insertions(+), 1 deletion(-) diff --git a/client/src/types/generated/strapi.schemas.ts b/client/src/types/generated/strapi.schemas.ts index a6c4ad2d..46fe3141 100644 --- a/client/src/types/generated/strapi.schemas.ts +++ b/client/src/types/generated/strapi.schemas.ts @@ -3318,6 +3318,7 @@ export type SdgProjectsDataItemAttributesPillarDataAttributesProjectEditSuggesti publishedAt?: string; review_decision_details?: string; review_status?: SdgProjectsDataItemAttributesPillarDataAttributesProjectEditSuggestionsDataItemAttributesReviewStatus; + reviewed_by?: string; sdgs?: SdgProjectsDataItemAttributesPillarDataAttributesProjectEditSuggestionsDataItemAttributesSdgs; source_country?: string; status?: string; @@ -3917,6 +3918,7 @@ export type SdgProjectsDataItemAttributesCountriesDataItemAttributesDatasetValue publishedAt?: string; review_decision_details?: string; review_status?: SdgProjectsDataItemAttributesCountriesDataItemAttributesDatasetValuesDataItemAttributesDatasetDataAttributesLayersDataItemAttributesDatasetEditSuggestionDataAttributesReviewStatus; + reviewed_by?: string; unit?: string; updatedAt?: string; updatedBy?: SdgProjectsDataItemAttributesCountriesDataItemAttributesDatasetValuesDataItemAttributesDatasetDataAttributesLayersDataItemAttributesDatasetEditSuggestionDataAttributesUpdatedBy; @@ -5140,6 +5142,7 @@ export interface ProjectEditSuggestion { publishedAt?: string; review_decision_details?: string; review_status: ProjectEditSuggestionReviewStatus; + reviewed_by?: string; sdgs?: ProjectEditSuggestionSdgs; source_country?: string; status?: string; @@ -5414,6 +5417,7 @@ export type ProjectEditSuggestionPillarDataAttributesProjectsDataItemAttributesS publishedAt?: string; review_decision_details?: string; review_status?: ProjectEditSuggestionPillarDataAttributesProjectsDataItemAttributesSdgsDataItemAttributesProjectEditSuggestionsDataItemAttributesReviewStatus; + reviewed_by?: string; sdgs?: ProjectEditSuggestionPillarDataAttributesProjectsDataItemAttributesSdgsDataItemAttributesProjectEditSuggestionsDataItemAttributesSdgs; source_country?: string; status?: string; @@ -6163,6 +6167,7 @@ export type ProjectEditSuggestionCountriesDataItemAttributesDatasetValuesDataIte publishedAt?: string; review_decision_details?: string; review_status?: ProjectEditSuggestionCountriesDataItemAttributesDatasetValuesDataItemAttributesDatasetDataAttributesLayersDataItemAttributesDatasetEditSuggestionDataAttributesReviewStatus; + reviewed_by?: string; unit?: string; updatedAt?: string; updatedBy?: ProjectEditSuggestionCountriesDataItemAttributesDatasetValuesDataItemAttributesDatasetDataAttributesLayersDataItemAttributesDatasetEditSuggestionDataAttributesUpdatedBy; @@ -6619,6 +6624,7 @@ export type ProjectEditSuggestionRequestData = { project?: ProjectEditSuggestionRequestDataProject; review_decision_details?: string; review_status: ProjectEditSuggestionRequestDataReviewStatus; + reviewed_by?: string; sdgs?: ProjectEditSuggestionRequestDataSdgsItem[]; source_country?: string; status?: string; @@ -6821,6 +6827,7 @@ export type ProjectPillarDataAttributesProjectsDataItemAttributesSdgsDataItemAtt publishedAt?: string; review_decision_details?: string; review_status?: ProjectPillarDataAttributesProjectsDataItemAttributesSdgsDataItemAttributesProjectEditSuggestionsDataItemAttributesReviewStatus; + reviewed_by?: string; sdgs?: ProjectPillarDataAttributesProjectsDataItemAttributesSdgsDataItemAttributesProjectEditSuggestionsDataItemAttributesSdgs; source_country?: string; status?: string; @@ -7458,6 +7465,7 @@ export type ProjectCountriesDataItemAttributesDatasetValuesDataItemAttributesDat publishedAt?: string; review_decision_details?: string; review_status?: ProjectCountriesDataItemAttributesDatasetValuesDataItemAttributesDatasetDataAttributesLayersDataItemAttributesDatasetEditSuggestionDataAttributesReviewStatus; + reviewed_by?: string; unit?: string; updatedAt?: string; updatedBy?: ProjectCountriesDataItemAttributesDatasetValuesDataItemAttributesDatasetDataAttributesLayersDataItemAttributesDatasetEditSuggestionDataAttributesUpdatedBy; @@ -8327,6 +8335,7 @@ export type PillarProjectsDataItemAttributesPillarDataAttributesProjectEditSugge publishedAt?: string; review_decision_details?: string; review_status?: PillarProjectsDataItemAttributesPillarDataAttributesProjectEditSuggestionsDataItemAttributesReviewStatus; + reviewed_by?: string; sdgs?: PillarProjectsDataItemAttributesPillarDataAttributesProjectEditSuggestionsDataItemAttributesSdgs; source_country?: string; status?: string; @@ -8955,6 +8964,7 @@ export type PillarProjectsDataItemAttributesCountriesDataItemAttributesDatasetVa publishedAt?: string; review_decision_details?: string; review_status?: PillarProjectsDataItemAttributesCountriesDataItemAttributesDatasetValuesDataItemAttributesDatasetDataAttributesLayersDataItemAttributesDatasetEditSuggestionDataAttributesReviewStatus; + reviewed_by?: string; unit?: string; updatedAt?: string; updatedBy?: PillarProjectsDataItemAttributesCountriesDataItemAttributesDatasetValuesDataItemAttributesDatasetDataAttributesLayersDataItemAttributesDatasetEditSuggestionDataAttributesUpdatedBy; @@ -11135,6 +11145,7 @@ export type LayerDatasetDataAttributesLayersDataItemAttributesDatasetEditSuggest publishedAt?: string; review_decision_details?: string; review_status?: LayerDatasetDataAttributesLayersDataItemAttributesDatasetEditSuggestionDataAttributesReviewStatus; + reviewed_by?: string; unit?: string; updatedAt?: string; updatedBy?: LayerDatasetDataAttributesLayersDataItemAttributesDatasetEditSuggestionDataAttributesUpdatedBy; @@ -12393,6 +12404,7 @@ export type DatasetValueDatasetDataAttributesLayersDataItemAttributesDatasetEdit publishedAt?: string; review_decision_details?: string; review_status?: DatasetValueDatasetDataAttributesLayersDataItemAttributesDatasetEditSuggestionDataAttributesReviewStatus; + reviewed_by?: string; unit?: string; updatedAt?: string; updatedBy?: DatasetValueDatasetDataAttributesLayersDataItemAttributesDatasetEditSuggestionDataAttributesUpdatedBy; @@ -13235,6 +13247,7 @@ export interface DatasetEditSuggestion { publishedAt?: string; review_decision_details?: string; review_status: DatasetEditSuggestionReviewStatus; + reviewed_by?: string; unit?: string; updatedAt?: string; updatedBy?: DatasetEditSuggestionUpdatedBy; @@ -13337,6 +13350,7 @@ export type DatasetEditSuggestionCategoryDataAttributesDatasetEditSuggestionsDat publishedAt?: string; review_decision_details?: string; review_status?: DatasetEditSuggestionCategoryDataAttributesDatasetEditSuggestionsDataItemAttributesReviewStatus; + reviewed_by?: string; unit?: string; updatedAt?: string; updatedBy?: DatasetEditSuggestionCategoryDataAttributesDatasetEditSuggestionsDataItemAttributesUpdatedBy; @@ -14245,6 +14259,7 @@ export type DatasetEditSuggestionRequestData = { name?: string; review_decision_details?: string; review_status: DatasetEditSuggestionRequestDataReviewStatus; + reviewed_by?: string; unit?: string; value_type?: DatasetEditSuggestionRequestDataValueType; }; @@ -14687,6 +14702,7 @@ export type DatasetLayersDataItemAttributesDatasetDataAttributesDatasetEditSugge publishedAt?: string; review_decision_details?: string; review_status?: DatasetLayersDataItemAttributesDatasetDataAttributesDatasetEditSuggestionsDataItemAttributesReviewStatus; + reviewed_by?: string; unit?: string; updatedAt?: string; updatedBy?: DatasetLayersDataItemAttributesDatasetDataAttributesDatasetEditSuggestionsDataItemAttributesUpdatedBy; @@ -15579,6 +15595,7 @@ export type CountryDatasetValuesDataItemAttributesDatasetDataAttributesLayersDat publishedAt?: string; review_decision_details?: string; review_status?: CountryDatasetValuesDataItemAttributesDatasetDataAttributesLayersDataItemAttributesDatasetEditSuggestionDataAttributesReviewStatus; + reviewed_by?: string; unit?: string; updatedAt?: string; updatedBy?: CountryDatasetValuesDataItemAttributesDatasetDataAttributesLayersDataItemAttributesDatasetEditSuggestionDataAttributesUpdatedBy; @@ -16599,6 +16616,7 @@ export type CollaboratorEditSuggestionCollaboratorDataAttributesCollaboratorEdit publishedAt?: string; review_decision_details?: string; review_status?: CollaboratorEditSuggestionCollaboratorDataAttributesCollaboratorEditSuggestionsDataItemAttributesReviewStatus; + reviewed_by?: string; type?: CollaboratorEditSuggestionCollaboratorDataAttributesCollaboratorEditSuggestionsDataItemAttributesType; updatedAt?: string; updatedBy?: CollaboratorEditSuggestionCollaboratorDataAttributesCollaboratorEditSuggestionsDataItemAttributesUpdatedBy; @@ -16942,6 +16960,7 @@ export interface CollaboratorEditSuggestion { publishedAt?: string; review_decision_details?: string; review_status: CollaboratorEditSuggestionReviewStatus; + reviewed_by?: string; type?: CollaboratorEditSuggestionType; updatedAt?: string; updatedBy?: CollaboratorEditSuggestionUpdatedBy; @@ -17312,6 +17331,7 @@ export type CollaboratorEditSuggestionRequestData = { name?: string; review_decision_details?: string; review_status: CollaboratorEditSuggestionRequestDataReviewStatus; + reviewed_by?: string; type?: CollaboratorEditSuggestionRequestDataType; }; @@ -17494,6 +17514,7 @@ export type CollaboratorCollaboratorEditSuggestionsDataItemAttributes = { publishedAt?: string; review_decision_details?: string; review_status?: CollaboratorCollaboratorEditSuggestionsDataItemAttributesReviewStatus; + reviewed_by?: string; type?: CollaboratorCollaboratorEditSuggestionsDataItemAttributesType; updatedAt?: string; updatedBy?: CollaboratorCollaboratorEditSuggestionsDataItemAttributesUpdatedBy; @@ -18427,6 +18448,7 @@ export type CategoryDatasetEditSuggestionsDataItemAttributes = { publishedAt?: string; review_decision_details?: string; review_status?: CategoryDatasetEditSuggestionsDataItemAttributesReviewStatus; + reviewed_by?: string; unit?: string; updatedAt?: string; updatedBy?: CategoryDatasetEditSuggestionsDataItemAttributesUpdatedBy; diff --git a/cms/src/api/collaborator-edit-suggestion/content-types/collaborator-edit-suggestion/schema.json b/cms/src/api/collaborator-edit-suggestion/content-types/collaborator-edit-suggestion/schema.json index 07cab7c2..c9a1ced1 100644 --- a/cms/src/api/collaborator-edit-suggestion/content-types/collaborator-edit-suggestion/schema.json +++ b/cms/src/api/collaborator-edit-suggestion/content-types/collaborator-edit-suggestion/schema.json @@ -56,6 +56,9 @@ }, "review_decision_details": { "type": "text" + }, + "reviewed_by": { + "type": "string" } } } diff --git a/cms/src/api/collaborator/content-types/collaborator/schema.json b/cms/src/api/collaborator/content-types/collaborator/schema.json index f213882b..a1883b11 100644 --- a/cms/src/api/collaborator/content-types/collaborator/schema.json +++ b/cms/src/api/collaborator/content-types/collaborator/schema.json @@ -21,7 +21,10 @@ }, "type": { "type": "enumeration", - "enum": ["donor", "collaborator"], + "enum": [ + "donor", + "collaborator" + ], "required": true }, "collaborator_edit_suggestions": { diff --git a/cms/src/api/dataset-edit-suggestion/content-types/dataset-edit-suggestion/schema.json b/cms/src/api/dataset-edit-suggestion/content-types/dataset-edit-suggestion/schema.json index 1964dd0a..83d2f7c4 100644 --- a/cms/src/api/dataset-edit-suggestion/content-types/dataset-edit-suggestion/schema.json +++ b/cms/src/api/dataset-edit-suggestion/content-types/dataset-edit-suggestion/schema.json @@ -72,6 +72,9 @@ }, "review_decision_details": { "type": "text" + }, + "reviewed_by": { + "type": "string" } } } diff --git a/cms/src/api/project-edit-suggestion/content-types/project-edit-suggestion/schema.json b/cms/src/api/project-edit-suggestion/content-types/project-edit-suggestion/schema.json index c29d463e..bf077c25 100644 --- a/cms/src/api/project-edit-suggestion/content-types/project-edit-suggestion/schema.json +++ b/cms/src/api/project-edit-suggestion/content-types/project-edit-suggestion/schema.json @@ -87,6 +87,9 @@ }, "review_decision_details": { "type": "text" + }, + "reviewed_by": { + "type": "string" } } } diff --git a/cms/types/generated/contentTypes.d.ts b/cms/types/generated/contentTypes.d.ts index 6560ce51..ad61d96c 100644 --- a/cms/types/generated/contentTypes.d.ts +++ b/cms/types/generated/contentTypes.d.ts @@ -788,6 +788,7 @@ export interface ApiCollaboratorEditSuggestionCollaboratorEditSuggestion >; image: Attribute.Media; review_decision_details: Attribute.Text; + reviewed_by: Attribute.String; createdAt: Attribute.DateTime; updatedAt: Attribute.DateTime; publishedAt: Attribute.DateTime; @@ -950,6 +951,7 @@ export interface ApiDatasetEditSuggestionDatasetEditSuggestion >; colors: Attribute.JSON; review_decision_details: Attribute.Text; + reviewed_by: Attribute.String; createdAt: Attribute.DateTime; updatedAt: Attribute.DateTime; publishedAt: Attribute.DateTime; @@ -1407,6 +1409,7 @@ export interface ApiProjectEditSuggestionProjectEditSuggestion 'api::project.project' >; review_decision_details: Attribute.Text; + reviewed_by: Attribute.String; createdAt: Attribute.DateTime; updatedAt: Attribute.DateTime; publishedAt: Attribute.DateTime; From 1c918669f02ad582580465441493fa6813e5f3ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa?= Date: Tue, 24 Sep 2024 16:48:29 +0200 Subject: [PATCH 3/8] deploy fix From bc25a2aa51dd33e710f5b5aa1609440a9d7a866d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa?= Date: Tue, 24 Sep 2024 16:50:53 +0200 Subject: [PATCH 4/8] v1 --- client/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/package.json b/client/package.json index a127bee3..fef0f63a 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "ccsa-client", - "version": "0.2.0", + "version": "1.0.0", "private": true, "scripts": { "dev": "yarn types && next dev", From 56a9d2515fad5200a5ebfaa7546c30a5728601ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa?= Date: Wed, 2 Oct 2024 12:09:33 +0200 Subject: [PATCH 5/8] new field for reviewers --- client/src/types/generated/strapi.schemas.ts | 22 +++++++++++++++++++ .../collaborator-edit-suggestion/schema.json | 3 +++ .../content-types/collaborator/schema.json | 5 ++++- .../dataset-edit-suggestion/schema.json | 3 +++ .../project-edit-suggestion/schema.json | 3 +++ cms/types/generated/contentTypes.d.ts | 3 +++ 6 files changed, 38 insertions(+), 1 deletion(-) diff --git a/client/src/types/generated/strapi.schemas.ts b/client/src/types/generated/strapi.schemas.ts index a6c4ad2d..46fe3141 100644 --- a/client/src/types/generated/strapi.schemas.ts +++ b/client/src/types/generated/strapi.schemas.ts @@ -3318,6 +3318,7 @@ export type SdgProjectsDataItemAttributesPillarDataAttributesProjectEditSuggesti publishedAt?: string; review_decision_details?: string; review_status?: SdgProjectsDataItemAttributesPillarDataAttributesProjectEditSuggestionsDataItemAttributesReviewStatus; + reviewed_by?: string; sdgs?: SdgProjectsDataItemAttributesPillarDataAttributesProjectEditSuggestionsDataItemAttributesSdgs; source_country?: string; status?: string; @@ -3917,6 +3918,7 @@ export type SdgProjectsDataItemAttributesCountriesDataItemAttributesDatasetValue publishedAt?: string; review_decision_details?: string; review_status?: SdgProjectsDataItemAttributesCountriesDataItemAttributesDatasetValuesDataItemAttributesDatasetDataAttributesLayersDataItemAttributesDatasetEditSuggestionDataAttributesReviewStatus; + reviewed_by?: string; unit?: string; updatedAt?: string; updatedBy?: SdgProjectsDataItemAttributesCountriesDataItemAttributesDatasetValuesDataItemAttributesDatasetDataAttributesLayersDataItemAttributesDatasetEditSuggestionDataAttributesUpdatedBy; @@ -5140,6 +5142,7 @@ export interface ProjectEditSuggestion { publishedAt?: string; review_decision_details?: string; review_status: ProjectEditSuggestionReviewStatus; + reviewed_by?: string; sdgs?: ProjectEditSuggestionSdgs; source_country?: string; status?: string; @@ -5414,6 +5417,7 @@ export type ProjectEditSuggestionPillarDataAttributesProjectsDataItemAttributesS publishedAt?: string; review_decision_details?: string; review_status?: ProjectEditSuggestionPillarDataAttributesProjectsDataItemAttributesSdgsDataItemAttributesProjectEditSuggestionsDataItemAttributesReviewStatus; + reviewed_by?: string; sdgs?: ProjectEditSuggestionPillarDataAttributesProjectsDataItemAttributesSdgsDataItemAttributesProjectEditSuggestionsDataItemAttributesSdgs; source_country?: string; status?: string; @@ -6163,6 +6167,7 @@ export type ProjectEditSuggestionCountriesDataItemAttributesDatasetValuesDataIte publishedAt?: string; review_decision_details?: string; review_status?: ProjectEditSuggestionCountriesDataItemAttributesDatasetValuesDataItemAttributesDatasetDataAttributesLayersDataItemAttributesDatasetEditSuggestionDataAttributesReviewStatus; + reviewed_by?: string; unit?: string; updatedAt?: string; updatedBy?: ProjectEditSuggestionCountriesDataItemAttributesDatasetValuesDataItemAttributesDatasetDataAttributesLayersDataItemAttributesDatasetEditSuggestionDataAttributesUpdatedBy; @@ -6619,6 +6624,7 @@ export type ProjectEditSuggestionRequestData = { project?: ProjectEditSuggestionRequestDataProject; review_decision_details?: string; review_status: ProjectEditSuggestionRequestDataReviewStatus; + reviewed_by?: string; sdgs?: ProjectEditSuggestionRequestDataSdgsItem[]; source_country?: string; status?: string; @@ -6821,6 +6827,7 @@ export type ProjectPillarDataAttributesProjectsDataItemAttributesSdgsDataItemAtt publishedAt?: string; review_decision_details?: string; review_status?: ProjectPillarDataAttributesProjectsDataItemAttributesSdgsDataItemAttributesProjectEditSuggestionsDataItemAttributesReviewStatus; + reviewed_by?: string; sdgs?: ProjectPillarDataAttributesProjectsDataItemAttributesSdgsDataItemAttributesProjectEditSuggestionsDataItemAttributesSdgs; source_country?: string; status?: string; @@ -7458,6 +7465,7 @@ export type ProjectCountriesDataItemAttributesDatasetValuesDataItemAttributesDat publishedAt?: string; review_decision_details?: string; review_status?: ProjectCountriesDataItemAttributesDatasetValuesDataItemAttributesDatasetDataAttributesLayersDataItemAttributesDatasetEditSuggestionDataAttributesReviewStatus; + reviewed_by?: string; unit?: string; updatedAt?: string; updatedBy?: ProjectCountriesDataItemAttributesDatasetValuesDataItemAttributesDatasetDataAttributesLayersDataItemAttributesDatasetEditSuggestionDataAttributesUpdatedBy; @@ -8327,6 +8335,7 @@ export type PillarProjectsDataItemAttributesPillarDataAttributesProjectEditSugge publishedAt?: string; review_decision_details?: string; review_status?: PillarProjectsDataItemAttributesPillarDataAttributesProjectEditSuggestionsDataItemAttributesReviewStatus; + reviewed_by?: string; sdgs?: PillarProjectsDataItemAttributesPillarDataAttributesProjectEditSuggestionsDataItemAttributesSdgs; source_country?: string; status?: string; @@ -8955,6 +8964,7 @@ export type PillarProjectsDataItemAttributesCountriesDataItemAttributesDatasetVa publishedAt?: string; review_decision_details?: string; review_status?: PillarProjectsDataItemAttributesCountriesDataItemAttributesDatasetValuesDataItemAttributesDatasetDataAttributesLayersDataItemAttributesDatasetEditSuggestionDataAttributesReviewStatus; + reviewed_by?: string; unit?: string; updatedAt?: string; updatedBy?: PillarProjectsDataItemAttributesCountriesDataItemAttributesDatasetValuesDataItemAttributesDatasetDataAttributesLayersDataItemAttributesDatasetEditSuggestionDataAttributesUpdatedBy; @@ -11135,6 +11145,7 @@ export type LayerDatasetDataAttributesLayersDataItemAttributesDatasetEditSuggest publishedAt?: string; review_decision_details?: string; review_status?: LayerDatasetDataAttributesLayersDataItemAttributesDatasetEditSuggestionDataAttributesReviewStatus; + reviewed_by?: string; unit?: string; updatedAt?: string; updatedBy?: LayerDatasetDataAttributesLayersDataItemAttributesDatasetEditSuggestionDataAttributesUpdatedBy; @@ -12393,6 +12404,7 @@ export type DatasetValueDatasetDataAttributesLayersDataItemAttributesDatasetEdit publishedAt?: string; review_decision_details?: string; review_status?: DatasetValueDatasetDataAttributesLayersDataItemAttributesDatasetEditSuggestionDataAttributesReviewStatus; + reviewed_by?: string; unit?: string; updatedAt?: string; updatedBy?: DatasetValueDatasetDataAttributesLayersDataItemAttributesDatasetEditSuggestionDataAttributesUpdatedBy; @@ -13235,6 +13247,7 @@ export interface DatasetEditSuggestion { publishedAt?: string; review_decision_details?: string; review_status: DatasetEditSuggestionReviewStatus; + reviewed_by?: string; unit?: string; updatedAt?: string; updatedBy?: DatasetEditSuggestionUpdatedBy; @@ -13337,6 +13350,7 @@ export type DatasetEditSuggestionCategoryDataAttributesDatasetEditSuggestionsDat publishedAt?: string; review_decision_details?: string; review_status?: DatasetEditSuggestionCategoryDataAttributesDatasetEditSuggestionsDataItemAttributesReviewStatus; + reviewed_by?: string; unit?: string; updatedAt?: string; updatedBy?: DatasetEditSuggestionCategoryDataAttributesDatasetEditSuggestionsDataItemAttributesUpdatedBy; @@ -14245,6 +14259,7 @@ export type DatasetEditSuggestionRequestData = { name?: string; review_decision_details?: string; review_status: DatasetEditSuggestionRequestDataReviewStatus; + reviewed_by?: string; unit?: string; value_type?: DatasetEditSuggestionRequestDataValueType; }; @@ -14687,6 +14702,7 @@ export type DatasetLayersDataItemAttributesDatasetDataAttributesDatasetEditSugge publishedAt?: string; review_decision_details?: string; review_status?: DatasetLayersDataItemAttributesDatasetDataAttributesDatasetEditSuggestionsDataItemAttributesReviewStatus; + reviewed_by?: string; unit?: string; updatedAt?: string; updatedBy?: DatasetLayersDataItemAttributesDatasetDataAttributesDatasetEditSuggestionsDataItemAttributesUpdatedBy; @@ -15579,6 +15595,7 @@ export type CountryDatasetValuesDataItemAttributesDatasetDataAttributesLayersDat publishedAt?: string; review_decision_details?: string; review_status?: CountryDatasetValuesDataItemAttributesDatasetDataAttributesLayersDataItemAttributesDatasetEditSuggestionDataAttributesReviewStatus; + reviewed_by?: string; unit?: string; updatedAt?: string; updatedBy?: CountryDatasetValuesDataItemAttributesDatasetDataAttributesLayersDataItemAttributesDatasetEditSuggestionDataAttributesUpdatedBy; @@ -16599,6 +16616,7 @@ export type CollaboratorEditSuggestionCollaboratorDataAttributesCollaboratorEdit publishedAt?: string; review_decision_details?: string; review_status?: CollaboratorEditSuggestionCollaboratorDataAttributesCollaboratorEditSuggestionsDataItemAttributesReviewStatus; + reviewed_by?: string; type?: CollaboratorEditSuggestionCollaboratorDataAttributesCollaboratorEditSuggestionsDataItemAttributesType; updatedAt?: string; updatedBy?: CollaboratorEditSuggestionCollaboratorDataAttributesCollaboratorEditSuggestionsDataItemAttributesUpdatedBy; @@ -16942,6 +16960,7 @@ export interface CollaboratorEditSuggestion { publishedAt?: string; review_decision_details?: string; review_status: CollaboratorEditSuggestionReviewStatus; + reviewed_by?: string; type?: CollaboratorEditSuggestionType; updatedAt?: string; updatedBy?: CollaboratorEditSuggestionUpdatedBy; @@ -17312,6 +17331,7 @@ export type CollaboratorEditSuggestionRequestData = { name?: string; review_decision_details?: string; review_status: CollaboratorEditSuggestionRequestDataReviewStatus; + reviewed_by?: string; type?: CollaboratorEditSuggestionRequestDataType; }; @@ -17494,6 +17514,7 @@ export type CollaboratorCollaboratorEditSuggestionsDataItemAttributes = { publishedAt?: string; review_decision_details?: string; review_status?: CollaboratorCollaboratorEditSuggestionsDataItemAttributesReviewStatus; + reviewed_by?: string; type?: CollaboratorCollaboratorEditSuggestionsDataItemAttributesType; updatedAt?: string; updatedBy?: CollaboratorCollaboratorEditSuggestionsDataItemAttributesUpdatedBy; @@ -18427,6 +18448,7 @@ export type CategoryDatasetEditSuggestionsDataItemAttributes = { publishedAt?: string; review_decision_details?: string; review_status?: CategoryDatasetEditSuggestionsDataItemAttributesReviewStatus; + reviewed_by?: string; unit?: string; updatedAt?: string; updatedBy?: CategoryDatasetEditSuggestionsDataItemAttributesUpdatedBy; diff --git a/cms/src/api/collaborator-edit-suggestion/content-types/collaborator-edit-suggestion/schema.json b/cms/src/api/collaborator-edit-suggestion/content-types/collaborator-edit-suggestion/schema.json index 07cab7c2..c9a1ced1 100644 --- a/cms/src/api/collaborator-edit-suggestion/content-types/collaborator-edit-suggestion/schema.json +++ b/cms/src/api/collaborator-edit-suggestion/content-types/collaborator-edit-suggestion/schema.json @@ -56,6 +56,9 @@ }, "review_decision_details": { "type": "text" + }, + "reviewed_by": { + "type": "string" } } } diff --git a/cms/src/api/collaborator/content-types/collaborator/schema.json b/cms/src/api/collaborator/content-types/collaborator/schema.json index f213882b..a1883b11 100644 --- a/cms/src/api/collaborator/content-types/collaborator/schema.json +++ b/cms/src/api/collaborator/content-types/collaborator/schema.json @@ -21,7 +21,10 @@ }, "type": { "type": "enumeration", - "enum": ["donor", "collaborator"], + "enum": [ + "donor", + "collaborator" + ], "required": true }, "collaborator_edit_suggestions": { diff --git a/cms/src/api/dataset-edit-suggestion/content-types/dataset-edit-suggestion/schema.json b/cms/src/api/dataset-edit-suggestion/content-types/dataset-edit-suggestion/schema.json index 1964dd0a..83d2f7c4 100644 --- a/cms/src/api/dataset-edit-suggestion/content-types/dataset-edit-suggestion/schema.json +++ b/cms/src/api/dataset-edit-suggestion/content-types/dataset-edit-suggestion/schema.json @@ -72,6 +72,9 @@ }, "review_decision_details": { "type": "text" + }, + "reviewed_by": { + "type": "string" } } } diff --git a/cms/src/api/project-edit-suggestion/content-types/project-edit-suggestion/schema.json b/cms/src/api/project-edit-suggestion/content-types/project-edit-suggestion/schema.json index c29d463e..bf077c25 100644 --- a/cms/src/api/project-edit-suggestion/content-types/project-edit-suggestion/schema.json +++ b/cms/src/api/project-edit-suggestion/content-types/project-edit-suggestion/schema.json @@ -87,6 +87,9 @@ }, "review_decision_details": { "type": "text" + }, + "reviewed_by": { + "type": "string" } } } diff --git a/cms/types/generated/contentTypes.d.ts b/cms/types/generated/contentTypes.d.ts index 6560ce51..ad61d96c 100644 --- a/cms/types/generated/contentTypes.d.ts +++ b/cms/types/generated/contentTypes.d.ts @@ -788,6 +788,7 @@ export interface ApiCollaboratorEditSuggestionCollaboratorEditSuggestion >; image: Attribute.Media; review_decision_details: Attribute.Text; + reviewed_by: Attribute.String; createdAt: Attribute.DateTime; updatedAt: Attribute.DateTime; publishedAt: Attribute.DateTime; @@ -950,6 +951,7 @@ export interface ApiDatasetEditSuggestionDatasetEditSuggestion >; colors: Attribute.JSON; review_decision_details: Attribute.Text; + reviewed_by: Attribute.String; createdAt: Attribute.DateTime; updatedAt: Attribute.DateTime; publishedAt: Attribute.DateTime; @@ -1407,6 +1409,7 @@ export interface ApiProjectEditSuggestionProjectEditSuggestion 'api::project.project' >; review_decision_details: Attribute.Text; + reviewed_by: Attribute.String; createdAt: Attribute.DateTime; updatedAt: Attribute.DateTime; publishedAt: Attribute.DateTime; From 76ffbdff0c18b01db2002bb4bd41e035a827fb67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa?= Date: Wed, 2 Oct 2024 12:24:02 +0200 Subject: [PATCH 6/8] on change fullscreen --- client/src/containers/welcome-message/index.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/client/src/containers/welcome-message/index.tsx b/client/src/containers/welcome-message/index.tsx index 45e15306..8d7f3337 100644 --- a/client/src/containers/welcome-message/index.tsx +++ b/client/src/containers/welcome-message/index.tsx @@ -37,18 +37,18 @@ export default function WelcomeMessage() { const handlePlay = () => { if (!videoRefContainer.current) return; setPlaying((prev) => !prev); - screenfull.request(videoRefContainer.current); + screenfull?.request(videoRefContainer.current); }; const handleFullscreen = () => { - setFullscreen(screenfull.isFullscreen); + setFullscreen(screenfull?.isFullscreen); }; - + console.log(screenfull); useEffect(() => { - screenfull.on("change", handleFullscreen); + screenfull?.on("change", handleFullscreen); return () => { - screenfull.off("change", handleFullscreen); + screenfull?.off("change", handleFullscreen); }; }, []); From 02b0c090668bc6569ad17472c77d960974d14ed8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa?= Date: Wed, 2 Oct 2024 13:59:27 +0200 Subject: [PATCH 7/8] viewport update --- client/src/app/(auth)/signin/page.tsx | 8 ++++++-- client/src/app/(auth)/signup/page.tsx | 8 ++++++-- .../(dashboard)/dashboard/(profile)/[[...id]]/page.tsx | 8 ++++++-- .../dashboard/collaborators/[[...id]]/page.tsx | 8 ++++++-- .../dashboard/datasets/changes-to-approve/[id]/page.tsx | 8 ++++++-- .../app/(dashboard)/dashboard/datasets/edit/[id]/page.tsx | 8 ++++++-- .../src/app/(dashboard)/dashboard/datasets/new/page.tsx | 8 ++++++-- .../(dashboard)/dashboard/other-tools/[[...id]]/page.tsx | 8 ++++++-- .../app/(dashboard)/dashboard/projects/[[...id]]/page.tsx | 8 ++++++-- client/src/app/(password)/reset-password/page.tsx | 8 ++++++-- client/src/app/(password)/update-password/page.tsx | 7 ++++++- client/src/app/layout.tsx | 8 ++++++-- 12 files changed, 72 insertions(+), 23 deletions(-) diff --git a/client/src/app/(auth)/signin/page.tsx b/client/src/app/(auth)/signin/page.tsx index 1809848b..956fc984 100644 --- a/client/src/app/(auth)/signin/page.tsx +++ b/client/src/app/(auth)/signin/page.tsx @@ -1,11 +1,15 @@ -import { Metadata } from "next"; +import { Metadata, Viewport } from "next"; import Signin from "@/components/forms/signin"; export const metadata: Metadata = { title: "Sign in | Caribbean Climate smart map", description: "Generated by create next app", - viewport: "width=1000, initial-scale=1", +}; + +export const viewport: Viewport = { + width: 1000, + initialScale: 1, }; export default function SigninPage() { diff --git a/client/src/app/(auth)/signup/page.tsx b/client/src/app/(auth)/signup/page.tsx index 3484de72..796f9d82 100644 --- a/client/src/app/(auth)/signup/page.tsx +++ b/client/src/app/(auth)/signup/page.tsx @@ -1,11 +1,15 @@ -import { Metadata } from "next"; +import { Metadata, Viewport } from "next"; import Signup from "@/components/forms/signup"; export const metadata: Metadata = { title: "Sign up | Caribbean Climate smart map", description: "Caribbean Climate smart map", - viewport: "width=1000, initial-scale=1", +}; + +export const viewport: Viewport = { + width: 1000, + initialScale: 1, }; export default function SignupPage() { diff --git a/client/src/app/(dashboard)/dashboard/(profile)/[[...id]]/page.tsx b/client/src/app/(dashboard)/dashboard/(profile)/[[...id]]/page.tsx index 6a681317..981e84e6 100644 --- a/client/src/app/(dashboard)/dashboard/(profile)/[[...id]]/page.tsx +++ b/client/src/app/(dashboard)/dashboard/(profile)/[[...id]]/page.tsx @@ -1,11 +1,15 @@ -import { Metadata } from "next"; +import { Metadata, Viewport } from "next"; import DashboardContent from "@/containers/dashboard"; export const metadata: Metadata = { title: "Dashboard | Caribbean Climate smart map", description: "Generated by create next app", - viewport: "width=1000, initial-scale=1", +}; + +export const viewport: Viewport = { + width: 1000, + initialScale: 1, }; export default function DashboardPage() { diff --git a/client/src/app/(dashboard)/dashboard/collaborators/[[...id]]/page.tsx b/client/src/app/(dashboard)/dashboard/collaborators/[[...id]]/page.tsx index 340ec358..98387d83 100644 --- a/client/src/app/(dashboard)/dashboard/collaborators/[[...id]]/page.tsx +++ b/client/src/app/(dashboard)/dashboard/collaborators/[[...id]]/page.tsx @@ -1,11 +1,15 @@ -import { Metadata } from "next"; +import { Metadata, Viewport } from "next"; import CollaboratorsForm from "@/containers/collaborators/form"; export const metadata: Metadata = { title: "Create new collaborator | Caribbean Climate smart map", description: "Generated by create next app", - viewport: "width=1000, initial-scale=1", +}; + +export const viewport: Viewport = { + width: 1000, + initialScale: 1, }; export default function CollaboratorPage() { diff --git a/client/src/app/(dashboard)/dashboard/datasets/changes-to-approve/[id]/page.tsx b/client/src/app/(dashboard)/dashboard/datasets/changes-to-approve/[id]/page.tsx index 9ba5b3b8..4752f542 100644 --- a/client/src/app/(dashboard)/dashboard/datasets/changes-to-approve/[id]/page.tsx +++ b/client/src/app/(dashboard)/dashboard/datasets/changes-to-approve/[id]/page.tsx @@ -1,4 +1,4 @@ -import { Metadata } from "next"; +import { Metadata, Viewport } from "next"; import Link from "next/link"; @@ -28,7 +28,11 @@ import { export const metadata: Metadata = { title: "Changes to approve | Caribbean Climate smart map", description: "Generated by create next app", - viewport: "width=1000, initial-scale=1", +}; + +export const viewport: Viewport = { + width: 1000, + initialScale: 1, }; export default async function ChangesToApprovePage({ params }: { params: { id: number } }) { diff --git a/client/src/app/(dashboard)/dashboard/datasets/edit/[id]/page.tsx b/client/src/app/(dashboard)/dashboard/datasets/edit/[id]/page.tsx index 89d23475..991cb80c 100644 --- a/client/src/app/(dashboard)/dashboard/datasets/edit/[id]/page.tsx +++ b/client/src/app/(dashboard)/dashboard/datasets/edit/[id]/page.tsx @@ -1,4 +1,4 @@ -import { Metadata } from "next"; +import { Metadata, Viewport } from "next"; import Link from "next/link"; @@ -23,7 +23,11 @@ import { export const metadata: Metadata = { title: "Edit dataset form | Caribbean Climate smart map", description: "Generated by create next app", - viewport: "width=1000, initial-scale=1", +}; + +export const viewport: Viewport = { + width: 1000, + initialScale: 1, }; export default async function EditDatasetPage({ params }: { params: { id: number } }) { diff --git a/client/src/app/(dashboard)/dashboard/datasets/new/page.tsx b/client/src/app/(dashboard)/dashboard/datasets/new/page.tsx index 7070b588..83389a96 100644 --- a/client/src/app/(dashboard)/dashboard/datasets/new/page.tsx +++ b/client/src/app/(dashboard)/dashboard/datasets/new/page.tsx @@ -1,4 +1,4 @@ -import { Metadata } from "next"; +import { Metadata, Viewport } from "next"; import Link from "next/link"; @@ -16,7 +16,11 @@ import { export const metadata: Metadata = { title: "New dataset form | Caribbean Climate smart map", description: "Generated by create next app", - viewport: "width=1000, initial-scale=1", +}; + +export const viewport: Viewport = { + width: 1000, + initialScale: 1, }; export default function NewDatasetPage() { diff --git a/client/src/app/(dashboard)/dashboard/other-tools/[[...id]]/page.tsx b/client/src/app/(dashboard)/dashboard/other-tools/[[...id]]/page.tsx index 822e1435..c2685ffe 100644 --- a/client/src/app/(dashboard)/dashboard/other-tools/[[...id]]/page.tsx +++ b/client/src/app/(dashboard)/dashboard/other-tools/[[...id]]/page.tsx @@ -1,11 +1,15 @@ -import { Metadata } from "next"; +import { Metadata, Viewport } from "next"; import ToolForm from "@/containers/other-tools/form"; export const metadata: Metadata = { title: "Create / edit a tool | Caribbean Climate smart map", description: "Generated by create next app", - viewport: "width=1000, initial-scale=1", +}; + +export const viewport: Viewport = { + width: 1000, + initialScale: 1, }; export default function OtherToolsFormPage() { diff --git a/client/src/app/(dashboard)/dashboard/projects/[[...id]]/page.tsx b/client/src/app/(dashboard)/dashboard/projects/[[...id]]/page.tsx index 3905b40e..01f335dd 100644 --- a/client/src/app/(dashboard)/dashboard/projects/[[...id]]/page.tsx +++ b/client/src/app/(dashboard)/dashboard/projects/[[...id]]/page.tsx @@ -1,11 +1,15 @@ -import { Metadata } from "next"; +import { Metadata, Viewport } from "next"; import ProjectForm from "@/containers/projects/form"; export const metadata: Metadata = { title: "Create / edit a project | Caribbean Climate smart map", description: "Generated by create next app", - viewport: "width=1000, initial-scale=1", +}; + +export const viewport: Viewport = { + width: 1000, + initialScale: 1, }; export default function NewProjectsPage() { diff --git a/client/src/app/(password)/reset-password/page.tsx b/client/src/app/(password)/reset-password/page.tsx index bdd9391a..54b86128 100644 --- a/client/src/app/(password)/reset-password/page.tsx +++ b/client/src/app/(password)/reset-password/page.tsx @@ -1,11 +1,15 @@ -import { Metadata } from "next"; +import { Metadata, Viewport } from "next"; import ResetPassword from "@/components/forms/reset-password"; export const metadata: Metadata = { title: "Reset Password | Caribbean Climate smart map", description: "Generated by create next app", - viewport: "width=1000, initial-scale=1", +}; + +export const viewport: Viewport = { + width: 1000, + initialScale: 1, }; export default function ResetPasswordPage() { diff --git a/client/src/app/(password)/update-password/page.tsx b/client/src/app/(password)/update-password/page.tsx index 8598ac50..7b4634c3 100644 --- a/client/src/app/(password)/update-password/page.tsx +++ b/client/src/app/(password)/update-password/page.tsx @@ -1,4 +1,4 @@ -import { Metadata } from "next"; +import { Metadata, Viewport } from "next"; import PasswordUpdate from "@/components/forms/password-update"; @@ -8,6 +8,11 @@ export const metadata: Metadata = { viewport: "width=1000, initial-scale=1", }; +export const viewport: Viewport = { + width: 1000, + initialScale: 1, +}; + export default function UpdatePasswordPage() { return ( <> diff --git a/client/src/app/layout.tsx b/client/src/app/layout.tsx index 37204acc..2dfacff2 100644 --- a/client/src/app/layout.tsx +++ b/client/src/app/layout.tsx @@ -6,7 +6,7 @@ import { PropsWithChildren } from "react"; import { ToastContainer } from "react-toastify"; -import type { Metadata } from "next"; +import type { Metadata, Viewport } from "next"; import { GoogleAnalytics } from "@next/third-parties/google"; import { Hydrate, dehydrate } from "@tanstack/react-query"; @@ -29,7 +29,11 @@ import LayoutProviders from "./layout-providers"; export const metadata: Metadata = { title: { template: "%s | CCSA", default: "CCSA" }, description: "Caribbean Climate smart map", - viewport: "width=1000, initial-scale=1", +}; + +export const viewport: Viewport = { + width: 1000, + initialScale: 1, }; export default async function RootLayout({ children }: PropsWithChildren) { From 4434845c0fa5206bf5e25d6d462848ebe0f78618 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa?= Date: Wed, 2 Oct 2024 19:17:29 +0200 Subject: [PATCH 8/8] fullscreen check --- client/src/app/(auth)/signin/page.tsx | 1 - client/src/app/(auth)/signup/page.tsx | 1 - .../dashboard/(profile)/[[...id]]/page.tsx | 1 - .../collaborators/[[...id]]/page.tsx | 1 - .../datasets/changes-to-approve/[id]/page.tsx | 1 - .../dashboard/datasets/edit/[id]/page.tsx | 1 - .../dashboard/datasets/new/page.tsx | 1 - .../dashboard/other-tools/[[...id]]/page.tsx | 1 - .../dashboard/projects/[[...id]]/page.tsx | 1 - .../app/(password)/reset-password/page.tsx | 1 - .../app/(password)/update-password/page.tsx | 1 - client/src/app/layout.tsx | 1 - .../src/containers/welcome-message/index.tsx | 11 +++++++--- client/src/types/generated/strapi.schemas.ts | 22 ------------------- 14 files changed, 8 insertions(+), 37 deletions(-) diff --git a/client/src/app/(auth)/signin/page.tsx b/client/src/app/(auth)/signin/page.tsx index 9160503a..956fc984 100644 --- a/client/src/app/(auth)/signin/page.tsx +++ b/client/src/app/(auth)/signin/page.tsx @@ -5,7 +5,6 @@ import Signin from "@/components/forms/signin"; export const metadata: Metadata = { title: "Sign in | Caribbean Climate smart map", description: "Generated by create next app", - viewport: "width=1000, initial-scale=1", }; export const viewport: Viewport = { diff --git a/client/src/app/(auth)/signup/page.tsx b/client/src/app/(auth)/signup/page.tsx index 2950b2be..796f9d82 100644 --- a/client/src/app/(auth)/signup/page.tsx +++ b/client/src/app/(auth)/signup/page.tsx @@ -5,7 +5,6 @@ import Signup from "@/components/forms/signup"; export const metadata: Metadata = { title: "Sign up | Caribbean Climate smart map", description: "Caribbean Climate smart map", - viewport: "width=1000, initial-scale=1", }; export const viewport: Viewport = { diff --git a/client/src/app/(dashboard)/dashboard/(profile)/[[...id]]/page.tsx b/client/src/app/(dashboard)/dashboard/(profile)/[[...id]]/page.tsx index 9543b679..981e84e6 100644 --- a/client/src/app/(dashboard)/dashboard/(profile)/[[...id]]/page.tsx +++ b/client/src/app/(dashboard)/dashboard/(profile)/[[...id]]/page.tsx @@ -5,7 +5,6 @@ import DashboardContent from "@/containers/dashboard"; export const metadata: Metadata = { title: "Dashboard | Caribbean Climate smart map", description: "Generated by create next app", - viewport: "width=1000, initial-scale=1", }; export const viewport: Viewport = { diff --git a/client/src/app/(dashboard)/dashboard/collaborators/[[...id]]/page.tsx b/client/src/app/(dashboard)/dashboard/collaborators/[[...id]]/page.tsx index 424b0417..98387d83 100644 --- a/client/src/app/(dashboard)/dashboard/collaborators/[[...id]]/page.tsx +++ b/client/src/app/(dashboard)/dashboard/collaborators/[[...id]]/page.tsx @@ -5,7 +5,6 @@ import CollaboratorsForm from "@/containers/collaborators/form"; export const metadata: Metadata = { title: "Create new collaborator | Caribbean Climate smart map", description: "Generated by create next app", - viewport: "width=1000, initial-scale=1", }; export const viewport: Viewport = { diff --git a/client/src/app/(dashboard)/dashboard/datasets/changes-to-approve/[id]/page.tsx b/client/src/app/(dashboard)/dashboard/datasets/changes-to-approve/[id]/page.tsx index 884ad911..4752f542 100644 --- a/client/src/app/(dashboard)/dashboard/datasets/changes-to-approve/[id]/page.tsx +++ b/client/src/app/(dashboard)/dashboard/datasets/changes-to-approve/[id]/page.tsx @@ -28,7 +28,6 @@ import { export const metadata: Metadata = { title: "Changes to approve | Caribbean Climate smart map", description: "Generated by create next app", - viewport: "width=1000, initial-scale=1", }; export const viewport: Viewport = { diff --git a/client/src/app/(dashboard)/dashboard/datasets/edit/[id]/page.tsx b/client/src/app/(dashboard)/dashboard/datasets/edit/[id]/page.tsx index cb477660..991cb80c 100644 --- a/client/src/app/(dashboard)/dashboard/datasets/edit/[id]/page.tsx +++ b/client/src/app/(dashboard)/dashboard/datasets/edit/[id]/page.tsx @@ -23,7 +23,6 @@ import { export const metadata: Metadata = { title: "Edit dataset form | Caribbean Climate smart map", description: "Generated by create next app", - viewport: "width=1000, initial-scale=1", }; export const viewport: Viewport = { diff --git a/client/src/app/(dashboard)/dashboard/datasets/new/page.tsx b/client/src/app/(dashboard)/dashboard/datasets/new/page.tsx index 9c023150..83389a96 100644 --- a/client/src/app/(dashboard)/dashboard/datasets/new/page.tsx +++ b/client/src/app/(dashboard)/dashboard/datasets/new/page.tsx @@ -16,7 +16,6 @@ import { export const metadata: Metadata = { title: "New dataset form | Caribbean Climate smart map", description: "Generated by create next app", - viewport: "width=1000, initial-scale=1", }; export const viewport: Viewport = { diff --git a/client/src/app/(dashboard)/dashboard/other-tools/[[...id]]/page.tsx b/client/src/app/(dashboard)/dashboard/other-tools/[[...id]]/page.tsx index 88155710..c2685ffe 100644 --- a/client/src/app/(dashboard)/dashboard/other-tools/[[...id]]/page.tsx +++ b/client/src/app/(dashboard)/dashboard/other-tools/[[...id]]/page.tsx @@ -5,7 +5,6 @@ import ToolForm from "@/containers/other-tools/form"; export const metadata: Metadata = { title: "Create / edit a tool | Caribbean Climate smart map", description: "Generated by create next app", - viewport: "width=1000, initial-scale=1", }; export const viewport: Viewport = { diff --git a/client/src/app/(dashboard)/dashboard/projects/[[...id]]/page.tsx b/client/src/app/(dashboard)/dashboard/projects/[[...id]]/page.tsx index 26bc7972..01f335dd 100644 --- a/client/src/app/(dashboard)/dashboard/projects/[[...id]]/page.tsx +++ b/client/src/app/(dashboard)/dashboard/projects/[[...id]]/page.tsx @@ -5,7 +5,6 @@ import ProjectForm from "@/containers/projects/form"; export const metadata: Metadata = { title: "Create / edit a project | Caribbean Climate smart map", description: "Generated by create next app", - viewport: "width=1000, initial-scale=1", }; export const viewport: Viewport = { diff --git a/client/src/app/(password)/reset-password/page.tsx b/client/src/app/(password)/reset-password/page.tsx index 2bf25f3c..54b86128 100644 --- a/client/src/app/(password)/reset-password/page.tsx +++ b/client/src/app/(password)/reset-password/page.tsx @@ -5,7 +5,6 @@ import ResetPassword from "@/components/forms/reset-password"; export const metadata: Metadata = { title: "Reset Password | Caribbean Climate smart map", description: "Generated by create next app", - viewport: "width=1000, initial-scale=1", }; export const viewport: Viewport = { diff --git a/client/src/app/(password)/update-password/page.tsx b/client/src/app/(password)/update-password/page.tsx index 7b4634c3..2d1309b5 100644 --- a/client/src/app/(password)/update-password/page.tsx +++ b/client/src/app/(password)/update-password/page.tsx @@ -5,7 +5,6 @@ import PasswordUpdate from "@/components/forms/password-update"; export const metadata: Metadata = { title: "Update Password | Caribbean Climate smart map", description: "Generated by create next app", - viewport: "width=1000, initial-scale=1", }; export const viewport: Viewport = { diff --git a/client/src/app/layout.tsx b/client/src/app/layout.tsx index a8e61640..2dfacff2 100644 --- a/client/src/app/layout.tsx +++ b/client/src/app/layout.tsx @@ -29,7 +29,6 @@ import LayoutProviders from "./layout-providers"; export const metadata: Metadata = { title: { template: "%s | CCSA", default: "CCSA" }, description: "Caribbean Climate smart map", - viewport: "width=1000, initial-scale=1", }; export const viewport: Viewport = { diff --git a/client/src/containers/welcome-message/index.tsx b/client/src/containers/welcome-message/index.tsx index 8d7f3337..dc84baf3 100644 --- a/client/src/containers/welcome-message/index.tsx +++ b/client/src/containers/welcome-message/index.tsx @@ -18,6 +18,7 @@ import { useGetWelcomeMessage } from "@/types/generated/welcome-message"; import { Button } from "@/components/ui/button"; import { Dialog, DialogContent } from "@/components/ui/dialog"; +import isEmpty from "lodash-es/isEmpty"; export default function WelcomeMessage() { const videoRef = useRef(null); @@ -43,12 +44,16 @@ export default function WelcomeMessage() { const handleFullscreen = () => { setFullscreen(screenfull?.isFullscreen); }; - console.log(screenfull); + useEffect(() => { - screenfull?.on("change", handleFullscreen); + if (screenfull.isEnabled) { + screenfull.on("change", handleFullscreen); + } return () => { - screenfull?.off("change", handleFullscreen); + if (screenfull.isEnabled) { + screenfull.off("change", handleFullscreen); + } }; }, []); diff --git a/client/src/types/generated/strapi.schemas.ts b/client/src/types/generated/strapi.schemas.ts index 46fe3141..a6c4ad2d 100644 --- a/client/src/types/generated/strapi.schemas.ts +++ b/client/src/types/generated/strapi.schemas.ts @@ -3318,7 +3318,6 @@ export type SdgProjectsDataItemAttributesPillarDataAttributesProjectEditSuggesti publishedAt?: string; review_decision_details?: string; review_status?: SdgProjectsDataItemAttributesPillarDataAttributesProjectEditSuggestionsDataItemAttributesReviewStatus; - reviewed_by?: string; sdgs?: SdgProjectsDataItemAttributesPillarDataAttributesProjectEditSuggestionsDataItemAttributesSdgs; source_country?: string; status?: string; @@ -3918,7 +3917,6 @@ export type SdgProjectsDataItemAttributesCountriesDataItemAttributesDatasetValue publishedAt?: string; review_decision_details?: string; review_status?: SdgProjectsDataItemAttributesCountriesDataItemAttributesDatasetValuesDataItemAttributesDatasetDataAttributesLayersDataItemAttributesDatasetEditSuggestionDataAttributesReviewStatus; - reviewed_by?: string; unit?: string; updatedAt?: string; updatedBy?: SdgProjectsDataItemAttributesCountriesDataItemAttributesDatasetValuesDataItemAttributesDatasetDataAttributesLayersDataItemAttributesDatasetEditSuggestionDataAttributesUpdatedBy; @@ -5142,7 +5140,6 @@ export interface ProjectEditSuggestion { publishedAt?: string; review_decision_details?: string; review_status: ProjectEditSuggestionReviewStatus; - reviewed_by?: string; sdgs?: ProjectEditSuggestionSdgs; source_country?: string; status?: string; @@ -5417,7 +5414,6 @@ export type ProjectEditSuggestionPillarDataAttributesProjectsDataItemAttributesS publishedAt?: string; review_decision_details?: string; review_status?: ProjectEditSuggestionPillarDataAttributesProjectsDataItemAttributesSdgsDataItemAttributesProjectEditSuggestionsDataItemAttributesReviewStatus; - reviewed_by?: string; sdgs?: ProjectEditSuggestionPillarDataAttributesProjectsDataItemAttributesSdgsDataItemAttributesProjectEditSuggestionsDataItemAttributesSdgs; source_country?: string; status?: string; @@ -6167,7 +6163,6 @@ export type ProjectEditSuggestionCountriesDataItemAttributesDatasetValuesDataIte publishedAt?: string; review_decision_details?: string; review_status?: ProjectEditSuggestionCountriesDataItemAttributesDatasetValuesDataItemAttributesDatasetDataAttributesLayersDataItemAttributesDatasetEditSuggestionDataAttributesReviewStatus; - reviewed_by?: string; unit?: string; updatedAt?: string; updatedBy?: ProjectEditSuggestionCountriesDataItemAttributesDatasetValuesDataItemAttributesDatasetDataAttributesLayersDataItemAttributesDatasetEditSuggestionDataAttributesUpdatedBy; @@ -6624,7 +6619,6 @@ export type ProjectEditSuggestionRequestData = { project?: ProjectEditSuggestionRequestDataProject; review_decision_details?: string; review_status: ProjectEditSuggestionRequestDataReviewStatus; - reviewed_by?: string; sdgs?: ProjectEditSuggestionRequestDataSdgsItem[]; source_country?: string; status?: string; @@ -6827,7 +6821,6 @@ export type ProjectPillarDataAttributesProjectsDataItemAttributesSdgsDataItemAtt publishedAt?: string; review_decision_details?: string; review_status?: ProjectPillarDataAttributesProjectsDataItemAttributesSdgsDataItemAttributesProjectEditSuggestionsDataItemAttributesReviewStatus; - reviewed_by?: string; sdgs?: ProjectPillarDataAttributesProjectsDataItemAttributesSdgsDataItemAttributesProjectEditSuggestionsDataItemAttributesSdgs; source_country?: string; status?: string; @@ -7465,7 +7458,6 @@ export type ProjectCountriesDataItemAttributesDatasetValuesDataItemAttributesDat publishedAt?: string; review_decision_details?: string; review_status?: ProjectCountriesDataItemAttributesDatasetValuesDataItemAttributesDatasetDataAttributesLayersDataItemAttributesDatasetEditSuggestionDataAttributesReviewStatus; - reviewed_by?: string; unit?: string; updatedAt?: string; updatedBy?: ProjectCountriesDataItemAttributesDatasetValuesDataItemAttributesDatasetDataAttributesLayersDataItemAttributesDatasetEditSuggestionDataAttributesUpdatedBy; @@ -8335,7 +8327,6 @@ export type PillarProjectsDataItemAttributesPillarDataAttributesProjectEditSugge publishedAt?: string; review_decision_details?: string; review_status?: PillarProjectsDataItemAttributesPillarDataAttributesProjectEditSuggestionsDataItemAttributesReviewStatus; - reviewed_by?: string; sdgs?: PillarProjectsDataItemAttributesPillarDataAttributesProjectEditSuggestionsDataItemAttributesSdgs; source_country?: string; status?: string; @@ -8964,7 +8955,6 @@ export type PillarProjectsDataItemAttributesCountriesDataItemAttributesDatasetVa publishedAt?: string; review_decision_details?: string; review_status?: PillarProjectsDataItemAttributesCountriesDataItemAttributesDatasetValuesDataItemAttributesDatasetDataAttributesLayersDataItemAttributesDatasetEditSuggestionDataAttributesReviewStatus; - reviewed_by?: string; unit?: string; updatedAt?: string; updatedBy?: PillarProjectsDataItemAttributesCountriesDataItemAttributesDatasetValuesDataItemAttributesDatasetDataAttributesLayersDataItemAttributesDatasetEditSuggestionDataAttributesUpdatedBy; @@ -11145,7 +11135,6 @@ export type LayerDatasetDataAttributesLayersDataItemAttributesDatasetEditSuggest publishedAt?: string; review_decision_details?: string; review_status?: LayerDatasetDataAttributesLayersDataItemAttributesDatasetEditSuggestionDataAttributesReviewStatus; - reviewed_by?: string; unit?: string; updatedAt?: string; updatedBy?: LayerDatasetDataAttributesLayersDataItemAttributesDatasetEditSuggestionDataAttributesUpdatedBy; @@ -12404,7 +12393,6 @@ export type DatasetValueDatasetDataAttributesLayersDataItemAttributesDatasetEdit publishedAt?: string; review_decision_details?: string; review_status?: DatasetValueDatasetDataAttributesLayersDataItemAttributesDatasetEditSuggestionDataAttributesReviewStatus; - reviewed_by?: string; unit?: string; updatedAt?: string; updatedBy?: DatasetValueDatasetDataAttributesLayersDataItemAttributesDatasetEditSuggestionDataAttributesUpdatedBy; @@ -13247,7 +13235,6 @@ export interface DatasetEditSuggestion { publishedAt?: string; review_decision_details?: string; review_status: DatasetEditSuggestionReviewStatus; - reviewed_by?: string; unit?: string; updatedAt?: string; updatedBy?: DatasetEditSuggestionUpdatedBy; @@ -13350,7 +13337,6 @@ export type DatasetEditSuggestionCategoryDataAttributesDatasetEditSuggestionsDat publishedAt?: string; review_decision_details?: string; review_status?: DatasetEditSuggestionCategoryDataAttributesDatasetEditSuggestionsDataItemAttributesReviewStatus; - reviewed_by?: string; unit?: string; updatedAt?: string; updatedBy?: DatasetEditSuggestionCategoryDataAttributesDatasetEditSuggestionsDataItemAttributesUpdatedBy; @@ -14259,7 +14245,6 @@ export type DatasetEditSuggestionRequestData = { name?: string; review_decision_details?: string; review_status: DatasetEditSuggestionRequestDataReviewStatus; - reviewed_by?: string; unit?: string; value_type?: DatasetEditSuggestionRequestDataValueType; }; @@ -14702,7 +14687,6 @@ export type DatasetLayersDataItemAttributesDatasetDataAttributesDatasetEditSugge publishedAt?: string; review_decision_details?: string; review_status?: DatasetLayersDataItemAttributesDatasetDataAttributesDatasetEditSuggestionsDataItemAttributesReviewStatus; - reviewed_by?: string; unit?: string; updatedAt?: string; updatedBy?: DatasetLayersDataItemAttributesDatasetDataAttributesDatasetEditSuggestionsDataItemAttributesUpdatedBy; @@ -15595,7 +15579,6 @@ export type CountryDatasetValuesDataItemAttributesDatasetDataAttributesLayersDat publishedAt?: string; review_decision_details?: string; review_status?: CountryDatasetValuesDataItemAttributesDatasetDataAttributesLayersDataItemAttributesDatasetEditSuggestionDataAttributesReviewStatus; - reviewed_by?: string; unit?: string; updatedAt?: string; updatedBy?: CountryDatasetValuesDataItemAttributesDatasetDataAttributesLayersDataItemAttributesDatasetEditSuggestionDataAttributesUpdatedBy; @@ -16616,7 +16599,6 @@ export type CollaboratorEditSuggestionCollaboratorDataAttributesCollaboratorEdit publishedAt?: string; review_decision_details?: string; review_status?: CollaboratorEditSuggestionCollaboratorDataAttributesCollaboratorEditSuggestionsDataItemAttributesReviewStatus; - reviewed_by?: string; type?: CollaboratorEditSuggestionCollaboratorDataAttributesCollaboratorEditSuggestionsDataItemAttributesType; updatedAt?: string; updatedBy?: CollaboratorEditSuggestionCollaboratorDataAttributesCollaboratorEditSuggestionsDataItemAttributesUpdatedBy; @@ -16960,7 +16942,6 @@ export interface CollaboratorEditSuggestion { publishedAt?: string; review_decision_details?: string; review_status: CollaboratorEditSuggestionReviewStatus; - reviewed_by?: string; type?: CollaboratorEditSuggestionType; updatedAt?: string; updatedBy?: CollaboratorEditSuggestionUpdatedBy; @@ -17331,7 +17312,6 @@ export type CollaboratorEditSuggestionRequestData = { name?: string; review_decision_details?: string; review_status: CollaboratorEditSuggestionRequestDataReviewStatus; - reviewed_by?: string; type?: CollaboratorEditSuggestionRequestDataType; }; @@ -17514,7 +17494,6 @@ export type CollaboratorCollaboratorEditSuggestionsDataItemAttributes = { publishedAt?: string; review_decision_details?: string; review_status?: CollaboratorCollaboratorEditSuggestionsDataItemAttributesReviewStatus; - reviewed_by?: string; type?: CollaboratorCollaboratorEditSuggestionsDataItemAttributesType; updatedAt?: string; updatedBy?: CollaboratorCollaboratorEditSuggestionsDataItemAttributesUpdatedBy; @@ -18448,7 +18427,6 @@ export type CategoryDatasetEditSuggestionsDataItemAttributes = { publishedAt?: string; review_decision_details?: string; review_status?: CategoryDatasetEditSuggestionsDataItemAttributesReviewStatus; - reviewed_by?: string; unit?: string; updatedAt?: string; updatedBy?: CategoryDatasetEditSuggestionsDataItemAttributesUpdatedBy;