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

Session login aitor #73

Open
wants to merge 62 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
e49b9d2
foros gatos completo
SGuevaraClark Jan 22, 2025
86f0e4f
Merge pull request #36 from 4GeeksAcademy/myfeedaless
alessf95 Jan 24, 2025
ac29d70
comunidad perruna
SGuevaraClark Jan 25, 2025
1f7fbe5
roedores
SGuevaraClark Jan 25, 2025
c44d480
Merge branch 'development' into foros
SGuevaraClark Jan 25, 2025
dcf0934
Merge pull request #37 from 4GeeksAcademy/foros
SGuevaraClark Jan 25, 2025
b594998
foros iniciales completos
SGuevaraClark Jan 25, 2025
91b7f0b
Merge pull request #38 from 4GeeksAcademy/foros
SGuevaraClark Jan 25, 2025
64a8555
Merge pull request #39 from 4GeeksAcademy/SessionLogin_Aitor
AitorMoran Jan 26, 2025
764a2b9
Merge pull request #40 from 4GeeksAcademy/SessionLogin_Aitor
AitorMoran Jan 26, 2025
92722cc
Style: Cambios estéticos en MyRegister
AitorMoran Jan 26, 2025
cf405a5
Merge pull request #43 from 4GeeksAcademy/SessionLogin_Aitor
AitorMoran Jan 26, 2025
fa97e2f
cuidados gatos
SGuevaraClark Jan 27, 2025
ab3dba3
Merge pull request #44 from 4GeeksAcademy/foros
SGuevaraClark Jan 27, 2025
cadd5d1
Feat: Diseño FrontEnd de Home
AitorMoran Jan 27, 2025
c548a96
Merge pull request #45 from 4GeeksAcademy/Home_Aitor
AitorMoran Jan 27, 2025
be85915
sub foros perros y gatos listos
SGuevaraClark Jan 27, 2025
8dfdc90
Merge pull request #46 from 4GeeksAcademy/foros
SGuevaraClark Jan 27, 2025
4be1b79
terminado frontend todos los subforos
SGuevaraClark Jan 27, 2025
bc48231
Merge pull request #47 from 4GeeksAcademy/foros
SGuevaraClark Jan 27, 2025
3431280
layout footer.js
SGuevaraClark Jan 27, 2025
085a850
Merge branch 'development' into foros
SGuevaraClark Jan 27, 2025
83bacca
Merge pull request #48 from 4GeeksAcademy/foros
SGuevaraClark Jan 27, 2025
7793e1c
Feat: identificación con token añadida a inicio sesión
AitorMoran Jan 27, 2025
b37779c
Merge pull request #49 from 4GeeksAcademy/SessionLogin_Aitor
AitorMoran Jan 27, 2025
896cde6
routes flux forumId y perros/accesorios.jsx
SGuevaraClark Jan 28, 2025
385ae21
Merge pull request #50 from 4GeeksAcademy/foros
SGuevaraClark Jan 28, 2025
9665f4d
Merge pull request #51 from 4GeeksAcademy/myfeedaless
alessf95 Jan 28, 2025
6347673
jaja
alessf95 Jan 28, 2025
6cebc3d
Merge pull request #53 from 4GeeksAcademy/myfeedaless
alessf95 Jan 28, 2025
ebcc476
funcionalidad de foros perros accesorios
SGuevaraClark Jan 28, 2025
58fe2cd
Merge pull request #54 from 4GeeksAcademy/foros
SGuevaraClark Jan 28, 2025
0719326
subforo con posts y comentarios
SGuevaraClark Jan 28, 2025
07781ea
Merge pull request #55 from 4GeeksAcademy/foros
SGuevaraClark Jan 28, 2025
875f28e
bio
alessf95 Jan 28, 2025
4f6e597
public
alessf95 Jan 28, 2025
7d52c29
Merge pull request #57 from 4GeeksAcademy/publicaciones
alessf95 Jan 28, 2025
9c9554b
arreglosbio
alessf95 Jan 28, 2025
e229311
soloenbio
alessf95 Jan 28, 2025
74ccf4b
Merge branch 'development' into myfeedaless
alessf95 Jan 28, 2025
3815581
Merge pull request #60 from 4GeeksAcademy:myfeedaless
alessf95 Jan 28, 2025
70707e1
Pequeño Ajuste
AitorMoran Jan 28, 2025
2a38e48
prueba
alessf95 Jan 28, 2025
1cc6c65
funcionalidad de mis foros
SGuevaraClark Jan 28, 2025
6fe96af
Merge pull request #63 from 4GeeksAcademy/foros
SGuevaraClark Jan 28, 2025
a67fb3f
Merge branch 'development' into SessionLogin_Aitor
AitorMoran Jan 28, 2025
ed60983
Merge pull request #62 from 4GeeksAcademy/SessionLogin_Aitor
AitorMoran Jan 28, 2025
378368b
bioeditable
alessf95 Jan 28, 2025
8136195
Feat: Cambio de rutas botones registro y entrar
AitorMoran Jan 28, 2025
c67006b
cont
alessf95 Jan 29, 2025
43d2e55
Merge pull request #65 from 4GeeksAcademy/Home_Aitor
AitorMoran Jan 29, 2025
9e34e78
Merge pull request #66 from 4GeeksAcademy/publi
alessf95 Jan 29, 2025
8fa866c
Merge pull request #67 from 4GeeksAcademy/myfeedaless
alessf95 Jan 29, 2025
edf163b
Merge pull request #68 from 4GeeksAcademy/publi
alessf95 Jan 29, 2025
4b84106
Merge pull request #69 from 4GeeksAcademy/development
alessf95 Jan 29, 2025
7eb037b
erroresseborrotodo
alessf95 Jan 29, 2025
bd89836
Merge pull request #70 from 4GeeksAcademy/myfeedaless
alessf95 Jan 29, 2025
94bd72d
foros y subforos terminados
SGuevaraClark Jan 29, 2025
abdc12c
Merge pull request #71 from 4GeeksAcademy/foros
SGuevaraClark Jan 29, 2025
54262aa
Feat: Diseño de home
AitorMoran Jan 29, 2025
028bdb3
Merge pull request #72 from 4GeeksAcademy/about
AitorMoran Jan 29, 2025
5c2f9ed
Feat: solución enlace
AitorMoran Jan 29, 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
36 changes: 36 additions & 0 deletions migrations/versions/a62ec8de84a9_.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
"""empty message

Revision ID: a62ec8de84a9
Revises: 66f943960ed8
Create Date: 2025-01-28 21:37:49.531718

"""
from alembic import op
import sqlalchemy as sa


