Skip to content
Snippets Groups Projects
Commit 2e7fd5e4 authored by Morris, Sophie E (UG - Comp Sci & Elec Eng)'s avatar Morris, Sophie E (UG - Comp Sci & Elec Eng)
Browse files

posts added to profile and content clipping at top of pages fixed

parent f6d358f3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 35 additions and 124 deletions
main/db.sqlite3
+ 0
− 0
View file @ 2e7fd5e4
No preview for this file type
main/media/img/IMG_1651.jpg 0 → 100644
+ 0
− 0
View file @ 2e7fd5e4
main/media/img/IMG_1651.jpg

2.46 MiB

main/postSection/templates/postSection/postIndex.html
+ 1
− 2
View file @ 2e7fd5e4
...@@ -28,5 +28,4 @@ ...@@ -28,5 +28,4 @@
<hr/> <hr/>
<input type="button" onclick="location.href='{% url 'postSection:newPost' %}';" value="New Post" /> <input type="button" onclick="location.href='{% url 'postSection:newPost' %}';" value="New Post" />
{% endblock content %} {% endblock content %}
\ No newline at end of file
main/postSection/templates/postSection/postpage.html deleted 100644 → 0
+ 0
− 15
View file @ f6d358f3
{% 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
main/profile/__pycache__/views.cpython-310.pyc
+ 0
− 0
View file @ 2e7fd5e4
No preview for this file type
main/profile/templates/profile/view_profile.html
+ 3
− 27
View file @ 2e7fd5e4
{% extends 'base.html' %} {% extends 'postSection/postIndex.html' %}
{% load static %}
{% load sass_tags %}
{% 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> {% block profile %}
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>
<!-- Profile Content --> <!-- Profile Content -->
<div class="container mt-5"> <div class="container mt-5">
<h1 class="mb-4">View Profile</h1> <h1 class="mb-4">View Profile</h1>
...@@ -40,9 +21,4 @@ ...@@ -40,9 +21,4 @@
</div> </div>
</div> </div>
</div> </div>
{% endblock profile %}
<!-- User's Posts -->
</body>
</html>
{% endblock content %}
main/profile/views.py
+ 14
− 44
View file @ 2e7fd5e4
...@@ -4,11 +4,12 @@ from .models import Profile ...@@ -4,11 +4,12 @@ from .models import Profile
from .forms import ProfileForm from .forms import ProfileForm
from PIL import Image from PIL import Image
from postSection.models import post from postSection.models import post
from postSection.views import index_view
from django.core.files.storage import default_storage
@login_required @login_required
def view_profile(request): def view_profile(request):
profile = Profile.objects.get_or_create(user=request.user)[0] profile = Profile.objects.get_or_create(user=request.user)[0]
# Resize profile picture if it exists # Resize profile picture if it exists
if profile.profile_picture: if profile.profile_picture:
# Open the image # Open the image
...@@ -22,53 +23,22 @@ def view_profile(request): ...@@ -22,53 +23,22 @@ def view_profile(request):
# Save resized image (overwrite the original) # Save resized image (overwrite the original)
image.save(profile.profile_picture.path) image.save(profile.profile_picture.path)
# Get all posts
return render(request, 'profile/view_profile.html', {'profile': profile}) 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 @login_required
def edit_profile(request): 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 profile = request.user.profile
if request.method == 'POST': if request.method == 'POST':
...@@ -81,7 +51,7 @@ def edit_profile(request): ...@@ -81,7 +51,7 @@ def edit_profile(request):
else: else:
# Initialize the form with the current username # Initialize the form with the current username
form = ProfileForm(instance=profile, initial={'username': request.user.username}) form = ProfileForm(instance=profile, initial={'username': request.user.username})
return render(request, 'profile/edit_profile.html', {'form': form}) return render(request, 'profile/edit_profile.html', {'form': form})
def user_posts(request, username): def user_posts(request, username):
......
main/register/templates/register/welcome.html
+ 1
− 5
View file @ 2e7fd5e4
{% extends "base.html" %} {% extends "base.html" %}
{% block title %} {% block title %}
<title>Home Page</title> <title>Home Page</title>
{% endblock title %} {% endblock title %}
\ No newline at end of file
{% block header %}
<h1 style="color: #167D8F;">Petgram</h1>
{% endblock header %}
\ No newline at end of file
main/static/css/base.css
+ 2
− 10
View file @ 2e7fd5e4
...@@ -4,7 +4,7 @@ body { ...@@ -4,7 +4,7 @@ body {
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
height: 90vh; min-height: 90vh;
margin: 0; margin: 0;
position: relative; } position: relative; }
...@@ -125,6 +125,7 @@ body { ...@@ -125,6 +125,7 @@ body {
.background-image { .background-image {
position: relative; position: relative;
margin-top: 60px;
width: 200px; width: 200px;
opacity: 0.7; } opacity: 0.7; }
...@@ -200,15 +201,6 @@ form input { ...@@ -200,15 +201,6 @@ form input {
flex-direction: column; flex-direction: column;
color: #167D8F; } 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 { form button, .back-button {
background-color: #FFFFFF; background-color: #FFFFFF;
color: #167D8F; color: #167D8F;
......
main/static/css/base.css.map
+ 1
− 1
View file @ 2e7fd5e4
...@@ -5,5 +5,5 @@ ...@@ -5,5 +5,5 @@
"base.scss" "base.scss"
], ],
"names": [], "names": [],
"mappings": "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" "mappings": "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"
} }
\ No newline at end of file
main/static/css/base.scss
+ 2
− 9
View file @ 2e7fd5e4
...@@ -4,7 +4,7 @@ body { ...@@ -4,7 +4,7 @@ body {
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
height: 90vh; min-height: 90vh;
margin: 0; margin: 0;
position: relative; position: relative;
} }
...@@ -120,6 +120,7 @@ body { ...@@ -120,6 +120,7 @@ body {
.background-image { .background-image {
position: relative; position: relative;
margin-top: 60px;
width: 200px; width: 200px;
opacity: 0.7; opacity: 0.7;
} }
...@@ -206,14 +207,6 @@ form input{ ...@@ -206,14 +207,6 @@ form input{
color: #167D8F; 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 { form button, .back-button {
background-color: #FFFFFF; background-color: #FFFFFF;
color: #167D8F; color: #167D8F;
......
main/templates/base.html
+ 11
− 11
View file @ 2e7fd5e4
...@@ -33,19 +33,19 @@ ...@@ -33,19 +33,19 @@
<a href="#" onclick="confirmLogoff()">Log Off</a> <a href="#" onclick="confirmLogoff()">Log Off</a>
</div> </div>
</div> </div>
{% endblock navbar %} {% endblock navbar %}
<header>
{% block header %}
<img src="{% static 'paw.png' %}" alt="Paw" class="background-image">
<h1>Petgram</h1>
{% endblock header%}
</header>
<main> {% block header %}
{% block content %} <img src="{% static 'paw.png' %}" alt="Paw" class="background-image">
<p>Welcome to Petgram! Here you can share your pet photos and stories.</p> <h1>Petgram</h1>
{% endblock content%} {% 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> </main>
<footer> <footer>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment