diff --git a/webapp/src/pages/AddUser.jsx b/webapp/src/pages/AddUser.jsx
index 4c23370..a0df33b 100644
--- a/webapp/src/pages/AddUser.jsx
+++ b/webapp/src/pages/AddUser.jsx
@@ -31,7 +31,7 @@ const AddUser = () => {
// Añadir un retardo antes de navegar
setTimeout(() => {
navigate('/login');
- }, 2000); // 2000 ms = 2 segundos
+ }, 1000); // 1000 ms = 1 segundos
} catch (error) {
setError(error.response?.data?.error || 'An error occurred');
}
diff --git a/webapp/src/pages/Admin.jsx b/webapp/src/pages/Admin.jsx
index 50894cc..2193adc 100644
--- a/webapp/src/pages/Admin.jsx
+++ b/webapp/src/pages/Admin.jsx
@@ -1,6 +1,30 @@
+import { useLoaderData, redirect } from 'react-router-dom';
+import axios from 'axios';
+import Wrapper from '../assets/wrappers/StatsContainer';
import { AddQuestionContainer } from '../components';
+const apiEndpoint =
+ process.env.REACT_APP_API_ENDPOINT || 'http://localhost:8000';
+
+export const loader = async () => {
+ try {
+ const token = localStorage.getItem('token');
+ const response = await axios.get(`${apiEndpoint}/current-user`, {
+ headers: {
+ Authorization: `Bearer ${token}`,
+ },
+ });
+
+ return response.data;
+ } catch (error) {
+ console.log('You are not authorized to view this page');
+ return redirect('/dashboard');
+ }
+};
+
const Admin = () => {
+ const { user } = useLoaderData();
+
return
;
};
diff --git a/webapp/src/pages/DashboardLayout.jsx b/webapp/src/pages/DashboardLayout.jsx
index c368c95..7cbbac6 100644
--- a/webapp/src/pages/DashboardLayout.jsx
+++ b/webapp/src/pages/DashboardLayout.jsx
@@ -1,4 +1,4 @@
-import { Outlet, useNavigate } from 'react-router-dom';
+import { Outlet, redirect, useLoaderData, useNavigate } from 'react-router-dom';
import Wrapper from '../assets/wrappers/Dashboard';
import { SmallSidebar, BigSidebar, Navbar } from '../components';
import { createContext, useContext, useState } from 'react';
@@ -9,18 +9,30 @@ import { Snackbar } from '@mui/material';
const apiEndpoint =
process.env.REACT_APP_API_ENDPOINT || 'http://localhost:8000';
+export const loader = async () => {
+ try {
+ const token = localStorage.getItem('token');
+ const response = await axios.get(`${apiEndpoint}/current-user`, {
+ headers: {
+ Authorization: `Bearer ${token}`,
+ },
+ });
+ return response.data;
+ } catch (error) {
+ return redirect('/');
+ }
+};
+
const DashboardContext = createContext();
const DashboardLayout = () => {
- // temp
- const user = { name: 'user' };
+ const { user } = useLoaderData();
+ const navigate = useNavigate();
const [error, setError] = useState('');
const [openSnackbar, setOpenSnackbar] = useState(false);
const [showSidebar, setShowSidebar] = useState(false);
const [isDarkTheme, setIsDarkTheme] = useState(checkDefaultTheme());
- const navigate = useNavigate();
-
const toggleDarkTheme = () => {
const newDarkTheme = !isDarkTheme;
setIsDarkTheme(newDarkTheme);
@@ -40,9 +52,7 @@ const DashboardLayout = () => {
Authorization: `Bearer ${token}`,
},
});
- console.log('token');
localStorage.removeItem('token');
- console.log('token');
setOpenSnackbar(true);
// Añadir un retardo antes de navegar
setTimeout(() => {
diff --git a/webapp/src/pages/Landing.jsx b/webapp/src/pages/Landing.jsx
index 9e5b813..f743582 100644
--- a/webapp/src/pages/Landing.jsx
+++ b/webapp/src/pages/Landing.jsx
@@ -15,10 +15,9 @@ const Landing = () => {
wiq
quiz game
- Lorem ipsum dolor sit amet consectetur adipisicing elit. Tenetur
- quas quidem itaque doloremque accusantium laudantium? Earum maiores
- consectetur vero eligendi, beatae reprehenderit recusandae placeat
- accusantium dignissimos deserunt sed quasi quisquam!
+ Sumérgete en la emoción del concurso, ahora en versión digital.
+ Desafía tus conocimientos, compite con amigos y demuestra tu
+ sabiduría en esta experiencia interactiva única.
Register
diff --git a/webapp/src/pages/Login.jsx b/webapp/src/pages/Login.jsx
index 9b445bc..a292522 100644
--- a/webapp/src/pages/Login.jsx
+++ b/webapp/src/pages/Login.jsx
@@ -33,7 +33,7 @@ const Login = () => {
// Añadir un retardo antes de navegar
setTimeout(() => {
navigate('/dashboard');
- }, 2000); // 2000 ms = 2 segundos
+ }, 1000); // 1000 ms = 1 segundos
} catch (error) {
setError(error.response.data.error);
}