Fix: Resolución de conflictos (#164)

Frasquito3 · github-actions[bot] · NiconiKimg · web-flow · commit 7847443cab73 · 2025-12-11T14:46:14.000-03:00
* Add workflow to automate Pull Requests * fix: Correct workflow directory name * fix: Add checkout code and change the creation pull request code * Boilerplate Creation (#8) Co-authored-by: Franco Zariaga <francozariaga.zariaga@gmail.com> * PR: Merge feature/login-register into develop (#9) * Folder structuring + creating login and register pages The project folders were structured and the Login and Register pages were successfully created (the focus was on functionality, but still nothing visually appealing). * Visually pleasing login and register The layouts folder was also added, where the MainLayout and AuthLayout were created. Based on that, the App.tsx and AppRoutes.tsx files were changed. --------- Co-authored-by: Franco Zariaga <francozariaga.zariaga@gmail.com> * Added Tailwind to the project. (#10) Modified LoginPage.tsx and RegisterPage.tsx to start using Tailwind, and began implementing reusable React components. Co-authored-by: Franco Zariaga <francozariaga.zariaga@gmail.com> * ref: update readme with git flow info (#11) * PR: Merge feature/landing-page into develop (#12) * wip: added landing page with minimal changes to Tailwind settings * wip: deleted unnecessary comments --------- Co-authored-by: Franco Zariaga <francozariaga.zariaga@gmail.com> * feat: Setup Code Quality Pipeline with CI workflow (#15) Co-authored-by: NiconiKimg <pedemontenicolas2004@gmail.com> * fix(ci): Align CI workflow to use pnpm (#18) Co-authored-by: NiconiKimg <pedemontenicolas2004@gmail.com> * fix(ci): Read pnpm version from package.json (#19) * ref:change-styles-from-login-and-register * feat(ui): Replace the Hero image with a 3d interactive model (#22) Co-authored-by: NiconiKimg <pedemontenicolas2004@gmail.com> * fix: handling of tokens received from the backend (#25) Co-authored-by: Franco Zariaga <francozariaga.zariaga@gmail.com> * feat: navBar-Logged V1.0 * Refactor: Unify and Stabilize Authentication System (#29) * refactor(auth): implement token-only flow and unify session management * fix(auth): resolve user state update and unify response handling * chore(deps): remove unused fontawesome dependencies * feat: Professor Application Page * /feature/Course-List-Page-Prototype * Implentation of the appeal logic Co-authored-by: Nicolás Pedemonte <pedemontenicolas2004@gmail.com> * feat(ci): Add workflow to auto-add new issues to project (#36) * chore(workflow): add automated issue templates (#38) * feat: Update issue templates (#39) Creación de la plantilla de reporte bugs. * chore: Changed the Feature and Bug templates. (#40) Deleted the new bug report template and updated the previous to start working. * fix(layout): prevent auth form overlapping header on low-height viewports (#42) * feat(ui): implement responsive design for existing views (#44) * Fix/ci workflow and triggers (#46) * fix(deps): Remove unused package causing security vulnerability * chore(ci): Remove automatic pull request creation workflow * chore(workflow): Add automatic pull request template (#48) * fix: Update issue templates (#49) * feat(admin): implement complete admin panel UI (#52) * feat(admin): implement in-app document viewer for professor applications (#54) * Feature/Implementation of the professor dashboard (#58) * feat(ui): Implementación del dashboard del profesor * fix: fixed a problem with the versions of the dependencies in package.json * refactor: Unificar AdminLayout en NavBar para una Navegación Consistente (#59) * refactor(admin): Unify AdminLayout in the NavBar component * fix(admin): Remove bell in admin views * feat(admin): Allow management of Course Types from the admin panel * refactor: eliminate loguin requeriment on link course (#64) * feat: Mejorar la estructura del layout y el scroll de navegación (#66) * feat: add ScrollToTop component to improve navigation experience and relocated Footer to MainLayout * fix: Fixed the problems with the merge. --------- Co-authored-by: Nicolás Pedemonte <pedemontenicolas2004@gmail.com> * fix(admin): Mejorar la responsividad y consistencia visual del Panel de Admin y Layouts (#69) * fix(admin): Improve responsiveness of the Admin Panel and Layouts * fix(admin): Resolve modal stacking context issues with portals * Feature: Flujo de recuperacion de contraseña (#70) * feat: Initial version of the password recovery flow * fix: Changed the way to keep the user out of rest-password without the token * fix: Problems with GitHub Actions * fix: Add missing dependency to useEffect in ResetPasswordPage --------- Co-authored-by: Franco Zariaga <francozariaga.zariaga@gmail.com> * refactor(data): migrate server state management to TanStack Query Co-authored-by: LucaTvl <LucaTvl@users.noreply.github.com> * refactor(data): add @tanstack/react-query-devtools to test Also we added some time in the staleTime to see the state "fresh" Co-authored-by: LucaTvl <LucaTvl@users.noreply.github.com> * refactor(forms): Migrate all forms to React Hook Form and Valibot Co-authored-by: LucaTvl <LucaTvl@users.noreply.github.com> * refactor:button-ui (#76) * refactor:button-ui * chore(): install clsx and tailwind-merge for styles * feat(ui): create flexible and robust Button component * refactor(auth): standardize form buttons with new Button API * refactor(ui): apply Button standard to NavBar and HeroSection * fix(ui): correct Dialog close button and admin button sizes * refactor(ui): standardize miscellaneous remaining buttons * fix(ui): standardize password toggle botton usage * docs(): add button documentation JSDoc --------- Co-authored-by: LucaTvl <155491309+LucaTvl@users.noreply.github.com> Co-authored-by: NiconiKimg <pedemontenicolas2004@gmail.com> * chore(project): standardize UI folder structure (#91) * Feat: Crear y Aplicar Utilidad 'cn' para Composición de Clases (#92) * feat(lib): create cn class composition utility * refactor(): apply cn class composition utility in Button component * refactor(ui): enhance Label component with cn and forwardRef (#93) * feat: Implementacion de API service, hooks y tipos para la gestión de Cursos (#100) * feat(types): align course entities with backend models Co-authored-by: LucaTvl <LucaTvl@users.noreply.github.com> * feat(api): create course service for CRUD operations Co-authored-by: LucaTvl <LucaTvl@users.noreply.github.com> * feat(hooks): implement TanStack Query hooks for courses Also changed de ProfessorCoursesPage to see the course of the professor insted of static courses Co-authored-by: LucaTvl <LucaTvl@users.noreply.github.com> --------- Co-authored-by: LucaTvl <LucaTvl@users.noreply.github.com> * refactor:refactor navbar v1 (#94) * refactor:refactor navbar v1 * refactor: navbar itv1.1 * refactor: navBar it1v1.2 * reactor: navBarit1 v1.3 * feat:Star course creation page * feat: Finished the course creation structure * feat(professor): enable navigation to course creation pag Also fixed empty interface linting error in Switch component * feat: courseCreation-continue & start-unit-creation * feat: Modified ProfessorCourseEdition and implemented ProfessorCourseCreation vinculation Co-authored-by: Frasquito3 <Frasquito3@users.noreply.github.com> * feat(professor): Implements course creation from the professor view * fix(components): solved conflicts in some components * Feature/course content management (#102) * feat:initial config of editor * create-unit-service * feat:try-to-custom-side-menu * fix: Modals open correctly * feat: Added the upload for material and fixed the problem with the units Co-authored-by: Frasquito3 <Frasquito3@users.noreply.github.com> * feat: Course changes are applied to the database * feat:stanting-activity-edition * refactor: Added a general button to save changes in the Edit view. Changed data made in the configuration modal is no longer sent there, the general button is used instead. * refactor: Modified the material modal Now have the option to put individual names on each uploaded file * fix: Local data saving when canceling in the configuration modal * feat:adapt to send courses units * feat: Send everything to the back * feat: The ProfessorCourseEdition page fetchs all the data from the back * fix: Deleted unused entities and functions --------- Co-authored-by: carlex74 <r.icardogugliermino@gmail.com> Co-authored-by: Frasquito3 <Frasquito3@users.noreply.github.com> Co-authored-by: Franco Zariaga <francozariaga.zariaga@gmail.com> * refactor(ui): Refactor Badge component for reusability and variants (#106) * refactor(ui): Enhance Button component with professional JSDoc (#107) * refactor(ui): Refactor Input component with cn utility and JSDoc (#108) * refactor(ui): Refactor Textarea component for reusability and form integration (#109) * refactor(ui): Refactor Select component for consistency and form integration (#110) * refactor(ui): Standardize Card component system with cn, ref, and JSDoc * refactor(ui): Integrate CardList component with standard Card system * fix(vulnerabilities): Updated axios and vite * feat(profile): Add user profile view and edit functionality * feat: get-courses-from-db * Minor changues * Refactor: modulize editor course page (#125) * wip: reorder editor page componente * feat: add question crud service and hooks * feat: add question editor modal component * feat: add question list and crud actions to unit content * feat: replace edit button with view/edit mode switch * feat: integrate edit mode toggle and question management * feat: add dynamic course status badges and data * refactor: improve dialog styling and unit editor ui * refactor: update api services and auth context * style: update global styles * refactor: update course sidebar component * Feature/course detail page (#126) * add getById function and CourseDetail page * coding UI of courseDetails page * feat: add-course-details * Feature: sistema de evaluaciones (#127) * feat: add assessment type definitions and interfaces * feat: implement assessment API service layer * feat: add React Query hooks for assessment management * feat: add assessments listing page for professors * feat: add assessment editor for create and update * feat: add assessment attempts review page * feat: create unified QuestionForm component * feat: add QuestionSelector component with search and create * refactor: update QuestionEditor to use unified QuestionForm * feat: add assessment routes to app router * feat: add bidirectional navigation between courses and assessments * style: remove legacy commented code from course edition * feat: add general questions service and hooks * fix: support general questions in assessment selector * feat: add general questions manager component * feat: integrate general questions manager in course editor * fix: remove unnecessary unit validation in question form * feat: improve general questions UI with expandable design * feat: implement instructor profile institutional flow (UI) (#129) * Refactor: Stablished the appeals page to support pagination and filters (#123) * refactor: Stablished the appeals page to support pagination and filters * feat: enhance course search functionality with filters and pagination feat: add CoursePreviewCard component for course previews refactor: update CourseListPage to include search and filter options fix: improve search parameter handling in shared types * feat: Implement infinite scroll for courses and pagination for appeals --------- Co-authored-by: Franco Zariaga <francozariaga.zariaga@gmail.com> * Feature/course enroll button (#130) * initial enrrollment logic * feat: enrollment courses --------- Co-authored-by: NiconiKimg <pedemontenicolas2004@gmail.com> Co-authored-by: LucaTvl <LucaTvl@users.noreply.github.com> * refactor: appeal validation (#131) * refactor: Modified the landing page (#132) * refactor: Modified the landing page * refactor: Modified the landing page * Feature/assessment and learning system (#133) * feat: add assessment system pages * feat: add student learning components * feat: add my learning page * feat: add error boundary component * feat: update types for assessment system * feat: add assessment and question services * feat: add assessment hooks * feat: update enrollment service and hooks * feat: add routes for assessment and learning * feat: update navbar for professors * refactor: clean course details logic * feat: update course learn page * refactor: update ui components * feat: update professor and course pages * feat: implement full payment and post-payment user flow * fix: Resolve merge conflicts * fix: Resolve navigation problems * feat: Implement Full Assessment and Reporting System * fix: fixed bugs related to the course cards. Added vinculation with backend for ProfessorDashboard. Co-authored-by: Frasquito3 <Frasquito3@users.noreply.github.com> * fix: Delete some comments * refactor: course-institutions and description units (#138) * Refactor/improve payment uxui (#137) * refactor: improve some details in payment * feat: add HTTPS support to development server - Add vite-plugin-mkcert for automatic SSL certificate generation - Enable HTTPS on port 5173 - Configure development server with secure connections --------- Co-authored-by: Luca Trincavelli <155491309+LucaTvl@users.noreply.github.com> Co-authored-by: Luca Trincavelli <ltrincavell@frro.utn.edu.ar> * fix: fixes (#139) * fix: fixes * fix: fixes * Feature/analytics integration (#140) * feat: add admin analytics service and hook * feat: update professor analytics hook with backend structure * feat: integrate professor analytics page with backend data * feat: integrate admin dashboard with real-time analytics * feat: implement comprehensive analytics page with charts and rankings * feat: Added protection to the routes (#141) * feat: Implementacion de filtrado y paginacion de Appeals y CourseTypes (#142) * feat: Refactor Appeals page to use server-side filtering and pagination * fix: Prevent crash on professor courses page with undefined price * fix: fixed the modal for editing course (#143) * Feat/improve course filters (#144) * feat:improve filters options * feat: add professor-filters and Links with filters --------- Co-authored-by: NiconiKimg <pedemontenicolas2004@gmail.com> * Refactor: visual details deadline (#145) * feat: add new basic pages, faq, about us and contact * fix: fixed the filter params --------- Co-authored-by: NiconiKimg <pedemontenicolas2004@gmail.com> * bugfix: improve questions endpoints (#146) Co-authored-by: NiconiKimg <pedemontenicolas2004@gmail.com> * feat: Agregado la pestaña del historial de apelaciones de estudiantes al perfil y arreglar la barra de navegación móvil (#147) * feat: add student appeals history tab to profile and fix mobile navbar * bugfix: fix vulnerabilities * feat: Configuracion de vitest y cypress con pruebas unitarias y e2e iniciales (#148) * feat: Setup vitest and cypress with initial unit and e2e tests * bugfix: fix problems * feat: Implemented react-hot-toast (#149) * feat: Implemented react-hot-toast * feat: Implemented react-hot-toast * fix: fixed the failed test * feat: Implemented more notifications with react-hot-toast * feat: Implemented the remaining notifications (#150) * fix: Resolución de problemas de redirección de aplicaciones del profesor y de desbordamiento de texto modal (#151) * fix: resolve professor application redirection and modal text overflow issues * fix: Delete some comments * Feat: Implementar sistema de mails (#152) * feat: modificate pages * feat: complete modules * feat: Added feedback with react-hot-toast --------- Co-authored-by: LucaTvl <ltrincavell@frro.utn.edu.ar> * feat:install storybook and example (#153) * refactor: Implemented Lazy loading in AppRouter and HeroSection (#155) Co-authored-by: LucaTvl <lucatrincavell@frro.utn.edu.ar> * Feature/components doc (#154) * feat:documentation-badge-cardlist-documentpreviewer * feat:badgeDoc * feat:documentComponents * feat: Integración de refresh token y manejo de sesiones (#156) * feat: Implement silent refresh interceptor and fix course pricing * fix: Ngrok redirection problems * fix: Problems with refresh token * fix: Update error handling and improve course institution references (#157) Co-authored-by: LucaTvl <lucatrincavell@frro.utn.edu.ar> * fear:install knip and delete unused files (#158) Co-authored-by: carlex <ricardogugliermino@gmail.com> * refactor:delete unused exports (#159) Co-authored-by: carlex <ricardogugliermino@gmail.com> * fix: Resolve build problems for deployment (#161) * fix: Resolucion de conflictos de Merge con main (#163) * Add workflow to automate Pull Requests (#1) * Feat: primer paso a produccion (#160) * Add workflow to automate Pull Requests * fix: Correct workflow directory name * fix: Add checkout code and change the creation pull request code * Boilerplate Creation (#8) Co-authored-by: Franco Zariaga <francozariaga.zariaga@gmail.com> * PR: Merge feature/login-register into develop (#9) * Folder structuring + creating login and register pages The project folders were structured and the Login and Register pages were successfully created (the focus was on functionality, but still nothing visually appealing). * Visually pleasing login and register The layouts folder was also added, where the MainLayout and AuthLayout were created. Based on that, the App.tsx and AppRoutes.tsx files were changed. --------- Co-authored-by: Franco Zariaga <francozariaga.zariaga@gmail.com> * Added Tailwind to the project. (#10) Modified LoginPage.tsx and RegisterPage.tsx to start using Tailwind, and began implementing reusable React components. Co-authored-by: Franco Zariaga <francozariaga.zariaga@gmail.com> * ref: update readme with git flow info (#11) * PR: Merge feature/landing-page into develop (#12) * wip: added landing page with minimal changes to Tailwind settings * wip: deleted unnecessary comments --------- Co-authored-by: Franco Zariaga <francozariaga.zariaga@gmail.com> * feat: Setup Code Quality Pipeline with CI workflow (#15) Co-authored-by: NiconiKimg <pedemontenicolas2004@gmail.com> * fix(ci): Align CI workflow to use pnpm (#18) Co-authored-by: NiconiKimg <pedemontenicolas2004@gmail.com> * fix(ci): Read pnpm version from package.json (#19) * ref:change-styles-from-login-and-register * feat(ui): Replace the Hero image with a 3d interactive model (#22) Co-authored-by: NiconiKimg <pedemontenicolas2004@gmail.com> * fix: handling of tokens received from the backend (#25) Co-authored-by: Franco Zariaga <francozariaga.zariaga@gmail.com> * feat: navBar-Logged V1.0 * Refactor: Unify and Stabilize Authentication System (#29) * refactor(auth): implement token-only flow and unify session management * fix(auth): resolve user state update and unify response handling * chore(deps): remove unused fontawesome dependencies * feat: Professor Application Page * /feature/Course-List-Page-Prototype * Implentation of the appeal logic Co-authored-by: Nicolás Pedemonte <pedemontenicolas2004@gmail.com> * feat(ci): Add workflow to auto-add new issues to project (#36) * chore(workflow): add automated issue templates (#38) * feat: Update issue templates (#39) Creación de la plantilla de reporte bugs. * chore: Changed the Feature and Bug templates. (#40) Deleted the new bug report template and updated the previous to start working. * fix(layout): prevent auth form overlapping header on low-height viewports (#42) * feat(ui): implement responsive design for existing views (#44) * Fix/ci workflow and triggers (#46) * fix(deps): Remove unused package causing security vulnerability * chore(ci): Remove automatic pull request creation workflow * chore(workflow): Add automatic pull request template (#48) * fix: Update issue templates (#49) * feat(admin): implement complete admin panel UI (#52) * feat(admin): implement in-app document viewer for professor applications (#54) * Feature/Implementation of the professor dashboard (#58) * feat(ui): Implementación del dashboard del profesor * fix: fixed a problem with the versions of the dependencies in package.json * refactor: Unificar AdminLayout en NavBar para una Navegación Consistente (#59) * refactor(admin): Unify AdminLayout in the NavBar component * fix(admin): Remove bell in admin views * feat(admin): Allow management of Course Types from the admin panel * refactor: eliminate loguin requeriment on link course (#64) * feat: Mejorar la estructura del layout y el scroll de navegación (#66) * feat: add ScrollToTop component to improve navigation experience and relocated Footer to MainLayout * fix: Fixed the problems with the merge. --------- Co-authored-by: Nicolás Pedemonte <pedemontenicolas2004@gmail.com> * fix(admin): Mejorar la responsividad y consistencia visual del Panel de Admin y Layouts (#69) * fix(admin): Improve responsiveness of the Admin Panel and Layouts * fix(admin): Resolve modal stacking context issues with portals * Feature: Flujo de recuperacion de contraseña (#70) * feat: Initial version of the password recovery flow * fix: Changed the way to keep the user out of rest-password without the token * fix: Problems with GitHub Actions * fix: Add missing dependency to useEffect in ResetPasswordPage --------- Co-authored-by: Franco Zariaga <francozariaga.zariaga@gmail.com> * refactor(data): migrate server state management to TanStack Query Co-authored-by: LucaTvl <LucaTvl@users.noreply.github.com> * refactor(data): add @tanstack/react-query-devtools to test Also we added some time in the staleTime to see the state "fresh" Co-authored-by: LucaTvl <LucaTvl@users.noreply.github.com> * refactor(forms): Migrate all forms to React Hook Form and Valibot Co-authored-by: LucaTvl <LucaTvl@users.noreply.github.com> * refactor:button-ui (#76) * refactor:button-ui * chore(): install clsx and tailwind-merge for styles * feat(ui): create flexible and robust Button component * refactor(auth): standardize form buttons with new Button API * refactor(ui): apply Button standard to NavBar and HeroSection * fix(ui): correct Dialog close button and admin button sizes * refactor(ui): standardize miscellaneous remaining buttons * fix(ui): standardize password toggle botton usage * docs(): add button documentation JSDoc --------- Co-authored-by: LucaTvl <155491309+LucaTvl@users.noreply.github.com> Co-authored-by: NiconiKimg <pedemontenicolas2004@gmail.com> * chore(project): standardize UI folder structure (#91) * Feat: Crear y Aplicar Utilidad 'cn' para Composición de Clases (#92) * feat(lib): create cn class composition utility * refactor(): apply cn class composition utility in Button component * refactor(ui): enhance Label component with cn and forwardRef (#93) * feat: Implementacion de API service, hooks y tipos para la gestión de Cursos (#100) * feat(types): align course entities with backend models Co-authored-by: LucaTvl <LucaTvl@users.noreply.github.com> * feat(api): create course service for CRUD operations Co-authored-by: LucaTvl <LucaTvl@users.noreply.github.com> * feat(hooks): implement TanStack Query hooks for courses Also changed de ProfessorCoursesPage to see the course of the professor insted of static courses Co-authored-by: LucaTvl <LucaTvl@users.noreply.github.com> --------- Co-authored-by: LucaTvl <LucaTvl@users.noreply.github.com> * refactor:refactor navbar v1 (#94) * refactor:refactor navbar v1 * refactor: navbar itv1.1 * refactor: navBar it1v1.2 * reactor: navBarit1 v1.3 * feat:Star course creation page * feat: Finished the course creation structure * feat(professor): enable navigation to course creation pag Also fixed empty interface linting error in Switch component * feat: courseCreation-continue & start-unit-creation * feat: Modified ProfessorCourseEdition and implemented ProfessorCourseCreation vinculation Co-authored-by: Frasquito3 <Frasquito3@users.noreply.github.com> * feat(professor): Implements course creation from the professor view * fix(components): solved conflicts in some components * Feature/course content management (#102) * feat:initial config of editor * create-unit-service * feat:try-to-custom-side-menu * fix: Modals open correctly * feat: Added the upload for material and fixed the problem with the units Co-authored-by: Frasquito3 <Frasquito3@users.noreply.github.com> * feat: Course changes are applied to the database * feat:stanting-activity-edition * refactor: Added a general button to save changes in the Edit view. Changed data made in the configuration modal is no longer sent there, the general button is used instead. * refactor: Modified the material modal Now have the option to put individual names on each uploaded file * fix: Local data saving when canceling in the configuration modal * feat:adapt to send courses units * feat: Send everything to the back * feat: The ProfessorCourseEdition page fetchs all the data from the back * fix: Deleted unused entities and functions --------- Co-authored-by: carlex74 <r.icardogugliermino@gmail.com> Co-authored-by: Frasquito3 <Frasquito3@users.noreply.github.com> Co-authored-by: Franco Zariaga <francozariaga.zariaga@gmail.com> * refactor(ui): Refactor Badge component for reusability and variants (#106) * refactor(ui): Enhance Button component with professional JSDoc (#107) * refactor(ui): Refactor Input component with cn utility and JSDoc (#108) * refactor(ui): Refactor Textarea component for reusability and form integration (#109) * refactor(ui): Refactor Select component for consistency and form integration (#110) * refactor(ui): Standardize Card component system with cn, ref, and JSDoc * refactor(ui): Integrate CardList component with standard Card system * fix(vulnerabilities): Updated axios and vite * feat(profile): Add user profile view and edit functionality * feat: get-courses-from-db * Minor changues * Refactor: modulize editor course page (#125) * wip: reorder editor page componente * feat: add question crud service and hooks * feat: add question editor modal component * feat: add question list and crud actions to unit content * feat: replace edit button with view/edit mode switch * feat: integrate edit mode toggle and question management * feat: add dynamic course status badges and data * refactor: improve dialog styling and unit editor ui * refactor: update api services and auth context * style: update global styles * refactor: update course sidebar component * Feature/course detail page (#126) * add getById function and CourseDetail page * coding UI of courseDetails page * feat: add-course-details * Feature: sistema de evaluaciones (#127) * feat: add assessment type definitions and interfaces * feat: implement assessment API service layer * feat: add React Query hooks for assessment management * feat: add assessments listing page for professors * feat: add assessment editor for create and update * feat: add assessment attempts review page * feat: create unified QuestionForm component * feat: add QuestionSelector component with search and create * refactor: update QuestionEditor to use unified QuestionForm * feat: add assessment routes to app router * feat: add bidirectional navigation between courses and assessments * style: remove legacy commented code from course edition * feat: add general questions service and hooks * fix: support general questions in assessment selector * feat: add general questions manager component * feat: integrate general questions manager in course editor * fix: remove unnecessary unit validation in question form * feat: improve general questions UI with expandable design * feat: implement instructor profile institutional flow (UI) (#129) * Refactor: Stablished the appeals page to support pagination and filters (#123) * refactor: Stablished the appeals page to support pagination and filters * feat: enhance course search functionality with filters and pagination feat: add CoursePreviewCard component for course previews refactor: update CourseListPage to include search and filter options fix: improve search parameter handling in shared types * feat: Implement infinite scroll for courses and pagination for appeals --------- Co-authored-by: Franco Zariaga <francozariaga.zariaga@gmail.com> * Feature/course enroll button (#130) * initial enrrollment logic * feat: enrollment courses --------- Co-authored-by: NiconiKimg <pedemontenicolas2004@gmail.com> Co-authored-by: LucaTvl <LucaTvl@users.noreply.github.com> * refactor: appeal validation (#131) * refactor: Modified the landing page (#132) * refactor: Modified the landing page * refactor: Modified the landing page * Feature/assessment and learning system (#133) * feat: add assessment system pages * feat: add student learning components * feat: add my learning page * feat: add error boundary component * feat: update types for assessment system * feat: add assessment and question services * feat: add assessment hooks * feat: update enrollment service and hooks * feat: add routes for assessment and learning * feat: update navbar for professors * refactor: clean course details logic * feat: update course learn page * refactor: update ui components * feat: update professor and course pages * feat: implement full payment and post-payment user flow * fix: Resolve merge conflicts * fix: Resolve navigation problems * feat: Implement Full Assessment and Reporting System * fix: fixed bugs related to the course cards. Added vinculation with backend for ProfessorDashboard. Co-authored-by: Frasquito3 <Frasquito3@users.noreply.github.com> * fix: Delete some comments * refactor: course-institutions and description units (#138) * Refactor/improve payment uxui (#137) * refactor: improve some details in payment * feat: add HTTPS support to development server - Add vite-plugin-mkcert for automatic SSL certificate generation - Enable HTTPS on port 5173 - Configure development server with secure connections --------- Co-authored-by: Luca Trincavelli <155491309+LucaTvl@users.noreply.github.com> Co-authored-by: Luca Trincavelli <ltrincavell@frro.utn.edu.ar> * fix: fixes (#139) * fix: fixes * fix: fixes * Feature/analytics integration (#140) * feat: add admin analytics service and hook * feat: update professor analytics hook with backend structure * feat: integrate professor analytics page with backend data * feat: integrate admin dashboard with real-time analytics * feat: implement comprehensive analytics page with charts and rankings * feat: Added protection to the routes (#141) * feat: Implementacion de filtrado y paginacion de Appeals y CourseTypes (#142) * feat: Refactor Appeals page to use server-side filtering and pagination * fix: Prevent crash on professor courses page with undefined price * fix: fixed the modal for editing course (#143) * Feat/improve course filters (#144) * feat:improve filters options * feat: add professor-filters and Links with filters --------- Co-authored-by: NiconiKimg <pedemontenicolas2004@gmail.com> * Refactor: visual details deadline (#145) * feat: add new basic pages, faq, about us and contact * fix: fixed the filter params --------- Co-authored-by: NiconiKimg <pedemontenicolas2004@gmail.com> * bugfix: improve questions endpoints (#146) Co-authored-by: NiconiKimg <pedemontenicolas2004@gmail.com> * feat: Agregado la pestaña del historial de apelaciones de estudiantes al perfil y arreglar la barra de navegación móvil (#147) * feat: add student appeals history tab to profile and fix mobile navbar * bugfix: fix vulnerabilities * feat: Configuracion de vitest y cypress con pruebas unitarias y e2e iniciales (#148) * feat: Setup vitest and cypress with initial unit and e2e tests * bugfix: fix problems * feat: Implemented react-hot-toast (#149) * feat: Implemented react-hot-toast * feat: Implemented react-hot-toast * fix: fixed the failed test * feat: Implemented more notifications with react-hot-toast * feat: Implemented the remaining notifications (#150) * fix: Resolución de problemas de redirección de aplicaciones del profesor y de desbordamiento de texto modal (#151) * fix: resolve professor application redirection and modal text overflow issues * fix: Delete some comments * Feat: Implementar sistema de mails (#152) * feat: modificate pages * feat: complete modules * feat: Added feedback with react-hot-toast --------- Co-authored-by: LucaTvl <ltrincavell@frro.utn.edu.ar> * feat:install storybook and example (#153) * refactor: Implemented Lazy loading in AppRouter and HeroSection (#155) Co-authored-by: LucaTvl <lucatrincavell@frro.utn.edu.ar> * Feature/components doc (#154) * feat:documentation-badge-cardlist-documentpreviewer * feat:badgeDoc * feat:documentComponents * feat: Integración de refresh token y manejo de sesiones (#156) * feat: Implement silent refresh interceptor and fix course pricing * fix: Ngrok redirection problems * fix: Problems with refresh token * fix: Update error handling and improve course institution references (#157) Co-authored-by: LucaTvl <lucatrincavell@frro.utn.edu.ar> * fear:install knip and delete unused files (#158) Co-authored-by: carlex <ricardogugliermino@gmail.com> * refactor:delete unused exports (#159) Co-authored-by: carlex <ricardogugliermino@gmail.com> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Nicolás Pedemonte <pedemontenicolas2004@gmail.com> Co-authored-by: carlex74 <r.icardogugliermino@gmail.com> Co-authored-by: LucaTvl <155491309+LucaTvl@users.noreply.github.com> Co-authored-by: LucaTvl <ltrincavell@frro.utn.edu.ar> Co-authored-by: LucaTvl <LucaTvl@users.noreply.github.com> Co-authored-by: Frasquito3 <Frasquito3@users.noreply.github.com> Co-authored-by: LucaTvl <lucatrincavell@frro.utn.edu.ar> Co-authored-by: carlex <ricardogugliermino@gmail.com> * fix: Delete old workflow --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Nicolás Pedemonte <pedemontenicolas2004@gmail.com> Co-authored-by: carlex74 <r.icardogugliermino@gmail.com> Co-authored-by: LucaTvl <155491309+LucaTvl@users.noreply.github.com> Co-authored-by: LucaTvl <ltrincavell@frro.utn.edu.ar> Co-authored-by: LucaTvl <LucaTvl@users.noreply.github.com> Co-authored-by: Frasquito3 <Frasquito3@users.noreply.github.com> Co-authored-by: LucaTvl <lucatrincavell@frro.utn.edu.ar> Co-authored-by: carlex <ricardogugliermino@gmail.com> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Nicolás Pedemonte <pedemontenicolas2004@gmail.com> Co-authored-by: carlex74 <r.icardogugliermino@gmail.com> Co-authored-by: LucaTvl <155491309+LucaTvl@users.noreply.github.com> Co-authored-by: LucaTvl <ltrincavell@frro.utn.edu.ar> Co-authored-by: LucaTvl <LucaTvl@users.noreply.github.com> Co-authored-by: Frasquito3 <Frasquito3@users.noreply.github.com> Co-authored-by: LucaTvl <lucatrincavell@frro.utn.edu.ar> Co-authored-by: carlex <ricardogugliermino@gmail.com>
diff --git a/src/components/professor/assessments/QuestionSelector.tsx b/src/components/professor/assessments/QuestionSelector.tsx
@@ -336,6 +336,7 @@ function CreateQuestionForm({
         onSave={handleSave}
         onCancel={onCancel}
         saveButtonText="Crear Pregunta"
+        isLoading ={false}
       />
     </div>
   );
diff --git a/src/components/professor/institutionManagement/ManageInstitutionSection.tsx b/src/components/professor/institutionManagement/ManageInstitutionSection.tsx
@@ -13,7 +13,7 @@ interface ManageInstitutionSectionProps {
 
 export default function ManageInstitutionSection({ institution }: ManageInstitutionSectionProps) {
   const { mutate: removeProfessor, isPending: isRemoving } = useRemoveProfessor();
-  const { data: pendingRequests = [], isLoading: isLoadingRequests } = useGetPendingRequests(institution.id);
+  const { data: pendingRequests = [], isLoading: isLoadingRequests } = useGetPendingRequests(institution.institutionId);
   const { mutate: processRequest, isPending: isProcessingRequest } = useProcessJoinRequest();
   const [processingId, setProcessingId] = useState<string | null>(null);
 
@@ -34,7 +34,7 @@ export default function ManageInstitutionSection({ institution }: ManageInstitut
 
   const handleRemoveProfessor = (professorId: string, professorName: string) => {
     if (confirm(`¿Estás seguro de que quieres remover a ${professorName} de la institución?`)) {
-      removeProfessor({ institutionId: institution.id, professorId }, {
+      removeProfessor({ institutionId: institution.institutionId, professorId }, {
         onSuccess: () => {
           // Silencioso en caso de éxito
         },
diff --git a/src/components/professor/institutionManagement/modals/JoinInstitutionModal.tsx b/src/components/professor/institutionManagement/modals/JoinInstitutionModal.tsx
@@ -42,7 +42,7 @@ export default function JoinInstitutionModal({
   const handleConfirmRequest = () => {
     if (!selectedInstitution) return;
 
-    createJoinRequest(selectedInstitution.id, {
+    createJoinRequest(selectedInstitution.institutionId, {
       onSuccess: () => {
         handleClose();
       },
@@ -133,7 +133,7 @@ export default function JoinInstitutionModal({
             </div>
           ) : (
             (filteredInstitutions || []).map((institution) => (
-              <div key={institution.id} className="border border-slate-200 rounded-lg p-4 hover:border-blue-300 hover:bg-blue-50/50 transition-colors">
+              <div key={institution.institutionId} className="border border-slate-200 rounded-lg p-4 hover:border-blue-300 hover:bg-blue-50/50 transition-colors">
                 <div className="flex items-start justify-between gap-3">
                   <div className="flex items-start gap-3 flex-1 min-w-0">
                     <div className="w-10 h-10 rounded-lg bg-purple-100 flex items-center justify-center flex-shrink-0">
diff --git a/src/components/ui/Badge/Badge.stories.tsx b/src/components/ui/Badge/Badge.stories.tsx
@@ -11,6 +11,6 @@ type Story = StoryObj<typeof meta>;
  
 export const Primary: Story = {
   args: {
-    label: "Badge"
+    children: 'Badge',
   },
 };
diff --git a/src/components/ui/Button/Button.stories.tsx b/src/components/ui/Button/Button.stories.tsx
@@ -13,7 +13,6 @@ type Story = StoryObj<typeof meta>;
 export const Primary: Story = {
   args: {
     children:"Button",
-    label: "Button",
     isLoading: false
   },
 };
diff --git a/src/components/ui/CardList/CardList.tsx b/src/components/ui/CardList/CardList.tsx
@@ -13,6 +13,10 @@ interface CourseCardListProps extends React.HTMLAttributes<HTMLDivElement> {
    * The complete course object containing the information to be displayed (title, price, instructor, image, etc.).
    */
   course: Course;
+  /**
+   * Optional callback function when the "View more" button is clicked.
+   */
+  onViewMore?: () => void | Promise<void>;
 }
 /**
  * Horizontal card component used to display a summary of a course in lists.
@@ -21,7 +25,7 @@ interface CourseCardListProps extends React.HTMLAttributes<HTMLDivElement> {
  * It is interactive and redirects to the course details.
  */
 const CardList = React.forwardRef<HTMLDivElement, CourseCardListProps>(
-  ({ course, className, ...props }, ref) => {
+  ({ course, className, onViewMore, ...props }, ref) => {
 
     const instructorName = course.professor?.user 
       ? `${course.professor.user.name} ${course.professor.user.surname}`
@@ -105,6 +109,12 @@ const CardList = React.forwardRef<HTMLDivElement, CourseCardListProps>(
                       variant="primary"
                       size="sm"
                       className="w-full lg:w-auto"
+                      onClick={(e) => {
+                        if (onViewMore) {
+                          e.preventDefault(); 
+                          onViewMore();
+                        }
+                      }}
                     >
                       Ver más
                     </Button>
diff --git a/src/components/ui/DocumentViewer/DocumentViewer.stories.tsx b/src/components/ui/DocumentViewer/DocumentViewer.stories.tsx
@@ -1,18 +1,26 @@
-// Replace your-framework with the framework you are using, e.g. react-vite, nextjs, nextjs-vite, etc.
 import type { Meta, StoryObj } from '@storybook/react-vite';
-
-import DocumentViewer  from '../DocumentViewer';
+import DocumentViewer from '../DocumentViewer';
 
 const meta = {
+  title: 'Components/ui/DocumentViewer',
   component: DocumentViewer,
+  parameters: {
+    layout: 'centered',
+  },
+  tags: ['autodocs'],
+  
+  argTypes: {
+    onClose: { action: 'clicked' }, 
+  },
+
 } satisfies Meta<typeof DocumentViewer>;
- 
+
 export default meta;
 type Story = StoryObj<typeof meta>;
- 
-export const Primary: Story = {
+
+export const Default: Story = {
   args: {
-    label: "DocumentViewer",
-    url: "https://www.w3.org/WAI/ER/tests/xhtml/testfiles/resources/pdf/dummy.pdf",
+    url: 'https://www.w3.org/WAI/ER/tests/xhtml/testfiles/resources/pdf/dummy.pdf',
+    onClose: () => console.log('Cerrar presionado'),
   },
 };
diff --git a/src/components/ui/Input/Input.stories.tsx b/src/components/ui/Input/Input.stories.tsx
@@ -15,7 +15,7 @@ const iconMap = {
 type IconKey = keyof typeof iconMap;
 
 const meta = {
-  title: 'Components/ui/Input/Input',
+  title: 'Components/ui/Input',
   component: Input,
   tags: ['autodocs'],
   parameters: {
diff --git a/src/pages/ContactPage.tsx b/src/pages/ContactPage.tsx
@@ -16,6 +16,12 @@ import {
 import Button from '../components/ui/Button/Button';
 import { useContact } from '../hooks/useContact';
 import { toast } from 'react-hot-toast';
+import { isAxiosError } from 'axios';
+
+interface ApiErrorData {
+  message?: string;
+  errors?: string | Record<string, unknown>;
+}
 
 export default function ContactPage() {
   const [formData, setFormData] = useState({
@@ -61,7 +67,6 @@ export default function ContactPage() {
         </p>
 
         <div className="grid md:grid-cols-2 gap-8">
-          {/* Formulario de Contacto */}
           <Card>
             <CardHeader>
               <CardTitle>Envíanos un Mensaje</CardTitle>
@@ -99,7 +104,7 @@ export default function ContactPage() {
                           Error al Enviar el Mensaje
                         </h4>
                         <p className="text-sm text-red-700">
-                          {contactMutation.error?.response?.data?.errors ||
+                          {(isAxiosError(contactMutation.error) && (contactMutation.error.response?.data as ApiErrorData)?.message) ||
                             'Ocurrió un error al enviar tu mensaje. Por favor, intenta nuevamente.'}
                         </p>
                       </div>
@@ -204,7 +209,6 @@ export default function ContactPage() {
             </CardContent>
           </Card>
 
-          {/* Información de Contacto */}
           <div className="space-y-6">
             <Card>
               <CardContent className="p-6">
diff --git a/src/pages/Course/CourseListPage.tsx b/src/pages/Course/CourseListPage.tsx
@@ -148,7 +148,7 @@ const CourseListPage = () => {
           >
             <option value="">Todas las instituciones</option>
             {institutions?.map((inst) => (
-              <option key={inst.id} value={inst.id}>
+              <option key={inst.institutionId} value={inst.institutionId}>
                 {inst.name}
               </option>
             ))}
diff --git a/src/pages/User/ProfessorProfileTab.tsx b/src/pages/User/ProfessorProfileTab.tsx
@@ -31,7 +31,7 @@ export default function InstructorProfileTab() {
 
   const handleLeaveInstitution = () => {
     if (professor?.institution && confirm('¿Estás seguro de que quieres abandonar esta institución?')) {
-      leaveInstitution(professor.institution.id, {
+      leaveInstitution(professor.institution.institutionId, {
         onError: (error) => alert(`Error al abandonar la institución: ${error.message}`),
       });
     }
diff --git a/src/stories/Button.tsx b/src/stories/Button.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import './button.css';
 
 export interface ButtonProps {
diff --git a/src/stories/Header.tsx b/src/stories/Header.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import { Button } from './Button';
 import './header.css';
 

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ const CourseListPage = () => {`
`148`	`148`	`>`
`149`	`149`	`<option value="">Todas las instituciones</option>`
`150`	`150`	`{institutions?.map((inst) => (`
`151`		`- <option key={inst.id} value={inst.id}>`
	`151`	`+ <option key={inst.institutionId} value={inst.institutionId}>`
`152`	`152`	`{inst.name}`
`153`	`153`	`</option>`
`154`	`154`	`))}`