diff --git a/main/db.sqlite3 b/main/db.sqlite3
index 4444bcf67995ddefa508c4b09a8711f1de347770..1e696f51d5fdc1bb6880a407770f32bf2a033ba4 100644
Binary files a/main/db.sqlite3 and b/main/db.sqlite3 differ
diff --git a/main/media/img/IMG_1651.jpg b/main/media/img/IMG_1651.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..009fb21746424a9cdf83d38425ade422b2189df4
Binary files /dev/null and b/main/media/img/IMG_1651.jpg differ
diff --git a/main/postSection/templates/postSection/postIndex.html b/main/postSection/templates/postSection/postIndex.html
index 66bb25ea3189fe477e018dfd80c83211e3f362c7..c485c8f412f9371e5b5c60e23874b86003d3136f 100644
--- a/main/postSection/templates/postSection/postIndex.html
+++ b/main/postSection/templates/postSection/postIndex.html
@@ -28,5 +28,4 @@
<hr/>
<input type="button" onclick="location.href='{% url 'postSection:newPost' %}';" value="New Post" />
-{% endblock content %}
-
+{% endblock content %}
\ No newline at end of file
diff --git a/main/postSection/templates/postSection/postpage.html b/main/postSection/templates/postSection/postpage.html
deleted file mode 100644
index 2f45ee7e9956d2cea426f202fa48fc321c799a44..0000000000000000000000000000000000000000
--- a/main/postSection/templates/postSection/postpage.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{% extends 'base.html' %}
-{% block content %}
-<!-- i have no idea what you are using this poge for lol -->
-
- <p>POST :D</p>
- <form method = 'post' enctype="multipart/form-data">
- {%csrf_token%}
- {{form.as_p}}
- <button type ="submit">Upload</button>
-
- </form>
-
-
- <h2> <h2><hr>
-{% endblock content %}
\ No newline at end of file
diff --git a/main/profile/__pycache__/views.cpython-310.pyc b/main/profile/__pycache__/views.cpython-310.pyc
index f50c08c2cb2b633768c03dbc7b4f09872c213f2e..5aeaa669e2ca7c4b34c79cf3420c6e168af7a3fd 100644
Binary files a/main/profile/__pycache__/views.cpython-310.pyc and b/main/profile/__pycache__/views.cpython-310.pyc differ
diff --git a/main/profile/templates/profile/view_profile.html b/main/profile/templates/profile/view_profile.html
index 6a225c2926b5938dbce655d9e7c006e7244dea26..10535c3c49b71bcb204a4fb6bb28a4fa3f143e6a 100644
--- a/main/profile/templates/profile/view_profile.html
+++ b/main/profile/templates/profile/view_profile.html
@@ -1,26 +1,7 @@
-{% extends 'base.html' %}
-{% load static %}
-{% load sass_tags %}
+{% extends 'postSection/postIndex.html' %}
-{% block content %}
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="UTF-8">
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <title>View Profile</title>
- {% load static %}
- <script>
- function confirmLogoff() {
- var confirmation = confirm("Are you sure you want to log out?");
- if (confirmation) {
- window.location.href = "{% url 'home' %}"; // Redirect to home after logoff
- }
- }
- </script>
-</head>
-<body>
+{% block profile %}
<!-- Profile Content -->
<div class="container mt-5">
<h1 class="mb-4">View Profile</h1>
@@ -40,9 +21,4 @@
</div>
</div>
</div>
-
- <!-- User's Posts -->
-
-</body>
-</html>
-{% endblock content %}
+{% endblock profile %}
diff --git a/main/profile/views.py b/main/profile/views.py
index c44a5282b7728bd35abd07fed7fc23e9e97e9ffc..82a8ab30a5cf73ce80a760c69e679dd0218cf604 100644
--- a/main/profile/views.py
+++ b/main/profile/views.py
@@ -4,11 +4,12 @@ from .models import Profile
from .forms import ProfileForm
from PIL import Image
from postSection.models import post
+from postSection.views import index_view
+from django.core.files.storage import default_storage
@login_required
def view_profile(request):
profile = Profile.objects.get_or_create(user=request.user)[0]
-
# Resize profile picture if it exists
if profile.profile_picture:
# Open the image
@@ -22,53 +23,22 @@ def view_profile(request):
# Save resized image (overwrite the original)
image.save(profile.profile_picture.path)
-
- return render(request, 'profile/view_profile.html', {'profile': profile})
+ # Get all posts
+ if request.user.is_staff:
+ all_posts = post.objects.all()
+ else:
+ all_posts = post.objects.filter(author=request.user)
+ # Filter out posts without a valid image
+ valid_posts = []
+ for post_item in all_posts:
+ if post_item.image and default_storage.exists(post_item.image.name):
+ valid_posts.append(post_item)
+ return render(request, 'profile/view_profile.html', {'profile': profile, 'post_list': valid_posts})
@login_required
def edit_profile(request):
- # profile = Profile.objects.get_or_create(user=request.user)[0]
-
- # if request.method == 'POST':
- # form = ProfileForm(request.POST, request.FILES, instance=profile)
- # if form.is_valid():
- # form.save()
- # return redirect('view_profile')
- # else:
- # form = ProfileForm(instance=profile)
-
- # return render(request, 'profile/edit_profile.html'), {'form': form}
-
- # profile = request.user.profile
-
- # if request.method == 'POST':
- # # Pass request.FILES to handle profile picture upload
- # form = ProfileForm(request.POST, request.FILES, instance=profile)
- # if form.is_valid():
- # form.save()
- # return redirect('view_profile')
- # else:
- # form = ProfileForm(instance=profile)
-
- # return render(request, 'profile/edit_profile.html', {'form': form})
-
- # profile = request.user.profile
-
- # if request.method == 'POST':
- # form = ProfileForm(request.POST, request.FILES, instance=profile)
- # if form.is_valid():
- # # Update username
- # request.user.username = form.cleaned_data['username']
- # request.user.save()
- # form.save()
- # return redirect('view_profile')
- # else:
- # form = ProfileForm(instance=profile)
-
- # return render(request, 'profile/edit_profile.html', {'form': form})
-
profile = request.user.profile
if request.method == 'POST':
@@ -81,7 +51,7 @@ def edit_profile(request):
else:
# Initialize the form with the current username
form = ProfileForm(instance=profile, initial={'username': request.user.username})
-
+
return render(request, 'profile/edit_profile.html', {'form': form})
def user_posts(request, username):
diff --git a/main/register/templates/register/welcome.html b/main/register/templates/register/welcome.html
index 4a41b3cd28cdd4ffb659fc107d9f1fe31c393c23..a700207948da055459ddcd1c1003e8aa3bfeaa5c 100644
--- a/main/register/templates/register/welcome.html
+++ b/main/register/templates/register/welcome.html
@@ -1,8 +1,4 @@
{% extends "base.html" %}
{% block title %}
<title>Home Page</title>
-{% endblock title %}
-
-{% block header %}
- <h1 style="color: #167D8F;">Petgram</h1>
-{% endblock header %}
\ No newline at end of file
+{% endblock title %}
\ No newline at end of file
diff --git a/main/static/css/base.css b/main/static/css/base.css
index 4786acf0549f7704651304601bafb9d4d1bedce1..eb11e118af88996bf1832ad084417086ade6a634 100644
--- a/main/static/css/base.css
+++ b/main/static/css/base.css
@@ -4,7 +4,7 @@ body {
flex-direction: column;
align-items: center;
justify-content: center;
- height: 90vh;
+ min-height: 90vh;
margin: 0;
position: relative; }
@@ -125,6 +125,7 @@ body {
.background-image {
position: relative;
+ margin-top: 60px;
width: 200px;
opacity: 0.7; }
@@ -200,15 +201,6 @@ form input {
flex-direction: column;
color: #167D8F; }
-.logo {
- color: #167D8F;
- font-size: 24px;
- margin-bottom: 100px;
- /* Adjust the margin to lift the logo higher */
- position: relative;
- z-index: 2;
- /* Ensure it's above the background image */ }
-
form button, .back-button {
background-color: #FFFFFF;
color: #167D8F;
diff --git a/main/static/css/base.css.map b/main/static/css/base.css.map
index ecc84d4a7ce6ad7a85af08d9eaada2f95779f53d..f92a4c18f3fa5e4daa30ad0f4604d16cb811ab5f 100644
--- a/main/static/css/base.css.map
+++ b/main/static/css/base.css.map
@@ -5,5 +5,5 @@
"base.scss"
],
"names": [],
- "mappings": "AAAA,AAAA,IAAI,CAAC;EACD,gBAAgB,EAAE,OAAO;EACzB,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,MAAM;EACtB,WAAW,EAAE,MAAM;EACnB,eAAe,EAAE,MAAM;EACvB,MAAM,EAAE,IAAI;EACZ,MAAM,EAAE,CAAC;EACT,QAAQ,EAAE,QAAQ,GACrB;;AAED,AAAA,QAAQ,CAAC;EACL,KAAK,EAAE,IAAI;EACX,SAAS,EAAE,KAAK;EAChB,MAAM,EAAE,MAAM;EACd,UAAU,EAAE,MAAM,GACrB;;AAED,AAAA,cAAc,CAAC;EACX,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI,GACf;;AAED,AAAA,aAAa,CAAC;EACV,SAAS,EAAE,GAAG;EACd,UAAU,EAAE,CAAC,GAChB;;AACD,AAAA,oBAAoB,CAAC;EACjB,SAAS,EAAE,KAAK;EAChB,KAAK,EAAE,IAAI,GACd;;AAED,AAAA,eAAe,CAAC;EACZ,SAAS,EAAE,KAAK;EAAE,2BAA2B;EAC7C,UAAU,EAAE,KAAK;EAAE,4BAA4B,EAClD;;AAED,AAAA,uBAAuB,CAAA;EACnB,SAAS,EAAE,KAAK;EAAE,2BAA2B;EAC7C,UAAU,EAAE,KAAK;EAAE,4BAA4B,EAClD;;AAED,AAAA,OAAO;AACP,WAAW;AACX,eAAe,CAAC;EACZ,WAAW,EAAE,GAAG;EAAE,sCAAsC,EAC3D;;AAED,AAAA,eAAe,CAAC,CAAC,CAAC;EACd,OAAO,EAAE,YAAY,GACxB;;AAED,AAAA,WAAW,CAAC;EACR,MAAM,EAAE,KAAK;EAAE,oBAAoB;EACnC,QAAQ,EAAE,MAAM;EAAE,2BAA2B;EAC7C,KAAK,EAAE,IAAI;EAAE,wBAAwB,EACxC;;AAED,AAAA,WAAW,AAAA,UAAU,CAAC;EAClB,MAAM,EAAE,IAAI;EAAE,4BAA4B,EAC7C;;AAGD,AAAA,eAAe,CAAC;EACZ,OAAO,EAAE,IAAI,GAChB;;AAED,AAAA,SAAS;AACT,aAAa,CAAC;EACV,IAAI,EAAE,CAAC;EAAE,gCAAgC,EAC5C;;AAED,AAAA,iBAAiB,CAAC;EACd,MAAM,EAAE,IAAI;EAAE,gCAAgC;EAC9C,OAAO,EAAE,IAAI;EAAE,iCAAiC;EAChD,MAAM,EAAE,cAAc;EAAE,4BAA4B;EACpD,aAAa,EAAE,IAAI;EAAE,2CAA2C;EAChE,gBAAgB,EAAE,IAAI;EAAE,6CAA6C;EACrE,OAAO,EAAE,IAAI;EACb,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,kBAAkB,GAC1C;;AAED,AAAA,aAAa,CAAC;EACV,MAAM,EAAE,IAAI;EAAE,gCAAgC;EAC9C,OAAO,EAAE,IAAI;EAAE,iCAAiC;EAChD,MAAM,EAAE,cAAc;EAAE,4BAA4B;EACpD,aAAa,EAAE,IAAI;EAAE,2CAA2C;EAChE,gBAAgB,EAAE,IAAI;EAAE,6CAA6C;EACrE,OAAO,EAAE,IAAI;EACb,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,kBAAkB;EACvC,UAAU,EAAE,KAAK;EAAE,yCAAyC;EAC5D,UAAU,EAAE,IAAI,GACnB;;AAED,AAAA,aAAa,CAAC,GAAG,CAAC;EACd,UAAU,EAAE,GAAG;EAAE,6CAA6C,EACjE;;AAED,AAAA,QAAQ,CAAC;EACL,KAAK,EAAE,KAAK;EACZ,SAAS,EAAE,GAAG;EACd,WAAW,EAAE,GAAG;EAChB,aAAa,EAAE,IAAI;EAAE,oCAAoC,EAC5D;;AAED,AAAA,aAAa,CAAC;EACV,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,GAAG;EAAE,oCAAoC,EACzD;;AAED,AAAA,gBAAgB,CAAC;EACb,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,CAAC;EAAE,oCAAoC,EACvD;;AAED,AAAA,QAAQ,CAAC,MAAM,CAAC;EACZ,WAAW,EAAE,IAAI;EAAE,yDAAyD,EAC/E;;AAGD,AAAA,iBAAiB,CAAC;EACd,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,KAAK;EACZ,OAAO,EAAE,GAAG,GACf;;AAED,AAAA,QAAQ,CAAC;EACL,UAAU,EAAE,MAAM;EAClB,OAAO,EAAE,IAAI;EACb,gBAAgB,EAAE,OAAO;EACzB,KAAK,EAAE,OAAO;EACd,aAAa,EAAE,IAAI;EACnB,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,kBAAkB;EACvC,QAAQ,EAAE,QAAQ;EAClB,OAAO,EAAE,CAAC;EACV,UAAU,EAAE,IAAI;EAAE,qDAAqD,EAC1E;;AAED,AAAA,EAAE,CAAC;EACC,aAAa,EAAE,IAAI;EACnB,KAAK,EAAE,OAAO;EACd,UAAU,EAAE,MAAM,GACrB;;AAED,AAAA,aAAa,CAAA;EACT,KAAK,EAAE,OACX,GAAC;;AACD,AAAA,MAAM,CAAC;EACH,MAAM,EAAE,GAAG;EACX,gBAAgB,EAAE,OAAO;EACzB,KAAK,EAAE,OAAO;EAAE,mCAAmC;EACnD,MAAM,EAAE,IAAI;EACZ,OAAO,EAAE,SAAS;EAClB,aAAa,EAAE,GAAG;EAClB,MAAM,EAAE,OAAO;EACf,UAAU,EAAE,2CAA2C;EACvD,eAAe,EAAE,IAAI;EACrB,eAAe,EAAE,IAAI;EAErB,UAAU,EAAE,MAAM,GAErB;;AAED,AAAA,MAAM,CAAC,KAAK,CAAC;EACT,gBAAgB,EAAE,OAAO;EACzB,KAAK,EAAE,OAAO,GACjB;;AAED,AAAA,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC;EAClC,gBAAgB,EAAE,OAAO;EACzB,KAAK,EAAE,OAAO,GACjB;;AACD,AAAA,MAAM,CAAC;EACH,UAAU,EAAE,MAAM;EAClB,UAAU,EAAE,IAAI,GACnB;;AAED,AAAA,eAAe,CAAC;EACZ,OAAO,EAAE,IAAI;EACb,eAAe,EAAE,MAAM;EACvB,UAAU,EAAE,IAAI;EAChB,OAAO,EAAE,IAAI;EACb,gBAAgB,EAAE,OAAO;EACzB,aAAa,EAAE,IAAI;EACnB,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,kBAAkB;EACvC,MAAM,EAAE,CAAC,GACZ;;AAED,AAAA,IAAI,CAAC;EACD,MAAM,EAAE,CAAC,GACZ;;AAED,AAAA,IAAI,CAAC,KAAK,CAAA;EACN,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,MAAM;EACtB,KAAK,EAAE,OAAO,GACjB;;AAED,AAAA,aAAa,CAAA;EACT,OAAO,EAAE,YAAY,GACxB;;AAED,AAAA,IAAI,CAAC,KAAK,CAAA;EACN,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,MAAM;EACtB,KAAK,EAAE,OAAO,GACjB;;AAED,AAAA,KAAK,CAAC;EACF,KAAK,EAAE,OAAO;EACd,SAAS,EAAE,IAAI;EACf,aAAa,EAAE,KAAK;EAAE,+CAA+C;EACrE,QAAQ,EAAE,QAAQ;EAClB,OAAO,EAAE,CAAC;EAAE,4CAA4C,EAC3D;;AAED,AAAA,IAAI,CAAC,MAAM,EAAE,YAAY,CAAC;EACtB,gBAAgB,EAAE,OAAO;EACzB,KAAK,EAAE,OAAO;EACd,OAAO,EAAE,SAAS;EAClB,MAAM,EAAE,IAAI;EACZ,aAAa,EAAE,GAAG;EAClB,MAAM,EAAE,OAAO;EACf,UAAU,EAAE,2CAA2C;EACvD,YAAY,EAAE,IAAI;EAClB,eAAe,EAAE,IAAI;EAAE,iCAAiC;EACxD,OAAO,EAAE,YAAY;EAAE,qCAAqC;EAC5D,UAAU,EAAE,MAAM;EAAE,uCAAuC;EAC3D,eAAe,EAAE,IAAI,GACxB;;AAED,AAAA,SAAS,CAAC;EACN,MAAM,EAAE,KAAK;EACb,SAAS,EAAE,IAAI;EACf,KAAK,EAAE,OAAO;EACd,YAAY,EAAE,IAAI,GACrB;;AAED,AAAA,OAAO,CAAC,CAAC,CAAC;EACN,KAAK,EAAE,OAAO;EACd,eAAe,EAAE,IAAI;EACrB,MAAM,EAAE,MAAM;EACd,SAAS,EAAE,IAAI,GAClB;;AAED,AAAA,aAAa,CAAC;EACV,OAAO,EAAE,IAAI;EACb,eAAe,EAAE,MAAM;EACvB,SAAS,EAAE,CAAC,GACf;;AACD,AAAA,OAAO,CAAC;EACJ,UAAU,EAAE,UAAU;EACtB,OAAO,EAAE,IAAI;EACb,eAAe,EAAE,aAAa;EAC9B,WAAW,EAAE,MAAM;EAAE,0CAA0C;EAC/D,gBAAgB,EAAE,OAAO;EACzB,OAAO,EAAE,SAAS;EAClB,UAAU,EAAE,MAAM;EAClB,KAAK,EAAE,IAAI;EACX,QAAQ,EAAE,KAAK;EACf,GAAG,EAAE,CAAC;EACN,OAAO,EAAE,IAAI,GAChB"
+ "mappings": "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"
}
\ No newline at end of file
diff --git a/main/static/css/base.scss b/main/static/css/base.scss
index f58afab887fa51de67081436f3b9f0942f3d64b6..eaf277f59450e0cf60750995014fb59b767d86eb 100644
--- a/main/static/css/base.scss
+++ b/main/static/css/base.scss
@@ -4,7 +4,7 @@ body {
flex-direction: column;
align-items: center;
justify-content: center;
- height: 90vh;
+ min-height: 90vh;
margin: 0;
position: relative;
}
@@ -120,6 +120,7 @@ body {
.background-image {
position: relative;
+ margin-top: 60px;
width: 200px;
opacity: 0.7;
}
@@ -206,14 +207,6 @@ form input{
color: #167D8F;
}
-.logo {
- color: #167D8F;
- font-size: 24px;
- margin-bottom: 100px; /* Adjust the margin to lift the logo higher */
- position: relative;
- z-index: 2; /* Ensure it's above the background image */
-}
-
form button, .back-button {
background-color: #FFFFFF;
color: #167D8F;
diff --git a/main/templates/base.html b/main/templates/base.html
index 5e69d3171b0e8a6098a2a84ed4ce29d4061f7f33..0901dfd1c4fa1452b705323d38b50b31173e852c 100644
--- a/main/templates/base.html
+++ b/main/templates/base.html
@@ -33,19 +33,19 @@
<a href="#" onclick="confirmLogoff()">Log Off</a>
</div>
</div>
-
{% endblock navbar %}
- <header>
- {% block header %}
- <img src="{% static 'paw.png' %}" alt="Paw" class="background-image">
- <h1>Petgram</h1>
- {% endblock header%}
- </header>
- <main>
- {% block content %}
- <p>Welcome to Petgram! Here you can share your pet photos and stories.</p>
- {% endblock content%}
+ {% block header %}
+ <img src="{% static 'paw.png' %}" alt="Paw" class="background-image">
+ <h1>Petgram</h1>
+ {% endblock header%}
+
+ {% block profile %}
+ {% endblock profile %}
+
+ {% block content %}
+ <p>Welcome to Petgram! Here you can share your pet photos and stories.</p>
+ {% endblock content%}
</main>
<footer>