update

Muhammad Shafaf · Muhammad Shafaf · commit cc12f19db1b9 · 2024-02-12T01:53:02.000+05:30
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,4 @@
+env
+__pycache__/
+.env
+migrations/
diff --git a/app.py b/app.py
@@ -2,7 +2,9 @@
 from flask_sqlalchemy import SQLAlchemy
 from flask_migrate import Migrate
 from werkzeug.security import generate_password_hash, check_password_hash
+from sqlalchemy_utils import UUIDType
 import os
+import uuid
 
 # SQLAlchemy.
 pg_user = os.getenv("POSTGRES_USER", "postgres")
@@ -24,15 +26,35 @@
 db = SQLAlchemy(app)
 migrate = Migrate(app, db)
 
+# Base model class for all models
+class BaseModel(db.Model):
+    """
+        Base model of the mapping class inheritace 
+
+        https://docs.sqlalchemy.org/en/14/orm/inheritance.html
+    """
+
+    __abstract__ = True
+
+    STATUS_CHOICES = ["Active", "Disabled", "Deleted"]
+
+    id = db.Column(UUIDType(binary=False), primary_key=True, default=uuid.uuid4)
+    name = db.Column(db.String(255), nullable=False)
+    extra = db.Column(db.JSON(), nullable=True)
+    status = db.Column(
+        db.Enum(*STATUS_CHOICES, name="status", native_enum=False),
+        nullable=False,
+        default="active"
+    )
 
 # User Model
-class User(db.Model):
+class User(BaseModel):
     id = db.Column(db.Integer, primary_key=True)
     username = db.Column(db.String(80), unique=True, nullable=False)
     password = db.Column(db.String(520), nullable=False)
 
 
-class Student(db.Model):
+class Student(BaseModel):
     id = db.Column(db.Integer, primary_key=True)
     student_name = db.Column(db.String(200), nullable=False)
     student_age = db.Column(db.Integer, nullable=True)
@@ -78,7 +100,8 @@ def register():
             # create a new user
             new_user = User(
                 username=username,
-                password=generate_password_hash(password),
+                password=password,
+                name=username,
             )
             db.session.add(new_user)
             db.session.commit()
diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1,17 @@
+alembic==1.13.1
+blinker==1.7.0
+click==8.1.7
+Flask==3.0.2
+Flask-Migrate==4.0.5
+Flask-SQLAlchemy==3.1.1
+importlib-metadata==7.0.1
+itsdangerous==2.1.2
+Jinja2==3.1.3
+Mako==1.3.2
+MarkupSafe==2.1.5
+psycopg2==2.9.9
+SQLAlchemy==2.0.25
+SQLAlchemy-Utils==0.41.1
+typing_extensions==4.9.0
+Werkzeug==3.0.1
+zipp==3.17.0
diff --git a/templates/login.html b/templates/login.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Login</title>
 </head>
-<body>
+<body style="background: black; color: aliceblue;">
     <h2>Login</h2>
     {% with messages = get_flashed_messages() %}
         {% if messages %}
diff --git a/templates/register.html b/templates/register.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Register</title>
 </head>
-<body>
+<body style="background: black; color: aliceblue;">
     <h2>Register</h2>
     {% with messages = get_flashed_messages() %}
         {% if messages %}

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +env
 +__pycache__/
 +.env
 +migrations/