Skip to content

Commit b136780

Browse files
Frasquito3github-actions[bot]NiconiKimgcarlex74LucaTvl
authored
Fix: Resolución de conflictos (#164) (#165)
* 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) * 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. --------- * Added Tailwind to the project. (#10) Modified LoginPage.tsx and RegisterPage.tsx to start using Tailwind, and began implementing reusable React components. * 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 --------- * feat: Setup Code Quality Pipeline with CI workflow (#15) * fix(ci): Align CI workflow to use pnpm (#18) * 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) * fix: handling of tokens received from the backend (#25) * 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 * 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. --------- * 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 --------- * refactor(data): migrate server state management to TanStack Query * refactor(data): add @tanstack/react-query-devtools to test Also we added some time in the staleTime to see the state "fresh" * refactor(forms): Migrate all forms to React Hook Form and Valibot * 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 --------- * 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 * feat(api): create course service for CRUD operations * feat(hooks): implement TanStack Query hooks for courses Also changed de ProfessorCoursesPage to see the course of the professor insted of static courses --------- * 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 * 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 * 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 --------- * 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 --------- * Feature/course enroll button (#130) * initial enrrollment logic * feat: enrollment courses --------- * 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. * 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 --------- * 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 --------- * Refactor: visual details deadline (#145) * feat: add new basic pages, faq, about us and contact * fix: fixed the filter params --------- * bugfix: improve questions endpoints (#146) * 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 --------- * feat:install storybook and example (#153) * refactor: Implemented Lazy loading in AppRouter and HeroSection (#155) * 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) * fear:install knip and delete unused files (#158) * refactor:delete unused exports (#159) * 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) * 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. --------- * Added Tailwind to the project. (#10) Modified LoginPage.tsx and RegisterPage.tsx to start using Tailwind, and began implementing reusable React components. * 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 --------- * feat: Setup Code Quality Pipeline with CI workflow (#15) * fix(ci): Align CI workflow to use pnpm (#18) * 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) * fix: handling of tokens received from the backend (#25) * 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 * 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. --------- * 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 --------- * refactor(data): migrate server state management to TanStack Query * refactor(data): add @tanstack/react-query-devtools to test Also we added some time in the staleTime to see the state "fresh" * refactor(forms): Migrate all forms to React Hook Form and Valibot * 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 --------- * 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 * feat(api): create course service for CRUD operations * feat(hooks): implement TanStack Query hooks for courses Also changed de ProfessorCoursesPage to see the course of the professor insted of static courses --------- * 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 * 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 * 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 --------- * 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 --------- * Feature/course enroll button (#130) * initial enrrollment logic * feat: enrollment courses --------- * 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. * 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 --------- * 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 --------- * Refactor: visual details deadline (#145) * feat: add new basic pages, faq, about us and contact * fix: fixed the filter params --------- * bugfix: improve questions endpoints (#146) * 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 --------- * feat:install storybook and example (#153) * refactor: Implemented Lazy loading in AppRouter and HeroSection (#155) * 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) * fear:install knip and delete unused files (#158) * refactor:delete unused exports (#159) --------- * 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>
1 parent 0bf4ddf commit b136780

0 file changed

File tree

    0 commit comments

    Comments
     (0)