Merge pull request #16 from azeddine-hmd/dev

Dev
azeddine-hmd · Dec 16, 2023 · 69f72e2 · 69f72e2
2 parents a30a07f + bdbe7ed
commit 69f72e2
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 45 deletions.
diff --git a/backend/src/api/auth/auth-controller.ts b/backend/src/api/auth/auth-controller.ts
@@ -12,18 +12,15 @@ export async function register(req: Request, res: Response) {
   const registerDto = plainToClass(RegisterDto, req.body);
   const validationError = await validate(registerDto);
   if (validationError.length > 0) return res.status(400).json(validationError);
-  const user = await authService.registerUser(registerDto);
-  res.status(201).send();
+  await authService.registerUser(registerDto);
+  res.status(204).send();
 }
 
 export async function uploadAvatar(req: Request, res: Response) {
   const user = await authService.getUser(req.body.email, req.body.password);
-  const avatar = await profileService.uploadAvatar(
-    user,
-    req.files['avatar'][0]
-  );
+  await profileService.uploadAvatar(user, req.files['avatar'][0]);
   await authService.sendEmailVerification(user);
-  res.status(201).send({ url: avatar.url });
+  res.status(204).send();
 }
 
 export async function login(req: Request, res: Response) {
@@ -40,9 +37,6 @@ export async function verifyEmail(req: Request, res: Response) {
   const validationError = await validate(verifyEmailDto);
   if (validationError.length > 0) return res.status(400).json(validationError);
   const user = await authService.verifyEmail(verifyEmailDto.code);
-  res.status(200).send();
-  return;
-
   const { token } = await authService.login(user.email);
   res.cookie(`${process.env.JWT_COOKIE_NAME}`, token, defaultCookieOptions);
   res.status(200).send();

diff --git a/backend/types/express.d.ts b/backend/types/express.d.ts
@@ -3,4 +3,8 @@ declare namespace Express {
     id: number;
     username: string;
   }
+
+  export interface Request {
+    files: { [filename: string]: Express.Multer.File[] };
+  }
 }
diff --git a/frontend/app/layout.tsx b/frontend/app/layout.tsx
@@ -1,7 +1,7 @@
 import "./globals.css";
 import React from "react";
 import { Inter } from "next/font/google";
-import { GlobalTemplateConfig } from "@/components/templates/global";
+import GlobalTemplateConfig from "@/components/templates/global-config";
 
 export const metadata = {
   title: "ChiChat | Chat and Hang Out With Friends",
@@ -19,7 +19,7 @@ export default function RootLayout({
   return (
     <html lang="en">
       <body className={inter.className}>
-          <GlobalTemplateConfig>{children}</GlobalTemplateConfig>
+        <GlobalTemplateConfig>{children}</GlobalTemplateConfig>
       </body>
     </html>
   );

diff --git a/frontend/app/test/page.tsx b/frontend/app/test/page.tsx
diff --git a/frontend/components/molecules/dropdown-menu.tsx b/frontend/components/molecules/dropdown-menu.tsx
@@ -59,6 +59,7 @@ function FloatingMenu({
       fireItemSelection();
       setInputKeyPress("");
     }
+    // eslint-disable-next-line
   }, [inputkeyPress, setInputKeyPress, items.length]);
 
   return (

diff --git a/frontend/components/molecules/search-result-new.tsx b/frontend/components/molecules/search-result-new.tsx
@@ -31,7 +31,7 @@ export default function SearchResults<T>({
           .toLowerCase()
           .includes(searchText.toLowerCase())
       ),
-    [results, searchText]
+    [results, searchText, targetKey]
   );
 
   return (

diff --git a/frontend/components/templates/global-config.tsx b/frontend/components/templates/global-config.tsx
@@ -0,0 +1,26 @@
+"use client";
+
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
+import GlobalTemplate from "./global";
+
+const queryClient = new QueryClient();
+
+export type GlobalTemplateConfigProps = {
+  children?: React.ReactNode;
+};
+
+export default function GlobalTemplateConfig({
+  children,
+}: {
+  children: React.ReactNode;
+}) {
+  return (
+    <>
+      <QueryClientProvider client={queryClient}>
+        <GlobalTemplate>{children}</GlobalTemplate>
+        <ReactQueryDevtools initialIsOpen={false} />
+      </QueryClientProvider>
+    </>
+  );
+}
diff --git a/frontend/components/templates/global.tsx b/frontend/components/templates/global.tsx
@@ -1,40 +1,16 @@
 "use client";
 
-import {
-  QueryClient,
-  QueryClientProvider,
-  useMutation,
-} from "@tanstack/react-query";
+import { useMutation } from "@tanstack/react-query";
 import React, { useEffect, useState } from "react";
 import { io } from "socket.io-client";
 import { api } from "@/config";
-import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
 
 let pathWhitelist = ["/login", "/register", "/verify-email"];
 
-if (process.env.NODE_ENV === "development") pathWhitelist.push("/test");
-
 type GlobalTemplateProps = {
   children?: React.ReactNode;
 };
 
-const queryClient = new QueryClient();
-
-export function GlobalTemplateConfig({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  return (
-    <>
-      <QueryClientProvider client={queryClient}>
-        <GlobalTemplate>{children}</GlobalTemplate>
-        <ReactQueryDevtools initialIsOpen={false} />
-      </QueryClientProvider>
-    </>
-  );
-}
-
 export default function GlobalTemplate({ children }: GlobalTemplateProps) {
   const [onRender, setOnRender] = useState(false);