@@ -6,7 +37,33 @@ const Register = () => {
Create an Account
-
diff --git a/src/schema/authSchema.js b/src/schema/authSchema.js
index 9a739d6..2fee15f 100644
--- a/src/schema/authSchema.js
+++ b/src/schema/authSchema.js
@@ -7,14 +7,15 @@ export const loginSchema = z.object({
export const registerSchema = z
.object({
+ name: z.string().min(1, "Full name is required"),
email: z.string().min(1, "Email is required").email("Invalid email format"),
password: z
.string()
- .min(8, "Password must be at least 8 characters")
- .regex(
- /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]{8,}$/,
- "Password must contain at least one uppercase letter, one lowercase letter, one number, and one special character"
- ),
+ .min(8, "Password must be at least 8 characters"),
+ // .regex(
+ // /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]{8,}$/,
+ // "Password must contain at least one uppercase letter, one lowercase letter, one number, and one special character"
+ // ),
confirmPassword: z.string().min(1, "Please confirm your password"),
})
.refine((data) => data.password === data.confirmPassword, {
diff --git a/src/store/App.jsx b/src/store/App.jsx
new file mode 100644
index 0000000..843102d
--- /dev/null
+++ b/src/store/App.jsx
@@ -0,0 +1,44 @@
+import { Routes, Route } from "react-router-dom";
+import Login from "../pages/Login";
+import Register from "../pages/Register";
+import CreateNote from "../pages/CreateNote";
+import ViewNotes from "../pages/ViewNotes";
+import Navbar from "../components/Navbar";
+import ProtectedRoute from "../components/auth/ProtectedRoute";
+
+const App = () => {
+ return (
+
+
+
+
+
+
+
+
+ } />
+
+
+
+ } />
+
+
+
+
+
+ } />
+
+
+
+ } />
+
+
+
+ );
+};
+
+export default App;
diff --git a/src/store/slices/authSlice.js b/src/store/slices/authSlice.js
index 35778d0..a9c48e9 100644
--- a/src/store/slices/authSlice.js
+++ b/src/store/slices/authSlice.js
@@ -13,9 +13,16 @@ export const checkAuthStatus = createAsyncThunk(
// 1. Make a GET request to /auth/check
// 2. Return the response data
// 3. Handle errors appropriately
- }
-);
-
+ try {
+ const response = await axios.get(`${BASE_URL}/auth/check`)
+ return response.data.user;
+ }
+ catch (error) {
+ return rejectWithValue(
+ error.response?.data?.message
+ );
+ }
+ });
// TODO: Implement login thunk
export const login = createAsyncThunk(
"auth/login",
@@ -24,19 +31,36 @@ export const login = createAsyncThunk(
// 1. Make a POST request to /auth/login with credentials
// 2. Return the response data
// 3. Handle errors appropriately
- }
-);
+ try {
+ const response = await axios.post(`${BASE_URL}/auth/login`, credentials)
+ return response.data.user;
+ }
+ catch (error) {
+ return rejectWithValue(
+ error.response?.data?.message
+ );
+ }
+ });
// TODO: Implement register thunk
-export const register = createAsyncThunk(
- "auth/register",
+export const registerUser = createAsyncThunk(
+ "auth/registerUser",
async (userData, { rejectWithValue }) => {
// TODO: Implement registration functionality
// 1. Make a POST request to /auth/register with userData
// 2. Return the response data
// 3. Handle errors appropriately
- }
-);
+ try {
+ const response = await axios.post(`${BASE_URL}/auth/register`, userData)
+ console.log(`${BASE_URL}/auth/register`);
+ return response.data.user;
+ }
+ catch (error) {
+ return rejectWithValue(
+ error.response?.data?.message
+ );
+ }
+ });
// TODO: Implement logout thunk
export const logout = createAsyncThunk(
@@ -45,14 +69,23 @@ export const logout = createAsyncThunk(
// TODO: Implement logout functionality
// 1. Make a POST request to /auth/logout
// 2. Handle errors appropriately
- }
-);
+ try {
+ const response = await axios.post(`${BASE_URL}/auth/logout`)
+ }
+ catch (error) {
+ return rejectWithValue(
+ error.response?.data?.message
+ );
+ }
+ });
+
const initialState = {
user: null,
isAuthenticated: false,
loading: true,
error: null,
+ status:"idle",
};
const authSlice = createSlice({
@@ -64,13 +97,66 @@ const authSlice = createSlice({
},
},
extraReducers: (builder) => {
- builder;
- // TODO: Add cases for checkAuthStatus
- // TODO: Add cases for login
- // TODO: Add cases for register
- // TODO: Add cases for logout
+ builder
+ // TODO: Add cases for checkAuthStatus
+
+ .addCase(checkAuthStatus.pending, (state) => {
+ state.status = "loading";
+ })
+ .addCase(checkAuthStatus.fulfilled, (state, action) => {
+ state.status = "succeeded";
+ state.isAuthenticated = true;
+ state.user = action.payload;
+ state.error = null;
+ })
+ .addCase(checkAuthStatus.rejected, (state) => {
+ state.status = "idle";
+ state.isAuthenticated = false;
+ state.user = null;
+ })
+
+ // TODO: Add cases for login
+ .addCase(login.pending, (state) => {
+ state.status = "loading";
+ state.error = null;
+ })
+ .addCase(login.fulfilled, (state, action) => {
+ state.status = "succeeded";
+ state.isAuthenticated = true;
+ state.user = action.payload;
+ state.error = null;
+ })
+ .addCase(login.rejected, (state, action) => {
+ state.status = "failed";
+ state.error = action.payload;
+ })
+
+ // TODO: Add cases for register
+ .addCase(registerUser.pending, (state) => {
+ state.status = "loading";
+ state.error = null;
+ })
+ .addCase(registerUser.fulfilled, (state, action) => {
+ state.status = "succeeded";
+ state.isAuthenticated = true;
+ state.user = action.payload;
+ state.error = null;
+ })
+ .addCase(registerUser.rejected, (state, action) => {
+ state.status = "failed";
+ state.error = action.payload;
+ })
+
+ // TODO: Add cases for logout
+ .addCase(logout.fulfilled, (state) => {
+ state.status = "idle";
+ state.isAuthenticated = false;
+ state.user = null;
+ state.error = null;
+ });
},
});
+
export const { clearError } = authSlice.actions;
export default authSlice.reducer;