More files

plugins/auth/models.py

@@ -1,3 +1,4 @@
+from werkzeug.security import generate_password_hash, check_password_hash
 from flask_login import UserMixin
 from datetime import datetime
 from app import db
@@ -7,7 +8,7 @@ class User(db.Model, UserMixin):
 
     id = db.Column(db.Integer, primary_key=True)
     email = db.Column(db.String(120), unique=True, nullable=False)
-    password_hash = db.Column(db.String(128), nullable=False)
+    password_hash = db.Column(db.Text, nullable=False)
     role = db.Column(db.String(50), default='user')
     is_verified = db.Column(db.Boolean, default=False)
     excluded_from_analytics = db.Column(db.Boolean, default=False)
@@ -15,113 +16,9 @@ class User(db.Model, UserMixin):
 
     # Optional: relationship to submissions
     submissions = db.relationship('Submission', backref='user', lazy=True)
+    
+    def set_password(self, password):
+        self.password_hash = generate_password_hash(password)
 
-
-class Submission(db.Model):
-    __tablename__ = 'submission'
-
-    id = db.Column(db.Integer, primary_key=True)
-    user_id = db.Column(
-        db.Integer,
-        db.ForeignKey('users.id', name='fk_submission_user_id'),
-        nullable=False
-    )
-    common_name = db.Column(db.String(120), nullable=False)
-    scientific_name = db.Column(db.String(120))
-    price = db.Column(db.Float, nullable=False)
-    source = db.Column(db.String(120))
-    timestamp = db.Column(db.DateTime, default=datetime.utcnow)
-    height = db.Column(db.Float)
-    width = db.Column(db.Float)
-    leaf_count = db.Column(db.Integer)
-    potting_mix = db.Column(db.String(255))
-    container_size = db.Column(db.String(120))
-    health_status = db.Column(db.String(50))
-    notes = db.Column(db.Text)
-    plant_id = db.Column(db.Integer)
-    images = db.relationship('SubmissionImage', backref='submission', lazy=True)
-
-
-class SubmissionImage(db.Model):
-    __tablename__ = 'submission_images'
-
-    id = db.Column(db.Integer, primary_key=True)
-    submission_id = db.Column(db.Integer, db.ForeignKey('submission.id'), nullable=False)
-    file_path = db.Column(db.String(255), nullable=False)
-
-
-class PlantCommonName(db.Model):
-    __tablename__ = 'plants_common'
-    id = db.Column(db.Integer, primary_key=True)
-    name = db.Column(db.String(120), unique=True, nullable=False)
-
-
-class PlantScientificName(db.Model):
-    __tablename__ = 'plants_scientific'
-    id = db.Column(db.Integer, primary_key=True)
-    name = db.Column(db.String(255), unique=True, nullable=False)
-
-
-class Plant(db.Model):
-    __tablename__ = 'plants'
-    id = db.Column(db.Integer, primary_key=True)
-    common_name_id = db.Column(db.Integer, db.ForeignKey('plants_common.id'))
-    scientific_name_id = db.Column(db.Integer, db.ForeignKey('plants_scientific.id'))
-    parent_id = db.Column(db.Integer, db.ForeignKey('plants.id'), nullable=True)
-    is_dead = db.Column(db.Boolean, default=False)
-    date_added = db.Column(db.DateTime, default=datetime.utcnow)
-    created_by_user_id = db.Column(db.Integer, db.ForeignKey('users.id'))
-
-    # Relationships
-    updates = db.relationship('PlantUpdate', backref='plant', lazy=True)
-    lineage = db.relationship('PlantLineage', backref='child', lazy=True,
-                              foreign_keys='PlantLineage.child_plant_id')
-
-
-class PlantLineage(db.Model):
-    __tablename__ = 'plant_lineage'
-    id = db.Column(db.Integer, primary_key=True)
-    parent_plant_id = db.Column(db.Integer, db.ForeignKey('plants.id'), nullable=False)
-    child_plant_id = db.Column(db.Integer, db.ForeignKey('plants.id'), nullable=False)
-
-
-class PlantOwnershipLog(db.Model):
-    __tablename__ = 'plant_ownership_log'
-    id = db.Column(db.Integer, primary_key=True)
-    plant_id = db.Column(db.Integer, db.ForeignKey('plants.id'), nullable=False)
-    user_id = db.Column(db.Integer, db.ForeignKey('users.id'), nullable=False)
-    date_acquired = db.Column(db.DateTime, default=datetime.utcnow)
-    date_relinquished = db.Column(db.DateTime, nullable=True)
-
-
-class PlantUpdate(db.Model):
-    __tablename__ = 'plant_updates'
-    id = db.Column(db.Integer, primary_key=True)
-    plant_id = db.Column(db.Integer, db.ForeignKey('plants.id'), nullable=False)
-    update_type = db.Column(db.String(100))
-    description = db.Column(db.Text)
-    created_at = db.Column(db.DateTime, default=datetime.utcnow)
-    images = db.relationship('UpdateImage', backref='update', lazy=True)
-
-
-class UpdateImage(db.Model):
-    __tablename__ = 'update_images'
-    id = db.Column(db.Integer, primary_key=True)
-    update_id = db.Column(db.Integer, db.ForeignKey('plant_updates.id'), nullable=False)
-    file_path = db.Column(db.String(255), nullable=False)
-
-
-class ImageHeart(db.Model):
-    __tablename__ = 'image_hearts'
-    id = db.Column(db.Integer, primary_key=True)
-    user_id = db.Column(db.Integer, db.ForeignKey('users.id'), nullable=False)
-    submission_image_id = db.Column(db.Integer, db.ForeignKey('submission_images.id'), nullable=False)
-    created_at = db.Column(db.DateTime, default=datetime.utcnow)
-
-
-class FeaturedImage(db.Model):
-    __tablename__ = 'featured_images'
-    id = db.Column(db.Integer, primary_key=True)
-    submission_image_id = db.Column(db.Integer, db.ForeignKey('submission_images.id'), nullable=False)
-    override_text = db.Column(db.String(255), nullable=True)
-    is_featured = db.Column(db.Boolean, default=True)
+    def check_password(self, password):
+        return check_password_hash(self.password_hash, password)

