Merge pull request #10 from azeddine-hmd/dev

Major Refactor: migrate to React-Query and Axios. Uplaodd avatar after registation but before activation

README.md

@@ -23,6 +23,7 @@ docker compose up --build
   * Nextjs 13
   * Server/Client component
   * Tailwindcss
+  * Framer-Motion (animation)
 
 ## Example :
   Check hosted webserver on: [Chichat | talk and hang out with friends](https://chichat.azeddine.xyz)

backend/prisma/migrations/20231212081228_avatar_file_in_user_model/migration.sql

@@ -0,0 +1,8 @@
+/*
+  Warnings:
+
+  - A unique constraint covering the columns `[uploadedById]` on the table `File` will be added. If there are existing duplicate values, this will fail.
+
+*/
+-- CreateIndex
+CREATE UNIQUE INDEX "File_uploadedById_key" ON "File"("uploadedById");

backend/prisma/migrations/20231215040248_adding_cascade_to_file_and_user_relation/migration.sql

@@ -0,0 +1,5 @@
+-- DropForeignKey
+ALTER TABLE "File" DROP CONSTRAINT "File_uploadedById_fkey";
+
+-- AddForeignKey
+ALTER TABLE "File" ADD CONSTRAINT "File_uploadedById_fkey" FOREIGN KEY ("uploadedById") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;

backend/prisma/schema.prisma

@@ -33,7 +33,7 @@ model User {
     Block2         Block[]             @relation("Block2")
     PendingFriend1 PendingFriendship[] @relation("PendingFriend1")
     PendingFriend2 PendingFriendship[] @relation("PendingFriend2")
-    files          File[]
+    avatar         File?
     sockets        UserSockets[]
 }
 
@@ -104,9 +104,9 @@ model File {
     url          String
     mimeType     String
     fileSize     Int
-    uploadedById Int
+    uploadedById Int      @unique
     createdAt    DateTime @default(now())
     updatedAt    DateTime @updatedAt
 
-    uploadedBy User @relation(fields: [uploadedById], references: [id])
+    uploadedBy User @relation(fields: [uploadedById], references: [id], onDelete: Cascade)
 }

backend/src/api/auth/auth-controller.ts

@@ -6,18 +6,24 @@ import * as authService from './auth-service';
 import { VerifyEmailDto } from './dto/verify-email';
 import { LoginDto } from './dto/login-dto';
 import { defaultCookieOptions } from '../../config';
+import * as profileService from '../users/services/profile-service';
 
 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();
+}
+
+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 authService.sendEmailVerification(user);
-  res.status(201).send({
-    id: user.id,
-    username: user.username,
-    email: user.email,
-  });
+  res.status(201).send({ url: avatar.url });
 }
 
 export async function login(req: Request, res: Response) {
@@ -34,6 +40,9 @@ 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();

backend/src/api/auth/auth-service.ts

@@ -21,6 +21,15 @@ export async function registerUser(registerDto: RegisterDto): Promise<User> {
   return user;
 }
 
+export async function getUser(email: string, password: string) {
+  const user = await prisma.user.findFirst({
+    where: { email: email },
+  });
+  if (!(await comparePassword(password, user.password)))
+    throw new HttpError(400, 'no such user with email and password');
+  return user;
+}
+
 export async function sendEmailVerification(user: User) {
   if (process.env.NODE_ENV === 'test') return;
   const emailSecret = randomUUID();
@@ -82,6 +91,7 @@ export async function login(email: string, password?: string) {
       password: true,
       username: true,
       active: true,
+      avatar: true,
     },
   });
   if (!user || (password && !comparePassword(password, user.password)))

backend/src/api/auth/route.ts

@@ -1,6 +1,7 @@
 import { Router } from 'express';
 import * as authController from './auth-controller';
 import passport from 'passport';
+import { upload } from '../../config';
 
 const prefix = '/auth';
 
@@ -13,5 +14,23 @@ authRouter.get(
 );
 
 authRouter.post(prefix + '/register', authController.register);
