Merge branch 'development' into alternate-dashboard

application/dash/forms.py

@@ -4,9 +4,19 @@ from wtforms.validators import DataRequired
 from flask_wtf.file import FileField, FileAllowed  # type: ignore
 
 
+# Form for service on dashboard, connected to database through ORM
 class ServiceForm(FlaskForm):
-    name = StringField("Service name:", validators=[DataRequired()])
-    url = URLField("Service URL:", validators=[DataRequired()])
+    name = StringField(
+        "Service name:",
+        validators=[DataRequired()],
+        render_kw={"placeholder": "Service Name"},
+    )
+    url = URLField(
+        "Service URL:",
+        validators=[DataRequired()],
+        render_kw={"placeholder": "https://example.com"},
+    )
+    # File field that only allows jpg, jpeg or png
     image = FileField(
         "Icon:",
         validators=[

application/dash/models.py

@@ -1,14 +1,17 @@
 from application import db
 
 
+# Service class for dashboard
 class Service(db.Model):
     id = db.Column(db.Integer, primary_key=True)
     name = db.Column(db.String, nullable=False)
     url = db.Column(db.String, nullable=False)
     icon = db.Column(db.String, default="google.png")
 
+    # Foreign key to connect to User table
     user_id = db.Column(db.Integer, db.ForeignKey("user.id"), nullable=False)
 
+    # Initialize the service (prevents ugly red lines)
     def __init__(
         self, name: str, url: str, user_id: int, icon: str = "google.png"
     ):

application/dash/templates/dashboard.html

@@ -22,13 +22,15 @@
                         </button>
                         <ul class="dropdown-menu" aria-labelledby="threeDotDropdown">
                             <li>
-                                <a class="dropdown-item" href="{{ url_for('dash.edit_service', service_id=service.id) }}">Edit</a>
+                                <a class="dropdown-item"
+                                    href="{{ url_for('dash.edit_service', service_id=service.id) }}">Edit</a>
                             </li>
                             <li>
                                 <hr class="dropdown-divider">
                             </li>
                             <li>
-                                <form action="{{ url_for('dash.delete_item', service_id=service.id) }}" method="POST" style="display:inline;">
+                                <form action="{{ url_for('dash.delete_service', service_id=service.id) }}" method="POST"
+                                    style="display:inline;">
                                     <button style="color: red;" type="submit" class="dropdown-item">Delete</button>
                                 </form>
                             </li>

application/dash/views.py

@@ -1,13 +1,16 @@
 from application import db
-from flask import Blueprint, render_template, redirect, url_for
+from flask import Blueprint, render_template, redirect, url_for, flash
 from application.dash.forms import ServiceForm
-from flask_login import login_required, current_user  # type: ignore
+from flask_login import current_user  # type: ignore
 from application.dash.models import Service
 from application.utils import saveImage
+from application.decorators import login_required
 
+# Dashboard blueprint
 dash_blueprint = Blueprint("dash", __name__, template_folder="templates")
 
 
+# index
 @dash_blueprint.route("/", methods=["GET", "POST"])
 @login_required
 def index():
@@ -17,23 +20,27 @@ def index():
     )
 
 
-@dash_blueprint.route("/delete_item/<int:service_id>", methods=["POST"])
+# Deleting a service
+@dash_blueprint.route("/delete_service/<int:service_id>", methods=["POST"])
 @login_required
-def delete_item(service_id: int):
+def delete_service(service_id: int):
     service = Service.query.get_or_404(service_id)
 
     # Check ownership
     if service.user_id != current_user.id:
+        flash("This is not your service!")
         return redirect(url_for("dash.index"))
 
     db.session.delete(service)
     db.session.commit()
+    flash("Service deleted")
     return redirect(url_for("dash.index"))
 
 
-@dash_blueprint.route("/service", methods=["GET", "POST"])
+# Add a service
+@dash_blueprint.route("/add_service", methods=["GET", "POST"])
 @login_required
-def service():
+def add_service():
     service_form = ServiceForm()
 
     if service_form.validate_on_submit():  # type: ignore
@@ -52,17 +59,14 @@ def service():
         )  # type: ignore
         db.session.add(new_service)
         db.session.commit()
-        return render_template(
-            "add_service.html",
-            form=ServiceForm(formdata=None),
-            feedback="Service succesfully added",
-            active_page="service",
-        )
+        flash("Service added")
+        return redirect(url_for("dash.index"))
     return render_template(
         "add_service.html", form=service_form, active_page="service"
     )
 
 
+# Edit service
 @dash_blueprint.route(
     "/edit_service/<int:service_id>", methods=["GET", "POST"]
 )
@@ -88,22 +92,8 @@ def edit_service(service_id: int):
             commit = True
         if commit:
             db.session.commit()
-        return redirect(url_for("dash.index"))
+            flash("Service edited")
+            return redirect(url_for("dash.index"))
     # Fill in correct data
     form = ServiceForm(name=service.name, url=service.url)
     return render_template("edit_service.html", form=form)
-
-
-"""
-def saveImage(image: ...):
-    filename = secure_filename(image.filename)
-    save_path = os.path.join(
-        app.config["UPLOAD_FOLDER"],  # type: ignore
-        str(current_user.id),
-        filename,
-    )
-    os.makedirs(os.path.dirname(save_path), exist_ok=True)
-    image.save(save_path)  # type: ignore
-    filename2 = str(current_user.id) + "/" + filename
-    return filename2
-"""