Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
be6e6d1
first
Nika254 Nov 6, 2025
a777342
commit
Mnrubn Nov 7, 2025
497d82b
Merge pull request #1 from 4GeeksAcademy/RegisterPage
Mnrubn Nov 7, 2025
66a8e3a
commit Abel
Nika254 Nov 7, 2025
4bf2558
Merge pull request #2 from 4GeeksAcademy/Backendregisterlogin
Nika254 Nov 7, 2025
b75a667
Commit Jorge
JorgeCKR Nov 7, 2025
3fa29a2
Merge pull request #3 from 4GeeksAcademy/NavBar_JorgeCKR
JorgeCKR Nov 7, 2025
ad638d8
Cambios echos en Form the login y register, imagen agregada.
Luis11prog Nov 9, 2025
b11d025
Agregadas paginas Dashboard, Groups y Profile
Luis11prog Nov 10, 2025
f789de0
Importacion de navbar.css
JorgeCKR Nov 10, 2025
9155a4f
Nuevo diseño de navbar
JorgeCKR Nov 10, 2025
2cd0676
Css Actualizado Navbar
JorgeCKR Nov 10, 2025
2d4f3be
commit Rubén
Mnrubn Nov 12, 2025
bfc731d
Base de datos
JorgeCKR Nov 13, 2025
f0e97d7
Relaciones creadas
JorgeCKR Nov 13, 2025
869de74
Integracion de tablas
JorgeCKR Nov 14, 2025
155a5ed
Correccion de Errores 1.0
JorgeCKR Nov 14, 2025
0d595a9
UUID, no obligatorio
JorgeCKR Nov 14, 2025
66d80c3
commit Rubén 2
Mnrubn Nov 14, 2025
fca3f7a
commitRubén3
Mnrubn Nov 14, 2025
14ec2d5
reparación
Mnrubn Nov 14, 2025
f6c1094
Merge pull request #4 from 4GeeksAcademy/Rubén
Mnrubn Nov 14, 2025
5d6bc4a
store
Mnrubn Nov 15, 2025
54f9260
Merge pull request #5 from 4GeeksAcademy/Rubén
Mnrubn Nov 15, 2025
6b7859b
google maps y ateras
Nika254 Nov 15, 2025
437c53e
Merge pull request #6 from 4GeeksAcademy/Abel
Nika254 Nov 15, 2025
2654398
Subo cambios en paginas: dashboard, profile, groups,
Luis11prog Nov 15, 2025
e0e804b
Merge branch 'develop' into Luchito
Luis11prog Nov 15, 2025
99ac08f
Merge pull request #7 from 4GeeksAcademy/Luchito
Luis11prog Nov 15, 2025
17cf22e
Agregamos routa de Tareas
JorgeCKR Nov 16, 2025
5eb6398
Agregamos ruta de usuarios
JorgeCKR Nov 16, 2025
0d72da3
Revert "Luchito11"
Mnrubn Nov 17, 2025
a9b56ad
Cargamos archivo de BD
JorgeCKR Nov 17, 2025
ce0e514
Endopints de Usuarios
JorgeCKR Nov 17, 2025
67fd476
Cambios para enrutar endpoints
JorgeCKR Nov 17, 2025
0482b78
Importamos CSS Nav bar
JorgeCKR Nov 17, 2025
ecb3393
Merge pull request #8 from 4GeeksAcademy/revert-7-Luchito
Mnrubn Nov 17, 2025
b3f8544
cambios store y rutes.
Luis11prog Nov 17, 2025
56e8723
ultimos cambios
Luis11prog Nov 17, 2025
75d10d1
Merge pull request #9 from 4GeeksAcademy/Luchito
Luis11prog Nov 17, 2025
05a4cdf
Archivo Ignore
JorgeCKR Nov 17, 2025
c9fba79
Cambios recibidos Develop
JorgeCKR Nov 17, 2025
9421713
Merge pull request #10 from 4GeeksAcademy/JorgeCKR
JorgeCKR Nov 17, 2025
e437020
Reapply "Luchito11"
PatriciaAlEs Nov 17, 2025
9133deb
revisado luchito
PatriciaAlEs Nov 17, 2025
2941e14
dashbord
AngelRRand Nov 18, 2025
7259270
dashbord
AngelRRand Nov 18, 2025
4e12a35
hola
AngelRRand Nov 19, 2025
0b75b91
commit ruben
Mnrubn Nov 20, 2025
b8fcfc8
Merge pull request #11 from 4GeeksAcademy/develop-ruben
AngelRRand Nov 20, 2025
6829fc0
cambio models.py agrego task
Luis11prog Nov 20, 2025
3ba10be
Merge pull request #12 from 4GeeksAcademy/develop-luchito
AngelRRand Nov 20, 2025
4457d0c
Landing
Mnrubn Nov 20, 2025
7cf2b53
Merge pull request #13 from 4GeeksAcademy/develop-ruben
AngelRRand Nov 20, 2025
8a146c0
Cambios en dashboard. landyn enrrutada.
Luis11prog Nov 20, 2025
8f37657
Merge pull request #14 from 4GeeksAcademy/develop-luchito
Luis11prog Nov 20, 2025
654a305
cambios 21/11/2025
Luis11prog Nov 21, 2025
a3a3328
Formulario crear tarea
Nika254 Nov 21, 2025
0a033bb
Merge pull request #15 from 4GeeksAcademy/develop-luchito
AngelRRand Nov 21, 2025
1a7168f
Merge branch 'revert-recovery-test' into develop-abel
AngelRRand Nov 21, 2025
7b24d1e
Merge pull request #16 from 4GeeksAcademy/develop-abel
AngelRRand Nov 21, 2025
945f561
revision
AngelRRand Nov 21, 2025
5a58875
back user unificado
Mnrubn Nov 21, 2025
475f253
Merge pull request #17 from 4GeeksAcademy/develop-ruben
Mnrubn Nov 21, 2025
415f05b
cambios en endpoints y editar perfil acabado
Mnrubn Nov 24, 2025
0fe17fe
Merge pull request #18 from 4GeeksAcademy/develop-ruben
Mnrubn Nov 24, 2025
efe75cd
store limpio
Mnrubn Nov 25, 2025
8960ce6
Merge pull request #19 from 4GeeksAcademy/develop-ruben
Mnrubn Nov 25, 2025
23c6fe2
Cambios en routesUser.jsx
Luis11prog Nov 25, 2025
f096822
Merge branch 'revert-recovery-test' into develop-luchito
Luis11prog Nov 25, 2025
681c077
maps y modal
Nika254 Nov 25, 2025
20edda5
revisado y login corregido
Mnrubn Nov 25, 2025
322292d
Merge pull request #20 from 4GeeksAcademy/develop-ruben
Mnrubn Nov 25, 2025
056f086
cambios leves
Mnrubn Nov 25, 2025
59cd51a
Merge pull request #21 from 4GeeksAcademy/develop-ruben
Mnrubn Nov 25, 2025
a58bd2b
Merge branch 'revert-recovery-test' into
Luis11prog Nov 25, 2025
3bf7e4b
Creado componente sidebar reutilizable y agregado
Luis11prog Nov 25, 2025
4ec2465
Merge pull request #22 from 4GeeksAcademy/develop-luchito
Luis11prog Nov 25, 2025
f822a77
Agrego cambios para recuperacion de contraseña
Luis11prog Nov 26, 2025
ba0bb14
Merge pull request #23 from 4GeeksAcademy/develop-luchito
Luis11prog Nov 26, 2025
f02c7a2
Tareas conectadas con Back
JorgeCKR Nov 27, 2025
25cd59d
Merge pull request #25 from 4GeeksAcademy/develop-jorge
JorgeCKR Nov 27, 2025
1ad9765
rama funcional
Mnrubn Nov 28, 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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ Thumbs.db