-authRouter.post(prefix + '/email-verify', authController.verifyEmail);
+authRouter.post(
+  prefix + '/upload/avatar',
+  upload.fields([
+    {
+      name: 'email',
+    },
+    {
+      name: 'password',
+    },
+    {
+      name: 'avatar',
+    },
+  ]),
+  authController.uploadAvatar
+);
+authRouter.post(
+  prefix + '/email-verify',
+  authController.verifyEmail
+);
 authRouter.post(prefix + '/login', authController.login);

backend/src/api/users/controllers/profile-controller.ts

@@ -15,19 +15,18 @@ function mapToProfileResponse(user: User, avatar?: File) {
 }
 
 export async function myProfile(req: Request, res: Response) {
-  const { user, avatar } = await profileService.getProfile(req.user.id);
-  res.status(200).send(mapToProfileResponse(user, avatar));
+  const { profile, avatar } = await profileService.getProfile(req.user.id);
+  res.status(200).send(mapToProfileResponse(profile, avatar));
 }
 
 export async function otherProfile(req: Request, res: Response) {
   const id = parseInt(req.params.id);
   if (!id) throw new HttpError(400, 'Invalid id');
-  const { user, avatar } = await profileService.getProfile(id);
-  res.status(200).send(mapToProfileResponse(user, avatar));
+  const { profile, avatar } = await profileService.getProfile(id);
+  res.status(200).send(mapToProfileResponse(profile, avatar));
 }
 
 export async function uploadAvatar(req: Request, res: Response) {
-  console.log('Uploaded file: ', req.file);
-  const avatar = await profileService.uploadFile(req.user, req.file);
+  const avatar = await profileService.uploadAvatar(req.user, req.file);
   res.status(201).send({ url: avatar.url });
 }

backend/src/api/users/services/profile-service.ts

@@ -5,17 +5,19 @@ export async function getProfile(id: number) {
   const user = await prisma.user.findUnique({
     where: { id: id },
     include: {
-      files: true,
+      avatar: true,
     },
   });
-  const avatar = user.files.find((file) => file['fieldname'] === 'avatar');
   return {
-    user: user,
-    avatar: avatar,
+    profile: user,
+    avatar: user.avatar,
   };
 }
 
-export async function uploadFile(me: Express.User, file: Express.Multer.File) {
+export async function uploadAvatar(
+  me: Express.User,
+  file: Express.Multer.File
+) {
   try {
     const avatar = await prisma.file.create({
       data: {

backend/src/config/pg.ts

@@ -1,7 +1,5 @@
 import { Pool } from 'pg';
 
-console.log('loading pg.ts file');
-
 export const pool = new Pool({
   user: process.env.POSTGRES_USER,
   host: process.env.POSTGRES_HOST,

frontend/.eslintrc.json

@@ -1,6 +1,6 @@
 {
-  "extends": "next/core-web-vitals"
-  // "rules": {
-  //   "max-len": ["error", {"code": 120}]
-  // }
+  "extends": [
+    "next/core-web-vitals",
+    "plugin:@tanstack/eslint-plugin-query/recommended"
+  ]
 }

frontend/app/(auth)/login/page.tsx

@@ -3,8 +3,8 @@
 import FormField from "@/components/molecules/form-field";
 import PrimaryDotLoadingButton from "@/components/molecules/primary-dot-loading-button";
 import { loginUser } from "@/network/login";
-import { delay } from "@/utils/delay";
-import { strongEmail } from "@/utils/yup-extra";
+import { delay } from "@/lib/delay";
+import { strongEmail } from "@/lib/yup-extra";
 import { Formik } from "formik";
 import { motion } from "framer-motion";
 import Link from "next/link";
@@ -41,9 +41,6 @@ export default function Login() {
       } else {
         setLoadingState(false);
         setError(error.message);
-        // setTimeout(() => {
-        //   setError(null);
-        // }, 10_000);
       }
     })();
   }