Merge branch 'master' of https://github.com/Sanchitbajaj02/palettegram

Author: Sanchitbajaj02

README.md

@@ -92,6 +92,13 @@ This repository also provides one such platform where contributors come over and
 
 ### Visit https://palettegram.vercel.app to see the live demo!
 
+### Demo Credentials to test applications:
+
+|Email Address| Password|
+|--------|--------------|
+|demo@gmail.com|SharePassword@101|
+
+
 ## 👋 Introduction
 
 Palettegram is a social media application dedicated to professionals like graphic designers, UI/UX designers, Developers, etc. to leverage UI designs, design ideas, UX approaches, and color palettes.

public/assets/img-1.png

@@ -12,12 +12,16 @@ import { saveUserToStore } from "@/redux/reducers/authReducer";
 import { toastify } from "@/helper/toastify";
 
 // API
-import { login, loginWithGithub, logoutUser } from "@/backend/auth.api";
+import { login, loginWithGithub } from "@/backend/auth.api";
 
 // Icons
 import { userCollectionDB } from "@/types/auth";
 import { setCookie } from "nookies";
 
+const disallowedPasswordRegex: RegExp = /[^A-Za-z\d@_!#$%^&]/;
+const passwordRegex: RegExp = /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[@_!#$%^&])[A-Za-z\d@_!#$%^&]{6,24}$/;
+
+
 export default function LoginComponent() {
   const [isLoading, setIsLoading] = useState(false);
   const [showPassword, setShowPassword] = useState(false);
@@ -44,14 +48,22 @@ export default function LoginComponent() {
     try {
       setIsLoading(true);
 
-      if (data.password.length < 6 || data.password.length > 16) {
-        throw new Error("Password should be in range of 6 to 16 characters");
-      }
-
       if (data.email === "" || data.password === "") {
         throw new Error("Email and Password fields should be filled");
       }
 
+      if (data.password.length < 6 || data.password.length > 24) {
+        throw new Error("Password should be in range of 6 to 24 characters");
+      }
+
+      if (disallowedPasswordRegex.test(data.password)) {
+        throw new Error("Invalid password. Only the following special characters are allowed: @, _, !, #, $, %, ^, &");
+      }
+
+      if (!passwordRegex.test(data.password)) {
+        throw new Error("password format not matched");
+      }
+
       const resp = await login(data.email, data.password);
 
       if (resp && resp.email === data.email) {

public/assets/img-2.png

@@ -99,7 +99,7 @@ function HomePage({ accountId }: { accountId: string | undefined }) {
               }}
             >
               <Image
-                src="/assets/imgA.png"
+                src="/assets/img-1.png"
                 alt="What is palettegram section"
                 loading="lazy"
                 width={600}
@@ -185,7 +185,7 @@ function HomePage({ accountId }: { accountId: string | undefined }) {
               }}
             >
               <Image
-                src="/assets/imgB.png"
+                src="/assets/img-2.png"
                 alt="Who is palettegram for section"
                 loading="lazy"
                 width={600}
@@ -210,7 +210,7 @@ function HomePage({ accountId }: { accountId: string | undefined }) {
               }}
             >
               <Image
-                src="/assets/imgC.png"
+                src="/assets/img-3.png"
                 alt="What you can do section"
                 loading="lazy"
                 width={600}