Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
b30979a
Create gitflow.txt
Sergidev Jul 24, 2026
d73818e
cambios
FullPas Jul 24, 2026
f28ce7f
Add Sergi to gitflow.txt
Sergidev Jul 24, 2026
41ef364
Conflict solved
Sergidev Jul 24, 2026
3d2aaff
Nataly cambios
Nataly-04 Jul 24, 2026
b34620b
Apellido
Nataly-04 Jul 24, 2026
456274f
apellido
Sergidev Jul 24, 2026
484382f
apellido
Sergidev Jul 24, 2026
b4e81c8
conflicts solved
Sergidev Jul 24, 2026
d4a23c8
Add breed
Nataly-04 Jul 24, 2026
cde0912
Add routes
Nataly-04 Jul 24, 2026
49d22d1
Merge remote-tracking branch 'refs/remotes/origin/develop' into develop
Nataly-04 Jul 24, 2026
da8cbea
Add routes-models
Nataly-04 Jul 24, 2026
8c37ff4
Add CRUD for Breed
Nataly-04 Jul 24, 2026
2bf28e2
CRUD done
Sergidev Jul 25, 2026
0665cc7
Merge branch 'feature/nombre-sergi' into develop
Sergidev Jul 25, 2026
a802549
minor fixes
Sergidev Jul 25, 2026
305a60e
pets CRUD corrected
Sergidev Jul 27, 2026
4f61b5c
Merge branch 'feature/nombre-sergi' into develop
Sergidev Jul 27, 2026
0ccccf3
merged sergi crud pets
Sergidev Jul 27, 2026
6a931dc
Complete Breed CRUD
Nataly-04 Jul 27, 2026
0def566
Add CRUD for Breed
Nataly-04 Jul 27, 2026
7d01dcb
database done with relationships
Sergidev Jul 28, 2026
e2f7426
CRUD wip
FullPas Jul 27, 2026
c4aa78c
CRUD wip
FullPas Jul 29, 2026
17246c3
Merge Breed y Pet
Nataly-04 Jul 29, 2026
51c53be
Merge pull request #1 from 4GeeksAcademy/develop-feature
Sergidev Jul 29, 2026
c0fa1c6
CRUD wip
FullPas Jul 29, 2026
af5615c
CRUD Shelter and User complete. DESING WIP
FullPas Jul 29, 2026
aa84591
wip
FullPas Jul 30, 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
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-envs.defaultEnvManager": "ms-python.python:pipenv"
}
32 changes: 18 additions & 14 deletions dist/index.html
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
<!DOCTYPE html>
<html class="h-100">
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta charset="UTF-8">
<title>Hello Rigo with React + Flux + Context.js</title>
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.2.0/css/all.css" integrity="sha384-hWVjflwFxL6sNzntih27bfxkr27PmbbK/iSvJ+a4+0owXq79v+lsFkW54bOGbiDQ" crossorigin="anonymous">
<link rel="shortcut icon" href="./4geeks.ico"></head>
<body class="h-100">
<div id="app" class="h-100"></div>
<script type="text/javascript" src="./bundle.js"></script>
</body>
</html>
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="icon" href="/4geeks.ico" />
<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>
<script type="module" crossorigin src="/assets/index-9445baaf.js"></script>
<link rel="stylesheet" href="/assets/index-2e9e5534.css">
</head>
<body>
<div id="root"></div>

<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL" crossorigin="anonymous"></script>
</body>
</html>
6 changes: 6 additions & 0 deletions gitflow.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Pascual
Sergi
Nataly
Zuluaga
March
Villalobos
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<title>Hello Rigo</title>
</head>
<body>
<div id="root"></div>
<div id="root" ></div>
<script type="module" src="/src/front/main.jsx"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL" crossorigin="anonymous"></script>
</body>
Expand Down
35 changes: 0 additions & 35 deletions migrations/versions/0763d677d453_.py

This file was deleted.

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

Revision ID: db906401e00b
Revises:
Create Date: 2026-07-30 17:25:12.858939

