diff --git a/frontend/pages/Signin.vue b/frontend/pages/Signin.vue
index 608ad5e..6f2f613 100644
--- a/frontend/pages/Signin.vue
+++ b/frontend/pages/Signin.vue
@@ -1,25 +1,55 @@
 <template>
-  <div class="main min-[1120px]:flex min-[1120px]:justify-evenly py-[2rem] md:py-[0rem] px-[0.1rem] md:mt-[2rem] mt-[1rem] ">
+  <div
+    class="main min-[1120px]:flex min-[1120px]:justify-evenly py-[2rem] md:py-[0rem] px-[0.1rem] md:mt-[2rem] mt-[1rem]"
+  >
     <div class="left-panel mt-[5.5rem] max-[1119px]:hidden min-[1120px]:block">
-      <img src="../assets/37.order-delivered-3.png" class="border-1 border-gray-400 min-[1120px]:order-1 h-[50vh]" alt="delivery-img">
+      <img
+        src="../assets/37.order-delivered-3.png"
+        class="border-1 border-gray-400 min-[1120px]:order-1 h-[50vh]"
+        alt="delivery-img"
+      />
     </div>
     <div class="right-panel max-[1119px]:px-[2rem] min-[1120px]:px-[0rem]">
       <div class="form-container">
         <form @submit.prevent="submitForm">
-          <div class="credentials - container min-[1120px]:order-2 min-[1120px]:mt-[3rem]">
+          <div
+            class="credentials - container min-[1120px]:order-2 min-[1120px]:mt-[3rem]"
+          >
             <div class="catch-line-outer">
               <div class="catch-line-inner">
-                <p class="text-slate-500 font-semibold py-[2rem]">Welcome back! Please enter your details</p>
+                <p class="text-slate-500 font-semibold py-[2rem]">
+                  Welcome back! Please enter your details
+                </p>
               </div>
             </div>
             <div class="credentials">
               <div class="email py-[1.0rem]">
-                <p class="font-bold subpixel-antialiased text-slate-500/[.98] py-[0.1rem] tracking-wide text-slate-800 ">Email</p>
-                <input type="email" required class="px-[1rem] border-2 h-[2.69rem] border-black-300 max-[1119px]:w-full min-[1120px]:w-[35rem] rounded-lg" v-model.trim.lazy="credentials.email" placeholder="Enter your email"/>
+                <p
+                  class="font-bold subpixel-antialiased text-slate-500/[.98] py-[0.1rem] tracking-wide text-slate-800"
+                >
+                  Email
+                </p>
+                <input
+                  type="email"
+                  required
+                  class="px-[1rem] border-2 h-[2.69rem] border-black-300 max-[1119px]:w-full min-[1120px]:w-[35rem] rounded-lg"
+                  v-model.trim.lazy="credentials.email"
+                  placeholder="Enter your email"
+                />
               </div>
-              <div class="password  py-[1.0rem]">
-                <p class="font-bold subpixel-antialiased text-slate-500/[.98] tracking-wide py-[0.1rem] text-slate-800">Password</p>
-                <input type="password" required class="px-[1rem] border-2 h-[2.69rem] border-black-300 max-[1119px]:w-full min-[1120px]:w-[35rem] rounded-lg" v-model.trim.lazy="credentials.password" placeholder="***********"/>
+              <div class="password py-[1.0rem]">
+                <p
+                  class="font-bold subpixel-antialiased text-slate-500/[.98] tracking-wide py-[0.1rem] text-slate-800"
+                >
+                  Password
+                </p>
+                <input
+                  type="password"
+                  required
+                  class="px-[1rem] border-2 h-[2.69rem] border-black-300 max-[1119px]:w-full min-[1120px]:w-[35rem] rounded-lg"
+                  v-model.trim.lazy="credentials.password"
+                  placeholder="***********"
+                />
               </div>
             </div>
             <!-- <div class="remember-forgot py-[1.0rem] flex justify-between hi"> -->
@@ -31,15 +61,26 @@
             <!--     <a href="#" class="font-bold subpixel-antialiased tracking-wide text-slate-800 fp">Forgot password ?</a> -->
             <!--   </div> -->
             <!-- </div> -->
-            <div class="sign-in  pt-[1rem] pb-[0rem]">
-              <button type="submit" class="signin w-full h-[3.25rem] rounded-[1.25rem]">
-                <p class="text-white hover:border-slate-500 py-[0rem]">Sign in</p>
+            <div class="sign-in pt-[1rem] pb-[0rem]">
+              <button
+                type="submit"
+                class="signin w-full h-[3.25rem] rounded-[1.25rem]"
+              >
+                <p class="text-white hover:border-slate-500 py-[0rem]">
+                  Sign in
+                </p>
               </button>
             </div>
             <div class="optional-sign-in mt-[0.7rem] hi">
               <p class="flex justify-center hi gap-1">
