Merge branch 'dev' into Conexion-Informar-Pago

Signed-off-by: Yoel Marain <[email protected]>
Seminario-Integrador-2024 · Sep 25, 2024 · 9fa8e5d · 9fa8e5d
2 parents 3260d8d + 8cdc35a
commit 9fa8e5d
Show file tree

Hide file tree

Showing 16 changed files with 501 additions and 367 deletions.
diff --git a/FrontAdmin/package-lock.json b/FrontAdmin/package-lock.json
diff --git a/FrontAdmin/package.json b/FrontAdmin/package.json
@@ -52,6 +52,6 @@
     "eslint-plugin-react-refresh": "^0.4.6",
     "prettier": "^3.3.3",
     "typescript": "^5.5.4",
-    "vite": "^5.4.0"
+    "vite": "^5.4.7"
   }
 }
diff --git a/FrontAdmin/src/API/EstadoCuentaAlumno.ts b/FrontAdmin/src/API/EstadoCuentaAlumno.ts
@@ -0,0 +1,24 @@
+import Cookies from 'js-cookie';
+
+export const FetchEstadoCuenta = async (dni: number) => {
+  try {
+    const token = Cookies.get('tokennn');
+
+    const response = await fetch(`http://localhost:8000/api/cuotas/alumno/${dni}/`, {
+      method: 'GET',
+      headers: {
+        'Content-Type': 'application/json',
+        Authorization: `Bearer ${token}`,
+      },
+    });
+
+    if (response.ok) {
+      const data = await response.json();
+      return data;
+    } else {
+      throw new Error('Error en la respuesta del servidor');
+    }
+  } catch (error) {
+    throw new Error('Network error: ' + error);
+  }
+};
diff --git a/FrontAdmin/src/API/Login.ts b/FrontAdmin/src/API/Login.ts
@@ -3,6 +3,7 @@ import Cookies from 'js-cookie';
 const URL = import.meta.env.VITE_URL_DEV;
 
 export const FetchLogin = async (password: string, account: string) => {
+  console.log(account, password);
   try {
     const response = await fetch(`http://localhost:8000/api/auth/login/`, {
       method: 'POST',
@@ -15,12 +16,16 @@ export const FetchLogin = async (password: string, account: string) => {
     if (response.ok) {
       const data = await response.json();
       console.log(data);
+      const roles = data.user.roles;
+      localStorage.setItem('userRol', JSON.stringify(roles));
+
       Cookies.set('tokennn', data.access);
       Cookies.set('dni', data.user.dni);
       Cookies.set('refresh_token', data.refresh);
       Cookies.set('access_expiration', data.access_expiration);
       Cookies.set('refresh_expiration', data.refresh_expiration);
       Cookies.set('username', data.user.dni);
+
       return data;
     } else {
       const errorResponse = await response.json();

diff --git a/FrontAdmin/src/API/Materias.ts b/FrontAdmin/src/API/Materias.ts
@@ -11,7 +11,7 @@ export const FetchPostMateria = async (
   try {
     const token = Cookies.get('tokennn');
 
-    const response = await fetch(`http://localhost:8000/api/materias/`, {
+    const response = await fetch(`${URL}/materias/`, {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json',
@@ -44,7 +44,7 @@ export const FetchMaterias = async () => {
   try {
     const token = Cookies.get('tokennn');
 
-    const response = await fetch(`http://localhost:8000/api/materias/`, {
+    const response = await fetch(`${URL}/materias/`, {
       method: 'GET',
       headers: {
         'Content-Type': 'application/json',
@@ -73,7 +73,7 @@ export const FetchPutMateria = async (
   try {
     const token = Cookies.get('tokennn');
 
-    const response = await fetch(`http://localhost:8000/api/materias/${codigo_materia}/`, {
+    const response = await fetch(`${URL}/materias/${codigo_materia}/`, {
       method: 'PUT',
       headers: {
         'Content-Type': 'application/json',
@@ -106,7 +106,7 @@ export const FetchDeleteMateria = async (codigo_materia: number) => {
   try {
     const token = Cookies.get('tokennn');
 
-    const response = await fetch(`http://localhost:8000/api/materias/${codigo_materia}/`, {
+    const response = await fetch(`${URL}/materias/${codigo_materia}/`, {
       method: 'DELETE',
       headers: {
         'Content-Type': 'application/json',
@@ -126,3 +126,26 @@ export const FetchDeleteMateria = async (codigo_materia: number) => {
     console.error('Network error:', error);
   }
 };
+
+export const FetchAlumnosMaterias = async (codigo_materia: number) => {
+  try {
+    const token = Cookies.get('tokennn');
+
+    const response = await fetch(`http://localhost:8000/api/materias/${codigo_materia}/alumnos/`, {
+      method: 'GET',
+      headers: {
+        'Content-Type': 'application/json',
+        Authorization: `Bearer ${token}`,
+      },
+    });
+
+    if (response.ok) {
+      const data = await response.json();
+      return data;
+    } else {
+      throw new Error('Error en la respuesta del servidor');
+    }
+  } catch (error) {
+    throw new Error('Network error: ' + error);
+  }
+};
diff --git a/FrontAdmin/src/API/Montos.ts b/FrontAdmin/src/API/Montos.ts
@@ -3,7 +3,7 @@ const URL = import.meta.env.VITE_URL_DEV;
 
 export const FetchMontos = async (offset: number, limit: number) => {
   try {
-    const token = Cookies.get('access_token');
+    const token = Cookies.get('tokennn');
 
     const response = await fetch(
       `${URL}/pagos/compromisos/?offset=${offset}&limit=${limit}`,
@@ -30,9 +30,9 @@ export const FetchMontos = async (offset: number, limit: number) => {
 
 export const createCompromiso = async (compromisoData: any, selectFile: any) => {
   try {
-    const token = Cookies.get('access_token');
+    const token = Cookies.get('tokennn');
 
-    const response = await fetch(`${URL}/pagos/compromisos/`, {
+    const response = await fetch(`http://localhost:8000/api/compromisos/`, {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json',
@@ -58,7 +58,7 @@ export const createCompromiso = async (compromisoData: any, selectFile: any) =>
 
 export const loadPDF = async (id :string,file: File) => {
   try {
-    const token = Cookies.get('access_token');
+    const token = Cookies.get('tokennn');
 
     const formData = new FormData();
     formData.append('archivo_pdf', file);

diff --git a/FrontAdmin/src/App.tsx b/FrontAdmin/src/App.tsx
@@ -6,7 +6,6 @@ import Auth from './layouts/Auth';
 import Admin from './layouts/Admin';
 import Alumnos from './layouts/Alumnos';
 import theme from './theme/theme';
-import Cookies from 'js-cookie';
 
 function App() {
   useEffect(() => {
@@ -15,29 +14,31 @@ function App() {
 
   const { isAuthenticated, rolUser } = useAuth();
   console.log(isAuthenticated, rolUser);
-/*samu*/
+  const isAdmin = rolUser.includes('staff') || rolUser.includes('superuser');
+  // const isAlumno = rolUser.includes('alumno');
+
 
   return (
     <ChakraProvider theme={theme}>
       <BrowserRouter>
         <Routes>
           {!isAuthenticated && <Route path="/auth/*" element={<Auth />} />}
-          {isAuthenticated && rolUser && (
-            <Route path="/admin/*" element={<Admin />} />
-          )}
-          {isAuthenticated && !rolUser && (
-            <Route path="/alumnos/*" element={<Alumnos />} />
-          )}
+          {isAuthenticated && isAdmin && (
+              <Route path="/admin/*" element={<Admin />} />
+            )}
+            {isAuthenticated && !isAdmin && (
+              <Route path="/alumnos/*" element={<Alumnos />} />
+            )}
           <Route
             path="/*"
             element={
               <Navigate
                 replace
                 to={
                   isAuthenticated
-                    ? rolUser
-                      ? '/admin/estadisticas'
-                      : '/alumnos/pagos'
+                    ? isAdmin
+                      ? '/admin/alumnos'
+                      : '/alumnos/cuenta'
                     : '/auth'
                 }
               />

diff --git a/FrontAdmin/src/Context.tsx b/FrontAdmin/src/Context.tsx
@@ -1,11 +1,12 @@
 import { createContext, useState, ReactNode, useContext, useEffect } from 'react';
 import Cookies from 'js-cookie';
+import { FetchLogin } from './API/Login';
 const URL= import.meta.env.VITE_URL_DEV;
 
 interface AuthContextType {
   isAuthenticated: boolean;
-  rolUser: boolean;
-  onLogin: () => void;
+  rolUser: String[];
+  onLogin: (password: string, account: string) => Promise<void>;
   onLogout: () => void;
 }
 
@@ -15,9 +16,7 @@ const AuthProvider = ({ children }: { children: ReactNode }) => {
   const [isAuthenticated, setIsAuthenticated] = useState(
     !Cookies.get('access_token') ? false : true
   );
-  const [rolUser, setRolUser] = useState(
-    Cookies.get('username') === '12345678' ? true : false
-  );
+  const [rolUser, setRolUser] = useState<String[]>([]);
   let refreshTimeout: NodeJS.Timeout;
 
   const refreshToken = async () => {
@@ -64,14 +63,14 @@ const AuthProvider = ({ children }: { children: ReactNode }) => {
     }
   };
 
-  const onLogin = () => {
-    setRolUser(Cookies.get('username') === '12345678' ? true : false);
+  const onLogin = async (password: string, account: string) => {
+    await FetchLogin(password, account);
+    setRolUser(JSON.parse(localStorage.getItem('userRol') || '[]'));
     setIsAuthenticated(true);
     const accessExpiration = Cookies.get('access_expiration');
     if (accessExpiration) {
       TokenRefresh(accessExpiration);
     }
-
   };
 
   const onLogout = () => {
@@ -81,6 +80,7 @@ const AuthProvider = ({ children }: { children: ReactNode }) => {
     Cookies.remove('refresh_expiration');
     Cookies.remove('username');
     Cookies.remove('dni');
+    localStorage.removeItem('userRol');
     console.log('logout');
     setIsAuthenticated(false);
     if (refreshTimeout) {