Skip to content
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

Emilia bazan #22

Open
wants to merge 82 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
aecfdbc
Eligiendo node como servidor default y html para el cliente
beresiartejuan Sep 11, 2024
21f957e
Reseteo de estilos usando normalize.css
beresiartejuan Sep 11, 2024
64b503b
Foto por default eliminada
beresiartejuan Sep 11, 2024
3de838c
Guardando en antiguo codigo en un archivo diferente
beresiartejuan Sep 11, 2024
08035a2
Reseteo del javascript
beresiartejuan Sep 11, 2024
a7f3f58
Esqueleto inicial y modelo a imitar
beresiartejuan Sep 11, 2024
1bb0554
Barra de navegación fija
beresiartejuan Sep 11, 2024
04c52da
Comentarios auxiliares
beresiartejuan Sep 11, 2024
563691b
Imagenes de los productos
beresiartejuan Sep 11, 2024
ab3189c
Merge pull request #1 from CodeStrong2023/client
beresiartejuan Sep 11, 2024
cebe0b8
Modificando el archivo server.js que viene por defecto
beresiartejuan Sep 11, 2024
16b9065
Separando la configuración del servidor en un archivo aparte
beresiartejuan Sep 11, 2024
c960acb
Cambio en la estructura de carpetas
beresiartejuan Sep 11, 2024
f7959ae
Implementación de las rutas para mercado pago
beresiartejuan Sep 11, 2024
f78a77a
Añadiendo documentación y verificación para las rutas de mercado pago
beresiartejuan Sep 11, 2024
24b2e39
Sirviendo los archivos del cliente desde express
beresiartejuan Sep 11, 2024
090f3b3
Merge pull request #2 from CodeStrong2023/dev
beresiartejuan Sep 11, 2024
b513d12
Mostrando productos en la pantalla
beresiartejuan Sep 12, 2024
0f6b135
Boton de pago añadido
beresiartejuan Sep 12, 2024
eccce83
Comunicando de manera directa el servidor y cliente
beresiartejuan Sep 12, 2024
0f4389f
Merge pull request #3 from CodeStrong2023/client
beresiartejuan Sep 12, 2024
657793a
Remove route /buy
beresiartejuan Sep 13, 2024
3a03572
Mejorando la validación en la ruta /mp/preference
beresiartejuan Sep 13, 2024
0018a4f
Carrito añadido
beresiartejuan Sep 13, 2024
6137c06
Arreglando errores en los estilos de los productos
beresiartejuan Sep 13, 2024
020c363
Función de añadir a carrito añadida
beresiartejuan Sep 13, 2024
d420ed2
Refactorización del carrito
beresiartejuan Sep 13, 2024
08cfc7c
Integración con mercado pago 😎😎🎉🎉
beresiartejuan Sep 15, 2024
74bc639
Boton de marcado pago en español
beresiartejuan Sep 15, 2024
c18b718
Add simple banner and filters
beresiartejuan Sep 26, 2024
fa3f537
Configuro archivo .gitignore
MaEmiliaB Sep 30, 2024
0278ed2
Creo formulario de registroe inicio de sesión
MaEmiliaB Sep 30, 2024
fc150c4
Agrego footer
MaEmiliaB Sep 30, 2024
1580bd4
Agrego banner y estilo al login y registro
MaEmiliaB Sep 30, 2024
1c1cde9
Agrego favicon
MaEmiliaB Oct 2, 2024
f0c2db2
Update gitignore
beresiartejuan Oct 3, 2024
8b67811
Responsive form
beresiartejuan Oct 4, 2024
f2ef80f
Actualización de rutas
beresiartejuan Oct 16, 2024
56dd464
Merge pull request #14 from CodeStrong2023/EmiliaBazan-small-update
beresiartejuan Oct 16, 2024
ba40474
Diseño de la base de datos
beresiartejuan Oct 21, 2024
7af2a4c
Creando modelos iniciales
beresiartejuan Oct 21, 2024
7b08132
Agregando metodos estaticos a los modelos
beresiartejuan Oct 22, 2024
49c0a0a
Error por falta de uuid arreglado
beresiartejuan Oct 24, 2024
4660aed
Add auth routes
beresiartejuan Oct 24, 2024
94e0ccb
Detalles en el sql y los scripts del cliente
beresiartejuan Oct 24, 2024
fb97685
Merge pull request #15 from CodeStrong2023/feature-database-mysql
beresiartejuan Oct 24, 2024
c3232e5
Sistema de Envios
Siro01 Oct 30, 2024
64e00d6
Merge pull request #16 from CodeStrong2023/SiroTorres
Siro01 Oct 30, 2024
d39dd28
Sistema de envíos v.1.2
Siro01 Nov 1, 2024
17111f5
Merge pull request #17 from CodeStrong2023/SiroTorres
Siro01 Nov 4, 2024
7021d4d
Sistema de Envios v1.3
Siro01 Nov 4, 2024
0e323f9
Merge pull request #18 from CodeStrong2023/SiroTorres
Siro01 Nov 4, 2024
d90d390
Sistema de Envios v1.4
Siro01 Nov 5, 2024
d1aa856
Merge pull request #19 from CodeStrong2023/SiroTorres
Siro01 Nov 5, 2024
3349bc6
Integración botón y función sistema envios
x1Fabri Nov 6, 2024
33afe2f
modificando envio parte 1
YamilaEsteche Nov 6, 2024
36d9a10
modificando sistema envios parte 1
YamilaEsteche Nov 6, 2024
70c2b97
Merge pull request #23 from CodeStrong2023/yamilaSistEnvios
YamilaEsteche Nov 6, 2024
5497439
Corrección funcionamiento button-cont calcular envío
x1Fabri Nov 7, 2024
8b5e7a4
Agrego footer
MaEmiliaB Nov 7, 2024
4f512ed
Ajuste ref styleshet
MaEmiliaB Nov 7, 2024
8d0afcc
agrego favicon al index
MaEmiliaB Nov 7, 2024
1aa5b0b
Descripción general del proyecto
beresiartejuan Nov 7, 2024
39feb8a
Estructura del proyecto añadida al readme
beresiartejuan Nov 7, 2024
ea3f161
Moviendo logica de envios a la carpeta public
beresiartejuan Nov 7, 2024
4a28aff
Merge branch 'master' into EmiliaBazan
MaEmiliaB Nov 7, 2024
f33ab0a
Merge pull request #24 from CodeStrong2023/EmiliaBazan
MaEmiliaB Nov 7, 2024
0a87f80
Añadiendo codigos postales a la base de datos
beresiartejuan Nov 8, 2024
eb49a19
Carrito en localstorage
beresiartejuan Nov 8, 2024
9af0988
Usando api para obtener los codigos postales
beresiartejuan Nov 8, 2024
12f4175
Agrego modelo de filtro
AdrianaVB Nov 8, 2024
c13d73a
Merge pull request #25 from CodeStrong2023/AdrianaVBalmaceda
AdrianaVB Nov 8, 2024
51de1cd
Merge pull request #26 from CodeStrong2023/master
AdrianaVB Nov 8, 2024
f929ce0
Merge pull request #27 from CodeStrong2023/AdrianaVBalmaceda
AdrianaVB Nov 8, 2024
ae25cd6
Arreglo bug en el perfil del usuario
beresiartejuan Nov 8, 2024
2a04f85
Agregar formulario de contacto y botón Contáctenos
marianasdev Nov 9, 2024
4b3a77d
cambios realizados
marianasdev Nov 9, 2024
9329ef4
contacto page
MarianaQuinteros Nov 9, 2024
e170ce7
Update README.md
MarianaQuinteros Nov 9, 2024
6b5f1f9
Merge pull request #30 from MarianaQuinteros/master
MaEmiliaB Nov 10, 2024
761a544
Merge pull request #29 from MarianaQuinteros/patch-2
AdrianaVB Nov 10, 2024
2db4a98
intentando deployar
MaEmiliaB Nov 11, 2024
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
342 changes: 342 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,342 @@
# Created by https://www.toptal.com/developers/gitignore/api/windows,linux,macos,python
# Edit at https://www.toptal.com/developers/gitignore?templates=windows,linux,macos,python

