{{ image.created_at }}
diff --git a/gallery/views/groups.py b/gallery/views/group.py
similarity index 97%
rename from gallery/views/groups.py
rename to gallery/views/group.py
index ac9cd5e..1218535 100644
--- a/gallery/views/groups.py
+++ b/gallery/views/group.py
@@ -42,7 +42,7 @@ def groups():
.filter(db.Posts.id == image[0])
.first())
- return render_template('groups/list.html', groups=groups)
+ return render_template('list.html', groups=groups)
@blueprint.route('/
')
@@ -83,7 +83,7 @@ def group(group_id):
'rgb(var(--fg-black))',
'rgb(var(--fg-white))')
- return render_template('groups/group.html',
+ return render_template('group.html',
group=group,
images=images,
text_colour=text_colour)
diff --git a/gallery/views/image.py b/gallery/views/image.py
new file mode 100644
index 0000000..e111e9d
--- /dev/null
+++ b/gallery/views/image.py
@@ -0,0 +1,59 @@
+"""
+Onlylegs - Image View
+"""
+from flask import Blueprint, abort, render_template, url_for
+
+from sqlalchemy.orm import sessionmaker
+from gallery import db
+
+
+blueprint = Blueprint('image', __name__, url_prefix='/image')
+db_session = sessionmaker(bind=db.engine)
+db_session = db_session()
+
+
+@blueprint.route('/')
+def image(image_id):
+ """
+ Image view, shows the image and its metadata
+ """
+ # Get the image, if it doesn't exist, 404
+ image = db_session.query(db.Posts).filter(db.Posts.id == image_id).first()
+ if not image:
+ abort(404, 'Image not found :<')
+
+ # Get the image's author username
+ image.author_username = (db_session.query(db.Users.username)
+ .filter(db.Users.id == image.author_id)
+ .first()[0])
+
+ # Get the image's groups
+ groups = (db_session.query(db.GroupJunction.group_id)
+ .filter(db.GroupJunction.post_id == image_id)
+ .all())
+
+ # For each group, get the group data and add it to the image item
+ image.groups = []
+ for group in groups:
+ image.groups.append(db_session.query(db.Groups.id, db.Groups.name)
+ .filter(db.Groups.id == group[0])
+ .first())
+
+ # Get the next and previous images
+ # Check if there is a group ID set
+ next_url = (db_session.query(db.Posts.id)
+ .filter(db.Posts.id > image_id)
+ .order_by(db.Posts.id.asc())
+ .first())
+ prev_url = (db_session.query(db.Posts.id)
+ .filter(db.Posts.id < image_id)
+ .order_by(db.Posts.id.desc())
+ .first())
+
+ # If there is a next or previous image, get the url
+ if next_url:
+ next_url = url_for('image.image', image_id=next_url[0])
+ if prev_url:
+ prev_url = url_for('image.image', image_id=prev_url[0])
+
+ return render_template('image.html', image=image, next_url=next_url, prev_url=prev_url)
diff --git a/gallery/views/index.py b/gallery/views/index.py
new file mode 100644
index 0000000..6ee0dc3
--- /dev/null
+++ b/gallery/views/index.py
@@ -0,0 +1,30 @@
+"""
+Onlylegs Gallery - Index view
+"""
+from flask import Blueprint, render_template, request
+from werkzeug.exceptions import abort
+
+from sqlalchemy.orm import sessionmaker
+from gallery import db
+
+
+blueprint = Blueprint('gallery', __name__)
+db_session = sessionmaker(bind=db.engine)
+db_session = db_session()
+
+
+@blueprint.route('/')
+def index():
+ """
+ Home page of the website, shows the feed of the latest images
+ """
+ images = db_session.query(db.Posts.filename,
+ db.Posts.alt,
+ db.Posts.colours,
+ db.Posts.created_at,
+ db.Posts.id).order_by(db.Posts.id.desc()).all()
+
+ if request.args.get('coffee') == 'please':
+ abort(418)
+
+ return render_template('index.html', images=images)
diff --git a/gallery/views/profile.py b/gallery/views/profile.py
new file mode 100644
index 0000000..ac7c92f
--- /dev/null
+++ b/gallery/views/profile.py
@@ -0,0 +1,39 @@
+"""
+Onlylegs Gallery - Profile view
+"""
+from flask import Blueprint, render_template, request
+from werkzeug.exceptions import abort
+from flask_login import current_user
+
+from sqlalchemy.orm import sessionmaker
+from gallery import db
+
+
+blueprint = Blueprint('profile', __name__, url_prefix='/profile')
+db_session = sessionmaker(bind=db.engine)
+db_session = db_session()
+
+
+@blueprint.route('/profile')
+def profile():
+ """
+ Profile overview, shows all profiles on the onlylegs gallery
+ """
+ user_id = request.args.get('id', default=None, type=int)
+
+ # If there is no userID set, check if the user is logged in and display their profile
+ if not user_id:
+ if current_user.is_authenticated:
+ user_id = current_user.id
+ else:
+ abort(404, 'You must be logged in to view your own profile!')
+
+ # Get the user's data
+ user = db_session.query(db.Users).filter(db.Users.id == user_id).first()
+
+ if not user:
+ abort(404, 'User not found :c')
+
+ images = db_session.query(db.Posts).filter(db.Posts.author_id == user_id).all()
+
+ return render_template('profile.html', user=user, images=images)
diff --git a/gallery/views/routing.py b/gallery/views/routing.py
deleted file mode 100644
index a398e54..0000000
--- a/gallery/views/routing.py
+++ /dev/null
@@ -1,102 +0,0 @@
-"""
-Onlylegs Gallery - Routing
-"""
-from flask import Blueprint, render_template, url_for, request
-from werkzeug.exceptions import abort
-from flask_login import current_user
-
-from sqlalchemy.orm import sessionmaker
-from gallery import db
-
-
-blueprint = Blueprint('gallery', __name__)
-db_session = sessionmaker(bind=db.engine)
-db_session = db_session()
-
-
-@blueprint.route('/')
-def index():
- """
- Home page of the website, shows the feed of the latest images
- """
- images = db_session.query(db.Posts.filename,
- db.Posts.alt,
- db.Posts.colours,
- db.Posts.created_at,
- db.Posts.id).order_by(db.Posts.id.desc()).all()
-
- if request.args.get('coffee') == 'please':
- abort(418)
-
- return render_template('index.html', images=images)
-
-
-@blueprint.route('/image/')
-def image(image_id):
- """
- Image view, shows the image and its metadata
- """
- # Get the image, if it doesn't exist, 404
- image = db_session.query(db.Posts).filter(db.Posts.id == image_id).first()
- if not image:
- abort(404, 'Image not found :<')
-
- # Get the image's author username
- image.author_username = (db_session.query(db.Users.username)
- .filter(db.Users.id == image.author_id)
- .first()[0])
-
- # Get the image's groups
- groups = (db_session.query(db.GroupJunction.group_id)
- .filter(db.GroupJunction.post_id == image_id)
- .all())
-
- # For each group, get the group data and add it to the image item
- image.groups = []
- for group in groups:
- image.groups.append(db_session.query(db.Groups.id, db.Groups.name)
- .filter(db.Groups.id == group[0])
- .first())
-
- # Get the next and previous images
- next_url = (db_session.query(db.Posts.id)
- .filter(db.Posts.id > image_id)
- .order_by(db.Posts.id.asc())
- .first())
- prev_url = (db_session.query(db.Posts.id)
- .filter(db.Posts.id < image_id)
- .order_by(db.Posts.id.desc())
- .first())
-
- # If there is a next or previous image, get the url
- if next_url:
- next_url = url_for('gallery.image', image_id=next_url[0])
- if prev_url:
- prev_url = url_for('gallery.image', image_id=prev_url[0])
-
- return render_template('image.html', image=image, next_url=next_url, prev_url=prev_url)
-
-
-@blueprint.route('/profile')
-def profile():
- """
- Profile overview, shows all profiles on the onlylegs gallery
- """
- user_id = request.args.get('id', default=None, type=int)
-
- # If there is no userID set, check if the user is logged in and display their profile
- if not user_id:
- if current_user.is_authenticated:
- user_id = current_user.id
- else:
- abort(404, 'You must be logged in to view your own profile!')
-
- # Get the user's data
- user = db_session.query(db.Users).filter(db.Users.id == user_id).first()
-
- if not user:
- abort(404, 'User not found :c')
-
- images = db_session.query(db.Posts).filter(db.Posts.author_id == user_id).all()
-
- return render_template('profile.html', user=user, images=images)