plugins/auth/routes.py

@@ -4,9 +4,9 @@ from werkzeug.security import check_password_hash
 from app import db
 from .models import User
 
-auth = Blueprint('auth', __name__)
+bp = Blueprint('auth', __name__, template_folder='templates')
 
-@auth.route('/auth/login', methods=['GET', 'POST'])
+@bp.route('/login', methods=['GET', 'POST'])
 def login():
     if request.method == 'POST':
         email = request.form['email']
@@ -15,14 +15,33 @@ def login():
         if user and check_password_hash(user.password_hash, password):
             login_user(user)
             flash('Logged in successfully.', 'success')
-            return redirect(url_for('core.user_dashboard'))
+            return redirect(url_for('core_ui.home'))
         else:
             flash('Invalid credentials.', 'danger')
-    return render_template('login.html')
+    return render_template('auth/login.html')
 
-@auth.route('/auth/logout')
+@bp.route('/logout')
 @login_required
 def logout():
     logout_user()
     flash('Logged out.', 'info')
-    return redirect(url_for('core.index'))
+    return redirect(url_for('core_ui.home'))
+
+@bp.route('/register', methods=['GET', 'POST'])
+def register():
+    if request.method == 'POST':
+        email = request.form['email']
+        password = request.form['password']
+
+        existing_user = User.query.filter_by(email=email).first()
+        if existing_user:
+            flash('Email already registered.', 'warning')
+        else:
+            user = User(email=email)
+            user.set_password(password)
+            db.session.add(user)
+            db.session.commit()
+            flash('Account created. You can now log in.', 'success')
+            return redirect(url_for('auth.login'))
+
+    return render_template('auth/register.html')

plugins/auth/templates/auth/login.html

@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'core_ui/base.html' %}
 {% block content %}
 <h2>Login</h2>
 <form method="POST" action="/login">

plugins/auth/templates/auth/register.html

@@ -1,15 +1,16 @@
-{% extends 'base.html' %}
+{% extends 'core_ui/base.html' %}
+{% block title %}Register{% endblock %}
 {% block content %}
 <h2>Register</h2>
-<form method="POST" action="/register">
-  <div class="mb-3">
-    <label for="email" class="form-label">Email</label>
-    <input type="email" class="form-control" id="email" name="email" required>
-  </div>
-  <div class="mb-3">
-    <label for="password" class="form-label">Password</label>
-    <input type="password" class="form-control" id="password" name="password" required>
-  </div>
-  <button type="submit" class="btn btn-success">Register</button>
+<form method="POST">
+    <div class="mb-3">
+        <label>Email</label>
+        <input name="email" class="form-control" type="email" required>
+    </div>
+    <div class="mb-3">
+        <label>Password</label>
+        <input name="password" class="form-control" type="password" required>
+    </div>
+    <button class="btn btn-primary" type="submit">Register</button>
 </form>
 {% endblock %}