-                <span class="account-text tracking-wider dha">Don't have an account?</span>
-                <nuxt-link to="/Signup" class="text-red-500 hover:underlined tracking-wider suf">Sign up </nuxt-link>
+                <span class="account-text tracking-wider dha"
+                  >Don't have an account?</span
+                >
+                <nuxt-link
+                  to="/Signup"
+                  class="text-red-500 hover:underlined tracking-wider suf"
+                  >Sign up
+                </nuxt-link>
               </p>
             </div>
           </div>
@@ -50,35 +91,39 @@
 </template>
 
 <script>
-import { useAuthStore } from '../store/auth'
-
+import { useAuthStore } from "../store/auth";
+import { useRouter } from "vue-router";
 
 export default {
-  name: 'Signin',
+  name: "Signin",
   setup() {
     const credentials = {
-      email: '',
-      password: '',
-    }
+      email: "",
+      password: "",
+    };
 
-    const store = useAuthStore()
-    const router = useRouter()
+    const store = useAuthStore();
+    const router = useRouter();
+
+    if (store.isAuthenticated) {
+      router.push("/");
+    }
 
     const submitForm = async (e) => {
       e.preventDefault();
       const data = await store.login(credentials);
-    }
+    };
 
     return {
       credentials,
-      submitForm
-    }
-  }
-}
+      submitForm,
+    };
+  },
+};
 </script>
 <style scoped>
