diff --git a/package-lock.json b/package-lock.json index ac545a5..223f02b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,6 +10,7 @@ "dependencies": { "@popperjs/core": "^2.11.8", "@reduxjs/toolkit": "^2.6.0", + "axios": "^1.8.1", "bootstrap": "^5.3.3", "react": "^19.0.0", "react-dom": "^19.0.0", @@ -1535,6 +1536,11 @@ "node": ">= 0.4" } }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + }, "node_modules/available-typed-arrays": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", @@ -1550,6 +1556,16 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/axios": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.8.1.tgz", + "integrity": "sha512-NN+fvwH/kV01dYUQ3PTOZns4LWtWhOFCAhQ/pHb88WQ1hNe5V/dvFwc4VJcDL11LT9xSX0QtsR8sWUuyOuOq7g==", + "dependencies": { + "follow-redirects": "^1.15.6", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -1662,7 +1678,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", - "dev": true, "dependencies": { "es-errors": "^1.3.0", "function-bind": "^1.1.2" @@ -1786,6 +1801,17 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -1934,6 +1960,14 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/doctrine": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", @@ -1950,7 +1984,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", - "dev": true, "dependencies": { "call-bind-apply-helpers": "^1.0.1", "es-errors": "^1.3.0", @@ -2035,7 +2068,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", - "dev": true, "engines": { "node": ">= 0.4" } @@ -2044,7 +2076,6 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", - "dev": true, "engines": { "node": ">= 0.4" } @@ -2080,7 +2111,6 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", - "dev": true, "dependencies": { "es-errors": "^1.3.0" }, @@ -2092,7 +2122,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", - "dev": true, "dependencies": { "es-errors": "^1.3.0", "get-intrinsic": "^1.2.6", @@ -2469,6 +2498,25 @@ "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==", "dev": true }, + "node_modules/follow-redirects": { + "version": "1.15.9", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz", + "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, "node_modules/for-each": { "version": "0.3.5", "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz", @@ -2484,6 +2532,20 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/form-data": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz", + "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "es-set-tostringtag": "^2.1.0", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/fsevents": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", @@ -2502,7 +2564,6 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", - "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -2549,7 +2610,6 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", - "dev": true, "dependencies": { "call-bind-apply-helpers": "^1.0.2", "es-define-property": "^1.0.1", @@ -2573,7 +2633,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", - "dev": true, "dependencies": { "dunder-proto": "^1.0.1", "es-object-atoms": "^1.0.0" @@ -2643,7 +2702,6 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", - "dev": true, "engines": { "node": ">= 0.4" }, @@ -2703,7 +2761,6 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", - "dev": true, "engines": { "node": ">= 0.4" }, @@ -2715,7 +2772,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", - "dev": true, "dependencies": { "has-symbols": "^1.0.3" }, @@ -2730,7 +2786,6 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", - "dev": true, "dependencies": { "function-bind": "^1.1.2" }, @@ -3339,11 +3394,29 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", - "dev": true, "engines": { "node": ">= 0.4" } }, + "node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", @@ -3676,6 +3749,11 @@ "react-is": "^16.13.1" } }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, "node_modules/punycode": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", diff --git a/package.json b/package.json index e788603..853b2f7 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "dependencies": { "@popperjs/core": "^2.11.8", "@reduxjs/toolkit": "^2.6.0", + "axios": "^1.8.1", "bootstrap": "^5.3.3", "react": "^19.0.0", "react-dom": "^19.0.0", diff --git a/public/vite.svg b/public/vite.svg index e7b8dfb..40d10df 100644 --- a/public/vite.svg +++ b/public/vite.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/App.jsx b/src/App.jsx index d0dde09..98bca94 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -1,7 +1,27 @@ -import HeaderWithNav from './layouts/HeaderWithNav'; -import AppRouter from './router'; +import { useDispatch, useSelector } from 'react-redux'; +import AppRouter from './router/router'; +import { checkAuthThunk } from './store/auth/auth.thunk'; +import { useEffect } from 'react'; +import { useNavigate } from 'react-router-dom'; +import { login } from './store/auth/auth.slice'; function App() { + const navigate = useNavigate(); + const dispatch = useDispatch(); + + const { user } = useSelector((state) => state.auth); + + useEffect(() => { + dispatch(login({id:111, username: 'test'})) + // handleCheckAuth(); + }, [dispatch]); + + const handleCheckAuth = async () => { + console.log('app handleCheckAuth'); + await dispatch(checkAuthThunk()).unwrap(); + if (user) navigate('/'); + }; + return ; } diff --git a/src/assets/react.svg b/src/assets/react.svg index 6c87de9..22c3eba 100644 --- a/src/assets/react.svg +++ b/src/assets/react.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/components/Snackbar.jsx b/src/components/Snackbar.jsx index c007395..14a762e 100644 --- a/src/components/Snackbar.jsx +++ b/src/components/Snackbar.jsx @@ -23,7 +23,7 @@ const Snackbar = ({ type = 'primary', message, duration = 3000, onClose }) => { return ( <>
diff --git a/src/layouts/HeaderWithNav.jsx b/src/layouts/HeaderWithNav.jsx index 3edb1b6..8052b73 100644 --- a/src/layouts/HeaderWithNav.jsx +++ b/src/layouts/HeaderWithNav.jsx @@ -1,13 +1,23 @@ import React from 'react'; +import { useDispatch, useSelector } from 'react-redux'; +import { Link } from 'react-router-dom'; +import { logoutThunk } from '../store/auth/auth.thunk'; export default function HeaderWithNav() { + const dispatch = useDispatch(); + const { user } = useSelector((state) => state.auth); + + const handleLogout = () => { + dispatch(logoutThunk()); + }; + return (
diff --git a/src/pages/KnowledgeBase/KnowledgeCard.jsx b/src/pages/KnowledgeBase/KnowledgeCard.jsx index d5ce0f4..928e20e 100644 --- a/src/pages/KnowledgeBase/KnowledgeCard.jsx +++ b/src/pages/KnowledgeBase/KnowledgeCard.jsx @@ -29,12 +29,12 @@ export default function KnowledgeCard({ title, description, documents, date, acc
{access === 'full' ? ( - + 完全访问 ) : access === 'read' ? ( - + 只读访问 diff --git a/src/pages/auth/Login.jsx b/src/pages/auth/Login.jsx new file mode 100644 index 0000000..334dcb3 --- /dev/null +++ b/src/pages/auth/Login.jsx @@ -0,0 +1,96 @@ +import React, { useEffect, useState } from 'react'; +import { useDispatch, useSelector } from 'react-redux'; +import { Link, useNavigate } from 'react-router-dom'; +import { checkAuthThunk, loginThunk } from '../../store/auth/auth.thunk'; + +export default function Login() { + const dispatch = useDispatch(); + const navigate = useNavigate(); + const [username, setUsername] = useState(''); + const [password, setPassword] = useState(''); + const [errors, setErrors] = useState({}); + const [submitted, setSubmitted] = useState(false); + + const { user } = useSelector((state) => state.auth); + + useEffect(() => { + handleCheckAuth(); + }, [dispatch]); + + const handleCheckAuth = async () => { + console.log('login page handleCheckAuth'); + await dispatch(checkAuthThunk()).unwrap(); + if (user) navigate('/'); + }; + + const validateForm = () => { + const newErrors = {}; + if (!username) { + newErrors.username = 'Username is required'; + } + if (!password) { + newErrors.password = 'Password is required'; + } else if (password.length < 6) { + newErrors.password = 'Password must be at least 6 characters'; + } + setErrors(newErrors); + return Object.keys(newErrors).length === 0; + }; + + const handleSubmit = (e) => { + e.preventDefault(); + setSubmitted(true); + console.log(validateForm()); + + if (validateForm()) { + console.log('Form submitted successfully!'); + console.log('Username:', username); + console.log('Password:', password); + + dispatch(loginThunk({ username, password })); + } + }; + return ( +
+
OOIN 智能知识库
+
+
+ setUsername(e.target.value.trim())} + > + {submitted && errors.username &&
{errors.username}
} +
+
+ setPassword(e.target.value.trim())} + > + {submitted && errors.password &&
{errors.password}
} +
+ + Forgot password? + + +
+ + Need Account? + +
+ ); +} diff --git a/src/pages/auth/Signup.jsx b/src/pages/auth/Signup.jsx new file mode 100644 index 0000000..90054a7 --- /dev/null +++ b/src/pages/auth/Signup.jsx @@ -0,0 +1,114 @@ +import React, { useEffect, useState } from 'react'; +import { useDispatch, useSelector } from 'react-redux'; +import { Link, useNavigate } from 'react-router-dom'; +import { checkAuthThunk, signupThunk } from '../../store/auth/auth.thunk'; + +export default function Signup() { + const dispatch = useDispatch(); + const navigate = useNavigate(); + const [username, setUsername] = useState(''); + const [email, setEmail] = useState(''); + const [password, setPassword] = useState(''); + const [errors, setErrors] = useState({}); + const [submitted, setSubmitted] = useState(false); + + const { user } = useSelector((state) => state.auth); + + useEffect(() => { + handleCheckAuth(); + }, [dispatch]); + + const handleCheckAuth = async () => { + console.log('signup page handleCheckAuth'); + await dispatch(checkAuthThunk()).unwrap(); + if (user) navigate('/'); + }; + + const validateForm = () => { + const newErrors = {}; + if (!username) { + newErrors.username = 'Username is required'; + } + + if (!email) { + newErrors.email = 'Email is required'; + } else if (!/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i.test(email)) { + newErrors.email = 'Invalid email address'; + } + + if (!password) { + newErrors.password = 'Password is required'; + } else if (password.length < 6) { + newErrors.password = 'Password must be at least 6 characters'; + } + setErrors(newErrors); + return Object.keys(newErrors).length === 0; + }; + + const handleSubmit = (e) => { + e.preventDefault(); + setSubmitted(true); + console.log(validateForm()); + + if (validateForm()) { + console.log('Form submitted successfully!'); + console.log('Username:', username); + console.log('Email:', email); + console.log('Password:', password); + + dispatch(signupThunk({ username, password, email })); + } + }; + + return ( +
+
OOIN 智能知识库
+
+
+ setUsername(e.target.value.trim())} + > + {submitted && errors.username &&
{errors.username}
} +
+
+ setEmail(e.target.value.trim())} + > + {submitted && errors.email &&
{errors.email}
} +
+
+ setPassword(e.target.value.trim())} + > + {submitted && errors.password &&
{errors.password}
} +
+ +
+ + Already have account? + +
+ ); +} diff --git a/src/router.jsx b/src/router.jsx deleted file mode 100644 index 125c0a5..0000000 --- a/src/router.jsx +++ /dev/null @@ -1,23 +0,0 @@ -import React, { Suspense } from 'react'; -import { Route, Routes } from 'react-router-dom'; -import Mainlayout from './layouts/Mainlayout'; -import KnowledgeBase from './pages/KnowledgeBase/KnowledgeBase'; -import Loading from './components/Loading'; - -function AppRouter() { - return ( - // }> - - - - - } - /> - - // - ); -} -export default AppRouter; diff --git a/src/router/protectedRoute.jsx b/src/router/protectedRoute.jsx new file mode 100644 index 0000000..ac4c9d8 --- /dev/null +++ b/src/router/protectedRoute.jsx @@ -0,0 +1,12 @@ +import { useEffect } from 'react'; +import { useSelector } from 'react-redux'; +import { Navigate, Outlet } from 'react-router-dom'; + +function ProtectedRoute() { + const { user } = useSelector((state) => state.auth); + + return + // return !!user ? : ; +} + +export default ProtectedRoute; diff --git a/src/router/router.jsx b/src/router/router.jsx new file mode 100644 index 0000000..dff99e8 --- /dev/null +++ b/src/router/router.jsx @@ -0,0 +1,34 @@ +import React, { Suspense } from 'react'; +import { Navigate, Route, Routes } from 'react-router-dom'; +import Mainlayout from '../layouts/Mainlayout'; +import KnowledgeBase from '../pages/KnowledgeBase/KnowledgeBase'; +import Loading from '../components/Loading'; +import Login from '../pages/auth/Login'; +import Signup from '../pages/auth/Signup'; +import ProtectedRoute from './protectedRoute'; +import { useSelector } from 'react-redux'; + +function AppRouter() { + const { id } = useSelector((state) => state.auth); + + return ( + }> + + }> + + + + } + /> + + } /> + } /> + } /> + + + ); +} +export default AppRouter; diff --git a/src/store/auth/auth.slice.js b/src/store/auth/auth.slice.js new file mode 100644 index 0000000..7c16ef7 --- /dev/null +++ b/src/store/auth/auth.slice.js @@ -0,0 +1,59 @@ +import { createSlice } from '@reduxjs/toolkit'; +import { checkAuthThunk, loginThunk, logoutThunk, signupThunk } from './auth.thunk'; + +const setPending = (state) => { + state.loading = true; + state.error = null; + state.user = null; +}; + +const setFulfilled = (state, action) => { + state.user = action.payload; + state.loading = false; + state.error = null; +}; + +const setRejected = (state, action) => { + state.error = action.payload; + state.loading = false; +}; + +const authSlice = createSlice({ + name: 'auth', + initialState: { loading: false, error: null, user: {id: 123, username: 'test'} }, + reducers: { + login: (state, action) => { + state.user = action.payload; + }, + logout: (state) => { + state.user = null; + state.error = null; + state.loading = false; + }, + }, + extraReducers: (builder) => { + builder + .addCase(checkAuthThunk.pending, setPending) + .addCase(checkAuthThunk.fulfilled, setFulfilled) + .addCase(checkAuthThunk.rejected, setRejected) + + .addCase(loginThunk.pending, setPending) + .addCase(loginThunk.fulfilled, setFulfilled) + .addCase(loginThunk.rejected, setRejected) + + .addCase(signupThunk.pending, setPending) + .addCase(signupThunk.fulfilled, setFulfilled) + .addCase(signupThunk.rejected, setRejected) + + .addCase(logoutThunk.pending, (state) => { + state.loading = true; + state.error = null; + }) + .addCase(logoutThunk.fulfilled) + .addCase(logoutThunk.rejected, setRejected); + }, +}); + +export const { login, logout } = authSlice.actions; +const authReducer = authSlice.reducer; +export default authReducer; diff --git a/src/store/auth/auth.thunk.js b/src/store/auth/auth.thunk.js new file mode 100644 index 0000000..331d6b1 --- /dev/null +++ b/src/store/auth/auth.thunk.js @@ -0,0 +1,77 @@ +import { createAsyncThunk } from '@reduxjs/toolkit'; +import { get, post } from '../../services/api'; +import { showNotification } from '../notification.slice'; +import { logout } from './auth.slice'; + +export const loginThunk = createAsyncThunk( + 'auth/login', + async ({ username, password }, { rejectWithValue, dispatch }) => { + try { + const { message, user } = await post('/login', { username, password }); + if (!user) { + throw new Error(message || 'Something went wrong'); + } + return user; + } catch (error) { + const errorMessage = error.response?.data?.message || 'Something went wrong'; + dispatch( + showNotification({ + message: errorMessage, + type: 'danger', + }) + ); + return rejectWithValue(errorMessage); + } + } +); + +export const signupThunk = createAsyncThunk('auth/signup', async (config, { rejectWithValue, dispatch }) => { + try { + const { message, user } = await post('/signup', config); + if (!user) { + throw new Error(message || 'Something went wrong'); + } + return user; + } catch (error) { + const errorMessage = error.response?.data?.message || 'Signup failed. Please try again.'; + dispatch( + showNotification({ + message: errorMessage, + type: 'danger', + }) + ); + return rejectWithValue(errorMessage); + } +}); + +export const checkAuthThunk = createAsyncThunk('auth/check', async (_, { rejectWithValue, dispatch }) => { + try { + const { user, message } = await get('/check-token'); + if (!user) { + dispatch(logout()); + throw new Error(message || 'No token found'); + } + return user; + } catch (error) { + dispatch(logout()); + return rejectWithValue(error.response?.data || 'Token verification failed'); + } +}); + +// Async thunk for logging out +export const logoutThunk = createAsyncThunk('auth/logout', async (_, { rejectWithValue, dispatch }) => { + try { + // Send the logout request to the server (this assumes your server clears any session-related info) + await post('/logout'); + dispatch(logout()); + } catch (error) { + const errorMessage = error.response?.data?.message || 'Log out failed'; + dispatch( + showNotification({ + message: errorMessage, + type: 'danger', + }) + ); + return rejectWithValue(errorMessage); + } +}); diff --git a/src/store/notification.slice.js b/src/store/notification.slice.js index 5e49057..b0658cd 100644 --- a/src/store/notification.slice.js +++ b/src/store/notification.slice.js @@ -2,7 +2,7 @@ import { createSlice } from '@reduxjs/toolkit'; const notificationSlice = createSlice({ name: 'notification', - initialState: null, + initialState: null, // type(success/primary/warning/danger), message, duration reducers: { showNotification: (state, action) => action.payload, hideNotification: () => null, diff --git a/src/store/store.js b/src/store/store.js index 3b4dbfc..6e06a4d 100644 --- a/src/store/store.js +++ b/src/store/store.js @@ -2,15 +2,17 @@ import { combineReducers, configureStore } from '@reduxjs/toolkit'; import { persistReducer, persistStore } from 'redux-persist'; import sessionStorage from 'redux-persist/lib/storage/session'; import notificationReducer from './notification.slice.js'; +import authReducer from './auth/auth.slice.js'; const rootRducer = combineReducers({ + auth: authReducer, notification: notificationReducer, }); const persistConfig = { key: 'root', storage: sessionStorage, - whitelist: [], + whitelist: ['auth'], }; // Persist configuration diff --git a/src/styles/style.scss b/src/styles/style.scss index 47e3605..e652e38 100644 --- a/src/styles/style.scss +++ b/src/styles/style.scss @@ -35,3 +35,9 @@ } } } + +.auth-form { + input { + min-width: 300px !important; + } +} \ No newline at end of file