# ignore node/grunt dependency directories
node_modules/
migrations/

# webpack output
dist/*
Expand Down
3 changes: 2 additions & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ gunicorn = "*"
cloudinary = "*"
flask-admin = "*"
typing-extensions = "*"
flask-jwt-extended = "==4.6.0"
wtforms = "==3.1.2"
sqlalchemy = "*"
flask-jwt-extended = "*"
flask-mail = "*"

[requires]
python_version = "3.13"
Expand Down
191 changes: 115 additions & 76 deletions Pipfile.lock

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Build web applications using React.js for the front end and python/flask for you

### 1) Installation:

> If you use Github Codespaces (recommended) or Gitpod this template will already come with Python, Node and the Posgres Database installed. If you are working locally make sure to install Python 3.10, Node
> If you use Github Codespaces (recommended) or Gitpod this template will already come with Python, Node and the Posgres Database installed. If you are working locally make sure to install Python 3.10, Node

It is recomended to install the backend first, make sure you have Python 3.10, Pipenv and a database engine (Posgress recomended)

Expand Down Expand Up @@ -61,11 +61,11 @@ And you will see the following message:

### **Important note for the database and the data inside it**

Every Github codespace environment will have **its own database**, so if you're working with more people eveyone will have a different database and different records inside it. This data **will be lost**, so don't spend too much time manually creating records for testing, instead, you can automate adding records to your database by editing ```commands.py``` file inside ```/src/api``` folder. Edit line 32 function ```insert_test_data``` to insert the data according to your model (use the function ```insert_test_users``` above as an example). Then, all you need to do is run ```pipenv run insert-test-data```.
Every Github codespace environment will have **its own database**, so if you're working with more people eveyone will have a different database and different records inside it. This data **will be lost**, so don't spend too much time manually creating records for testing, instead, you can automate adding records to your database by editing `commands.py` file inside `/src/api` folder. Edit line 32 function `insert_test_data` to insert the data according to your model (use the function `insert_test_users` above as an example). Then, all you need to do is run `pipenv run insert-test-data`.

### Front-End Manual Installation:

- Make sure you are using node version 20 and that you have already successfully installed and runned the backend.
- Make sure you are using node version 20 and that you have already successfully installed and runned the backend.

1. Install the packages: `$ npm install`
2. Start coding! start the webpack dev server `$ npm run start`
Expand Down
4 changes: 2 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="icon" href="/4geeks.ico" />
<link rel="icon" type="image/png" href="https://cdn-icons-png.flaticon.com/512/4697/4697260.png" />
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.2/css/all.min.css" integrity="sha512-SnH5WK+bZxgPHs44uWIX+LLJAJ9/2PkPKZ5QiAj6Ta86w+fsb2TkcmfRyVX3pBnMFcV7oQPJkl9QevSCWr3W6A==" crossorigin="anonymous" referrerpolicy="no-referrer" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Hello Rigo</title>
<title>TaskFlow</title>
</head>
<body>
<div id="root"></div>
Expand Down
35 changes: 0 additions & 35 deletions migrations/versions/0763d677d453_.py

This file was deleted.

Loading