Skip to content

Fix avatar image bug. Fixes #586 #595

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
A1L13N merged 5 commits into from
May 11, 2025
Merged

Fix avatar image bug. Fixes #586 #595

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4706ce3
Fix avatar image bug. Fixes #586
abdelrahman390 May 10, 2025
81d559c
edited
abdelrahman390 May 10, 2025
bd435f7
final
abdelrahman390 May 10, 2025
d3363e7
Merge branch 'main' into avatar-image-update-fixed
A1L13N May 11, 2025
d641dac
Merge branch 'main' into avatar-image-update-fixed
A1L13N May 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 52 additions & 31 deletions web/templates/profile.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,37 +30,39 @@ <h2 class="text-2xl font-bold">Profile</h2>
<span class="bg-teal-100 text-teal-800 dark:bg-teal-900 dark:text-teal-200 text-sm font-medium px-3 py-1 rounded-full">Teacher</span>
{% endif %}
</div>
<!-- Profile Picture -->
<div class="mb-6 flex flex-col items-center">
{% if user.profile.custom_avatar %}
<div class="w-full h-full p-1.5 transform hover:scale-105 transition-transform duration-200">
<div class="w-full h-full overflow-hidden rounded-full flex items-center justify-center">
{{ user.profile.custom_avatar.svg|safe }}
<!-- Main Profile Form -->
<form method="post"
id="main-form"
enctype="multipart/form-data"
class="space-y-6">
{% csrf_token %}
<!-- Profile Picture -->
<div class="mb-6 flex flex-col items-center">
{% if user.profile.custom_avatar %}
<div class="w-full h-full p-1.5 transform hover:scale-105 transition-transform duration-200">
<div class="w-full h-full overflow-hidden rounded-full flex items-center justify-center">
{{ user.profile.custom_avatar.svg|safe }}
</div>
</div>
</div>
{% elif user.profile.avatar %}
<img src="{{ user.profile.avatar.url }}"
alt="{{ user.username }}'s avatar"
class="w-32 h-32 rounded-full object-cover mb-4"
height="128"
width="128" />
{% else %}
{% if user.profile.is_teacher %}
<img src="{% static 'images/default_teacher.png' %}"
{% elif user.profile.avatar %}
<img src="{{ user.profile.avatar.url }}"
alt="{{ user.username }}'s avatar"
class="w-32 h-32 rounded-full object-cover mb-4"
height="128"
width="128" />
{% else %}
<div class="w-32 h-32 rounded-full bg-orange-500 flex items-center justify-center text-white text-4xl mb-4">
{{ user.first_name|first|default:user.username|first|upper }}
</div>
{% if user.profile.is_teacher %}
<img src="{% static 'images/default_teacher.png' %}"
alt="{{ user.username }}'s avatar"
class="w-32 h-32 rounded-full object-cover mb-4"
height="128"
width="128" />
{% else %}
<div class="w-32 h-32 rounded-full bg-orange-500 flex items-center justify-center text-white text-4xl mb-4">
{{ user.first_name|first|default:user.username|first|upper }}
</div>
{% endif %}
Comment thread
abdelrahman390 marked this conversation as resolved.
{% endif %}
{% endif %}
<form method="post"
enctype="multipart/form-data"
class="w-full flex flex-col items-center">
{% csrf_token %}
<label for="avatar-upload"
class="cursor-pointer mb-4 text-sm text-teal-600 dark:text-teal-400 hover:text-teal-700 dark:hover:text-teal-300">
<span class="flex items-center">
Expand All @@ -74,13 +76,9 @@ <h2 class="text-2xl font-bold">Profile</h2>
class="hidden"
onchange="this.form.submit()" />
</label>
</form>
<h3 class="text-lg font-medium">{{ user.username }}</h3>
{% if user.get_full_name %}<p class="text-sm text-gray-500 dark:text-gray-400">{{ user.get_full_name }}</p>{% endif %}
</div>
<!-- Main Profile Form -->
<form method="post" enctype="multipart/form-data" class="space-y-6">
{% csrf_token %}
<h3 class="text-lg font-medium">{{ user.username }}</h3>
{% if user.get_full_name %}<p class="text-sm text-gray-500 dark:text-gray-400">{{ user.get_full_name }}</p>{% endif %}
</div>
<!-- Add hidden avatar field for form processing -->
{{ form.avatar.as_hidden }}
Comment thread
abdelrahman390 marked this conversation as resolved.
<div class="p-5">
Expand Down Expand Up @@ -529,6 +527,29 @@ <h2 class="text-xl font-semibold mb-6">My Badges</h2>
</div>
</div>
</div>
<script>
const avatarInput = document.getElementById('avatar-upload');
const mainForm = document.getElementById('main-form');

avatarInput.addEventListener('change', function() {
// Set a flag indicating the avatar was changed
sessionStorage.setItem('avatarChanged', 'true');
});

mainForm.addEventListener('submit', function(e) {
e.preventDefault();

if (sessionStorage.getItem('avatarChanged') !== 'true') {
// disable the file input so the browser will not include it
avatarInput.disabled = true;
}

// Reset the flag
sessionStorage.removeItem('avatarChanged');

mainForm.submit()
});
</script>
{% if discount_codes %}
<div class="bg-white dark:bg-gray-800 rounded-lg shadow p-6 mt-6">
<h2 class="text-xl font-bold mb-4">Your Discount Codes</h2>
Expand Down