Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
1c020b5
migrations in gitIgnore
denn-p Feb 25, 2026
e89e335
models complete
denn-p Feb 26, 2026
7ca11ec
Merge pull request #1 from 4GeeksAcademy/models
juanjoseabreu23-oss Feb 26, 2026
8e0eda7
endpoints-por-revisar
juanjoseabreu23-oss Feb 27, 2026
baee58c
nuevas-carpeta-routes
denn-p Feb 27, 2026
e1a80bb
Merge pull request #3 from 4GeeksAcademy/endpoint-user
juanjoseabreu23-oss Feb 27, 2026
6426170
Merge branch 'endpoint-user' into develop
denn-p Feb 27, 2026
a1a60fe
carpeta-routes-en-develop
denn-p Feb 27, 2026
9f5cbe9
Merge branch 'develop' of https://github.com/4GeeksAcademy/FP-Juan-Me…
denn-p Feb 27, 2026
a5945c6
WIP: guardando cambios locales antes de actualizar develop
denn-p Feb 27, 2026
e2e9dcd
Merge branch 'develop' into endpoints-folders-y-pages
juanjoseabreu23-oss Feb 28, 2026
9f74780
Merge pull request #2 from 4GeeksAcademy/endpoints-folders-y-pages
juanjoseabreu23-oss Feb 28, 2026
63282fd
endpoints goals
messend Mar 1, 2026
d872343
Merge branch 'develop' into endpoints-goals
juanjoseabreu23-oss Mar 1, 2026
1cbdb7a
Merge pull request #4 from 4GeeksAcademy/endpoints-goals
juanjoseabreu23-oss Mar 1, 2026
bd1021d
cambios-de-develop
juanjoseabreu23-oss Mar 2, 2026
f78ab34
cambios-en-develop-2
juanjoseabreu23-oss Mar 2, 2026
61d56b3
Merge pull request #6 from 4GeeksAcademy/cambios
messend Mar 2, 2026
a18aa65
otros cambios de denn
denn-p Mar 2, 2026
b5f86bc
prueba cambios denn
denn-p Mar 3, 2026
38d20b8
cambios en user/token/hasheo/
denn-p Mar 4, 2026
b30e794
Merge pull request #7 from 4GeeksAcademy/user_routes
juanjoseabreu23-oss Mar 4, 2026
ffc3b8c
modificaciones-folder-pages
juanjoseabreu23-oss Mar 4, 2026
f4b45c9
Merge pull request #8 from 4GeeksAcademy/modificaciones-folder-y-pages
messend Mar 6, 2026
a967918
cambios_hechos
messend Mar 6, 2026
f14f919
Merge pull request #9 from 4GeeksAcademy/change-goals
juanjoseabreu23-oss Mar 6, 2026
83478fa
welcomepage-login-register
denn-p Mar 10, 2026
7d29839
Merge pull request #10 from 4GeeksAcademy/welcome_page_front
juanjoseabreu23-oss Mar 10, 2026
4a004e7
actualizaciones
denn-p Mar 11, 2026
46ade45
Merge pull request #11 from 4GeeksAcademy/welcome_page_front
juanjoseabreu23-oss Mar 11, 2026
f687c92
mis cambios
juanjoseabreu23-oss Mar 11, 2026
61ee0ec
creacion-de-home
denn-p Mar 11, 2026
ea01cd1
frontend-folder-y-pages
juanjoseabreu23-oss Mar 12, 2026
531f6dc
Merge pull request #14 from 4GeeksAcademy/frontend-folder
messend Mar 12, 2026
2514907
Merge pull request #12 from 4GeeksAcademy/home
messend Mar 12, 2026
f833b2f
finalizado-pomodoro-pages
juanjoseabreu23-oss Mar 12, 2026
b042a1a
Merge pull request #18 from 4GeeksAcademy/pomodoro-pages
denn-p Mar 12, 2026
d83ecda
cambios-1
denn-p Mar 12, 2026
038b307
Merge branch 'develop' of https://github.com/4GeeksAcademy/FP-Juan-Me…
denn-p Mar 12, 2026
60987fa
API-externa
messend Mar 12, 2026
0ea0c2f
Merge pull request #19 from 4GeeksAcademy/front-API
juanjoseabreu23-oss Mar 12, 2026
d1a2a80
pomodoro-home
denn-p Mar 12, 2026
2a0ca1e
Merge pull request #20 from 4GeeksAcademy/pomodoro-home
juanjoseabreu23-oss Mar 12, 2026
52e6cb7
navbar provicional
messend Mar 13, 2026
be2df68
Merge branch 'develop' into navbar
messend Mar 13, 2026
439103b
Merge pull request #21 from 4GeeksAcademy/navbar
juanjoseabreu23-oss Mar 13, 2026
db49f39
cambios-home-desing
denn-p Mar 13, 2026
e0fe1d7
desing-home
denn-p Mar 13, 2026
11bf9cf
desing-home-2
denn-p Mar 13, 2026
6b33c9a
cambios-finalizados
juanjoseabreu23-oss Mar 16, 2026
84c3a00
cambios
denn-p Mar 16, 2026
8f51e52
Merge pull request #23 from 4GeeksAcademy/combios-folder-pages
denn-p Mar 16, 2026
3dda1bc
Merge branch 'develop' into home
juanjoseabreu23-oss Mar 18, 2026
81f24c6
Merge pull request #24 from 4GeeksAcademy/home
juanjoseabreu23-oss Mar 18, 2026
5b3698e
cambios-finalizados
juanjoseabreu23-oss Mar 18, 2026
3b7d3f9
Merge pull request #25 from 4GeeksAcademy/cambios
messend Mar 18, 2026
c394da1
cambios-importantes
denn-p Mar 18, 2026
1de24d7
Merge pull request #26 from 4GeeksAcademy/home
juanjoseabreu23-oss Mar 18, 2026
a80a412
cambios-hechos
juanjoseabreu23-oss Mar 18, 2026
159e799
Merge pull request #27 from 4GeeksAcademy/cambios-pages-folder
juanjoseabreu23-oss Mar 18, 2026
9cf1e8a
profile-finalizado
juanjoseabreu23-oss Mar 18, 2026
74137b2
Merge pull request #28 from 4GeeksAcademy/profile
denn-p Mar 18, 2026
b9cda56
navbar-goals-freesound
messend Mar 18, 2026
5cc7ea8
feat: pomodoro global state with sessionStorage persistence
denn-p Mar 18, 2026
d7ea0ff
fix: move pomodoro interval to StoreProvider so it survives navigation
denn-p Mar 18, 2026
9d5e3f1
pomodoro funtional - break tips done
denn-p Mar 18, 2026
c7be211
Merge pull request #29 from 4GeeksAcademy/break-pomodoro
juanjoseabreu23-oss Mar 19, 2026
57abcb2
agregar-boton-perfil
juanjoseabreu23-oss Mar 19, 2026
a381fcd
Merge pull request #30 from 4GeeksAcademy/agregar-boton-perfil
denn-p Mar 19, 2026
0b6cb30
Merge branch 'develop' into goals
messend Mar 19, 2026
4799495
Merge pull request #31 from 4GeeksAcademy/goals
juanjoseabreu23-oss Mar 19, 2026
7399294
changes-hechos
messend Mar 19, 2026
9cdc3d3
Merge pull request #32 from 4GeeksAcademy/music
juanjoseabreu23-oss Mar 19, 2026
6b16f0c
cambios-hechos
juanjoseabreu23-oss Mar 19, 2026
ab00994
Merge pull request #33 from 4GeeksAcademy/cambios-steticos
denn-p Mar 20, 2026
e8c1c82
cambios
juanjoseabreu23-oss Mar 20, 2026
5500db4
Merge pull request #34 from 4GeeksAcademy/cambiosvarios
denn-p Mar 20, 2026
1c60c5e
Merge pull request #35 from 4GeeksAcademy/develop
denn-p Mar 20, 2026
d52a55b
despliegue
juanjoseabreu23-oss Mar 20, 2026
e4ad2ce
quitar-jtw-pipfile
juanjoseabreu23-oss Mar 20, 2026
2561883
add-tomli-pipfile
juanjoseabreu23-oss Mar 20, 2026
7609477
acomodo-html
juanjoseabreu23-oss Mar 20, 2026
6b83dcf
ultimos camibios
denn-p Mar 23, 2026
307ac1d
Merge remote-tracking branch 'origin/main' into cambios-welcome-page
denn-p Mar 23, 2026
8f6a1c3
Update welcome page UI and fix folder text alignment
denn-p Mar 23, 2026
45a061c
Update welcome page UI and fix folder text alignment2
denn-p Mar 23, 2026
ade0b81
Merge pull request #37 from 4GeeksAcademy/cambios-welcome-page
juanjoseabreu23-oss Mar 24, 2026
c0845c3
cambios-hechos
juanjoseabreu23-oss Mar 24, 2026
621fcae
Merge pull request #38 from 4GeeksAcademy/cambios-profile
denn-p Mar 24, 2026
0f5a792
Update About page goals section
denn-p Mar 24, 2026
3d61f98
Merge remote-tracking branch 'origin/main' into cambios-welcome-page
denn-p Mar 24, 2026
4bcce63
ultimos cambios creo
denn-p Mar 24, 2026
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
2 changes: 1 addition & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ DEBUG=TRUE

