diff --git a/dashboard/static/css/admin.css b/dashboard/static/css/admin.css
index d0d0e03..918fc66 100644
--- a/dashboard/static/css/admin.css
+++ b/dashboard/static/css/admin.css
@@ -217,7 +217,7 @@ body {
}
.message.success {
- background-color: #4CAF50;
+ background-color: #cda45e;
/* Green */
}
@@ -258,3 +258,8 @@ body {
background-color: #cda45e;
color: white;
}
+
+.alert-success {
+ background-color: #cda45e;
+ color: white;
+}
\ No newline at end of file
diff --git a/dashboard/views.py b/dashboard/views.py
index 003e80d..4b5480e 100644
--- a/dashboard/views.py
+++ b/dashboard/views.py
@@ -1,3 +1,4 @@
+from django.db import IntegrityError
from django.shortcuts import render, redirect, get_object_or_404
from django.contrib import messages
from django.views import View
@@ -114,25 +115,32 @@ def post(self, request, branch_id):
request.POST, queryset=opening_hours)
if opening_hour_formset.is_valid():
- # Proceed with saving the formset if it's valid
- opening_hour_instances = opening_hour_formset.save(commit=False)
- for opening_hour_instance in opening_hour_instances:
- opening_hour_instance.branch = branch # Set the branch before saving
- opening_hour_instance.save()
-
- for obj in opening_hour_formset.deleted_objects:
- obj.delete()
- messages.success(request, 'Opening hours updated successfully')
- return redirect('dashboard:branches.edit', pk=branch_id)
+ try:
+ # Save the formset if it's valid
+ opening_hour_instances = opening_hour_formset.save(
+ commit=False)
+ for opening_hour_instance in opening_hour_instances:
+ opening_hour_instance.branch = branch # Set the branch before saving
+ opening_hour_instance.save()
+
+ for obj in opening_hour_formset.deleted_objects:
+ obj.delete()
+
+ messages.success(request, 'Opening hours updated successfully')
+ return redirect('dashboard:branches.edit', pk=branch_id)
+ except IntegrityError as e:
+ # Handle the integrity error for duplicate days
+ messages.error(
+ request, 'A duplicate entry exists for the same day.')
else:
# If formset is invalid, display the formset with errors
print(opening_hour_formset.errors)
- messages.error(
- request, 'Please correct the days or time errors below.')
- return render(request, 'branches/update-opening-hours.html', {
- 'branch': branch,
- 'opening_hour_formset': opening_hour_formset,
- })
+ messages.error(request, 'Please correct the errors below.')
+
+ return render(request, 'branch/update-opening-hours.html', {
+ 'branch': branch,
+ 'opening_hour_formset': opening_hour_formset,
+ })
class ViewDeleteBranchView(View):
diff --git a/static/assets/img/event-birthday.jpg b/static/assets/img/event-birthday.jpg
deleted file mode 100644
index 6b299bd..0000000
Binary files a/static/assets/img/event-birthday.jpg and /dev/null differ
diff --git a/static/assets/img/event-custom.jpg b/static/assets/img/event-custom.jpg
deleted file mode 100644
index 2f523cd..0000000
Binary files a/static/assets/img/event-custom.jpg and /dev/null differ
diff --git a/static/assets/img/event-private.jpg b/static/assets/img/event-private.jpg
deleted file mode 100644
index d2ef514..0000000
Binary files a/static/assets/img/event-private.jpg and /dev/null differ
diff --git a/static/assets/img/events-bg.jpg b/static/assets/img/events-bg.jpg
deleted file mode 100644
index b25f428..0000000
Binary files a/static/assets/img/events-bg.jpg and /dev/null differ
diff --git a/static/assets/img/gallery/gallery-1.jpg b/static/assets/img/gallery/gallery-1.jpg
deleted file mode 100644
index 155a20e..0000000
Binary files a/static/assets/img/gallery/gallery-1.jpg and /dev/null differ
diff --git a/static/assets/img/gallery/gallery-2.jpg b/static/assets/img/gallery/gallery-2.jpg
deleted file mode 100644
index 5387067..0000000
Binary files a/static/assets/img/gallery/gallery-2.jpg and /dev/null differ
diff --git a/static/assets/img/gallery/gallery-3.jpg b/static/assets/img/gallery/gallery-3.jpg
deleted file mode 100644
index 885b9cd..0000000
Binary files a/static/assets/img/gallery/gallery-3.jpg and /dev/null differ
diff --git a/static/assets/img/gallery/gallery-4.jpg b/static/assets/img/gallery/gallery-4.jpg
deleted file mode 100644
index f7417e4..0000000
Binary files a/static/assets/img/gallery/gallery-4.jpg and /dev/null differ
diff --git a/static/assets/img/gallery/gallery-5.jpg b/static/assets/img/gallery/gallery-5.jpg
deleted file mode 100644
index 8fc88d3..0000000
Binary files a/static/assets/img/gallery/gallery-5.jpg and /dev/null differ
diff --git a/static/assets/img/gallery/gallery-6.jpg b/static/assets/img/gallery/gallery-6.jpg
deleted file mode 100644
index e2719b8..0000000
Binary files a/static/assets/img/gallery/gallery-6.jpg and /dev/null differ
diff --git a/static/assets/img/gallery/gallery-7.jpg b/static/assets/img/gallery/gallery-7.jpg
deleted file mode 100644
index 8a5950b..0000000
Binary files a/static/assets/img/gallery/gallery-7.jpg and /dev/null differ
diff --git a/static/assets/img/gallery/gallery-8.jpg b/static/assets/img/gallery/gallery-8.jpg
deleted file mode 100644
index 4b99b83..0000000
Binary files a/static/assets/img/gallery/gallery-8.jpg and /dev/null differ
diff --git a/static/assets/img/menu/bread-barrel.jpg b/static/assets/img/menu/bread-barrel.jpg
deleted file mode 100644
index 566ecc1..0000000
Binary files a/static/assets/img/menu/bread-barrel.jpg and /dev/null differ
diff --git a/static/assets/img/menu/caesar.jpg b/static/assets/img/menu/caesar.jpg
deleted file mode 100644
index 00aee28..0000000
Binary files a/static/assets/img/menu/caesar.jpg and /dev/null differ
diff --git a/static/assets/img/menu/cake.jpg b/static/assets/img/menu/cake.jpg
deleted file mode 100644
index dc15047..0000000
Binary files a/static/assets/img/menu/cake.jpg and /dev/null differ
diff --git a/static/assets/img/menu/greek-salad.jpg b/static/assets/img/menu/greek-salad.jpg
deleted file mode 100644
index 8f8d02f..0000000
Binary files a/static/assets/img/menu/greek-salad.jpg and /dev/null differ
diff --git a/static/assets/img/menu/lobster-bisque.jpg b/static/assets/img/menu/lobster-bisque.jpg
deleted file mode 100644
index e772db2..0000000
Binary files a/static/assets/img/menu/lobster-bisque.jpg and /dev/null differ
diff --git a/static/assets/img/menu/lobster-roll.jpg b/static/assets/img/menu/lobster-roll.jpg
deleted file mode 100644
index 1da93f5..0000000
Binary files a/static/assets/img/menu/lobster-roll.jpg and /dev/null differ
diff --git a/static/assets/img/menu/mozzarella.jpg b/static/assets/img/menu/mozzarella.jpg
deleted file mode 100644
index 610ed7c..0000000
Binary files a/static/assets/img/menu/mozzarella.jpg and /dev/null differ
diff --git a/static/assets/img/menu/spinach-salad.jpg b/static/assets/img/menu/spinach-salad.jpg
deleted file mode 100644
index c1dc3b2..0000000
Binary files a/static/assets/img/menu/spinach-salad.jpg and /dev/null differ
diff --git a/static/assets/img/menu/tuscan-grilled.jpg b/static/assets/img/menu/tuscan-grilled.jpg
deleted file mode 100644
index 4e5d31c..0000000
Binary files a/static/assets/img/menu/tuscan-grilled.jpg and /dev/null differ
diff --git a/static/assets/img/specials-1.png b/static/assets/img/specials-1.png
deleted file mode 100644
index 650b67d..0000000
Binary files a/static/assets/img/specials-1.png and /dev/null differ
diff --git a/static/assets/img/specials-2.png b/static/assets/img/specials-2.png
deleted file mode 100644
index ac9e580..0000000
Binary files a/static/assets/img/specials-2.png and /dev/null differ
diff --git a/static/assets/img/specials-3.png b/static/assets/img/specials-3.png
deleted file mode 100644
index 2cdb043..0000000
Binary files a/static/assets/img/specials-3.png and /dev/null differ
diff --git a/static/assets/img/specials-4.png b/static/assets/img/specials-4.png
deleted file mode 100644
index 27f8912..0000000
Binary files a/static/assets/img/specials-4.png and /dev/null differ
diff --git a/static/assets/img/specials-5.png b/static/assets/img/specials-5.png
deleted file mode 100644
index e9f7b2f..0000000
Binary files a/static/assets/img/specials-5.png and /dev/null differ
diff --git a/static/assets/img/testimonials/testimonials-1.jpg b/static/assets/img/testimonials/testimonials-1.jpg
deleted file mode 100644
index cf84417..0000000
Binary files a/static/assets/img/testimonials/testimonials-1.jpg and /dev/null differ
diff --git a/static/assets/img/testimonials/testimonials-2.jpg b/static/assets/img/testimonials/testimonials-2.jpg
deleted file mode 100644
index 8adbd7b..0000000
Binary files a/static/assets/img/testimonials/testimonials-2.jpg and /dev/null differ
diff --git a/static/assets/img/testimonials/testimonials-3.jpg b/static/assets/img/testimonials/testimonials-3.jpg
deleted file mode 100644
index 03e5938..0000000
Binary files a/static/assets/img/testimonials/testimonials-3.jpg and /dev/null differ
diff --git a/static/assets/img/testimonials/testimonials-4.jpg b/static/assets/img/testimonials/testimonials-4.jpg
deleted file mode 100644
index 6595cee..0000000
Binary files a/static/assets/img/testimonials/testimonials-4.jpg and /dev/null differ
diff --git a/static/assets/img/testimonials/testimonials-5.jpg b/static/assets/img/testimonials/testimonials-5.jpg
deleted file mode 100644
index cb0a641..0000000
Binary files a/static/assets/img/testimonials/testimonials-5.jpg and /dev/null differ
diff --git a/users/static/users.css b/users/static/users.css
index 18291d2..7c57c39 100644
--- a/users/static/users.css
+++ b/users/static/users.css
@@ -93,3 +93,8 @@ h2 {
margin-top: 15px;
text-align: center;
}
+
+.alert-success {
+ background-color: #cda45e;
+ color: white;
+}
\ No newline at end of file
diff --git a/users/templates/profile-detail.html b/users/templates/profile-detail.html
index a77d6df..2fb72b7 100644
--- a/users/templates/profile-detail.html
+++ b/users/templates/profile-detail.html
@@ -2,10 +2,25 @@
{% load static %}
+{% block css_files %}
+
+
+
+{% endblock %}
+
{% block content %}