Merge pull request #22 from Rayliable/DisplayPhotos

Dan added the "tag" filtered pages
Rayliable · Mar 21, 2024 · 987a342 · 987a342
2 parents c673b9f + 7de17be
commit 987a342
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 3 deletions.
diff --git a/Media/user_upload/compressed/Avengers.jpg b/Media/user_upload/compressed/Avengers.jpg
diff --git a/Media/user_upload/compressed/Inception.jpg b/Media/user_upload/compressed/Inception.jpg
diff --git a/Media/user_upload/full_quality/Avengers.jpg b/Media/user_upload/full_quality/Avengers.jpg
diff --git a/Media/user_upload/full_quality/Inception.jpg b/Media/user_upload/full_quality/Inception.jpg
diff --git a/db.sqlite3 b/db.sqlite3
diff --git a/home/models.py b/home/models.py
@@ -3,6 +3,8 @@
 from django.db import models
 from PIL import Image
 from io import BytesIO
+
+
 # Create your models here.
 
 # user uploads mode (includes title, image, tags)

diff --git a/home/urls.py b/home/urls.py
@@ -8,4 +8,6 @@
     path("upload_view/", views.upload_view, name="upload_view"),
     path("about_us/", views.about, name="about_us"),
     path("contact_us", views.contact, name="contact_us"),
+    path("photography/", views.photography, name="photography"),
+    path("illustration/", views.illustration, name="illustration"),
 ]
diff --git a/home/views.py b/home/views.py
@@ -1,6 +1,6 @@
 from django.shortcuts import render, redirect
 from .forms import ImageForm, ImageFormURL
-
+from .models import UserUpload, UserUploadURL
 
 # Create your views here.
 
@@ -44,3 +44,15 @@ def url_upload(request):  # page for users to upload images
         else:  # if invalid print errors
             form = ImageForm()
     return redirect("upload_view")  # return to form view
+
+
+def photography(request):
+    # Filter through images based on tag and privacy
+    filtered_images = UserUpload.objects.filter(tags='option_two', privacy='option_one')
+    return render(request, 'photography.html', {'images': filtered_images})
+
+
+def illustration(request):
+    # Filter through images based on tag and privacy
+    filtered_images = UserUpload.objects.filter(tags='option_three', privacy='option_one')
+    return render(request, 'illustration.html', {'images': filtered_images})
diff --git a/templates/home.html b/templates/home.html
@@ -15,10 +15,10 @@ <h4 style="font-size: 20px; text-align: center"> Browse Categories! </h4>
     <!-- Scroll line for categories -->
     <div class="categories">
         <div class="categoryDisplay">
-            <a href="#"> <!-- links to the page of art -->
+            <a href="/photography"> <!-- links to the photography page -->
                 <img src="{% static 'placeHolderImage.png' %}" alt="img" class="categoryimg">
             </a>
-            <a href="#"> <!-- links to the page of art -->
+            <a href="/illustration"> <!-- links to the illustration page -->
                 <img src="{% static 'placeHolderImage.png' %}" alt="img" class="categoryimg">
             </a>
             <a href="#"> <!-- links to the page of art -->

diff --git a/templates/illustration.html b/templates/illustration.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title> Illustration </title>
+</head>
+<body>
+    <h1> Illustration </h1>
+    {% for image in images %}  <!-- prints out all images -->
+        <img src="{{ image.image_compressed.url }}" alt="Image" style="width: 250px; height: 250px">
+    {% endfor %}
+</body>
+</html>
diff --git a/templates/photography.html b/templates/photography.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title> Photography </title>
+</head>
+<body>
+    <h1> Photography </h1>
+    {% for image in images %}  <!-- prints out all images -->
+        <img src="{{ image.image_compressed.url }}" alt="Image" style="width: 250px; height: 250px">
+    {% endfor %}
+</body>
+</html>