# revision identifiers, used by Alembic.
revision = 'a62ec8de84a9'
down_revision = '66f943960ed8'
branch_labels = None
depends_on = None


def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.create_table('favorites',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('user_id', sa.Integer(), nullable=False),
sa.Column('forum_id', sa.Integer(), nullable=False),
sa.Column('created_at', sa.DateTime(), nullable=False),
sa.ForeignKeyConstraint(['forum_id'], ['forums.id'], ),
sa.ForeignKeyConstraint(['user_id'], ['users.id'], ),
sa.PrimaryKeyConstraint('id')
)
# ### end Alembic commands ###


def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.drop_table('favorites')
# ### end Alembic commands ###
55 changes: 47 additions & 8 deletions package-lock.json

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

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
"prop-types": "^15.6.1",
"react": "^16.8.4",
"react-dom": "^16.8.4",
"react-draggable": "^4.4.6",
"react-polyfills": "0.0.1",
"react-router-dom": "^6.3.0",
"swiper": "^11.2.1"
Expand Down
18 changes: 17 additions & 1 deletion src/api/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@




# USER TABLE ------------------------------------------------------------
class Users(db.Model):
__tablename__ = 'users'
Expand Down Expand Up @@ -106,6 +105,7 @@ def serialize(self):
"id": self.id,
"forum_id": self.forum_id,
"user_id": self.user_id,
"username": self.users.username if self.users else "Unknown User", #SGC ADDED USERNAME
"content": self.content,
"created_at": self.created_at.strftime('%Y-%m-%d %H:%M:%S')
}
Expand All @@ -125,6 +125,7 @@ def serialize(self):
"id": self.id,
"post_id": self.post_id,
"user_id": self.user_id,
"username": self.user.username if self.user else "Unknown User", #SGC ADDED USERNAME
"content": self.content,
"created_at": self.created_at.strftime('%Y-%m-%d %H:%M:%S')
}
Expand Down Expand Up @@ -175,3 +176,18 @@ def serialize(self):
"created_at": self.created_at
}

# Favorites Table for Mis Foros SGC -----------------------------------------
class Favorites(db.Model):
__tablename__ = 'favorites'
id = db.Column(db.Integer, primary_key=True)
user_id = db.Column(db.Integer, db.ForeignKey('users.id'), nullable=False)
forum_id = db.Column(db.Integer, db.ForeignKey('forums.id'), nullable=False)
created_at = db.Column(db.DateTime, default=datetime.now, nullable=False)

def serialize(self):
return {
"id": self.id,
"user_id": self.user_id,
"forum_id": self.forum_id,
"created_at": self.created_at.strftime('%Y-%m-%d %H:%M:%S')
}
Loading