Sergio Mattei
|
574230caf8
|
Merge branch 'eliam-final'
|
2 jaren geleden |
Sergio Mattei
|
e724ae7ba9
|
Fix typos
|
2 jaren geleden |
eliam.ruiz
|
8565c3366e
|
Merge branch 'eliam-final' of sergio.mattei/RenacerSocial into main
|
2 jaren geleden |
eliam.ruiz
|
99c478b2ad
|
Tried to add some color to app
|
2 jaren geleden |
eliam.ruiz
|
34a2b47064
|
Added the call and mail buttons to each service specific page
|
2 jaren geleden |
eliam.ruiz
|
fcf1437269
|
Chnaged call and email values to dummy values
|
2 jaren geleden |
eliam.ruiz
|
c87b96acfb
|
Merge branch 'eliam-sprint-1'
|
2 jaren geleden |
eliam.ruiz
|
d8e9075441
|
Fixed Seguridad y apoyo page routing bug
|
2 jaren geleden |
eliam.ruiz
|
5f9f37945b
|
Merge branch 'eduardo-sprint-2' of sergio.mattei/RenacerSocial into main
|
2 jaren geleden |
eliam.ruiz
|
4a226b4199
|
Ran app in android studio in order to verify that it worked
|
2 jaren geleden |
eliam.ruiz
|
13edd3582f
|
Merge branch 'main' of https://git.ccom.uprrp.edu/sergio.mattei/RenacerSocial into eliam-sprint-1
# Conflicts:
# src/components/DropdownComponent.tsx
# src/components/ListComponent.tsx
# src/pages/AdviceListPage.tsx
|
2 jaren geleden |
eduardo.figueroa7
|
5a7c232d9b
|
añadi info de los servicios y info general
|
2 jaren geleden |
eduardo.figueroa7
|
253bc0a6ed
|
Añadi mi test
|
2 jaren geleden |
eliam.ruiz
|
c4e6fad61f
|
Add my cypress testing functions
|
2 jaren geleden |
Sergio Mattei
|
27ad2ea2af
|
[fix] Fix CORS issue
|
2 jaren geleden |
Sergio Mattei
|
46b3710a27
|
[feat] Add cypress command
|
2 jaren geleden |
Sergio Mattei
|
5a7212624d
|
[feat] Add E2E testing
|
2 jaren geleden |
Sergio Mattei
|
f93263078e
|
[feat] Add multiple categories
|
2 jaren geleden |
Sergio Mattei
|
d94c95d5a4
|
Merge branch 'main' into matteing-sprint-1
# Conflicts:
# src/components/DropdownComponent.tsx
|
2 jaren geleden |
eliam.ruiz
|
63c50d8956
|
Merge
|
2 jaren geleden |
Sergio Mattei
|
d3cfb9af94
|
Merge branch 'main' into matteing-sprint-1
|
2 jaren geleden |
Sergio Mattei
|
f73408f895
|
[feat] Don't use dropdown
|
2 jaren geleden |
eliam.ruiz
|
0ef5cb714a
|
Merge branch 'eduardo-sprint-2'
# Conflicts:
# package-lock.json
# package.json
# src/App.tsx
|
2 jaren geleden |
eduardo.figueroa7
|
775ec9a0bb
|
editar paginas de servicios
|
2 jaren geleden |
sergio.mattei
|
2213cd9df8
|
Merge branch 'matteing-sprint-1' of sergio.mattei/RenacerSocial into main
|
2 jaren geleden |
Sergio Mattei
|
b2e0660ba3
|
[mant] Merge all current conflicta
|
2 jaren geleden |
Sergio Mattei
|
ed9ba1e37f
|
Merge branch 'main' into matteing-sprint-1
# Conflicts:
# src/components/ListComponent.css
# src/components/ListComponent.tsx
# src/pages/AdviceListPage.tsx
# src/pages/Home.tsx
# src/pages/LawListPage.tsx
# src/types.ts
|
2 jaren geleden |
Sergio Mattei
|
9fda4b116b
|
[feat] Add routing for Notion articles
|
2 jaren geleden |
eduardo.figueroa7
|
61122a8031
|
Crear el about y editar logos
|
2 jaren geleden |
eduardo.figueroa7
|
1712cae972
|
Crear el about y editar logos
|
2 jaren geleden |
Sergio Mattei
|
9ac7df12d6
|
[feat] Refinements to UX for fetching data from Notion
|
2 jaren geleden |
eliam.ruiz
|
ff646bbced
|
cleaning working tree
|
2 jaren geleden |
Sergio Mattei
|
ba67862d80
|
[feat] Add proof of concept Notion integration
|
2 jaren geleden |
eliam.ruiz
|
a92ce928f8
|
Merge branch 'eliam-sprint-1' of sergio.mattei/RenacerSocial into main
|
2 jaren geleden |
eliam.ruiz
|
aa667f76f7
|
[feat] Add accordion component to advice list page
|
2 jaren geleden |
eliam.ruiz
|
611a7f1a06
|
added use of dropdown component to advice page
|
2 jaren geleden |
eliam.ruiz
|
89dbf7516d
|
implemented DropdownComponent.tsx
|
2 jaren geleden |
eliam.ruiz
|
4d1f61ab2a
|
changes laws variable name to be more general
|
2 jaren geleden |
eliam.ruiz
|
e1edfc39e3
|
Merge branch 'matteing-sprint-1' of sergio.mattei/RenacerSocial into main
|
2 jaren geleden |
Sergio Mattei
|
2eb0518ca5
|
[feat] Add Article, Advice, Law screens
|
2 jaren geleden |
Sergio Mattei
|
7a2b9e5176
|
[fix] Clean up code for ListComponent, add href -> ArticlePage
|
2 jaren geleden |
Sergio Mattei
|
a2a6791cad
|
[mant] Clean up sprint code
|
2 jaren geleden |
sergio.mattei
|
58dd79c6b9
|
Merge branch 'eliam-sprint-1' of sergio.mattei/RenacerSocial into main
|
2 jaren geleden |
eliam.ruiz
|
3f5c56a924
|
Delete useless file
|
2 jaren geleden |
eliam.ruiz
|
591d3b3f76
|
general data commit
|
2 jaren geleden |
eliam.ruiz
|
fe3563fc4f
|
Home Screen
|
2 jaren geleden |
eliam.ruiz
|
f8721bfd4a
|
Added List component
|
2 jaren geleden |
sergio.mattei
|
5a11ad4f82
|
Update 'README.md'
|
2 jaren geleden |
sergio.mattei
|
096b35bf68
|
Update 'README.md'
|
2 jaren geleden |
Sergio Mattei
|
22f6a654a2
|
[mant] Add Husky and Prettier for formatting + linting staged files
|
2 jaren geleden |