lots of changes

plugins/submission/models.py

@@ -1,39 +1,35 @@
 from datetime import datetime
 from app import db
 from plugins.plant.models import Plant
-
+from plugins.auth.models import User
 
 class Submission(db.Model):
-    __tablename__ = 'submissions'
-    __table_args__ = {'extend_existing': True}
+    __tablename__ = "submissions"
+    __table_args__ = {"extend_existing": True}
 
     id = db.Column(db.Integer, primary_key=True)
-    user_id = db.Column(db.Integer, db.ForeignKey('users.id'), nullable=False)
-    plant_id = db.Column(db.Integer, db.ForeignKey('plant.id'), nullable=True)
+    user_id = db.Column(db.Integer, db.ForeignKey("users.id"), nullable=False)
+    submitted_at = db.Column(db.DateTime, default=datetime.utcnow)
+    plant_name = db.Column(db.String(100), nullable=False)
+    scientific_name = db.Column(db.String(120), nullable=True)
+    notes = db.Column(db.Text, nullable=True)
+    approved = db.Column(db.Boolean, default=None)
+    approved_at = db.Column(db.DateTime, nullable=True)
+    reviewed_by = db.Column(db.Integer, db.ForeignKey("users.id"), nullable=True)
 
-    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)
+    # Explicit bidirectional relationships
+    submitter = db.relationship("User", foreign_keys=[user_id], back_populates="submitted_submissions")
+    reviewer = db.relationship("User", foreign_keys=[reviewed_by], back_populates="reviewed_submissions")
 
-    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)
+    images = db.relationship("SubmissionImage", backref="submission", lazy=True)
 
-    # Image references via SubmissionImage table
-    images = db.relationship('SubmissionImage', backref='submission', lazy=True)
 
 
 class SubmissionImage(db.Model):
-    __tablename__ = 'submission_images'
-    __table_args__ = {'extend_existing': True}
+    __tablename__ = "submission_images"
+    __table_args__ = {"extend_existing": True}
 
     id = db.Column(db.Integer, primary_key=True)
-    submission_id = db.Column(db.Integer, db.ForeignKey('submissions.id'), nullable=False)
-    file_path = db.Column(db.String(255), nullable=False)
-    is_visible = db.Column(db.Boolean, default=True)
+    submission_id = db.Column(db.Integer, db.ForeignKey("submissions.id"), nullable=False)
+    file_url = db.Column(db.String(256), nullable=False)
+    uploaded_at = db.Column(db.DateTime, default=datetime.utcnow)

plugins/submission/routes.py

@@ -1,10 +1,78 @@
-from flask import Blueprint, render_template
-from .models import Submission
+from flask import Blueprint, render_template, request, redirect, url_for, flash, jsonify, send_from_directory, current_app
+from flask_login import current_user, login_required
+from werkzeug.utils import secure_filename
+import os
 from app import db
+from .models import SubmissionImage, ImageHeart, FeaturedImage
+from plugins.plant.models import Plant
 
-bp = Blueprint('submission', __name__, url_prefix='/submission')
+bp = Blueprint("submission", __name__, template_folder="templates")
 
-@bp.route('/')
-def index():
-    submissions = Submission.query.order_by(Submission.timestamp.desc()).all()
-    return render_template('submission/index.html', submissions=submissions)
+UPLOAD_FOLDER = "static/uploads"
+ALLOWED_EXTENSIONS = {"png", "jpg", "jpeg", "gif"}
+
+def allowed_file(filename):
+    return "." in filename and filename.rsplit(".", 1)[1].lower() in ALLOWED_EXTENSIONS
+
+@bp.route("/submissions/upload", methods=["GET", "POST"])
+@login_required
+def upload_submissions():
+    if request.method == "POST":
+        file = request.files.get("image")
+        caption = request.form.get("caption")
+        plant_id = request.form.get("plant_id")
+
+        if file and allowed_file(file.filename):
+            filename = secure_filename(file.filename)
+            save_path = os.path.join(current_app.root_path, UPLOAD_FOLDER)
+            os.makedirs(save_path, exist_ok=True)
+            file.save(os.path.join(save_path, filename))
+
+            submissions = SubmissionImage(file_url=f"{UPLOAD_FOLDER}/{filename}", caption=caption, plant_id=plant_id)
+            db.session.add(submissions)
+            db.session.commit()
+
+            flash("Image uploaded successfully.", "success")
+            return redirect(url_for("submissions.upload_submissions"))
+        else:
+            flash("Invalid file or no file uploaded.", "danger")
+
+    return render_template("submissions/upload.html")
+
+@bp.route("/submissions/files/<path:filename>")
+def submissions_file(filename):
+    return send_from_directory(os.path.join(current_app.root_path, "static/uploads"), filename)
+
+@bp.route("/submissions/heart/<int:image_id>", methods=["POST"])
+@login_required
+def toggle_heart(image_id):
+    existing = ImageHeart.query.filter_by(user_id=current_user.id, submission_image_id=image_id).first()
+    if existing:
+        db.session.delete(existing)
+        db.session.commit()
+        return jsonify({"status": "unhearted"})
+    else:
+        heart = ImageHeart(user_id=current_user.id, submission_image_id=image_id)
+        db.session.add(heart)
+        db.session.commit()
+        return jsonify({"status": "hearted"})
+
+@bp.route("/submissions/feature/<int:image_id>", methods=["POST"])
+@login_required
+def set_featured_image(image_id):
+    image = SubmissionImage.query.get_or_404(image_id)
+    plant = image.plant
+    if not plant:
+        flash("This image is not linked to a plant.", "danger")
+        return redirect(request.referrer or url_for("core_ui.home"))
+
+    if current_user.id != plant.owner_id and current_user.role != "admin":
+        flash("Not authorized to set featured image.", "danger")
+        return redirect(request.referrer or url_for("core_ui.home"))
+
+    FeaturedImage.query.filter_by(submission_image_id=image_id).delete()
+    featured = FeaturedImage(submission_image_id=image_id, is_featured=True)
+    db.session.add(featured)
+    db.session.commit()
+    flash("Image set as featured.", "success")
+    return redirect(request.referrer or url_for("core_ui.home"))