rebasing and fixing conflicts

Author: kennyg37

Diff for: src/controllers/user.controller.ts

@@ -2,10 +2,8 @@ import { Request, Response } from "express";
 import { UserSignupAttributes } from "../types/user.types";
 import { UserService } from "../services/user.services";
 import { hashPassword } from "../utils/password.utils";
-import { generateVerificationToken } from "../utils/tokenGenerator.utils";
+import { generateToken, generateVerificationToken } from "../utils/tokenGenerator.utils";
 import { sendEmail } from "../utils/email.utils";
-
-
 import { comparePassword } from "../utils/password.utils";
 
 export const userSignup = async (req: Request, res: Response) => {

Diff for: src/routes/user.route.ts

@@ -12,4 +12,7 @@ userRoutes.post('/login', validateUserLogin, userLogin);
 // verify user email
 userRoutes.get('/verify-email',verifyEmail);
 
+// verify user email
+userRoutes.get('/verify-email',verifyEmail);
+
 export default userRoutes;