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

viewport change #146

Merged
merged 1 commit into from
Oct 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 6 additions & 2 deletions client/src/app/(auth)/signin/page.tsx
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
8 changes: 6 additions & 2 deletions client/src/app/(auth)/signup/page.tsx
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Metadata } from "next";
import { Metadata, Viewport } from "next";

import Link from "next/link";

Expand Down Expand Up @@ -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 } }) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { Metadata } from "next";

import { Metadata, Viewport } from "next";
import Link from "next/link";

import { Hydrate, dehydrate } from "@tanstack/react-query";
Expand All @@ -23,7 +22,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 } }) {
Expand Down
8 changes: 6 additions & 2 deletions client/src/app/(dashboard)/dashboard/datasets/new/page.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Metadata } from "next";
import { Metadata, Viewport } from "next";

import Link from "next/link";

Expand All @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
8 changes: 6 additions & 2 deletions client/src/app/(password)/reset-password/page.tsx
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
8 changes: 6 additions & 2 deletions client/src/app/(password)/update-password/page.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
import { Metadata } from "next";
import { Metadata, Viewport } from "next";

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 = {
width: 1000,
initialScale: 1,
};

export default function UpdatePasswordPage() {
Expand Down
8 changes: 6 additions & 2 deletions client/src/app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/forms/dataset/colors.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ export default function DatasetColorsForm({
),
})}
onChange={(e) => {
return field.onChange(e.target.value);
return field.onChange(e?.target?.value);
}}
disabled={status === "declined" && ME_DATA?.role?.type !== "admin"}
/>
Expand Down
Loading