-.main{
-  font-family: 'Poppins', sans-serif;
+.main {
+  font-family: "Poppins", sans-serif;
   font-smooth: always;
   position: inherit;
   height: 100%;
@@ -89,18 +134,16 @@ export default {
   bottom: 0;
   background-color: white;
 }
-.signin{
-  background-color:rgba(234, 69, 76, 1);
+.signin {
+  background-color: rgba(234, 69, 76, 1);
 }
 @media (max-width: 420px) {
-  .hil{
+  .hil {
     margin-left: -20px !important;
   }
-  .hir
-  {
+  .hir {
     margin-right: -20px !important;
   }
-
 }
 @media (max-width: 420px) {
   /* .hil{
@@ -110,8 +153,7 @@ export default {
   {
     margin-right: -40px !important;
   } */
-  .hi
-  {
+  .hi {
     display: flex;
     flex-direction: column !important;
     gap: 5px;
@@ -120,28 +162,23 @@ export default {
     /* justify-content: center; */
     text-align: center;
   }
-  .dha
-  {
+  .dha {
     display: inline-block;
     /* font-size:larger; */
     margin-left: -30px !important;
     margin-right: -40px !important;
     text-align: center !important;
-
   }
-  .suf
-  {
+  .suf {
     display: inline-block;
     /* font-size:larger; */
     margin-left: -48px !important;
     margin-right: -45px !important;
     text-align: center !important;
   }
-  .fp
-  {
+  .fp {
     margin-left: -25px !important;
     text-align: center;
-
   }
   /* .hil{
     margin-left: 16px !important;
@@ -156,4 +193,5 @@ export default {
     margin-right: -43px !important;
   }
 } */
-</style>../store/auth
+</style>
+../store/auth
diff --git a/frontend/pages/Signup.vue b/frontend/pages/Signup.vue
index 3a4b025..dece8e8 100644
--- a/frontend/pages/Signup.vue
+++ b/frontend/pages/Signup.vue
@@ -5,7 +5,7 @@
     <div class="left-panel mt-[5.5rem] max-[1119px]:hidden min-[1120px]:block">
       <img
         src="../assets/37.order-delivered-3.png"
-        class=" border-1 border-gray-400 min-[1120px]:order-1 h-[50vh]"
+        class="border-1 border-gray-400 min-[1120px]:order-1 h-[50vh]"
         alt="delivery-img"
       />
     </div>
@@ -26,7 +26,9 @@
           <div class="credentials">
             <div class="flex flex-wrap">
               <div class="username py-[0.5rem] w-full md:w-1/2 md:pr-2">
-                <p class="font-bold text-slate-500/[.98] py-[0.1rem] tracking-wider text-slate-800">
+                <p
+                  class="font-bold text-slate-500/[.98] py-[0.1rem] tracking-wider text-slate-800"
+                >
                   First Name
                 </p>
                 <input
@@ -38,7 +40,9 @@
                 />
               </div>
               <div class="username py-[0.5rem] w-full md:w-1/2 md:pl-2">
-                <p class="font-bold text-slate-500/[.98] py-[0.1rem] tracking-wider text-slate-800">
+                <p
+                  class="font-bold text-slate-500/[.98] py-[0.1rem] tracking-wider text-slate-800"
+                >
                   Last Name
                 </p>
                 <input
@@ -51,11 +55,19 @@
               </div>
             </div>
 
-            <div class ="phone-number py-[0.5rem]">
-              <p class = "font-bold text-slate-500/[.98] py-[0.1rem] tracking-wider text-slate-800">Phone Number</p>
-              <input type="tel" class = "px-[1rem] border-2 h-[2.69rem] border-black-300 w-full items-center rounded-lg min-[1120px]:w-[35rem]"
-              v-model.trim.lazy = "credentials.phone_number"
-              placeholder="Enter your phone number" required/>
+            <div class="phone-number py-[0.5rem]">
+              <p
+                class="font-bold text-slate-500/[.98] py-[0.1rem] tracking-wider text-slate-800"
+              >
+                Phone Number
+              </p>
+              <input
+                type="tel"
+                class="px-[1rem] border-2 h-[2.69rem] border-black-300 w-full items-center rounded-lg min-[1120px]:w-[35rem]"
+                v-model.trim.lazy="credentials.phone_number"
+                placeholder="Enter your phone number"
+                required
+              />
             </div>
             <div class="email py-[0.5rem]">
               <p
@@ -107,7 +119,8 @@
               <button
                 type="submit"
                 id="Sign-up"
-                class="signup w-full h-[3.25rem] rounded-[1.25rem] backdrop-blur-lg" onclick=(submitForm)
+                class="signup w-full h-[3.25rem] rounded-[1.25rem] backdrop-blur-lg"
+                onclick="(submitForm)"
               >
                 <p class="text-white hover:border-slate-500 tracking-wider">
                   Sign Up
@@ -115,13 +128,16 @@
               </button>
             </a>
           </div>
-
           <div class="optional-sign-in mt-[0.7rem] hi">
             <p class="flex justify-center hi">
               <span class="account-text tracking-wider dha"
                 >Already have an account?
               </span>
-              <nuxt-link to="/Signin" class="text-red-500 hover:underlined tracking-wider suf">Sign in</nuxt-link>
+              <nuxt-link
+                to="/Signin"
+                class="text-red-500 hover:underlined tracking-wider suf"
+                >Sign in</nuxt-link
+              >
             </p>
           </div>
         </div>
@@ -131,66 +147,75 @@
 </template>
 
 <script>
-import { toast } from 'vue3-toastify'
-import { useAuthStore } from '../store/auth'
-import { useRouter } from 'vue-router'
+import { toast } from "vue3-toastify";
+import { useAuthStore } from "../store/auth";
+import { useRouter } from "vue-router";
 
 export default {
-  name: 'Signup',
+  name: "Signup",
   setup() {
     const credentials = {
-      first_name: '',
-      last_name: '',
+      first_name: "",
+      last_name: "",
       phone_number: "",
-      email: '',
-      password: '',
-      password_check: '',
+      email: "",
+      password: "",
+      password_check: "",
+    };
+
+    const store = useAuthStore();
+    const router = useRouter();
+
+    if (store.isAuthenticated) {
+      router.push("/");
     }
-    const store = useAuthStore()
-    const router = useRouter()
 
     const submitForm = async (e) => {
       e.preventDefault();
 
-    const emailRegex = /[a-zA-Z0-9._%+-]+@iiitdmj\.ac\.in/;
-    if (!emailRegex.test(credentials.email)) {
-      toast.error("Please enter a valid institute email address", {
-        autoClose: 2000,
-        position: toast.POSITION.BOTTOM_CENTER
-      });
-      return;
-    }
+      if (credentials.phone_number.length != 10) {
+        toast.error("Please enter a valid phone number", {
+          autoClose: 2000,
+          position: toast.POSITION.BOTTOM_CENTER,
+        });
+        return;
+      }
 
-      if (checker()){
+      const emailRegex = /[a-zA-Z0-9._%+-]+@iiitdmj\.ac\.in$/;
+      if (!emailRegex.test(credentials.email)) {
+        toast.error("Please enter a valid institute email address", {
+          autoClose: 2000,
+          position: toast.POSITION.BOTTOM_CENTER,
+        });
+        return;
+      }
 
+      if (checker()) {
         store.register(credentials);
-      }
-      else{
-        toast.error("Passwords do not match",{
+      } else {
+        toast.error("Passwords do not match", {
           autoClose: 2000,
-          position:  toast.POSITION.BOTTOM_CENTER
-        })
+          position: toast.POSITION.BOTTOM_CENTER,
+        });
       }
-
-    }
+    };
 
     const checker = () => {
       if (credentials.password !== credentials.password_check) {
         return false;
       }
       return true;
-    }
+    };
 
     return {
       credentials,
       submitForm,
-      checker
-    }
-  }
-}
+      checker,
+    };
+  },
+};
 </script>
 
-
 <style scoped>
 .main {
   font-family: "Poppins", sans-serif;
@@ -228,6 +253,5 @@ export default {
     margin-right: 5px !important;
     text-align: center !important;
   }
-
 }
 </style>