Skip to content
This repository has been archived by the owner on Sep 9, 2024. It is now read-only.

Minor fixes in manage user profile #25

Merged
merged 3 commits into from
May 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions branches/templates/branches.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ <h3>{{ branch.branch_name }}</h3>
<ul>
{% for opening_hour in branch.opening_hours.all %}
{% if opening_hour.day != 'CL' %}
<li>{{ opening_hour.get_day_display }} {{ opening_hour.open_time|time:"H:i" }} - {{
opening_hour.close_time|time:"H:i" }}</li>
<li>{{ opening_hour.get_day_display }}
{{ opening_hour.open_time|time:"H:i" }} - {{ opening_hour.close_time|time:"H:i" }}</li>
{% else %}
<li>{{ opening_hour.get_day_display }}</li>
{% endif %}
Expand Down
3 changes: 3 additions & 0 deletions users/apps.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@
class UsersConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField'
name = 'users'

def ready(self):
import users.signals
4 changes: 2 additions & 2 deletions users/urls.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from django.urls import path
from . import views
from .views import RegisterView, CustomLoginView, update_user
from .views import RegisterView, CustomLoginView, UpdateUserView
from django.contrib.auth import views as auth_views


Expand All @@ -14,7 +14,7 @@
"profile", views.ViewUserProfileView.as_view(), name="view-profile"
),

path("profile/edit", update_user, name="edit-profile"),
path("profile/edit", UpdateUserView.as_view(), name="edit-profile"),


path("register", RegisterView.as_view(), name="users-register"),
Expand Down
37 changes: 17 additions & 20 deletions users/views.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from django.shortcuts import render, redirect, get_object_or_404
from django.contrib.auth.views import LoginView
from django.views import View
from django.contrib.auth.decorators import login_required
from django.contrib.auth.mixins import LoginRequiredMixin
from .forms import UserUpdateForm
from .forms import RegisterForm, LoginForm, UpdateProfileForm
from .models import Profile
Expand All @@ -11,10 +11,6 @@
from django.contrib import messages


def home(request):
return render(request, 'users/home.html')


class RegisterView(View):
form_class = RegisterForm
initial = {'key': 'value'}
Expand Down Expand Up @@ -54,20 +50,25 @@ def get_success_url(self):
return '/'


@login_required
def update_user(request):
Profile.objects.get_or_create(user=request.user)
user = get_object_or_404(User, pk=request.user.id)
if request.user != user:
# Redirect if the logged-in user is not the same as the user to be edited
return redirect(to='users:view-profile')
class UpdateUserView(LoginRequiredMixin, View):
template_name = 'edit-profile.html'

def get(self, request, *args, **kwargs):
user = get_object_or_404(User, pk=request.user.id)
form = UserUpdateForm(instance=user)
profile_form = UpdateProfileForm(instance=request.user.profile)
return render(request, self.template_name, {'form': form, 'profile_form': profile_form})

def post(self, request, *args, **kwargs):
user = get_object_or_404(User, pk=request.user.id)
if request.user != user:
# Redirect if the logged-in user is not the same as the user to be edited
return redirect(to='users:view-profile')

if request.method == 'POST':
form = UserUpdateForm(request.POST, instance=user)
profile_form = UpdateProfileForm(
request.POST, request.FILES, instance=request.user.profile)
if form.is_valid() and profile_form.is_valid():

profile, created = Profile.objects.get_or_create(user=request.user)
image_path = profile.avatar.path

Expand All @@ -79,14 +80,10 @@ def update_user(request):

# Redirect to a success page
return redirect(to='users:view-profile')
else:
form = UserUpdateForm(instance=user)
profile_form = UpdateProfileForm(instance=request.user.profile)

return render(request, 'edit-profile.html', {'form': form, 'profile_form': profile_form})
return render(request, self.template_name, {'form': form, 'profile_form': profile_form})


class ViewUserProfileView(View):
class ViewUserProfileView(LoginRequiredMixin, View):

def get(self, request):
return render(request, "user-profile.html")
Loading