Merge pull request #60 from ConducereIT/dev

Dev
ConducereIT · Apr 12, 2024 · 5c1470b · 5c1470b
2 parents 6120840 + 2d63bd4
commit 5c1470b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 12 deletions.
diff --git 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 ? (
-              <Dropdown url="/login" key={9} text="Login" />
+              <Dropdown url="/login" key={9} text="Înscriere" />
             ) : (
               <Dropdown url="/logout" key={10} text="Logout" />
             )}

diff --git 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
@@ -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/.../migrations/20240412100539_/migration.sql → ...grations/20240412230037_dev/migration.sql b/.../migrations/20240412100539_/migration.sql → ...grations/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
@@ -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[]
 }