"""
from alembic import op
import sqlalchemy as sa


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


def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.create_table('breed',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('breedName', sa.String(length=50), nullable=False),
sa.PrimaryKeyConstraint('id'),
sa.UniqueConstraint('breedName')
)
op.create_table('shelter',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('name', sa.String(length=100), nullable=False),
sa.Column('city', sa.String(length=100), nullable=False),
sa.Column('cif', sa.String(length=50), nullable=False),
sa.Column('address', sa.String(length=200), nullable=False),
sa.Column('email', sa.String(length=120), nullable=False),
sa.Column('creation_date', sa.Date(), nullable=True),
sa.Column('pc', sa.String(length=20), nullable=True),
sa.Column('icon_url', sa.String(length=255), nullable=True),
sa.Column('iban', sa.String(length=34), nullable=True),
sa.PrimaryKeyConstraint('id'),
sa.UniqueConstraint('cif'),
sa.UniqueConstraint('email')
)
op.create_table('user',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('name', sa.String(length=80), nullable=False),
sa.Column('email', sa.String(length=120), nullable=False),
sa.Column('password', sa.String(), nullable=False),
sa.Column('legal_document', sa.String(length=50), nullable=False),
sa.Column('address', sa.String(length=200), nullable=False),
sa.Column('birth_date', sa.Date(), nullable=True),
sa.Column('pc', sa.String(length=20), nullable=True),
sa.Column('city', sa.String(length=100), nullable=False),
sa.PrimaryKeyConstraint('id'),
sa.UniqueConstraint('email'),
sa.UniqueConstraint('legal_document')
)
op.create_table('veterinarian',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('name', sa.String(length=100), nullable=False),
sa.Column('city', sa.String(length=100), nullable=False),
sa.Column('address', sa.String(length=200), nullable=False),
sa.Column('email', sa.String(length=120), nullable=False),
sa.Column('pc', sa.String(length=20), nullable=True),
sa.Column('icon_url', sa.String(length=255), nullable=True),
sa.Column('iban', sa.String(length=34), nullable=True),
sa.Column('schedule', sa.String(length=100), nullable=True),
sa.PrimaryKeyConstraint('id'),
sa.UniqueConstraint('email')
)
op.create_table('pet',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('user_id', sa.Integer(), nullable=True),
sa.Column('shelter_id', sa.Integer(), nullable=True),
sa.Column('breed_id', sa.Integer(), nullable=True),
sa.Column('name', sa.String(length=50), nullable=False),
sa.Column('genre', sa.String(length=20), nullable=False),
sa.Column('birth_date', sa.Date(), nullable=True),
sa.Column('castrated', sa.Boolean(), nullable=False),
sa.Column('chip_number', sa.String(length=50), nullable=True),
sa.Column('color', sa.String(length=30), nullable=False),
sa.Column('photo_url', sa.String(length=255), nullable=True),
sa.Column('size', sa.String(length=20), nullable=False),
sa.ForeignKeyConstraint(['breed_id'], ['breed.id'], ),
sa.ForeignKeyConstraint(['shelter_id'], ['shelter.id'], ),
sa.ForeignKeyConstraint(['user_id'], ['user.id'], ),
sa.PrimaryKeyConstraint('id')
)
op.create_table('adoption',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('user_id', sa.Integer(), nullable=False),
sa.Column('pet_id', sa.Integer(), nullable=False),
sa.Column('shelter_id', sa.Integer(), nullable=False),
sa.Column('date', sa.Date(), nullable=False),
sa.Column('state', sa.String(length=50), nullable=False),
sa.Column('comment', sa.Text(), nullable=True),
sa.ForeignKeyConstraint(['pet_id'], ['pet.id'], ),
sa.ForeignKeyConstraint(['shelter_id'], ['shelter.id'], ),
sa.ForeignKeyConstraint(['user_id'], ['user.id'], ),
sa.PrimaryKeyConstraint('id')
)
op.create_table('medical_appointment',
sa.Column('id', sa.Integer(), nullable=False),
sa.Column('user_id', sa.Integer(), nullable=False),
sa.Column('pet_id', sa.Integer(), nullable=False),
sa.Column('veterinarian_id', sa.Integer(), nullable=False),
sa.Column('date', sa.Date(), nullable=False),
sa.Column('hour', sa.String(length=20), nullable=True),
sa.Column('comments', sa.Text(), nullable=True),
sa.ForeignKeyConstraint(['pet_id'], ['pet.id'], ),
sa.ForeignKeyConstraint(['user_id'], ['user.id'], ),
sa.ForeignKeyConstraint(['veterinarian_id'], ['veterinarian.id'], ),
sa.PrimaryKeyConstraint('id')
)
# ### end Alembic commands ###


def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.drop_table('medical_appointment')
op.drop_table('adoption')
op.drop_table('pet')
op.drop_table('veterinarian')
op.drop_table('user')
op.drop_table('shelter')
op.drop_table('breed')
# ### end Alembic commands ###
Loading