Prueba

migrations/versions/413e5fe65505_.py

@@ -0,0 +1,52 @@
+"""empty message
+
+Revision ID: 413e5fe65505
+Revises: 
+Create Date: 2025-07-21 12:24:39.717542
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '413e5fe65505'
+down_revision = None
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('user',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('email', sa.String(length=120), nullable=False),
+    sa.Column('password', sa.String(), nullable=False),
+    sa.Column('vehicle', sa.Boolean(), nullable=False),
+    sa.Column('coordenates', sa.String(length=120), nullable=False),
+    sa.Column('name', sa.String(length=200), nullable=False),
+    sa.Column('vehicle_consume_km', sa.Float(precision=50), nullable=True),
+    sa.PrimaryKeyConstraint('id'),
+    sa.UniqueConstraint('email')
+    )
+    op.create_table('oferta',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('id_comprador', sa.Integer(), nullable=True),
+    sa.Column('id_vendedor', sa.Integer(), nullable=False),
+    sa.Column('esta_realizada', sa.Boolean(), nullable=False),
+    sa.Column('descripcion', sa.String(length=600), nullable=False),
+    sa.Column('titulo', sa.String(length=200), nullable=False),
+    sa.Column('coordenates_vendedor', sa.String(length=120), nullable=False),
+    sa.Column('coordenates_comprador', sa.String(length=120), nullable=True),
+    sa.ForeignKeyConstraint(['id_comprador'], ['user.id'], ),
+    sa.ForeignKeyConstraint(['id_vendedor'], ['user.id'], ),
+    sa.PrimaryKeyConstraint('id')
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('oferta')
+    op.drop_table('user')
+    # ### end Alembic commands ###

package.json

@@ -8,10 +8,10 @@
 	"main": "index.js",
 	"scripts": {
 		"dev": "vite",
-        "start": "vite",
-        "build": "vite build",
-        "lint": "eslint . --ext js,jsx --report-unused-disable-directives --max-warnings 0",
-        "preview": "vite preview"
+		"start": "vite",
+		"build": "vite build",
+		"lint": "eslint . --ext js,jsx --report-unused-disable-directives --max-warnings 0",
+		"preview": "vite preview"
 	},
 	"author": {
 		"name": "Alejandro Sanchez",
@@ -30,13 +30,13 @@
 	"license": "ISC",
 	"devDependencies": {
 		"@types/react": "^18.2.18",
-        "@types/react-dom": "^18.2.7",
-        "@vitejs/plugin-react": "^4.0.4",
-        "eslint": "^8.46.0",
-        "eslint-plugin-react": "^7.33.1",
-        "eslint-plugin-react-hooks": "^4.6.0",
-        "eslint-plugin-react-refresh": "^0.4.3",
-        "vite": "^4.4.8"
+		"@types/react-dom": "^18.2.7",
+		"@vitejs/plugin-react": "^4.0.4",
+		"eslint": "^8.46.0",
+		"eslint-plugin-react": "^7.33.1",
+		"eslint-plugin-react-hooks": "^4.6.0",
+		"eslint-plugin-react-refresh": "^0.4.3",
+		"vite": "^4.4.8"
 	},
 	"babel": {
 		"presets": [
@@ -54,9 +54,10 @@
 		]
 	},
 	"dependencies": {
+		"@vis.gl/react-google-maps": "^1.5.4",
 		"prop-types": "^15.8.1",
-        "react": "^18.2.0",
-        "react-dom": "^18.2.0",
-        "react-router-dom": "^6.18.0"
+		"react": "^18.2.0",
+		"react-dom": "^18.2.0",
+		"react-router-dom": "^6.18.0"
 	}
 }

src/api/models.py

@@ -1,19 +1,59 @@
 from flask_sqlalchemy import SQLAlchemy
-from sqlalchemy import String, Boolean
+from sqlalchemy import String, Boolean, Float,Integer,ForeignKey
 from sqlalchemy.orm import Mapped, mapped_column
 
 db = SQLAlchemy()
 
 class User(db.Model):
+    __tablename__ = "user"
+
     id: Mapped[int] = mapped_column(primary_key=True)
     email: Mapped[str] = mapped_column(String(120), unique=True, nullable=False)
     password: Mapped[str] = mapped_column(nullable=False)
-    is_active: Mapped[bool] = mapped_column(Boolean(), nullable=False)
+    vehicle: Mapped[bool] = mapped_column(Boolean(), nullable=False)
+    coordenates: Mapped[str] = mapped_column(String(120),nullable=False)
+    name: Mapped[str]= mapped_column(String(200),nullable=False)
+    vehicle_consume_km: Mapped[float] = mapped_column(Float(50),nullable= True)
+
 
 
     def serialize(self):
         return {
             "id": self.id,
             "email": self.email,
+            "name":self.name,
+            "coordenates":self.coordenates,
+            "vehicle":self.vehicle,
+            "vehicle_consume_km":self.vehicle_consume_km
+
+            # do not serialize the password, its a security breach
+        }
+
+class Oferta(db.Model):
+    __tablename__="oferta"
+
+    id: Mapped[int] = mapped_column(primary_key=True)
+    id_comprador: Mapped[int] = mapped_column(Integer(),ForeignKey("user.id"), nullable=True)
+    id_vendedor: Mapped[int] = mapped_column(Integer(),ForeignKey("user.id"),nullable=False)
+    esta_realizada: Mapped[bool] = mapped_column(Boolean(), nullable=False)
+    descripcion: Mapped[str] = mapped_column(String(600),nullable=False)
+    titulo: Mapped[str]= mapped_column(String(200),nullable=False)
+    coordenates_vendedor: Mapped[str] = mapped_column(String(120),nullable=False)
+    coordenates_comprador: Mapped[str] = mapped_column(String(120),nullable=True)
+
+
+
+
+    def serialize(self):
+        return {
+            "id": self.id,
+            "id_comprador": self.id_comprador,
+            "id_vendedor":self.id_vendedor,
+            "esta_realizada":self.esta_realizada,
+            "descripcion":self.descripcion,
+            "titulo":self.titulo,
+            "coordenates_vendedor":self.coordenates_vendedor,
+            "coordenates_comprador":self.coordenates_comprador
+
             # do not serialize the password, its a security breach
         }