Merge branch 'main' into authentication-issues

src/apis/api.tsx

@@ -3,7 +3,7 @@ import axios, {
   AxiosResponse,
   InternalAxiosRequestConfig,
 } from "axios";
-import { _EventInfo } from "../types";
+import { _EventInfo } from "../utils/types";
 
 /* set the token */
 

src/apis/eventApi.tsx

@@ -1,4 +1,4 @@
-import { _EventInfo } from "../types";
+import { _EventInfo } from "../utils/types";
 import {
   ResponseStatus,
   ResponseType,

src/apis/userApi.tsx

@@ -1,4 +1,9 @@
-import { _UserDetails, _UserLogin, _UserStep1, _UserStep2 } from "../types";
+import {
+  _UserDetails,
+  _UserLogin,
+  _UserStep1,
+  _UserStep2,
+} from "../utils/types";
 import {
   LoginStatus,
   ResponseStatus,

src/components/eventcard/EventCard.tsx

@@ -1,6 +1,6 @@
 import { Link } from "react-router-dom";
 import style from "./EventCard.module.css";
-import { _Event } from "../../types";
+import { _Event } from "../../utils/types";
 interface EventCardProps {
   event: _Event;
 }

src/components/eventlist/EventList.tsx

@@ -2,7 +2,7 @@ import style from "./EventList.module.css";
 import { useEffect, useState } from "react";
 import EventCard from "../eventcard/EventCard";
 import { getEvents } from "../../apis/eventApi";
-import { _Event } from "../../types";
+import { _Event } from "../../utils/types";
 import { useLoader } from "../toploader/useLoader";
 import { useToast } from "../toast/useToast";
 interface EventListProps {}

src/components/sidebar/Sidebar.tsx

@@ -1,5 +1,5 @@
 import style from "./Sidebar.module.css";
-import { _Event } from "../../types";
+import { _Event } from "../../utils/types";
 
 interface SidebarProps {
   state: boolean;

src/components/toast/Toast.tsx

@@ -1,5 +1,5 @@
 import style from "./Toast.module.css";
-import { _Event } from "../../types";
+import { _Event } from "../../utils/types";
 import { useEffect } from "react";
 import { useToast } from "./useToast";
 interface ToastProps {}

src/components/usercard/UserCard.tsx

@@ -1,5 +1,5 @@
 import style from "./UserCard.module.css";
-import { _Event, _UserDetails } from "../../types";
+import { _Event, _UserDetails } from "../../utils/types";
 import defaultProfile from "../../assets/frlIf.png";
 
 interface UserCardProps {

src/pages/dashboard/Dashboard.tsx

@@ -5,7 +5,7 @@ import { userDetails } from "../../apis/userApi";
 import { useLoader } from "../../components/toploader/useLoader";
 import { useToast } from "../../components/toast/useToast";
 import { useNavigate } from "react-router-dom";
-import { _UserDetails } from "../../types";
+import { _UserDetails } from "../../utils/types";
 import UserCard from "../../components/usercard/UserCard";
 import EventList from "../../components/eventlist/EventList";
 import { myEvents } from "../../apis/eventApi";

src/pages/event/Event.tsx

@@ -2,7 +2,7 @@ import style from "./Event.module.css";
 // import SecondaryButton from '../../components/buttons/secondary_button/SecondaryButton';
 import Footer from "../../components/footer/Footer";
 import { useEffect, useState } from "react";
-import { _EventInfo } from "../../types";
+import { _EventInfo } from "../../utils/types";
 import { getEvents } from "../../apis/eventApi";
 import { useParams } from "react-router-dom";
 import { useLoader } from "../../components/toploader/useLoader";

src/pages/login/Login.tsx

@@ -3,7 +3,12 @@ import style from "./Login.module.css";
 import { Link, useNavigate } from "react-router-dom";
 // import logo from "../../assets/Logo KBM.png";
 import alien from "../../assets/dehill-spacelove-1-dribble.gif";
-import { _EventInfo, _UserDetails, _UserLogin, _UserStep1 } from "../../types";
+import {
+  _EventInfo,
+  _UserDetails,
+  _UserLogin,
+  _UserStep1,
+} from "../../utils/types";
 import { loginEmail } from "../../apis/userApi";
 import { useLoader } from "../../components/toploader/useLoader";
 import { useToast } from "../../components/toast/useToast";

src/pages/register/Register.tsx

@@ -3,7 +3,7 @@ import style from "./Register.module.css";
 import { Link, useNavigate } from "react-router-dom";
 // import logo from "../../assets/Logo KBM.png";
 import alien from "../../assets/dehill-spacelove-1-dribble.gif";
-import { _EventInfo, _UserDetails, _UserStep1 } from "../../types";
+import { _EventInfo, _UserDetails, _UserStep1 } from "../../utils/types";
 import { createAccount } from "../../apis/userApi";
 import { useLoader } from "../../components/toploader/useLoader";
 import { useToast } from "../../components/toast/useToast";

src/pages/register/RegisterStep2.tsx

@@ -3,7 +3,12 @@ import style from "./Register.module.css";
 import { Link, useNavigate } from "react-router-dom";
 // import logo from "../../assets/Logo KBM.png";
 import alien from "../../assets/dehill-spacelove-1-dribble.gif";
-import { _EventInfo, _UserDetails, _UserStep1, _UserStep2 } from "../../types";
+import {
+  _EventInfo,
+  _UserDetails,
+  _UserStep1,
+  _UserStep2,
+} from "../../utils/types";
 import { useLoader } from "../../components/toploader/useLoader";
 import { useToast } from "../../components/toast/useToast";
 import { completeRegistration } from "../../apis/userApi";