Marianacss

.vscode/settings.json

@@ -6,5 +6,8 @@
     },
     "[javascript]": {
         "editor.defaultFormatter": "vscode.typescript-language-features"
+    },
+    "[javascriptreact]": {
+        "editor.defaultFormatter": "vscode.typescript-language-features"
     }
 }

migrations/versions/5cf725964086_.py → migrations/versions/cb544095a50b_.py

@@ -1,17 +1,17 @@
 """empty message
 
-Revision ID: 5cf725964086
-Revises: e882aaa7e01e
-Create Date: 2024-11-30 11:31:26.832067
+Revision ID: cb544095a50b
+Revises: d6e7917535b2
+Create Date: 2024-12-11 22:58:32.170013
 
 """
 from alembic import op
 import sqlalchemy as sa
 
 
 # revision identifiers, used by Alembic.
-revision = '5cf725964086'
-down_revision = 'e882aaa7e01e'
+revision = 'cb544095a50b'
+down_revision = 'd6e7917535b2'
 branch_labels = None
 depends_on = None
 
@@ -21,7 +21,7 @@ def upgrade():
     op.create_table('breed',
     sa.Column('id', sa.Integer(), nullable=False),
     sa.Column('name', sa.String(length=30), nullable=True),
-    sa.Column('species', sa.Enum('perro', 'gato', 'ave', 'conejo', 'otro', name='species'), nullable=False),
+    sa.Column('species', sa.Enum('perro', 'gato', 'ave', 'conejo', 'reptil', 'otro', name='species'), nullable=False),
     sa.PrimaryKeyConstraint('id')
     )
     op.create_table('pet',

migrations/versions/65ec0a935ab9_.py → migrations/versions/d6e7917535b2_.py

@@ -1,16 +1,16 @@
 """empty message
 
-Revision ID: 65ec0a935ab9
+Revision ID: d6e7917535b2
 Revises: 
-Create Date: 2024-11-27 23:26:32.249259
+Create Date: 2024-12-03 00:34:48.862682
 
 """
 from alembic import op
 import sqlalchemy as sa
 
 
 # revision identifiers, used by Alembic.
-revision = '65ec0a935ab9'
+revision = 'd6e7917535b2'
 down_revision = None
 branch_labels = None
 depends_on = None

src/api/admin.py

@@ -1,7 +1,7 @@
 
 import os
 from flask_admin import Admin
-from .models import db, User
+from .models import db, User, Pet, Post_Description, Breed
 from flask_admin.contrib.sqla import ModelView
 
 def setup_admin(app):
@@ -12,6 +12,9 @@ def setup_admin(app):
 
     # 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(ModelView(Pet, db.session))
+    admin.add_view(ModelView(Post_Description, db.session))
+    admin.add_view(ModelView(Breed, db.session))
 
     # You can duplicate that line to add mew models
     # admin.add_view(ModelView(YourModelName, db.session))

src/api/models.py

@@ -48,7 +48,7 @@ class Pet(db.Model):
     __tablename__ ="pet"
     id = db.Column (db.Integer, primary_key=True)
     name = db.Column (db.String(30))
-    breed = db.Column (db.Integer, db.ForeignKey("breed.id"))
+    breed = db.Column (db.Integer, db.ForeignKey("breed.id")) # bread_id
     gender = db.Column (db.Enum(Genders))
     color = db.Column (db.String(15))
     photo_1 = db.Column (db.String(120), nullable=False)
@@ -58,15 +58,14 @@ class Pet(db.Model):
     user_id = db.Column (db.Integer, db.ForeignKey("user.id"))
     user = db.relationship ("User", back_populates="pet")
     post = db.relationship("Post_Description", back_populates="pet_relationship")
-    breed_relationship = db.relationship("Breed", back_populates= "pets")
+    breed_relationship = db.relationship("Breed", back_populates= "pets") # breed
 
     def __repr__(self):
-        return f'<Pet {self.name, self.species, self.color, self.user}>'
+        return f'<Pet {self.name, self.color, self.user}>'
 
     def serialize(self):
         return{
             "name" : self.name,
-            "species" : self.species,
             "breed" : self.breed,
             "color": self.color,
             "photo_1": self.photo_1,

src/app.py

@@ -218,6 +218,15 @@ def create_post_description():
     return jsonify({'msg':'Post creado exitosamente', 'data': new_post.serialize()}), 201
 #######
 
+#GET All pets Matias 17:46PM 3/12/24..Update: working 11:43AM 4/12/24
+@app.route('/pets', methods=['GET'])
+def get_all_pets():
+    pets = Pet.query.all()
+    pets_serialized = []
+    for pet in pets:
+       pets_serialized.append(pet.serialize())
+    return jsonify({'msg': 'ok', 'data': pets_serialized}), 200
+
 
 # any other endpoint will try to serve it like a static file
 @app.route('/<path:path>', methods=['GET'])

src/front/js/App.js

@@ -0,0 +1,18 @@
+import React from "react";
+import { PasswordResetProvider } from "./PasswordResetContext"; // Importamos el proveedor
+import ResetPassword from "./ResetPassword"; // Importamos el componente de recuperación de contraseña
+import PetsView from "./PetsView"; // Vista de mascotas
+
+function App() {
+  return (
+    <PasswordResetProvider>
+      <div className="App">
+        <h1>Aplicación de Recuperación de Contraseña y Mascotas</h1>
+        <ResetPassword /> {/* Componente de recuperación de contraseña */}
+        <PetsView /> {/* Componente de vista de mascotas */}
+      </div>
+    </PasswordResetProvider>
+  );
+}
+
+export default App;

src/front/js/component/Filters.js

@@ -0,0 +1,46 @@
+import React from "react";
+import "../../styles/pets-view.css";
+
+const Filters = ({ onFilterChange }) => {
+  return (
+    <div className="filters">
+      <h4>Filter</h4>
+      <div>
+        <label>
+          <input type="radio" name="gender" value="male" onChange={onFilterChange} />
+          Male
+        </label>
+        <label>
+          <input type="radio" name="gender" value="female" onChange={onFilterChange} />
+          Female
+        </label>
+      </div>
+      <div>
+        <label>
+          <input type="checkbox" name="color" value="black" onChange={onFilterChange} />
+          Black
+        </label>
+        <label>
+          <input type="checkbox" name="color" value="white" onChange={onFilterChange} />
+          White
+        </label>
+        <label>
+          <input type="checkbox" name="color" value="brown" onChange={onFilterChange} />
+          Brown
+        </label>
+      </div>
+      <div>
+        <label>
+          <input type="radio" name="size" value="small" onChange={onFilterChange} />
+          Small
+        </label>
+        <label>
+          <input type="radio" name="size" value="large" onChange={onFilterChange} />
+          Large
+        </label>
+      </div>
+    </div>
+  );
+};
+
+export default Filters;