Skip to content

Facu back #632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 445 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
445 commits
Select commit Hold shift + click to select a range
8528f1f
Merge branch 'developer' into facu-front
facuscrollini Mar 10, 2025
63357bf
Merge pull request #90 from 4GeeksAcademy/facu-front
facuscrollini Mar 10, 2025
1790029
corrigiendo el precio de las cartas de la home
ALCIDESCONTRERAS Mar 10, 2025
1f94187
Merge pull request #91 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 10, 2025
21485b9
Corregido los colores del footer y el background en la vista de carrito
facuscrollini Mar 10, 2025
be72cb8
Merge pull request #92 from 4GeeksAcademy/facu-front
facuscrollini Mar 10, 2025
58a0bff
cambio en card
ALCIDESCONTRERAS Mar 10, 2025
28ccb96
Merge pull request #93 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 10, 2025
e901921
cambio en card
ALCIDESCONTRERAS Mar 10, 2025
26ca51b
Merge pull request #94 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 10, 2025
6ee12bc
iniciando las busquedas del navbar
ALCIDESCONTRERAS Mar 10, 2025
c04cc50
Funcionalidad vistas individuales (smartphones, tvs, laptops)
Roberto-Torres-Martinez Mar 10, 2025
e9fbba4
Merge pull request #95 from 4GeeksAcademy/roberto-front
Roberto-Torres-Martinez Mar 10, 2025
ce9ddd1
avanzando las barra de busqueda
ALCIDESCONTRERAS Mar 10, 2025
0269068
Merge pull request #96 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 10, 2025
2b1b6e3
Carrusel vistas individuales terminado y funciona, empezando en profu…
Roberto-Torres-Martinez Mar 11, 2025
633f059
Merge pull request #97 from 4GeeksAcademy/roberto-front
Roberto-Torres-Martinez Mar 11, 2025
6133026
Alineado en la vista de carrito mejorado, y comentada la verificación…
facuscrollini Mar 11, 2025
71999a5
Merge pull request #98 from 4GeeksAcademy/facu-front
facuscrollini Mar 11, 2025
9f383b5
vistas individuales actualizadas
Roberto-Torres-Martinez Mar 11, 2025
6e16d9e
Merge pull request #99 from 4GeeksAcademy/roberto-front
Roberto-Torres-Martinez Mar 11, 2025
57d93fa
guardando
ALCIDESCONTRERAS Mar 11, 2025
1bb02d3
Merge pull request #100 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 11, 2025
6155501
despues de la cagada
ALCIDESCONTRERAS Mar 11, 2025
5e21354
Merge pull request #101 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 11, 2025
ce40240
probando
ALCIDESCONTRERAS Mar 11, 2025
109f3d6
Merge pull request #102 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 11, 2025
d1fa354
avance barra de buscar
ALCIDESCONTRERAS Mar 11, 2025
a42da20
Merge pull request #103 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 11, 2025
05e637a
Traer informacion productos vistas individuales producto(smartphones,…
Roberto-Torres-Martinez Mar 11, 2025
6917276
Merge developer into roberto-front
Roberto-Torres-Martinez Mar 11, 2025
acbcfd4
Merge pull request #104 from 4GeeksAcademy/roberto-front
Roberto-Torres-Martinez Mar 11, 2025
8995013
Estilos y tipografias cambiadas en vistas individuales
Roberto-Torres-Martinez Mar 11, 2025
45bd59a
Merge pull request #105 from 4GeeksAcademy/roberto-front
Roberto-Torres-Martinez Mar 11, 2025
0a705bf
Carrito básico hecho
facuscrollini Mar 12, 2025
8f941be
funciona el filtro de busqueda
ALCIDESCONTRERAS Mar 12, 2025
0287cca
Merge pull request #106 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 12, 2025
3bcba3d
Merge pull request #107 from 4GeeksAcademy/facu-front
facuscrollini Mar 12, 2025
c8c89ac
cambie el texto
ALCIDESCONTRERAS Mar 12, 2025
ec9d324
Merge pull request #108 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 12, 2025
43f5588
Avance vistas individuales
Roberto-Torres-Martinez Mar 12, 2025
4ee72b8
Merge pull request #109 from 4GeeksAcademy/roberto-front
Roberto-Torres-Martinez Mar 12, 2025
510c669
barra de busqueda completa
ALCIDESCONTRERAS Mar 12, 2025
4693f3d
Merge pull request #110 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 12, 2025
7927209
Guardado previo a cambiar carrusel por slider
facuscrollini Mar 12, 2025
63bb6ea
diseño del navbar
ALCIDESCONTRERAS Mar 12, 2025
e28cf4a
Merge pull request #111 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 12, 2025
94d0a97
zona personal trabajando en las fotos de los usuarios
ALCIDESCONTRERAS Mar 12, 2025
351560b
Merge pull request #112 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 12, 2025
6d1b060
Carruseles de vistas individuales de phones y tvs tanto para imagenes…
Roberto-Torres-Martinez Mar 12, 2025
e403f0c
Merge branch 'developer' into roberto-front
Roberto-Torres-Martinez Mar 12, 2025
4319568
Merge pull request #113 from 4GeeksAcademy/roberto-front
Roberto-Torres-Martinez Mar 12, 2025
3c17fb4
terminando la zona privada
ALCIDESCONTRERAS Mar 13, 2025
0f5f6e4
Merge branch 'developer' into alci-front
ALCIDESCONTRERAS Mar 13, 2025
985c399
Merge pull request #114 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 13, 2025
6b51752
avance de la imagen de usuario
ALCIDESCONTRERAS Mar 13, 2025
acb8d4f
Merge pull request #115 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 13, 2025
98f7d50
Carrusel vista home cargado con imagenes y temporizador para mostar c…
facuscrollini Mar 13, 2025
d82a79c
Merge branch 'developer' into facu-front
facuscrollini Mar 13, 2025
a3e0b88
Merge pull request #116 from 4GeeksAcademy/facu-front
facuscrollini Mar 13, 2025
5b7541b
Guardado previo a reseteo de migraciones, agregada la redirección al …
facuscrollini Mar 13, 2025
d838fd3
Merge pull request #117 from 4GeeksAcademy/facu-front
facuscrollini Mar 13, 2025
b022a50
Crruseles y modificacion estilos en vista individual laptops
Roberto-Torres-Martinez Mar 13, 2025
b0d9086
Merge pull request #118 from 4GeeksAcademy/roberto-front
Roberto-Torres-Martinez Mar 13, 2025
0da1f86
terminado el area personal
ALCIDESCONTRERAS Mar 13, 2025
c00de7e
Merge pull request #119 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 13, 2025
260aba1
terminado el area de foto del navbar
ALCIDESCONTRERAS Mar 13, 2025
0efc05f
Merge pull request #120 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 13, 2025
3e2fd31
Enlace de productos de Carrito, y Tendencia en la home ajustado a cad…
facuscrollini Mar 13, 2025
ad1eb19
Merge pull request #121 from 4GeeksAcademy/facu-front
facuscrollini Mar 13, 2025
92f771a
productInfoPhone modificado
Roberto-Torres-Martinez Mar 13, 2025
8cf7703
Merge pull request #122 from 4GeeksAcademy/roberto-front
Roberto-Torres-Martinez Mar 13, 2025
b155cf5
terminado el area personal y recoger el id tv
ALCIDESCONTRERAS Mar 14, 2025
7342743
Merge pull request #123 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 14, 2025
54d593a
Agregada las funciones para que se muestre las imagenes de los colore…
facuscrollini Mar 14, 2025
f712d49
Merge pull request #124 from 4GeeksAcademy/facu-front
facuscrollini Mar 14, 2025
bfd0e15
guardar antes de comenzar la pasarela de pago
ALCIDESCONTRERAS Mar 14, 2025
c5ceea9
Merge pull request #125 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 14, 2025
6b68ac8
Endpoints para el carrito y llamada a la API para carrito con metodo …
Roberto-Torres-Martinez Mar 14, 2025
ff233c7
Merge pull request #126 from 4GeeksAcademy/roberto-endpoints
Roberto-Torres-Martinez Mar 14, 2025
a7ce02c
pasarela de pago funcionalidad hecha
ALCIDESCONTRERAS Mar 14, 2025
07f3c86
Merge pull request #127 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 14, 2025
946cfd2
Modelos actualizados y endpoints de carrito añadisos
Roberto-Torres-Martinez Mar 15, 2025
5d07f14
Merge pull request #128 from 4GeeksAcademy/roberto-endpoints
Roberto-Torres-Martinez Mar 15, 2025
37c5624
Avanzadas las conexiones del pedido con el usuario, moví la funcion g…
facuscrollini Mar 15, 2025
ba58afa
Merge branch 'developer' into facu-front
facuscrollini Mar 15, 2025
e13ddb2
Merge pull request #129 from 4GeeksAcademy/facu-front
facuscrollini Mar 15, 2025
d92f1dc
cambiado la pasarela de pago
ALCIDESCONTRERAS Mar 15, 2025
bdf0d47
Merge pull request #130 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 15, 2025
2dbc10f
Endpoints de agregar productos al carrito y de eliminar productos del…
Roberto-Torres-Martinez Mar 16, 2025
c3aa679
Merge pull request #131 from 4GeeksAcademy/roberto-endpoints
Roberto-Torres-Martinez Mar 16, 2025
733fe59
ya cambie la apariencia
ALCIDESCONTRERAS Mar 17, 2025
41d2587
Merge pull request #132 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 17, 2025
d19e3f2
Modificacion endpoint metodo delete para el carrito
Roberto-Torres-Martinez Mar 17, 2025
f93c215
Merge pull request #133 from 4GeeksAcademy/roberto-apiservices
Roberto-Torres-Martinez Mar 17, 2025
797440e
Vista cart es visible el contenido del carrito personal, y está funci…
facuscrollini Mar 17, 2025
b048b02
Merge pull request #134 from 4GeeksAcademy/facu-front
facuscrollini Mar 17, 2025
4a807cf
Endpoint metodo PUT para carrito agregado
Roberto-Torres-Martinez Mar 17, 2025
5c302ae
Merge pull request #135 from 4GeeksAcademy/roberto-endpoints
Roberto-Torres-Martinez Mar 17, 2025
8451a03
pasarela pago css
ALCIDESCONTRERAS Mar 17, 2025
51a0dcb
Merge pull request #136 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 17, 2025
cc44d5c
agregado otra vista de confirmacion
ALCIDESCONTRERAS Mar 17, 2025
f3e7506
Merge pull request #137 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 17, 2025
56d7467
Endpoint metodo PUT para el carrito finalizado
Roberto-Torres-Martinez Mar 17, 2025
9860d03
Merge pull request #138 from 4GeeksAcademy/roberto-modelos
Roberto-Torres-Martinez Mar 17, 2025
d66b1bc
componiendo mensajes
ALCIDESCONTRERAS Mar 17, 2025
5888fbb
Merge pull request #139 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 17, 2025
f977a48
agregué imagen
ALCIDESCONTRERAS Mar 18, 2025
4c1dfb8
Merge pull request #140 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 18, 2025
6d2fe3c
Agregada cantidad a la vista de carrito, se pasa la variable de subto…
facuscrollini Mar 18, 2025
c07399e
Merge pull request #141 from 4GeeksAcademy/facu-front
facuscrollini Mar 18, 2025
4194649
Agregadas las características de imagen y colores en los modelos de l…
facuscrollini Mar 18, 2025
de40bea
configuracion de paginas de mensaje de confirmacion de pago
ALCIDESCONTRERAS Mar 18, 2025
dd9d8ac
Merge pull request #142 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 18, 2025
9e52f35
Merge pull request #143 from 4GeeksAcademy/facu-front
facuscrollini Mar 18, 2025
6b743f9
Agregue la funcionalidad para traer las imagenes de la vista individu…
Roberto-Torres-Martinez Mar 18, 2025
5ccd08b
Merge pull request #144 from 4GeeksAcademy/roberto-front
Roberto-Torres-Martinez Mar 18, 2025
0487307
Guardado previo a pull
facuscrollini Mar 18, 2025
412c2c6
Merge pull request #145 from 4GeeksAcademy/facu-front
facuscrollini Mar 18, 2025
d35602e
Traer imagenes para el carrusel de laptops en vista individual laptops
Roberto-Torres-Martinez Mar 18, 2025
ac41788
Merge pull request #146 from 4GeeksAcademy/roberto-front
Roberto-Torres-Martinez Mar 18, 2025
d2f12cf
la imagen random ya estan del catalogo de la home
ALCIDESCONTRERAS Mar 18, 2025
b50c668
Merge pull request #147 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 18, 2025
7a3c5ae
Funcionalidad para agregar productos al carrito desde vista individua…
Roberto-Torres-Martinez Mar 18, 2025
282703d
Merge pull request #148 from 4GeeksAcademy/roberto-front
Roberto-Torres-Martinez Mar 18, 2025
bdeff2a
viendo el filtro de busqueda que está dando problemas
ALCIDESCONTRERAS Mar 18, 2025
541f879
Merge pull request #149 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 18, 2025
a6c1de9
Guardado previo a hacer pull de developer
facuscrollini Mar 19, 2025
d6230f5
Merge branch 'developer' into facu-front
facuscrollini Mar 19, 2025
2910f84
Merge pull request #150 from 4GeeksAcademy/facu-front
facuscrollini Mar 19, 2025
eb3e894
Agregada la funcionalidad para que muestre la imagen del producto en …
facuscrollini Mar 19, 2025
1b8bfc5
Merge pull request #151 from 4GeeksAcademy/facu-front
facuscrollini Mar 19, 2025
d5eb162
Agregúe la función de eliminar a la vista de cart.js, para eso modifi…
facuscrollini Mar 19, 2025
b06cba7
Creado el estado de userId en cart.js y creadas las conexiones para c…
facuscrollini Mar 19, 2025
e24fbd4
Merge pull request #152 from 4GeeksAcademy/facu-front
facuscrollini Mar 19, 2025
1c4c677
Agregado el id del usuario en cart.js consiguiendolo de sessionStorage
facuscrollini Mar 19, 2025
39ec49e
Merge pull request #153 from 4GeeksAcademy/facu-front
facuscrollini Mar 19, 2025
75ba81b
corregido la barra de busqueda, y la actualizacion del usuario que no…
ALCIDESCONTRERAS Mar 19, 2025
b42e868
Merge pull request #154 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 19, 2025
41dde57
actualizar imagen al momento
ALCIDESCONTRERAS Mar 19, 2025
34dbded
Merge pull request #155 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 19, 2025
4ab5508
borrando algunas lineas
ALCIDESCONTRERAS Mar 19, 2025
4c13030
Merge pull request #156 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 19, 2025
ee31bca
correccion de imagenes de productos
ALCIDESCONTRERAS Mar 19, 2025
d7526ae
Merge pull request #157 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 19, 2025
a0dd150
correccion de imagenes de productos
ALCIDESCONTRERAS Mar 19, 2025
a8519c8
Merge pull request #158 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 19, 2025
3ba4c17
Guardado previo antes del pull
facuscrollini Mar 20, 2025
87141e1
Merge pull request #159 from 4GeeksAcademy/facu-front
facuscrollini Mar 20, 2025
2e0cc17
imagenes de carrusel card small
ALCIDESCONTRERAS Mar 20, 2025
bdbb285
Traer imagenes vista individual para carrusel
Roberto-Torres-Martinez Mar 20, 2025
5c23106
Merge branch 'developer' into roberto-front
Roberto-Torres-Martinez Mar 20, 2025
c770373
Merge pull request #160 from 4GeeksAcademy/roberto-front
Roberto-Torres-Martinez Mar 20, 2025
522093b
Merge branch 'developer' into alci-front
ALCIDESCONTRERAS Mar 20, 2025
c3c3e6b
Merge pull request #161 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 20, 2025
2a55cac
agregue el navigate a los productos relacionados
ALCIDESCONTRERAS Mar 20, 2025
2561e57
Merge pull request #162 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 20, 2025
8454b7f
Aumentar cantidad en vista carro lista, en la parte de lista de produ…
facuscrollini Mar 20, 2025
2058adb
Merge branch 'developer' into facu-front
facuscrollini Mar 20, 2025
89713a3
Merge pull request #163 from 4GeeksAcademy/facu-front
facuscrollini Mar 20, 2025
3b43eba
ya funciona el cambiar de colores
ALCIDESCONTRERAS Mar 20, 2025
409315a
Merge pull request #164 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 20, 2025
0f14001
Retoques parte visual imagenes carrusel
Roberto-Torres-Martinez Mar 20, 2025
94cb721
Merge pull request #165 from 4GeeksAcademy/roberto-front
Roberto-Torres-Martinez Mar 20, 2025
74b7d40
darle formato a los archivos
ALCIDESCONTRERAS Mar 20, 2025
cb812c2
Merge pull request #166 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 20, 2025
a562f50
Añadida funcionalidad para animacion agregar al carrito, footer modif…
Roberto-Torres-Martinez Mar 20, 2025
3ac8bf5
Merge pull request #167 from 4GeeksAcademy/roberto-front
Roberto-Torres-Martinez Mar 20, 2025
6194195
Agregué la función de editar al carrito, y ya están funcionales los b…
facuscrollini Mar 21, 2025
0b6a380
Merge pull request #168 from 4GeeksAcademy/facu-front
facuscrollini Mar 21, 2025
5a89dcd
Cambié la linea window.location.onload() en el carrito para traer la …
facuscrollini Mar 21, 2025
257d018
Merge pull request #169 from 4GeeksAcademy/facu-front
facuscrollini Mar 21, 2025
ccb2bf7
reparar el conflicto de upload al iniciar sesion
ALCIDESCONTRERAS Mar 21, 2025
35fc3a3
Merge pull request #170 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 21, 2025
97666ef
Funcionalidad del carrito pulida, ya quedan los productos actualizado…
facuscrollini Mar 21, 2025
acfe7f4
Merge pull request #171 from 4GeeksAcademy/facu-front
facuscrollini Mar 21, 2025
9e48283
Proyecto funcional para presentación
facuscrollini Mar 21, 2025
e93330f
Merge pull request #172 from 4GeeksAcademy/facu-front
facuscrollini Mar 21, 2025
0ec8276
Funcion para cambio de boton al agregar producto al carrito para las …
Roberto-Torres-Martinez Mar 21, 2025
0d2e221
Merge pull request #173 from 4GeeksAcademy/roberto-front
Roberto-Torres-Martinez Mar 21, 2025
17dc177
Guardado previo
facuscrollini Mar 21, 2025
e287939
Merge pull request #174 from 4GeeksAcademy/facu-front
facuscrollini Mar 21, 2025
c828c7c
reparar las imaganes de carrusel de card-small
ALCIDESCONTRERAS Mar 21, 2025
1f69b51
Merge pull request #175 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 21, 2025
ef5e1d4
cambios de la imagen
ALCIDESCONTRERAS Mar 21, 2025
ae58d45
Merge pull request #176 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 21, 2025
45e2438
arregle las fotos donde se selecciona los colores, y agregue borde a …
ALCIDESCONTRERAS Mar 21, 2025
b2f15d6
Merge pull request #177 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 21, 2025
88c8e2e
arreglando las fotos de tendencia
ALCIDESCONTRERAS Mar 22, 2025
6eabcb6
Merge pull request #178 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 22, 2025
3c82e7d
Estilos actualizados
Roberto-Torres-Martinez Mar 22, 2025
65d52d3
Merge pull request #179 from 4GeeksAcademy/roberto-front
Roberto-Torres-Martinez Mar 22, 2025
184cd56
Funcion agregada al footer para cambio de vista, swal alert modificad…
Roberto-Torres-Martinez Mar 22, 2025
fc2edf4
cambios en la home y agregar al carrito en tv
ALCIDESCONTRERAS Mar 22, 2025
1e2c0eb
Merge pull request #180 from 4GeeksAcademy/roberto-front
Roberto-Torres-Martinez Mar 22, 2025
b68f47c
Merge branch 'developer' into alci-front
ALCIDESCONTRERAS Mar 22, 2025
06293bf
Merge pull request #182 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 22, 2025
0612250
cambie el fondo al seleccionar el color
ALCIDESCONTRERAS Mar 22, 2025
6598996
Merge pull request #183 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 22, 2025
adb8035
agregado la animacion al boton del carrito
ALCIDESCONTRERAS Mar 22, 2025
a767128
Merge pull request #184 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 22, 2025
296520a
Agregué la funcionalidad de que el color se guarde al seleccionarlo e…
facuscrollini Mar 22, 2025
a1d0bd3
Merge pull request #185 from 4GeeksAcademy/facu-front
facuscrollini Mar 22, 2025
4334f72
Funcionalidad para hacer contraseña visible mediante icono de ojo par…
Roberto-Torres-Martinez Mar 23, 2025
0bfb65a
Merge pull request #186 from 4GeeksAcademy/roberto-front
Roberto-Torres-Martinez Mar 23, 2025
57dbd11
backgound de dropdown de iniciar sesion
ALCIDESCONTRERAS Mar 23, 2025
b2b699f
Merge pull request #187 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 23, 2025
a1a9729
agregue flecha en el carrusel de la home
ALCIDESCONTRERAS Mar 23, 2025
8445c40
Merge pull request #188 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 23, 2025
cfdc68d
agregue flecha para que continue hacia abajo
ALCIDESCONTRERAS Mar 24, 2025
81cb7c5
Merge pull request #189 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 24, 2025
f32d11f
Solucion footer en vista de login para colocarlo al fondo del conteni…
Roberto-Torres-Martinez Mar 24, 2025
7c0c979
Merge branch 'developer' into roberto-front
Roberto-Torres-Martinez Mar 24, 2025
fccf9a0
Merge pull request #190 from 4GeeksAcademy/roberto-front
Roberto-Torres-Martinez Mar 24, 2025
19462d2
cambie las imagenes de phones y laptops
ALCIDESCONTRERAS Mar 25, 2025
82d92fc
Merge pull request #191 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 25, 2025
05c94ab
cambie las imagenes de tv
ALCIDESCONTRERAS Mar 25, 2025
656f6c5
Merge pull request #192 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 25, 2025
66f688e
Modificacion iconos footer
Roberto-Torres-Martinez Mar 24, 2025
4122cbf
Merge pull request #193 from 4GeeksAcademy/roberto-front
Roberto-Torres-Martinez Mar 25, 2025
e7589eb
tarjeta de la home se agrego una animacion para los botones
ALCIDESCONTRERAS Mar 25, 2025
fbb93bd
Merge pull request #194 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 25, 2025
72f48c4
guardado previo al lodo
ALCIDESCONTRERAS Mar 25, 2025
4eb13e8
Merge pull request #195 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 25, 2025
a285a97
Limpieza CSS
Roberto-Torres-Martinez Mar 25, 2025
2474380
Merge branch 'developer' into roberto-front
Roberto-Torres-Martinez Mar 25, 2025
f01d95a
Merge pull request #196 from 4GeeksAcademy/roberto-front
Roberto-Torres-Martinez Mar 25, 2025
c99a7f4
ya sirve pedido del carrito
ALCIDESCONTRERAS Mar 25, 2025
64cac31
Merge pull request #197 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 25, 2025
6653c99
Imagen Banner catalogo añadida, vista de confirmacion de pago diseñad…
Roberto-Torres-Martinez Mar 25, 2025
e5c1a83
Merge pull request #198 from 4GeeksAcademy/roberto-front
Roberto-Torres-Martinez Mar 25, 2025
ceb1fd4
Agregado el nuevo metodo de conseguir informacion del carrito, asi ta…
facuscrollini Mar 25, 2025
55af2ae
Merge pull request #199 from 4GeeksAcademy/facu-back
facuscrollini Mar 25, 2025
04c3743
Cambiado el color de los botones de aumentar cantidad en la vista Cart
facuscrollini Mar 26, 2025
3222fed
Merge pull request #200 from 4GeeksAcademy/facu-back
facuscrollini Mar 26, 2025
ac89a7b
cambie la direccion del dropdown
ALCIDESCONTRERAS Mar 26, 2025
53e09a4
Merge pull request #201 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 26, 2025
4a95065
Cambios esteticos tarjetas tendencia
Roberto-Torres-Martinez Mar 26, 2025
229f69c
Merge pull request #202 from 4GeeksAcademy/roberto-front
Roberto-Torres-Martinez Mar 26, 2025
78c8577
corregir funcion flecha de agregar laptops al pedido
ALCIDESCONTRERAS Mar 26, 2025
7ad9386
Merge pull request #203 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 26, 2025
84e94b1
agregado la flecha del carrusel
ALCIDESCONTRERAS Mar 26, 2025
1b9a463
Merge pull request #204 from 4GeeksAcademy/alci-front
ALCIDESCONTRERAS Mar 26, 2025
c7d4bdd
Imagen carrito corregido
facuscrollini Mar 26, 2025
296b3db
Merge pull request #205 from 4GeeksAcademy/facu-back
facuscrollini Mar 26, 2025
82c45e0
Corregida la posición de createCart en callToApi.js para que pueda se…
facuscrollini Mar 26, 2025
d13311e
Merge pull request #206 from 4GeeksAcademy/facu-back
facuscrollini Mar 26, 2025
0430fe1
Solucion para volver a crear carrito
Roberto-Torres-Martinez Mar 26, 2025
779baae
Merge pull request #207 from 4GeeksAcademy/roberto-front
Roberto-Torres-Martinez Mar 26, 2025
02a3532
Guardado previo a la carga de developer
facuscrollini Mar 26, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -80,3 +80,6 @@ database.database
database.db
diagram.png
__pycache__/
migrations
.env

9 changes: 9 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,14 @@
"editor.defaultFormatter": "esbenp.prettier-vscode",
"workbench.editorAssociations": {
"*.md": "vscode.markdown.preview.editor"
},
"[javascript]": {
"editor.defaultFormatter": "vscode.typescript-language-features"
},
"[html]": {
"editor.defaultFormatter": "vscode.html-language-features"
},
"[css]": {
"editor.defaultFormatter": "vscode.css-language-features"
}
}
1 change: 1 addition & 0 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ flask-admin = "*"
typing-extensions = "*"
flask-jwt-extended = "==4.6.0"
wtforms = "==3.1.2"
stripe = "*"

[requires]
python_version = "3.10"
Expand Down
770 changes: 476 additions & 294 deletions Pipfile.lock

Large diffs are not rendered by default.

Binary file added docs/assets/novedad-iphone.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/assets/oferta-samsung.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/assets/tendencia-pixelbook.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading