From 005bc239ffe940f0f736d8fcb4bf49601d93a13b Mon Sep 17 00:00:00 2001 From: Cristi Miloiu Date: Sat, 13 Apr 2024 01:46:06 +0300 Subject: [PATCH 1/2] . --- client/src/components/Header.component.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/components/Header.component.tsx b/client/src/components/Header.component.tsx index 7632bbc..257a294 100644 --- a/client/src/components/Header.component.tsx +++ b/client/src/components/Header.component.tsx @@ -25,7 +25,7 @@ const headerTextContent: HeaderItems[] = [ url: "/about", }, 2: { text: "Echipa", url: "/about#team" }, - 3: { text: "Istoric", url: "/about" }, + 3: { text: "Istoric", url: "/about#istoric" }, 4: { text: "Galerie Foto", url: "https://www.facebook.com/media/set/?set=a.603987195089837&type=3", @@ -208,7 +208,7 @@ export const Header = () => { text="Donează" /> {!isLogin ? ( - + ) : ( )} From 2d63bd4aaa12b4da23361e4dc28a4284242555ab Mon Sep 17 00:00:00 2001 From: Cristi Miloiu Date: Sat, 13 Apr 2024 02:11:14 +0300 Subject: [PATCH 2/2] update --- client/src/main.tsx | 2 +- server/backend.ts | 9 ++++----- .../migration.sql | 3 --- server/prisma/schema.prisma | 2 +- 4 files changed, 6 insertions(+), 10 deletions(-) rename server/prisma/migrations/{20240412100539_ => 20240412230037_dev}/migration.sql (90%) diff --git a/client/src/main.tsx b/client/src/main.tsx index 08323f9..e6600dc 100644 --- a/client/src/main.tsx +++ b/client/src/main.tsx @@ -7,7 +7,7 @@ import { GoogleOAuthProvider } from '@react-oauth/google' import { AuthService } from '@genezio/auth'; AuthService.getInstance().setTokenAndRegion( -"0-ul63zxst4qppvf6bbn526l2uyi0arumm", +"0-ra352vs2kx2yb6ygzk6jpndaqe0ljcem", "eu-central-1"); ReactDOM.createRoot(document.getElementById('root')!).render( diff --git a/server/backend.ts b/server/backend.ts index 85af337..bcf7b72 100644 --- a/server/backend.ts +++ b/server/backend.ts @@ -54,15 +54,14 @@ export class BackendService { marimeTricou: "Nu e definit!", }, }); + return { + status: 200, + message: "User added successfully" + } } catch (error) { console.log(error) return createHTTPError(400, 'Bad Request'); } - - return { - status: 200, - message: "User added successfully" - } } @GenezioAuth() diff --git a/server/prisma/migrations/20240412100539_/migration.sql b/server/prisma/migrations/20240412230037_dev/migration.sql similarity index 90% rename from server/prisma/migrations/20240412100539_/migration.sql rename to server/prisma/migrations/20240412230037_dev/migration.sql index 259afcb..be6e8ef 100644 --- a/server/prisma/migrations/20240412100539_/migration.sql +++ b/server/prisma/migrations/20240412230037_dev/migration.sql @@ -28,8 +28,5 @@ CREATE TABLE "Cursa" ( -- CreateIndex CREATE UNIQUE INDEX "UserAccount_userId_key" ON "UserAccount"("userId"); --- CreateIndex -CREATE UNIQUE INDEX "UserAccount_phone_key" ON "UserAccount"("phone"); - -- AddForeignKey ALTER TABLE "Cursa" ADD CONSTRAINT "Cursa_userId_fkey" FOREIGN KEY ("userId") REFERENCES "UserAccount"("userId") ON DELETE RESTRICT ON UPDATE CASCADE; diff --git a/server/prisma/schema.prisma b/server/prisma/schema.prisma index 5b347a3..c95edcc 100644 --- a/server/prisma/schema.prisma +++ b/server/prisma/schema.prisma @@ -18,7 +18,7 @@ model UserAccount { id Int @id @default(autoincrement()) userId String @unique userType String - phone String @unique + phone String marimeTricou String? curse Cursa[] }