diff --git a/src/layouts/dashboard/nav.tsx b/src/layouts/dashboard/nav.tsx
index 91416ff2e..260a6e368 100644
--- a/src/layouts/dashboard/nav.tsx
+++ b/src/layouts/dashboard/nav.tsx
@@ -131,7 +131,7 @@ export default function Nav(props: Props) {
{themeLayout !== ThemeLayout.Mini && (
- Slash Admin
+ SkillRazr Admin
)}
diff --git a/src/pages/dashboard/workbench/banner-card.tsx b/src/pages/dashboard/workbench/banner-card.tsx
index fe8c64c71..b0a4379d9 100644
--- a/src/pages/dashboard/workbench/banner-card.tsx
+++ b/src/pages/dashboard/workbench/banner-card.tsx
@@ -33,8 +33,8 @@ export default function BannerCard() {
style={{ color: themeToken.colorPrimaryTextActive }}
className="mx-auto mb-6 mt-4 max-w-sm text-sm opacity-80 md:mx-0"
>
- Welcome to join the Discord channel to discuss everything about Slash Admin, or you can
- visite my blog:
+ Welcome to join the Discord channel to discuss everything about SkillRazr Admin, or you
+ can visite my blog:
new Date(expiresIn!).getTime();
+
+ if (accessToken && !isTokenExpired) {
return ;
}
@@ -40,7 +40,9 @@ function Login() {
background: bg,
}}
>
- Slash Admin
+
+ SkillRazr Admin
+
{t('sys.login.signInSecondTitle')}
diff --git a/src/pages/sys/login/LoginForm.tsx b/src/pages/sys/login/LoginForm.tsx
index 914f9e49e..adff29ffe 100644
--- a/src/pages/sys/login/LoginForm.tsx
+++ b/src/pages/sys/login/LoginForm.tsx
@@ -1,12 +1,11 @@
-import { Alert, Button, Checkbox, Col, Divider, Form, Input, Row } from 'antd';
+import { Button, Checkbox, Col, Divider, Form, Input, Row } from 'antd';
import { useState } from 'react';
import { useTranslation } from 'react-i18next';
import { AiFillGithub, AiFillGoogleCircle, AiFillWechat } from 'react-icons/ai';
-import { DEFAULT_USER, TEST_USER } from '@/_mock/assets';
+import { DEFAULT_USER } from '@/_mock/assets';
import { SignInReq } from '@/api/services/userService';
import { useSignIn } from '@/store/userStore';
-import ProTag from '@/theme/antd/components/tag';
import { useThemeToken } from '@/theme/hooks';
import { LoginStateEnum, useLoginStateContext } from './providers/LoginStateProvider';
@@ -42,37 +41,6 @@ function LoginForm() {
}}
onFinish={handleFinish}
>
-
-
-
-
Admin {t('sys.login.userName')}:
-
- {DEFAULT_USER.username}
-
-
-
Test {t('sys.login.userName')}:
-
- {TEST_USER.username}
-
-
-
{t('sys.login.password')}:
-
- {DEFAULT_USER.password}
-
-
-
{
console.log('Received values of form: ', values);
- await signUpMutation.mutateAsync(values);
- backToLogin();
+ try {
+ const resp = await signUpMutation.mutateAsync(values);
+ console.log('resp signup from server', resp);
+ backToLogin();
+ } catch (e) {
+ console.log('e', e);
+ }
};
return (
diff --git a/src/pages/sys/others/calendar/index.tsx b/src/pages/sys/others/calendar/index.tsx
index b02d00460..d3a892974 100644
--- a/src/pages/sys/others/calendar/index.tsx
+++ b/src/pages/sys/others/calendar/index.tsx
@@ -28,7 +28,7 @@ const DefaultEventInitValue = {
color: '',
};
export default function Calendar() {
- const [events, setEvents] = useState([]);
+ const [events] = useState([]);
const fullCalendarRef = useRef(null);
const [view, setView] = useState('dayGridMonth');
const [date, setDate] = useState(new Date());
diff --git a/src/router/components/auth-guard.tsx b/src/router/components/auth-guard.tsx
index 2c0b88a36..0c8e56c43 100644
--- a/src/router/components/auth-guard.tsx
+++ b/src/router/components/auth-guard.tsx
@@ -11,13 +11,16 @@ type Props = {
};
export default function AuthGuard({ children }: Props) {
const router = useRouter();
- const { accessToken } = useUserToken();
+ const { accessToken, expiresIn } = useUserToken();
+ console.log('accessToken', accessToken, expiresIn);
+ const isTokenExpired = Date.now() > new Date(expiresIn!).getTime();
+ console.log('token expired', isTokenExpired);
const check = useCallback(() => {
- if (!accessToken) {
+ if (!accessToken || isTokenExpired) {
router.replace('/login');
}
- }, [router, accessToken]);
+ }, [router, accessToken, isTokenExpired]);
useEffect(() => {
check();
diff --git a/src/server.ts b/src/server.ts
new file mode 100644
index 000000000..ce1d4eacf
--- /dev/null
+++ b/src/server.ts
@@ -0,0 +1,142 @@
+import bcrypt from 'bcryptjs';
+import bodyParser from 'body-parser';
+import cors from 'cors';
+import express, { Request, Response } from 'express';
+import jwt from 'jsonwebtoken';
+
+import { adminPermissions } from './_mock/assets';
+
+const app = express();
+const PORT = 5000;
+
+// Secret key for JWT
+const JWT_SECRET = 'skillrazr_admin_app_1234$2893';
+
+// Middleware
+app.use(bodyParser.json());
+app.use(cors());
+
+// Mock user data (replace this with your database in a real app)
+interface User {
+ username: string;
+ password: string;
+ permissions: any;
+}
+const users: User[] = [];
+
+console.log('users in the server', users);
+console.log('hello');
+//
+// Signup endpoint
+app.post('/signup', async (req: Request, res: Response): Promise => {
+ const { username, password } = req.body;
+
+ console.log('signup, userName', 'password', username, password);
+
+ // Check if the user already exists
+ const userExists = users.find((user) => user.username === username);
+ if (userExists) {
+ return res.status(400).json({ message: 'User already exists' });
+ }
+
+ // Hash the password
+ const hashedPassword = await bcrypt.hash(password, 10);
+
+ // Save the new user
+ users.push({ username, password: hashedPassword, permissions: adminPermissions });
+
+ console.log('hashed password', hashedPassword, 'users database', users);
+
+ return res.status(201).json({ message: 'User created successfully', status: 0, data: [] });
+});
+
+// Signin endpoint
+app.post('/signin', async (req: Request, res: Response) => {
+ const { username, password } = req.body;
+
+ const now = Date.now();
+ const expiresIn = new Date(now + 1 * 60 * 1000).toISOString();
+
+ console.log('sign in, userName', 'password', username, password, expiresIn);
+
+ // Find the user
+ const user = users.find((user) => user.username === username);
+
+ console.log('user found ', user);
+ if (!user) {
+ return res.status(400).json({ message: 'Invalid credentials' });
+ }
+
+ // Check the password
+ const isMatch = await bcrypt.compare(password, user.password);
+ if (!isMatch) {
+ return res.status(400).json({ message: 'Invalid credentials' });
+ }
+
+ // Generate a JWT token
+ const token = jwt.sign({ username: user.username }, JWT_SECRET, { expiresIn: '1h' });
+
+ res.json({ status: 0, data: { user, accessToken: token, expiresIn } });
+});
+
+// Protected route example
+app.get('/protected', (req: Request, res: Response) => {
+ const token = req.headers.authorization;
+ if (!token) {
+ return res.status(401).json({ message: 'You are not authorized to access this' });
+ }
+
+ jwt.verify(token, JWT_SECRET, (err, decoded) => {
+ if (err) {
+ return res.status(401).json({ message: 'Invalid token' });
+ }
+
+ res.json({ message: 'Protected route accessed', user: decoded, status: 0 });
+ });
+});
+
+// const tokenCheck = (req, res, next) => {
+// const token = req.headers['authorization'];
+// if (!token) {
+// return res.status(401).json({ message: 'You are not authorized to access this'});
+// } else {
+// // do token checks using jwt
+// jwt.verify(token, JWT_SECRET, (err, decoded) => {
+// if (err) {
+// return res.status(401).json({ message: 'Invalid token' });
+// }
+
+// next()
+// });
+// }
+// }
+
+// app.get('/getExerciseMarks', [tokenCheck], (req: Request, res: Response) => {
+// const {userName} = req;
+
+// // make a db call to get exercise scroes for this userName
+
+// const token = req.headers['authorization'];
+// if (!token) {
+// return res.status(401).json({ message: 'You are not authorized to access this' });
+// }
+// // get exerciseScore from exerciseDb
+
+// });
+
+// app.get('/getQuizScores', [tokenCheck], (req: Request, res: Response) => {
+// const token = req.headers['authorization'];
+// if (!token) {
+// return res.status(401).json({ message: 'You are not authorized to access this' });
+// }
+
+// // get quizScore from exerciseDb
+// });
+
+app.get('/', (req: Request, res: Response) => {
+ res.send('Hello World!');
+});
+
+app.listen(PORT, () => {
+ console.log(`Server running on port ${PORT}`);
+});
diff --git a/src/store/userStore.ts b/src/store/userStore.ts
index a7704a916..207d2a839 100644
--- a/src/store/userStore.ts
+++ b/src/store/userStore.ts
@@ -60,8 +60,10 @@ export const useSignIn = () => {
const signIn = async (data: SignInReq) => {
try {
const res = await signInMutation.mutateAsync(data);
- const { user, accessToken, refreshToken } = res;
- setUserToken({ accessToken, refreshToken });
+ console.log('res from login api', res);
+
+ const { user, accessToken, refreshToken, expiresIn } = res;
+ setUserToken({ accessToken, refreshToken, expiresIn });
setUserInfo(user);
navigatge(HOMEPAGE, { replace: true });
diff --git a/tsconfig.json b/tsconfig.json
index 463b4122c..6f50da188 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -40,6 +40,10 @@
"#/*": ["types/*"]
}
},
+ "ts-node": {
+ "esm": true,
+ "experimentalSpecifierResolution": "node"
+ },
"include": ["src", "test", "types/**/*.ts", "**.ts", "*.json", "**.*js"],
"exclude": ["node_modules", "dist"],
"references": [{ "path": "./tsconfig.node.json" }]
diff --git a/types/entity.ts b/types/entity.ts
index 724e8e834..bfc1b8cc5 100644
--- a/types/entity.ts
+++ b/types/entity.ts
@@ -3,6 +3,7 @@ import { BasicStatus, PermissionType } from './enum';
export interface UserToken {
accessToken?: string;
refreshToken?: string;
+ expiresIn?: string
}
export interface UserInfo {
- 
-
-