# Front-End Variables
VITE_BASENAME=/
#VITE_BACKEND_URL=
VITE_BACKEND_URL=https://obscure-funicular-7v4g9jg94jwpfw56-3001.app.github.dev/
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,4 @@ dist/*
database.database
database.db
diagram.png
__pycache__/
__pycache__/
Empty file added =
Empty file.
8 changes: 6 additions & 2 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,16 @@ gunicorn = "*"
cloudinary = "*"
flask-admin = "==2.0.0"
typing-extensions = "*"
flask-jwt-extended = "==4.6.0"
wtforms = "==3.1.2"
sqlalchemy = "*"
flask-bcrypt = "*"
flask-jwt-extended = "*"
flask-mail = "*"
resend = "*"
tomli = "*"

[requires]
python_version = "3.13"
python_version = "3.10"

[scripts]
start="flask run -p 3001 -h 0.0.0.0"
Expand Down
615 changes: 460 additions & 155 deletions Pipfile.lock

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<!doctype html>
<html lang="en">
<html lang="en" translate="no">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="icon" href="/4geeks.ico" />
<meta name="google" content="notranslate" />
<link rel="icon" type="image/svg+xml" href="/pomify.svg" />
<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>Pomify</title>
</head>
<body>
<div id="root"></div>
Expand Down
35 changes: 0 additions & 35 deletions migrations/versions/0763d677d453_.py

This file was deleted.

79 changes: 79 additions & 0 deletions migrations/versions/592c49218df5_.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
"""empty message

Revision ID: 592c49218df5
Revises: 0763d677d453
Create Date: 2026-03-20 09:32:51.994792

"""
from alembic import op
import sqlalchemy as sa


# revision identifiers, used by Alembic.
revision = '592c49218df5'
down_revision = '0763d677d453'
branch_labels = None
depends_on = None


def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.create_table('user_table',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('name', sa.String(length=120), nullable=True),
sa.Column('email', sa.String(length=120), nullable=False),
sa.Column('password_hash', sa.String(), nullable=False),
sa.Column('avatar_url', sa.String(length=500), nullable=True),
sa.Column('reset_token', sa.String(length=500), nullable=True),
sa.PrimaryKeyConstraint('id'),
sa.UniqueConstraint('avatar_url'),
sa.UniqueConstraint('email')
)
op.create_table('folder_table',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('user_id', sa.Integer(), nullable=False),
sa.Column('title', sa.String(length=120), nullable=False),
sa.Column('created_at', sa.DateTime(timezone=True), nullable=False),
sa.ForeignKeyConstraint(['user_id'], ['user_table.id'], ),
sa.PrimaryKeyConstraint('id')
)
op.create_table('goal_table',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('title', sa.String(length=120), nullable=False),
sa.Column('content', sa.Text(), nullable=False),
sa.Column('status', sa.String(length=20), nullable=False),
sa.Column('created_at', sa.DateTime(timezone=True), nullable=False),
sa.Column('user_id', sa.Integer(), nullable=False),
sa.ForeignKeyConstraint(['user_id'], ['user_table.id'], ),
sa.PrimaryKeyConstraint('id'),
sa.UniqueConstraint('title')
)
op.create_table('page_table',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('title', sa.String(length=120), nullable=False),
sa.Column('content', sa.Text(), nullable=False),
sa.Column('created_at', sa.DateTime(timezone=True), nullable=False),
sa.Column('update_at', sa.DateTime(timezone=True), nullable=False),
sa.Column('folder_id', sa.Integer(), nullable=False),
sa.ForeignKeyConstraint(['folder_id'], ['folder_table.id'], ),
sa.PrimaryKeyConstraint('id')
)
op.drop_table('user')
# ### end Alembic commands ###


def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.create_table('user',
sa.Column('id', sa.INTEGER(), autoincrement=True, nullable=False),
sa.Column('email', sa.VARCHAR(length=120), autoincrement=False, nullable=False),
sa.Column('password', sa.VARCHAR(), autoincrement=False, nullable=False),
sa.Column('is_active', sa.BOOLEAN(), autoincrement=False, nullable=False),
sa.PrimaryKeyConstraint('id', name=op.f('user_pkey')),
sa.UniqueConstraint('email', name=op.f('user_email_key'), postgresql_include=[], postgresql_nulls_not_distinct=False)
)
op.drop_table('page_table')
op.drop_table('goal_table')
op.drop_table('folder_table')
op.drop_table('user_table')
# ### end Alembic commands ###
70 changes: 70 additions & 0 deletions migrations/versions/b9cc2c3efd90_.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
"""empty message

Revision ID: b9cc2c3efd90
Revises:
Create Date: 2026-03-20 10:48:43.696738

"""
from alembic import op
import sqlalchemy as sa


# revision identifiers, used by Alembic.
revision = 'b9cc2c3efd90'
down_revision = None
branch_labels = None
depends_on = None


def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.create_table('user_table',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('name', sa.String(length=120), nullable=True),
sa.Column('email', sa.String(length=120), nullable=False),
sa.Column('password_hash', sa.String(), nullable=False),
sa.Column('avatar_url', sa.String(length=500), nullable=True),
sa.Column('reset_token', sa.String(length=500), nullable=True),
sa.PrimaryKeyConstraint('id'),
sa.UniqueConstraint('avatar_url'),
sa.UniqueConstraint('email')
)
op.create_table('folder_table',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('user_id', sa.Integer(), nullable=False),
sa.Column('title', sa.String(length=120), nullable=False),
sa.Column('created_at', sa.DateTime(timezone=True), nullable=False),
sa.ForeignKeyConstraint(['user_id'], ['user_table.id'], ),
sa.PrimaryKeyConstraint('id')
)
op.create_table('goal_table',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('title', sa.String(length=120), nullable=False),
sa.Column('content', sa.Text(), nullable=False),
sa.Column('status', sa.String(length=20), nullable=False),
sa.Column('created_at', sa.DateTime(timezone=True), nullable=False),
sa.Column('user_id', sa.Integer(), nullable=False),
sa.ForeignKeyConstraint(['user_id'], ['user_table.id'], ),
sa.PrimaryKeyConstraint('id'),
sa.UniqueConstraint('title')
)
op.create_table('page_table',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('title', sa.String(length=120), nullable=False),
sa.Column('content', sa.Text(), nullable=False),
sa.Column('created_at', sa.DateTime(timezone=True), nullable=False),
sa.Column('update_at', sa.DateTime(timezone=True), nullable=False),
sa.Column('folder_id', sa.Integer(), nullable=False),
sa.ForeignKeyConstraint(['folder_id'], ['folder_table.id'], ),
sa.PrimaryKeyConstraint('id')
)
# ### end Alembic commands ###


def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.drop_table('page_table')
op.drop_table('goal_table')
op.drop_table('folder_table')
op.drop_table('user_table')
# ### end Alembic commands ###
Loading