Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
168 commits
Select commit Hold shift + click to select a range
f1e827f
Merge pull request #42 from G10-ISPC/developer
MicaelaJ26 Apr 25, 2024
0c4687c
ruteo de login
Noobuyer May 13, 2024
942784f
Subo pagina inicios con las rutas realizadas
DelfinaDAM May 13, 2024
fca6f9b
Merge pull request #63 from G10-ISPC/DelfinaAricoma
DelfinaDAM May 13, 2024
dc7d92a
Creacion componente carrito
felixfigueroa May 13, 2024
b4d45ec
Merge branch 'developer' of https://github.com/G10-ISPC/RICCO-2024 in…
felixfigueroa May 13, 2024
c026c6c
fusion app.routers.ts
felixfigueroa May 13, 2024
9a2c680
solucionado conflicto
felixfigueroa May 13, 2024
94425d4
solucionado conflicto
felixfigueroa May 13, 2024
033b7dc
se visualiza registro correctamente
MelisaSG May 13, 2024
a4cb781
se actualiza rama individual
MelisaSG May 13, 2024
605e5de
Merge pull request #64 from G10-ISPC/MelisaSG
MelisaSG May 13, 2024
0fcab9b
creacion carpeta para serrvicio y inicio en home
felixfigueroa May 13, 2024
6fa6401
Nuevo conflicto por mismo trabajo
felixfigueroa May 13, 2024
60c62e5
Merge pull request #65 from G10-ISPC/AntonioFigueroa
fafigueroa May 13, 2024
62e6544
Creación de Tablas en Django, enlace de icono footer a contactos, com…
May 13, 2024
cdb8675
Merge pull request #66 from G10-ISPC/Carlaarevalo
CarlaArevalo May 13, 2024
f3a4995
tablas completas
MicaelaJ26 May 13, 2024
a201cf0
Merge pull request #67 from G10-ISPC/Micajuarez
MicaelaJ26 May 13, 2024
a786303
Maqueto y pongo estilos a componente login
dalmaponce May 13, 2024
f6e3ddc
Merge pull request #82 from G10-ISPC/Dalmaponce
dalmaponce May 13, 2024
3c8076b
cambios del login-parte2
Noobuyer May 13, 2024
45ed292
cambios agregados a login
Noobuyer May 13, 2024
10ab50b
cambios del login-parte2
Noobuyer May 13, 2024
0eb9781
CREE CARRITO DE COMPRAS EN CARPETA ricco, Y MAQUETÉ COMPONENTE CARRI…
LauraPatriciaCruz May 13, 2024
fa29a62
Merge pull request #83 from G10-ISPC/LauraCruz
LauraPatriciaCruz May 13, 2024
68bc118
acomodamos todo
Noobuyer May 14, 2024
d6c9c4c
Merge pull request #84 from G10-ISPC/CevascoErnesto
Noobuyer May 14, 2024
f927dd4
se agrego validaciones del registro - falta terminar
May 14, 2024
b6ec8a9
Merge pull request #85 from G10-ISPC/MelisaSG
MelisaSG May 14, 2024
4c83412
Subo formulario reactivo del componente contacto
DelfinaDAM May 14, 2024
3941c12
Merge pull request #86 from G10-ISPC/DelfinaAricoma
DelfinaDAM May 14, 2024
19bde38
cambios de login
May 14, 2024
15283a9
rutas de nav
May 14, 2024
8e6da5c
Documentación
CarlaArevalo May 14, 2024
cd4c995
Merge pull request #87 from G10-ISPC/Carlaarevalo
CarlaArevalo May 14, 2024
4403edc
Merge pull request #88 from G10-ISPC/developer
CarlaArevalo May 14, 2024
b387bd7
Reorganización de carpetas y creación de component
CarlaArevalo May 21, 2024
d579d5a
Merge pull request #89 from G10-ISPC/Carlaarevalo
CarlaArevalo May 21, 2024
f868dd2
cambios en models.py
CarlaArevalo May 21, 2024
28d7da4
Merge pull request #90 from G10-ISPC/Carlaarevalo
CarlaArevalo May 21, 2024
de5d2b5
Dashboard
MicaelaJ26 May 22, 2024
755cf58
Merge pull request #91 from G10-ISPC/Micajuarez
MicaelaJ26 May 22, 2024
7bb5666
AGREGUÉ PAGINA ERROR404 INCLUYENDO RUTAS DE COMPONENTES Y FOTOS
LauraPatriciaCruz May 22, 2024
25c6541
Merge pull request #92 from G10-ISPC/LauraCruz
LauraPatriciaCruz May 22, 2024
b2c9bd7
Avance de formularios reactivos en componente registro
DelfinaDAM May 23, 2024
bfbb642
Avance de formularios reactivos en componente registro
DelfinaDAM May 23, 2024
345c002
Merge pull request #98 from G10-ISPC/DelfinaAricoma
DelfinaDAM May 23, 2024
aaf5086
Merge branch 'developer' of https://github.com/G10-ISPC/RICCO-2024 in…
May 23, 2024
c6197be
Backend-Subo creación de varias APIS
cosmariana May 25, 2024
4495a88
Merge pull request #99 from G10-ISPC/MarianaCos
cosmariana May 25, 2024
98a7898
Backend - Subo API registro y login con token
cosmariana May 25, 2024
051198e
Merge pull request #100 from G10-ISPC/MarianaCos
cosmariana May 25, 2024
f3b2e14
Merge branch 'developer' of https://github.com/G10-ISPC/RICCO-2024 in…
MelisaSG May 26, 2024
d533ca5
se agrega componente administrador
MelisaSG May 26, 2024
fcaa1e3
Merge branch 'developer' of https://github.com/G10-ISPC/RICCO-2024 in…
MelisaSG May 26, 2024
c8377ca
Cambio de href a routerLink nav, footer, productos, icono
felixfigueroa May 27, 2024
18eedb6
Merge pull request #101 from G10-ISPC/AntonioFigueroa
fafigueroa May 27, 2024
e88b029
Subo formulario reactivo del componente registro
DelfinaDAM May 28, 2024
4914664
Merge pull request #107 from G10-ISPC/DelfinaAricoma
DelfinaDAM May 29, 2024
a5e77ee
Avances en formulario reactivo
DelfinaDAM May 29, 2024
fedd761
Avances en formulario reactivo
DelfinaDAM May 29, 2024
3fcefeb
Merge pull request #108 from G10-ISPC/DelfinaAricoma
DelfinaDAM May 29, 2024
ff18bdb
Eliminé componente carrito, path y servicios
LauraPatriciaCruz May 29, 2024
20807cc
Convertí las tarjetas del componente Productos en componentes. Agregu…
LauraPatriciaCruz May 29, 2024
9e83d15
Merge pull request #109 from G10-ISPC/LauraCruz
LauraPatriciaCruz May 29, 2024
9afedc7
Subo modificaciones en Backend
cosmariana May 30, 2024
71abb21
Merge pull request #110 from G10-ISPC/MarianaCos
cosmariana May 30, 2024
56811a7
BACKEND: Nuevas modificaciones, RegisterApi
cosmariana May 31, 2024
a2c9d49
Merge pull request #111 from G10-ISPC/MarianaCos
cosmariana May 31, 2024
d160445
correcciones DB
CarlaArevalo May 31, 2024
1bee3ed
Merge pull request #112 from G10-ISPC/Carlaarevalo
CarlaArevalo May 31, 2024
f23fa2b
actualizacion de rama
MelisaSG May 31, 2024
98217dc
api en backend y modificaciones en dashboard
MicaelaJ26 May 31, 2024
b291cfc
cambios back y dashboard
MicaelaJ26 May 31, 2024
084ad82
Merge pull request #114 from G10-ISPC/Micajuarez
CarlaArevalo Jun 1, 2024
06b12d4
Api Backend
MicaelaJ26 Jun 1, 2024
e38999f
Merge pull request #115 from G10-ISPC/Micajuarez
MicaelaJ26 Jun 1, 2024
500651d
Terminacion barra navegacion y Conocenos mas
felixfigueroa Jun 2, 2024
8e87a8d
Merge pull request #116 from G10-ISPC/AntonioFigueroa
fafigueroa Jun 2, 2024
ad2fb54
Corrección error 405 en login y regitro
cosmariana Jun 2, 2024
5d03f22
Merge pull request #117 from G10-ISPC/MarianaCos
cosmariana Jun 2, 2024
295c67f
Se realiza orden de carpetas
cosmariana Jun 2, 2024
3bd94c4
Merge pull request #118 from G10-ISPC/MarianaCos
cosmariana Jun 2, 2024
2c8fd84
Dashboard
MicaelaJ26 Jun 2, 2024
18c19bd
Merge pull request #119 from G10-ISPC/Micajuarez
MicaelaJ26 Jun 2, 2024
8865ec8
se pueden agregar productos desde el front
MelisaSG Jun 2, 2024
dfb41f0
Merge branch 'developer' into MelisaSG
MelisaSG Jun 2, 2024
ce28356
Merge pull request #120 from G10-ISPC/MelisaSG
MelisaSG Jun 2, 2024
84b7a31
corregido el settigs en mi rama
MelisaSG Jun 2, 2024
a41f9fb
Merge branch 'MelisaSG' of https://github.com/G10-ISPC/RICCO-2024 int…
MelisaSG Jun 2, 2024
7cb345a
manipulacion de productos - eliminar/crear
MelisaSG Jun 3, 2024
4164d43
Merge pull request #121 from G10-ISPC/MelisaSG
MelisaSG Jun 3, 2024
d081c71
subo cambios en componente cart (carrito)
LauraPatriciaCruz Jun 3, 2024
e0490d4
Merge pull request #122 from G10-ISPC/LauraCruz
LauraPatriciaCruz Jun 3, 2024
062fb67
actualicé nombre de ruta q daba error
LauraPatriciaCruz Jun 3, 2024
d3c7088
Merge pull request #123 from G10-ISPC/LauraCruz
LauraPatriciaCruz Jun 3, 2024
87f243a
Correccionesp 404, carrito, errores
felixfigueroa Jun 3, 2024
a3be145
Merge branch 'developer' into AntonioFigueroa
fafigueroa Jun 3, 2024
4d0ffce
Merge pull request #124 from G10-ISPC/AntonioFigueroa
fafigueroa Jun 3, 2024
985e21b
Subo formulario reactivo de registro completo
DelfinaDAM Jun 3, 2024
38113f1
Merge branch 'developer' of https://github.com/G10-ISPC/RICCO-2024 in…
DelfinaDAM Jun 3, 2024
e327299
Merge pull request #125 from G10-ISPC/DelfinaAricoma
DelfinaDAM Jun 3, 2024
98c9a1d
modificaciones en login. Fuciona el get, falta ver post
CarlaArevalo Jun 4, 2024
d7bf65a
Merge branch 'developer' into Carlaarevalo
CarlaArevalo Jun 4, 2024
ce2ec66
Merge pull request #127 from G10-ISPC/Carlaarevalo
CarlaArevalo Jun 4, 2024
ff03656
agregué las funciones y acomodé cart
LauraPatriciaCruz Jun 4, 2024
12b288c
Merge pull request #128 from G10-ISPC/LauraCruz
LauraPatriciaCruz Jun 4, 2024
bf16409
Subo Modelo relacional y cambios en login.HTML
cosmariana Jun 4, 2024
9800002
Merge pull request #129 from G10-ISPC/MarianaCos
cosmariana Jun 4, 2024
c979857
Cambios en cart
LauraPatriciaCruz Jun 9, 2024
cdcf5ac
Merge pull request #131 from G10-ISPC/LauraCruz
LauraPatriciaCruz Jun 9, 2024
0db04f3
a
felixfigueroa Jun 9, 2024
8801955
Subo modificaciones en frontend:log.service, creacion de interceptors…
cosmariana Jun 9, 2024
eb683ff
Merge pull request #132 from G10-ISPC/MarianaCos
cosmariana Jun 9, 2024
291165d
Merge branch 'developer' of https://github.com/G10-ISPC/RICCO-2024 in…
felixfigueroa Jun 9, 2024
8782430
mejoras en el backend en logueo, en registro falta que active a los u…
CarlaArevalo Jun 11, 2024
8bd5f43
Merge pull request #133 from G10-ISPC/Carlaarevalo
CarlaArevalo Jun 11, 2024
aef6fe1
Agrego serializer y view registro
dalmaponce Jun 11, 2024
aab8a55
Merge pull request #136 from G10-ISPC/Dalmaponce
dalmaponce Jun 11, 2024
156e101
Se actualizó componente Nosotros de estática a pagina dinámica
felixfigueroa Jun 12, 2024
9d127f0
Subo modificaciones en frontend: login
cosmariana Jun 12, 2024
8ec6b08
Merge branch 'developer' of https://github.com/G10-ISPC/RICCO-2024 in…
felixfigueroa Jun 12, 2024
bd0bba4
Merge pull request #137 from G10-ISPC/MarianaCos
cosmariana Jun 12, 2024
3450c57
Actualización de componente nosotros.
felixfigueroa Jun 12, 2024
8be304e
Merge branch 'developer' of https://github.com/G10-ISPC/RICCO-2024 in…
felixfigueroa Jun 12, 2024
84e42ae
Merge pull request #138 from G10-ISPC/AntonioFigueroa
fafigueroa Jun 12, 2024
59c918b
dashboard
MicaelaJ26 Jun 13, 2024
8fa8186
Merge pull request #139 from G10-ISPC/Micajuarez
MicaelaJ26 Jun 13, 2024
c0c3ebf
Detalles
Jun 13, 2024
b3f0fad
Merge pull request #140 from G10-ISPC/DelfinaAricoma
DelfinaDAM Jun 13, 2024
b838146
Subo modificaciones en Frontend y Backend
cosmariana Jun 14, 2024
c6cee4e
Merge pull request #141 from G10-ISPC/MarianaCos
cosmariana Jun 14, 2024
289ac4b
Se agrega registro funcional completo
dalmaponce Jun 14, 2024
fd98c51
Merge pull request #142 from G10-ISPC/Dalmaponce
dalmaponce Jun 14, 2024
a5e4df5
arreglo de dashboard admin
MelisaSG Jun 14, 2024
048427d
arreglo dashadmin
MelisaSG Jun 14, 2024
3615196
arreglo conflicto
MelisaSG Jun 14, 2024
ca07e3f
Merge pull request #144 from G10-ISPC/MelisaSG
MelisaSG Jun 14, 2024
d7c3844
elimino codigo comentado
CarlaArevalo Jun 14, 2024
6e4877b
Merge pull request #145 from G10-ISPC/Carlaarevalo
CarlaArevalo Jun 14, 2024
2c43967
elimino carpeta abm
CarlaArevalo Jun 14, 2024
5e3feb2
Merge pull request #146 from G10-ISPC/Carlaarevalo
CarlaArevalo Jun 14, 2024
76ebacf
arreglo de dashadmin
MelisaSG Jun 14, 2024
fe0bfa6
borrado de password
MelisaSG Jun 14, 2024
d98b11e
Subo modificaciones en Frontend: GUARDS
cosmariana Jun 14, 2024
e6c2d00
Merge branch 'developer' into MarianaCos
cosmariana Jun 14, 2024
5cd0268
Merge pull request #147 from G10-ISPC/MarianaCos
cosmariana Jun 14, 2024
aef1156
se sube registro
dalmaponce Jun 14, 2024
9bd916f
Merge pull request #148 from G10-ISPC/Dalmaponce
dalmaponce Jun 14, 2024
9a23c0e
scrip
MicaelaJ26 Jun 14, 2024
41e394b
Merge pull request #149 from G10-ISPC/Micajuarez
MicaelaJ26 Jun 14, 2024
4263a76
Subo modificaciones en frontend: mejoras en rutas
cosmariana Jun 23, 2024
a83c4bd
Merge pull request #151 from G10-ISPC/MarianaCos
cosmariana Jun 23, 2024
a03f518
Organización de carpetas y registro
CarlaArevalo Jun 25, 2024
b116097
Merge pull request #152 from G10-ISPC/Carlaarevalo
CarlaArevalo Jun 25, 2024
65bdafb
llama los productos desde la base de datos, carga compras, falta deta…
CarlaArevalo Jul 4, 2024
1a947f7
Merge pull request #153 from G10-ISPC/Carlaarevalo
CarlaArevalo Jul 4, 2024
2d6aacb
Se logra funcionalidad del carrito, pagina de simulación de pago y ca…
CarlaArevalo Aug 21, 2024
f738f05
Merge pull request #154 from G10-ISPC/Carlaarevalo
CarlaArevalo Aug 21, 2024
1757294
historial de compras terminado
MicaelaJ26 Sep 3, 2024
19b71e8
Merge pull request #155 from G10-ISPC/Micajuarez
MicaelaJ26 Sep 3, 2024
16585b8
Agregué icono al nav y nombre de usuario al loguearse
cosmariana Jan 18, 2025
ce135a3
Merge pull request #156 from G10-ISPC/MarianaCos
cosmariana Jan 18, 2025
00ac7f6
Se agrega botón visibilidad de pass a login y msj de loguin exitoso
cosmariana Feb 14, 2025
6c5f6b9
Merge pull request #157 from G10-ISPC/MarianaCos
CarlaArevalo Feb 14, 2025
6d1804e
Nuevas funcionalidades
cosmariana Apr 10, 2025
4af3ddf
modificaciones para integrar con android
cosmariana Apr 15, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
174 changes: 0 additions & 174 deletions Base de Datos/bd_ricco.sql

This file was deleted.

Binary file not shown.
Binary file removed DER-Mod.Relacional-diagClases/DER RICCO.drawio.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed Documentacion/Casos de usos..docx
Binary file not shown.
Binary file not shown.
Binary file not shown.
Empty file.
8 changes: 0 additions & 8 deletions Ricco2024/src/app/app.config.ts

This file was deleted.

15 changes: 0 additions & 15 deletions Ricco2024/src/app/app.routes.ts

This file was deleted.

63 changes: 0 additions & 63 deletions Ricco2024/src/app/pages/auth/auth.component.html

This file was deleted.

12 changes: 0 additions & 12 deletions Ricco2024/src/app/pages/auth/auth.component.ts

This file was deleted.

Empty file.
19 changes: 0 additions & 19 deletions Ricco2024/src/app/pages/auth/auth_login/login/login.component.html

This file was deleted.

12 changes: 0 additions & 12 deletions Ricco2024/src/app/pages/auth/auth_login/login/login.component.ts

This file was deleted.

Loading