### Linux ###
*~

# temporary files which can be created if a process still has a handle open of a deleted file
.fuse_hidden*

# KDE directory preferences
.directory

# Linux trash folder which might appear on any partition or disk
.Trash-*

# .nfs files are created when an open file is removed but is still being accessed
.nfs*

### macOS ###
# General
.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon


# Thumbnails
._*

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk

### macOS Patch ###
# iCloud generated files
*.icloud

### Python ###
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
share/python-wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
*.py,cover
.hypothesis/
.pytest_cache/
cover/

# Translations
*.mo
*.pot

# Django stuff:
*.log
local_settings.py
db.sqlite3
db.sqlite3-journal

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
.pybuilder/
target/

# Jupyter Notebook
.ipynb_checkpoints

# IPython
profile_default/
ipython_config.py

# pyenv
# For a library or package, you might want to ignore these files since the code is
# intended to run in multiple environments; otherwise, check them in:
# .python-version

# pipenv
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
# However, in case of collaboration, if having platform-specific dependencies or dependencies
# having no cross-platform support, pipenv may install dependencies that don't work, or not
# install all needed dependencies.
#Pipfile.lock

# poetry
# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
# This is especially recommended for binary packages to ensure reproducibility, and is more
# commonly ignored for libraries.
# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
#poetry.lock

# pdm
# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
#pdm.lock
# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
# in version control.
# https://pdm.fming.dev/#use-with-ide
.pdm.toml

# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
__pypackages__/

# Celery stuff
celerybeat-schedule
celerybeat.pid

# SageMath parsed files
*.sage.py

# Environments
.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site

# mypy
.mypy_cache/
.dmypy.json
dmypy.json

# Pyre type checker
.pyre/

# pytype static type analyzer
.pytype/

# Cython debug symbols
cython_debug/

# PyCharm
# JetBrains specific template is maintained in a separate JetBrains.gitignore that can
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
# and can be added to the global gitignore or merged into this file. For a more nuclear
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
#.idea/

### Python Patch ###
# Poetry local configuration file - https://python-poetry.org/docs/configuration/#local-configuration
poetry.toml

# ruff
.ruff_cache/

# LSP config files
pyrightconfig.json

### Windows ###
# Windows thumbnail cache files
Thumbs.db
Thumbs.db:encryptable
ehthumbs.db
ehthumbs_vista.db

# Dump file
*.stackdump

# Folder config file
[Dd]esktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Windows Installer files
*.cab
*.msi
*.msix
*.msm
*.msp

# Windows shortcuts
*.lnk

# End of https://www.toptal.com/developers/gitignore/api/windows,linux,macos,python

# See http://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
/tmp
/out-tsc

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# nyc test coverage
.nyc_output

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Bower dependency directory (https://bower.io/)
bower_components

# node-waf configuration
.lock-wscript

# IDEs and editors
.idea
.project
.classpath
.c9/
*.launch
.settings/
*.sublime-workspace

# IDE - VSCode
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json

# misc
.sass-cache
connect.lock
typings

# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*


# Dependency directories
node_modules/
jspm_packages/

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

# Yarn Integrity file
.yarn-integrity

# dotenv environment variables file
.env

# next.js build output
.next

# Lerna
lerna-debug.log

# System Files
.DS_Store
Thumbs.db
Loading