From 7b55c419158c9dca46b53f4ceca3c3766de2ebe4 Mon Sep 17 00:00:00 2001 From: Karen1308 Date: Wed, 6 Dec 2023 16:10:21 -0300 Subject: [PATCH] Revert "Merge con rama 03_Registrar_Producto_3" This reverts commit 449ee8a66d7745636277bd446483884f91e177db, reversing changes made to cc9b78ee48673b3b30d8088aa09714815dedfec3. --- Back/.idea/.name | 1 - Back/.idea/workspace.xml | 54 - Back/api/reporteErrores.log | 0 .../api/controller/SalidaController.java | 2 +- .../api/controller/TourController.java | 111 +- .../java/com/viajecito/api/dto/SalidaDTO.java | 3 - .../java/com/viajecito/api/model/Reserva.java | 2 +- .../java/com/viajecito/api/model/Salida.java | 6 +- .../java/com/viajecito/api/model/Tour.java | 6 +- .../viajecito/api/model/TourDificultad.java | 11 - .../api/repository/ISalidaRepository.java | 5 - .../viajecito/api/service/ISalidaService.java | 5 +- .../viajecito/api/service/ITourService.java | 1 - .../api/service/impl/SalidaService.java | 25 +- .../api/service/impl/TourService.java | 27 +- .../src/main/resources/application.properties | 6 +- Back/reporteErrores.log | 2376 +-- Front/index.html | 1 - Front/package-lock.json | 13750 ++++++++-------- Front/package.json | 2 - .../src/Components/breadcrumb/Breadcrumb.jsx | 17 +- Front/src/Components/buttons/Button.jsx | 12 +- Front/src/Components/buttons/FavButton.jsx | 13 +- .../src/Components/category/CategoryTour.jsx | 29 +- Front/src/Components/hotel/Hotel.jsx | 7 +- Front/src/Components/salida/SalidaTour.jsx | 159 - .../ui-components/modal/ModalCommon.jsx | 49 - .../ui-components/modal/ModalEditTour.jsx | 131 - .../ui-components/navbar/Navbar.jsx | 2 +- .../ui-components/navbar/user/NavUser.jsx | 37 +- .../ui-components/pagination/Pagination.jsx | 13 +- .../ui-components/pagination/pagination.css | 26 - Front/src/Components/utils/List_original.jsx | 118 + Front/src/Components/utils/ProtectedRoute.jsx | 17 +- Front/src/Components/utils/global.context.jsx | 8 +- .../Components/utils/toast.notifications.js | 16 + Front/src/Components/utils/toastMessage.jsx | 15 - Front/src/Routes/AddTour.jsx | 526 +- Front/src/Routes/AdminPanel.jsx | 43 +- Front/src/Routes/EditTour.jsx | 115 - Front/src/Routes/Favs.jsx | 2 +- Front/src/Routes/List.jsx | 141 + Front/src/Routes/NotFound.jsx | 18 +- Front/src/Routes/Profile.jsx | 13 +- Front/src/Styles/buttons.css | 60 +- Front/src/Styles/commonStyles.css | 89 +- Front/src/Styles/forms.css | 13 +- Front/src/Styles/modal.css | 14 - Front/src/main.jsx | 88 +- 49 files changed, 7443 insertions(+), 10742 deletions(-) delete mode 100644 Back/.idea/.name create mode 100644 Back/api/reporteErrores.log delete mode 100644 Front/src/Components/salida/SalidaTour.jsx delete mode 100644 Front/src/Components/ui-components/modal/ModalCommon.jsx delete mode 100644 Front/src/Components/ui-components/modal/ModalEditTour.jsx create mode 100644 Front/src/Components/utils/List_original.jsx create mode 100644 Front/src/Components/utils/toast.notifications.js delete mode 100644 Front/src/Components/utils/toastMessage.jsx delete mode 100644 Front/src/Routes/EditTour.jsx create mode 100644 Front/src/Routes/List.jsx delete mode 100644 Front/src/Styles/modal.css diff --git a/Back/.idea/.name b/Back/.idea/.name deleted file mode 100644 index 42a60bc..0000000 --- a/Back/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -TourController.java \ No newline at end of file diff --git a/Back/.idea/workspace.xml b/Back/.idea/workspace.xml index a25c175..065d008 100644 --- a/Back/.idea/workspace.xml +++ b/Back/.idea/workspace.xml @@ -5,54 +5,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -106,7 +53,6 @@ -