fix: resolved merge conflict in notification page

src/app/(auth-routes)/login/page.tsx

@@ -25,7 +25,7 @@ import { useToast } from "~/components/ui/use-toast";
 import { cn } from "~/lib/utils";
 import { LoginSchema } from "~/schemas";
 import { getApiUrl } from "~/utils/getApiUrl";
-import { loginUser } from "~/utils/login";
+import { loginAuth } from "~/utils/loginAuth";
 
 const Login = () => {
   const router = useRouter();
@@ -66,7 +66,7 @@ const Login = () => {
 
   const onSubmit = async (values: z.infer<typeof LoginSchema>) => {
     startTransition(async () => {
-      await loginUser(values).then(async (data) => {
+      await loginAuth(values).then(async (data) => {
         const { email, password } = values;
 
         if (data.status === 200) {

src/app/(auth-routes)/register/organisation/page.tsx

@@ -1,10 +1,14 @@
 "use client";
 
 import { zodResolver } from "@hookform/resolvers/zod";
+import { useSession } from "next-auth/react";
+import { useRouter } from "next-nprogress-bar";
 import Link from "next/link";
+import { useTransition } from "react";
 import { useForm } from "react-hook-form";
 import { z } from "zod";
 
+import LoadingSpinner from "~/components/miscellaneous/loading-spinner";
 import { Button } from "~/components/ui/button";
 import {
   Form,
@@ -22,47 +26,53 @@ import {
   SelectTrigger,
   SelectValue,
 } from "~/components/ui/select";
+import { useToast } from "~/components/ui/use-toast";
+import { organizationSchema } from "~/schemas";
+import { createOrg } from "~/utils/createOrg";
 
-const formSchema = z.object({
-  fullname: z.string().min(2, {
-    message: "Fullname must be at least 2 characters.",
-  }),
-  email: z.string().email({
-    message: "Email must be a valid email address.",
-  }),
-  password: z.string().min(2, {
-    message: "Password must be at least 2 characters.",
-  }),
-  companyName: z.string().min(2, {
-    message: "Company name must be at least 2 characters.",
-  }),
-  companyEmail: z.string().email({
-    message: "Company email must be a valid email address.",
-  }),
-  industry: z.string().min(1, {
-    message: "Please select an industry.",
-  }),
-  organizationType: z.string().min(1, {
-    message: "Please select an organization type.",
-  }),
-  country: z.string().min(1, {
-    message: "Please select a country.",
-  }),
-  state: z.string().min(1, {
-    message: "Please select a state.",
-  }),
-  address: z.string().min(1, {
-    message: "Please enter company address.",
-  }),
-});
+function Organisation() {
+  const router = useRouter();
+  const { toast } = useToast();
+  const { status } = useSession();
+  const [isLoading, startTransition] = useTransition();
 
-type FormData = z.infer<typeof formSchema>;
+  if (status === "authenticated") {
+    router.push("/dashboard");
+  }
 
-function Organisation() {
-  const form = useForm<FormData>({
-    resolver: zodResolver(formSchema),
+  const form = useForm<z.infer<typeof organizationSchema>>({
+    resolver: zodResolver(organizationSchema),
+    defaultValues: {
+      name: "",
+      description: "Company Description",
+      email: "",
+      industry: "",
+      type: "",
+      country: "",
+      state: "",
+      address: "",
+    },
   });
 
+  const onSubmit = async (values: z.infer<typeof organizationSchema>) => {
+    const token = sessionStorage.getItem("temp_token");
+    startTransition(async () => {
+      await createOrg(values, token || "").then(async (data) => {
+        if (data.status === 201) {
+          router.push("/login");
+        }
+
+        toast({
+          title:
+            data.status === 201
+              ? "Organization created successfully"
+              : "an error occurred",
+          description: data.status === 201 ? "Continue to login" : data.error,
+        });
+      });
+    });
+  };
+
   return (
     <>
       <div>
@@ -77,10 +87,10 @@ function Organisation() {
 
         <div className="mx-auto md:w-2/4">
           <Form {...form}>
-            <form className="space-y-6">
+            <form className="space-y-6" onSubmit={form.handleSubmit(onSubmit)}>
               <FormField
                 control={form.control}
-                name="companyName"
+                name="name"
                 render={({ field }) => (
                   <FormItem className="flex flex-col gap-2">
                     <div>
@@ -98,7 +108,7 @@ function Organisation() {
               />
               <FormField
                 control={form.control}
-                name="companyEmail"
+                name="email"
                 render={({ field }) => (
                   <FormItem className="flex flex-col gap-2">
                     <div>
@@ -144,7 +154,7 @@ function Organisation() {
                 />
                 <FormField
                   control={form.control}
-                  name="organizationType"
+                  name="type"
                   render={({ field }) => (
                     <FormItem className="flex w-full flex-col gap-2">
                       <div className="w-full">
@@ -240,7 +250,16 @@ function Organisation() {
                 )}
               />
               <Button type="submit" className="w-full">
-                Create Account
+                {isLoading ? (
+                  <span className="flex items-center gap-x-2">
+                    <span className="animate-pulse">
+                      Creating Organization...
+                    </span>{" "}
+                    <LoadingSpinner className="size-4 animate-spin sm:size-5" />
+                  </span>
+                ) : (
+                  <span>Create Organization</span>
+                )}
               </Button>
               <div className="flex justify-center gap-2">
                 <p className="text-sm">Already Have An Account?</p>

src/app/(auth-routes)/register/page.tsx

@@ -68,6 +68,7 @@ const Register = () => {
     startTransition(async () => {
       await registerUser(values).then(async (data) => {
         if (data.status === 201) {
+          sessionStorage.setItem("temp_token", data.access_token);
           router.push("/register/organisation");
         }