From c4ec8561835c420d372179d67b5b19882c0175bc Mon Sep 17 00:00:00 2001 From: charles-gauthereau Date: Wed, 1 Jan 2025 22:28:21 +0100 Subject: [PATCH] Preparing the repository --- app/(auth)/register/page.tsx | 4 +-- docker-compose.prod.yml | 6 ++-- docker/dockerfile/Dockerfile | 1 + package.json | 4 +-- src/auth/current-organization.ts | 11 ------- .../projects/ProjectsForm/ProjectForm.tsx | 7 ++-- yarn.lock | 32 +++++++++---------- 7 files changed, 26 insertions(+), 39 deletions(-) delete mode 100644 src/auth/current-organization.ts diff --git a/app/(auth)/register/page.tsx b/app/(auth)/register/page.tsx index 011ec86c..14fb9497 100644 --- a/app/(auth)/register/page.tsx +++ b/app/(auth)/register/page.tsx @@ -1,9 +1,7 @@ -"use client" - import {PageParams} from "@/types/next"; import {RegisterForm} from "@/components/wrappers/auth/Register/register-form/RegisterForm"; -export default function RoutePage(props: PageParams<{}>) { +export default async function RoutePage(props: PageParams<{}>) { return (
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index bab87bbd..fe160ad6 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -10,9 +10,9 @@ services: ports: - '8887:80' - environment: - - TIME_ZONE="Europe/Paris" - - NODE_ENV=development + env_file: + - .env + depends_on: db: condition: service_healthy diff --git a/docker/dockerfile/Dockerfile b/docker/dockerfile/Dockerfile index 5057584c..fc536d7a 100644 --- a/docker/dockerfile/Dockerfile +++ b/docker/dockerfile/Dockerfile @@ -76,6 +76,7 @@ RUN chown nextjs:nodejs .next COPY --from=builder /app/next.config.mjs ./ COPY --from=builder /app/schema.zmodel ./ +COPY --from=builder /app/src/openapi.yaml ./src/ COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./ COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static COPY --chown=nextjs:nodejs prisma ./prisma/ diff --git a/package.json b/package.json index 8718c8c1..1e80624f 100644 --- a/package.json +++ b/package.json @@ -65,9 +65,9 @@ "next-themes": "^0.3.0", "nodemailer": "^6.9.16", "npm-check-updates": "^17.1.13", - "react": "19.0.0-rc-66855b96-20241106", + "react": "19.0.0", "react-day-picker": "8.10.1", - "react-dom": "19.0.0-rc-66855b96-20241106", + "react-dom": "19.0.0", "react-email": "^3.0.2", "react-hook-form": "^7.53.1", "react-resizable-panels": "^2.1.6", diff --git a/src/auth/current-organization.ts b/src/auth/current-organization.ts deleted file mode 100644 index 9478c4d5..00000000 --- a/src/auth/current-organization.ts +++ /dev/null @@ -1,11 +0,0 @@ -import {baseAuth} from "@/auth/auth"; -import {Organization} from "@prisma/client"; - -export const currentOrganization = async () => { - const session = await baseAuth(); - console.log("mysession", session) - if (!session?.organization) { - return null; - } - return session.organization as Organization; -} \ No newline at end of file diff --git a/src/components/wrappers/dashboard/projects/ProjectsForm/ProjectForm.tsx b/src/components/wrappers/dashboard/projects/ProjectsForm/ProjectForm.tsx index a9e20c4c..241da2b6 100644 --- a/src/components/wrappers/dashboard/projects/ProjectsForm/ProjectForm.tsx +++ b/src/components/wrappers/dashboard/projects/ProjectsForm/ProjectForm.tsx @@ -73,14 +73,13 @@ export const ProjectForm = (props: projectFormProps) => { organizationId: props.organization.id, projectId: props.projectId }); - console.log(project) - if (project.data.success) { + if (project.data?.success) { toast.success(project.data.actionSuccess.message); router.push(`/dashboard/${props.organization.slug}/projects/${project.data.value.id}`); - router.refresh() + router.refresh(); } else { - toast.success(project.data.actionError.message); + toast.error(project.data.actionError.message || "Unknown error occurred."); } diff --git a/yarn.lock b/yarn.lock index fc64c218..0afecc89 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7735,9 +7735,9 @@ __metadata: npm-check-updates: "npm:^17.1.13" postcss: "npm:^8" prisma: "npm:^5.22.0" - react: "npm:19.0.0-rc-66855b96-20241106" + react: "npm:19.0.0" react-day-picker: "npm:8.10.1" - react-dom: "npm:19.0.0-rc-66855b96-20241106" + react-dom: "npm:19.0.0" react-email: "npm:^3.0.2" react-hook-form: "npm:^7.53.1" react-resizable-panels: "npm:^2.1.6" @@ -8031,14 +8031,14 @@ __metadata: languageName: node linkType: hard -"react-dom@npm:19.0.0-rc-66855b96-20241106": - version: 19.0.0-rc-66855b96-20241106 - resolution: "react-dom@npm:19.0.0-rc-66855b96-20241106" +"react-dom@npm:19.0.0": + version: 19.0.0 + resolution: "react-dom@npm:19.0.0" dependencies: - scheduler: "npm:0.25.0-rc-66855b96-20241106" + scheduler: "npm:^0.25.0" peerDependencies: - react: 19.0.0-rc-66855b96-20241106 - checksum: 10c0/62298e0bd655f2bcbebccd03f593532a4728bebe119ecb30d7f50503d74882cbda90acacdb96bd54b6c1e29c36e74cc7ccab8132926d80e34002d89c07f6a9ab + react: ^19.0.0 + checksum: 10c0/a36ce7ab507b237ae2759c984cdaad4af4096d8199fb65b3815c16825e5cfeb7293da790a3fc2184b52bfba7ba3ff31c058c01947aff6fd1a3701632aabaa6a9 languageName: node linkType: hard @@ -8198,10 +8198,10 @@ __metadata: languageName: node linkType: hard -"react@npm:19.0.0-rc-66855b96-20241106": - version: 19.0.0-rc-66855b96-20241106 - resolution: "react@npm:19.0.0-rc-66855b96-20241106" - checksum: 10c0/d4e33b16257c7fdadc79d73798bdbb4865a460875463a3bf3f06d764ce8795fa7964ee714dcbf3010838842af9ab124495a943305e77b2c8d31db08895d067a3 +"react@npm:19.0.0": + version: 19.0.0 + resolution: "react@npm:19.0.0" + checksum: 10c0/9cad8f103e8e3a16d15cb18a0d8115d8bd9f9e1ce3420310aea381eb42aa0a4f812cf047bb5441349257a05fba8a291515691e3cb51267279b2d2c3253f38471 languageName: node linkType: hard @@ -8494,10 +8494,10 @@ __metadata: languageName: node linkType: hard -"scheduler@npm:0.25.0-rc-66855b96-20241106": - version: 0.25.0-rc-66855b96-20241106 - resolution: "scheduler@npm:0.25.0-rc-66855b96-20241106" - checksum: 10c0/65f1187d4b472ad674b91d98661c54dfc312e0ba850713b57411a05db722b5a9cdc7a46683c776116668c251c90cd4d3973b9f021d3821762fa224f94275c85a +"scheduler@npm:^0.25.0": + version: 0.25.0 + resolution: "scheduler@npm:0.25.0" + checksum: 10c0/a4bb1da406b613ce72c1299db43759526058fdcc413999c3c3e0db8956df7633acf395cb20eb2303b6a65d658d66b6585d344460abaee8080b4aa931f10eaafe languageName: node linkType: hard