Merge branch 'main' into jose-CRUDS

iic2154-uc-cl · Nov 22, 2024 · f940e83 · f940e83
2 parents 71a0d90 + 9a13110
commit f940e83
Show file tree

Hide file tree

Showing 93 changed files with 3,385 additions and 3,684 deletions.
diff --git a/package.json b/package.json
@@ -27,13 +27,15 @@
     "browser-image-compression": "^2.0.2",
     "compress.js": "1.1.2",
     "date-fns": "2.29.3",
+    "formik": "^2.4.6",
     "framer-motion": "^11.11.11",
     "lucide-react": "^0.454.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-dropzone": "^14.2.9",
     "react-icons": "^5.3.0",
-    "react-router-dom": "^6.26.2"
+    "react-router-dom": "^6.26.2",
+    "yup": "^1.4.0"
   },
   "devDependencies": {
     "@eslint/js": "^9.11.1",

diff --git a/src/App.css b/src/App.css
diff --git a/src/App.jsx b/src/App.jsx
@@ -1,5 +1,5 @@
 import Router from './Router.jsx';
-import './App.css';
+import './index.css'; 
 
 function App() {
   return (

diff --git a/src/Router.jsx b/src/Router.jsx
@@ -8,10 +8,14 @@ import Publicaciones from './pages/users/publicaciones.jsx';
 import Perfil from './pages/users/perfil.jsx';
 import Publicar from './pages/users/publicar.jsx';
 import Favoritos from './pages/users/favoritos.jsx';
-import Notification from './pages/users/notificaciones.jsx';
+import Notification from './pages/users/notificacion.jsx';
 import NewMapa from './pages/newMapa.jsx';
 import Calendario from './pages/calendario.jsx';
 import GestionSolicitudes from './pages/GestionSolicitudes.jsx';
+import ComponentePrecios from './pages/users/admin/precios.jsx';
+import ComponenteUsuarios from './pages/users/admin/usuarios.jsx';
+import ComponenteReportes from './pages/users/admin/reportes.jsx';
+import ComponenteCodigos from './pages/users/admin/codigos.jsx';
 import TermCondition from './pages/TermCondition.jsx';
 import Privacy from './pages/PrivacyPolitic.jsx';
 import NewPublicacionInfo from './components/NewPublicacionInfo.jsx';
@@ -38,7 +42,10 @@ function Router() {
         <Route path="/term-condition" element={<TermCondition />} />
         <Route path="/privacy" element={<Privacy />} />
         <Route path="/publicacion/:id" element={<NewPublicacionInfo />} />
-
+        <Route path="/gestion-precios" element={<ComponentePrecios/>} />
+        <Route path="/gestion-usuarios" element={<ComponenteUsuarios/>}/>
+        <Route path="/gestion-codigos" element={<ComponenteCodigos/>} />
+        <Route path="/gestion-reportes" element={<ComponenteReportes/>} />
       </Routes>
     </BrowserRouter>
   );

diff --git a/src/assets/buscar.jpg b/src/assets/buscar.jpg
diff --git a/src/assets/buscar2.jpg b/src/assets/buscar2.jpg
diff --git a/src/assets/buscar3.jpg b/src/assets/buscar3.jpg
diff --git a/src/assets/imagen_inicio.jpg b/src/assets/imagen_inicio.jpg
diff --git a/src/assets/publicar.jpg b/src/assets/publicar.jpg
diff --git a/src/assets/servicios.jpg b/src/assets/servicios.jpg
diff --git a/src/boton1.jpg b/src/boton1.jpg
diff --git a/src/boton2.jpg b/src/boton2.jpg
diff --git a/src/boton3.jpg b/src/boton3.jpg
diff --git a/src/components/AddressPopover.js b/src/components/AddressPopover.js
diff --git a/src/components/ArrowRouter.js b/src/components/ArrowRouter.js