Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
116 commits
Select commit Hold shift + click to select a range
65b2f83
Update .gitignore
Santiago-Rudas Jul 5, 2025
b0e8475
[Se crean modelos, tablas y relaciones en BBDD]
jramirez0982 Jul 16, 2025
2cf653f
Merge pull request #27 from 4GeeksAcademy/jramirez0982-DB-Model
jramirez0982 Jul 16, 2025
2ca5cbc
[Carpeta migrations actualizada]
BecerraJD Jul 17, 2025
d223a13
[CREACION DE ENDPOINT PARA REGISTRAR USUARIO]
jramirez0982 Jul 18, 2025
609e8ed
[CREACION DE ENDPOINT LOGIN]
jramirez0982 Jul 18, 2025
c56eddd
Merge pull request #28 from 4GeeksAcademy/jramirez0982-Back-Register
jramirez0982 Jul 18, 2025
fd53341
Merge branch 'development' into jramirez0982-Back-login
jramirez0982 Jul 18, 2025
43b25f3
Merge pull request #29 from 4GeeksAcademy/jramirez0982-Back-login
jramirez0982 Jul 18, 2025
d4ce692
Estructura de Navbar
AndreaNsc Jul 19, 2025
7b1ecaf
Merge pull request #30 from 4GeeksAcademy/andreansc-Navbar
AndreaNsc Jul 19, 2025
ac71c5c
[Se modifico funcion de serializacion en User]
jramirez0982 Jul 19, 2025
cc8a3ea
Merge pull request #31 from 4GeeksAcademy/jramirez0982-Back-Register
jramirez0982 Jul 19, 2025
1491d44
[Creacion de pagina de para mosstrar vehiculos]
jramirez0982 Jul 19, 2025
e735552
Navbar completo
AndreaNsc Jul 19, 2025
f251e2e
Carousel
AndreaNsc Jul 19, 2025
5b13c9c
Merge pull request #32 from 4GeeksAcademy/andreansc-home
AndreaNsc Jul 19, 2025
2f670f3
Merge pull request #33 from 4GeeksAcademy/andreansc-Navbar
AndreaNsc Jul 19, 2025
df4864d
[Se crea endpoint para registrar nuevo vehiculo]
jramirez0982 Jul 19, 2025
8685e85
[Se creo endpoint para traer vehiculos de un usuario autenticado (JWT)]
jramirez0982 Jul 19, 2025
dadae83
[comentario para aumetar expiracion del token]
jramirez0982 Jul 20, 2025
eca3528
[Se traen cambios en development para actualizar rama fron-vehiculos]
jramirez0982 Jul 20, 2025
1c9f25a
[Se empieza a crear pagina y componente vehiculos]
jramirez0982 Jul 20, 2025
cbb508c
Merge pull request #34 from 4GeeksAcademy/jramirez0982-Back-vehiculos
jramirez0982 Jul 20, 2025
80c4d83
[Se trae los cambios de developmente incluyen endpoint vehiculos]
jramirez0982 Jul 20, 2025
cd05593
[codigo de GET para todo los vehiculos en Front]
jramirez0982 Jul 20, 2025
3a5cec6
[Finaliza pagina mis vehiculos]
jramirez0982 Jul 20, 2025
b1c9a09
[Se adicionaron comentario sobre endpoint]
jramirez0982 Jul 21, 2025
4a30a0a
Merge pull request #36 from 4GeeksAcademy/jramirez0982-Front-Vehiculos
jramirez0982 Jul 21, 2025
9d40e04
[organiza endpoint para obtener vehiculos_by_user]
jramirez0982 Jul 21, 2025
08d532e
[Se crea endpoint para eliminar vehiculo_by_user]
jramirez0982 Jul 21, 2025
ab03d7d
se hacen ajustes al codigo de borrar vehiculo
jramirez0982 Jul 21, 2025
50f27ea
Se añadio el componente servisios
AndreaNsc Jul 21, 2025
2a7b7a2
Merge pull request #37 from 4GeeksAcademy/andreansc-home
AndreaNsc Jul 21, 2025
7e6ffd2
Se agregaron los servicios
AndreaNsc Jul 21, 2025
2bc1dad
[Estructura Página login solo visual sin lógica]
BecerraJD Jul 21, 2025
ddf1ec3
[Creación de funciones y lógica en frontend]
BecerraJD Jul 22, 2025
fe7ddba
[Endpoint Delete en proceso, persiste problemas de missing authorizat…
jramirez0982 Jul 22, 2025
cd8af9d
[Se agregó el manejo de botones]
BecerraJD Jul 22, 2025
34e1719
[endpoint para tarer vehiculos segun ide de usuario]
jramirez0982 Jul 22, 2025
cb0d318
[Pequeño cambio en el botón de login]
BecerraJD Jul 22, 2025
154e933
Merge pull request #38 from 4GeeksAcademy/BecerraJD-Front-Login
BecerraJD Jul 22, 2025
6c1ba22
[modal que registra nuevos vehiculos]
jramirez0982 Jul 23, 2025
45c6746
[CORRECCIONES EN EL FORMULARIO DEL MODAL]
jramirez0982 Jul 23, 2025
020d7f6
[Se crea pagina mis vehiculos, incluye modal para registro]
jramirez0982 Jul 23, 2025
f99e13b
[MODIFICACION BOTON DEL MODAL Y LECTURA DE TOKEN]
jramirez0982 Jul 23, 2025
186f343
Merge pull request #39 from 4GeeksAcademy/jramirez0982-Back-vehiculos
jramirez0982 Jul 23, 2025
b4b694e
[Creación página de Registro Front con su Endpoint]
BecerraJD Jul 23, 2025
442d883
[SE AJUSTA EL MODAL PARA RENDERIZAR VEHICULOS]
jramirez0982 Jul 24, 2025
b415987
Merge pull request #40 from 4GeeksAcademy/jramirez0982-Back-vehiculos
jramirez0982 Jul 24, 2025
5bb264c
[Se modifico linea de lectura del token]
jramirez0982 Jul 24, 2025
c20ac07
Merge pull request #42 from 4GeeksAcademy/jramirez0982-Back-vehiculos
jramirez0982 Jul 24, 2025
26687a8
Correciones en el Carousel
AndreaNsc Jul 24, 2025
86cd69f
[Página de Registro Creada]
BecerraJD Jul 24, 2025
b5274fd
[correccion boton cerrar del modal nuevo vehiculo]
jramirez0982 Jul 24, 2025
6fdb89e
Merge pull request #43 from 4GeeksAcademy/jramirez0982-Back-vehiculos
jramirez0982 Jul 24, 2025
a6a029a
Merge branch 'development' into BecerraJD-Front-UserRegister
BecerraJD Jul 24, 2025
223e7e1
Merge pull request #44 from 4GeeksAcademy/BecerraJD-Front-UserRegister
BecerraJD Jul 24, 2025
c02a112
[SE CREA MODAL PARA CONFIRMACION DE REGISTRO VEHC]
jramirez0982 Jul 24, 2025
89a527a
[Se habilita token]
jramirez0982 Jul 24, 2025
4eeebfd
Merge pull request #45 from 4GeeksAcademy/jramirez0982-Back-vehiculos
jramirez0982 Jul 24, 2025
6e90ab2
Actualización del componente Servicios.jsx
AndreaNsc Jul 25, 2025
b09010d
Merge pull request #46 from 4GeeksAcademy/andreansc-home
AndreaNsc Jul 25, 2025
9b99b67
Se añadio footer
AndreaNsc Jul 25, 2025
b6510af
Merge pull request #47 from 4GeeksAcademy/andreansc-footer
AndreaNsc Jul 25, 2025
7eedf28
Se agrega el Inicio del User
AndreaNsc Jul 25, 2025
9f07c6d
Merge pull request #48 from 4GeeksAcademy/andreansc-inicio-user
AndreaNsc Jul 25, 2025
4cc3b73
[Mejoras en el modal aspectos esteticos]
jramirez0982 Jul 25, 2025
33283c8
Se agrego pagina de inicio del mecanico
AndreaNsc Jul 25, 2025
787a4e7
Se corrigieron errores en pagina de inicio de mecanico
AndreaNsc Jul 25, 2025
e83359e
corrigiendo conflicto
AndreaNsc Jul 25, 2025
9fc3593
corrigiendo errores
AndreaNsc Jul 25, 2025
4f56a20
Merge branch 'development' into andreansc-inicio-mecanico
AndreaNsc Jul 25, 2025
e72c02a
Merge pull request #49 from 4GeeksAcademy/andreansc-inicio-mecanico
AndreaNsc Jul 25, 2025
c9b7ea2
[Se reemplazan todas las alertas por modales]
jramirez0982 Jul 25, 2025
de8fe36
Merge branch 'development' into jramirez0982-Back-vehiculos
jramirez0982 Jul 25, 2025
fbe97f5
Merge pull request #50 from 4GeeksAcademy/jramirez0982-Back-vehiculos
jramirez0982 Jul 25, 2025
4177294
Se corrigio error en la pagina de InicioMecanico
AndreaNsc Jul 25, 2025
80951b6
Merge pull request #51 from 4GeeksAcademy/andreansc-inicio-mecanico
AndreaNsc Jul 25, 2025
7505fe1
[se empiezan a conectar componentes y diferentes paginas]
jramirez0982 Jul 25, 2025
2f86a9e
Se agregan Navbar de User y Mecanico
AndreaNsc Jul 26, 2025
c327ab5
Merge pull request #52 from 4GeeksAcademy/andreansc-Navbar
AndreaNsc Jul 26, 2025
3e62250
[Se crea endpoint para conectar ordenes de trabaj]
jramirez0982 Jul 26, 2025
9bf1c19
Correccion de LogOut
AndreaNsc Jul 26, 2025
3e7edbd
Merge pull request #53 from 4GeeksAcademy/andreansc-Navbar
AndreaNsc Jul 26, 2025
bf4ccfc
Se moddifico Navbar de InicioMecanico
AndreaNsc Jul 26, 2025
53d8539
Merge pull request #54 from 4GeeksAcademy/andreansc-inicio-mecanico
AndreaNsc Jul 26, 2025
fc04123
Se modifico Navbar de InicioUser
AndreaNsc Jul 26, 2025
319787d
Merge pull request #55 from 4GeeksAcademy/andreansc-inicio-user
AndreaNsc Jul 26, 2025
73a462c
CONDICION PARA ENVIAR A PAGINA CLIENTE O MECANICO
jramirez0982 Jul 27, 2025
2060d9a
Merge pull request #56 from 4GeeksAcademy/jramirez0982-conexiones
jramirez0982 Jul 27, 2025
08ada11
[PUESTA EN MARCHA DE BOTON LOG OUT]
jramirez0982 Jul 27, 2025
89a4e51
se crea endpoint para validar correo para recuperacion de contraseña,…
Santiago-Rudas Jul 28, 2025
4e46298
se hace tabla de ordenes de servicio y get de ot
jramirez0982 Jul 28, 2025
395819d
Merge pull request #57 from 4GeeksAcademy/jramirez0982-conexiones
jramirez0982 Jul 28, 2025
1724817
Se agrego redireccionar si das clic en el Navbar
AndreaNsc Jul 28, 2025
2f48b4b
Se agrego el logo para todos los Navbars
AndreaNsc Jul 28, 2025
84ac54c
Merge pull request #58 from 4GeeksAcademy/andreansc-Navbar
AndreaNsc Jul 28, 2025
4d8f447
Se agregaron iconos en la "vision"
AndreaNsc Jul 28, 2025
c78bf54
Se agregaron los iconos de redes sociales
AndreaNsc Jul 28, 2025
8b43d7a
Merge pull request #59 from 4GeeksAcademy/andreansc-home
AndreaNsc Jul 28, 2025
14b638d
Se modificaron las imagenes del inicio
AndreaNsc Jul 28, 2025
0a527eb
Merge pull request #60 from 4GeeksAcademy/andreansc-home
AndreaNsc Jul 28, 2025
2388323
Cambios de forma en vehiculos.jsx
jramirez0982 Jul 29, 2025
bc25539
Merge pull request #61 from 4GeeksAcademy/jramirez0982-back-inicioUser
jramirez0982 Jul 29, 2025
c8ce498
[Correccion de importacion en Navbar]
jramirez0982 Jul 29, 2025
e6e53ff
Merge pull request #62 from 4GeeksAcademy/jramirez0982-back-inicioUse…
jramirez0982 Jul 29, 2025
d862d41
se crea tabla de ordenes de servicio en inicioUser
jramirez0982 Jul 29, 2025
4941b52
[Se organiza al 100% toda la tabla de ordenes]
jramirez0982 Jul 29, 2025
966b581
Merge pull request #63 from 4GeeksAcademy/jramirez0982-back-inicioUse…
jramirez0982 Jul 29, 2025
adb16d4
Se agrego logo en el footer
AndreaNsc Jul 30, 2025
dcf26f8
Merge pull request #64 from 4GeeksAcademy/andreansc-footer
AndreaNsc Jul 30, 2025
2a12506
se corrige endpoint de orden de trabajo en app.py para resolver confi…
Santiago-Rudas Aug 1, 2025
e4e2142
Merge branch 'development' into Reset-Password-Frond&Back_
Santiago-Rudas Aug 1, 2025
3951ad5
Merge pull request #67 from 4GeeksAcademy/Reset-Password-Frond&Back_
Santiago-Rudas Aug 1, 2025
a74fd80
se enruta resetPassword con Loging
Santiago-Rudas Aug 1, 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/
Pipfile.lock
package-lock.json
17 changes: 9 additions & 8 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
{
"editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode",
"workbench.editorAssociations": {
"*.md": "vscode.markdown.preview.editor"
},
"[javascriptreact]": {
"editor.defaultFormatter": "vscode.typescript-language-features"
}
"editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode",
"workbench.editorAssociations": {
"*.md": "vscode.markdown.preview.editor"
},
"[javascriptreact]": {
"editor.defaultFormatter": "vscode.typescript-language-features"
},
"python.analysis.extraPaths": ["./src/api"]
}
1 change: 1 addition & 0 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ typing-extensions = "*"
flask-jwt-extended = "==4.6.0"
wtforms = "==3.1.2"
sqlalchemy = "*"
flask-mail = "*"

[requires]
python_version = "3.13"
Expand Down
32 changes: 21 additions & 11 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 0 additions & 35 deletions migrations/versions/0763d677d453_.py

This file was deleted.

24 changes: 23 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 15 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
"main": "index.js",
"scripts": {
"dev": "vite",
"start": "vite",
"build": "vite build",
"lint": "eslint . --ext js,jsx --report-unused-disable-directives --max-warnings 0",
"preview": "vite preview"
"start": "vite",
"build": "vite build",
"lint": "eslint . --ext js,jsx --report-unused-disable-directives --max-warnings 0",
"preview": "vite preview"
},
"author": {
"name": "Alejandro Sanchez",
Expand All @@ -30,13 +30,13 @@
"license": "ISC",
"devDependencies": {
"@types/react": "^18.2.18",
"@types/react-dom": "^18.2.7",
"@vitejs/plugin-react": "^4.0.4",
"eslint": "^8.46.0",
"eslint-plugin-react": "^7.33.1",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.3",
"vite": "^4.4.8"
"@types/react-dom": "^18.2.7",
"@vitejs/plugin-react": "^4.0.4",
"eslint": "^8.46.0",
"eslint-plugin-react": "^7.33.1",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.3",
"vite": "^4.4.8"
},
"babel": {
"presets": [
Expand All @@ -55,8 +55,9 @@
},
"dependencies": {
"prop-types": "^15.8.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.18.0"
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.18.0",
"react-router-hash-link": "^2.4.3"
}
}
37 changes: 31 additions & 6 deletions src/api/admin.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,42 @@

import os
from flask_admin import Admin
from .models import db, User
from api.models import db, User, Orden_de_trabajo, Vehiculos, Servicio, AuxOrdenServicio
from flask_admin.contrib.sqla import ModelView


class OrdenTrabajoModelView(ModelView):
column_auto_selected_related = True
column_list = ['id_ot', 'fecha_ingreso', 'estado_servicio', 'fecha_final',
'usuario_id', 'vehiculo_id', 'mecanico_id', 'cliente', 'mecanico', 'vehiculo', 'servicios_asociados']


class vehiculosModelView(ModelView):
column_auto_selected_related = True
column_list = ['id_vehiculo', 'matricula', 'marca',
'modelo', 'year', 'user_id', 'user', 'ordenes_trabajo']


class servicioModelView(ModelView):
column_auto_selected_related = True
column_list = ['id_service', 'name_service', 'price', 'ordenes_asociadas']


class auxOrdenServicioModelView(ModelView):
column_auto_selected_related = True
column_list = ['id', 'orden_id', 'orden', 'servicio_id', 'servicio']


def setup_admin(app):
app.secret_key = os.environ.get('FLASK_APP_KEY', 'sample key')
app.config['FLASK_ADMIN_SWATCH'] = 'cerulean'
admin = Admin(app, name='4Geeks Admin', template_mode='bootstrap3')
admin = Admin(app, name='AutoTek Admin', template_mode='bootstrap3')


# Add your models here, for example this is how we add a the User model to the admin
admin.add_view(ModelView(User, db.session))

admin.add_view(OrdenTrabajoModelView(Orden_de_trabajo, db.session))
admin.add_view(vehiculosModelView(Vehiculos, db.session))
admin.add_view(servicioModelView(Servicio, db.session))
admin.add_view(auxOrdenServicioModelView(AuxOrdenServicio, db.session))
# You can duplicate that line to add mew models
# admin.add_view(ModelView(YourModelName, db.session))
# admin.add_view(ModelView(YourModelName, db.session))
11 changes: 5 additions & 6 deletions src/api/commands.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@

import click
from api.models import db, User
from .models import db, User

"""
In this file, you can add as many commands as you want using the @app.cli.command decorator
Flask commands are usefull to run cronjobs or tasks outside of the API but sill in integration
with youy database, for example: Import the price of bitcoin every night as 12am
Flask commands are useful to run cronjobs or tasks outside of the API but still in integration
with your database, for example: Import the price of bitcoin every night at 12am
"""
def setup_commands(app):

Expand All @@ -15,7 +14,7 @@ def setup_commands(app):
Note: 5 is the number of users to add
"""
@app.cli.command("insert-test-users") # name of our command
@click.argument("count") # argument of out command
@click.argument("count") # argument of our command
def insert_test_users(count):
print("Creating test users")
for x in range(1, int(count) + 1):
Expand All @@ -31,4 +30,4 @@ def insert_test_users(count):

@app.cli.command("insert-test-data")
def insert_test_data():
pass
pass
Loading