From 6b15f0b3f9b446b2db0b826e1b3f7956b6726b40 Mon Sep 17 00:00:00 2001 From: Keshav Priyadarshi Date: Tue, 7 Jan 2025 13:41:22 +0530 Subject: [PATCH 1/6] Use consistent template for 403/404 error page Signed-off-by: Keshav Priyadarshi --- fedcode/templates/403.html | 4 ++-- fedcode/templates/404.html | 4 ++-- fedcode/views.py | 10 +--------- federatedcode/settings.py | 3 --- 4 files changed, 5 insertions(+), 16 deletions(-) diff --git a/fedcode/templates/403.html b/fedcode/templates/403.html index ef9c98c..f054a1e 100644 --- a/fedcode/templates/403.html +++ b/fedcode/templates/403.html @@ -5,7 +5,7 @@ {% endblock %} {% block content %} -
+

@@ -14,7 +14,7 @@

You do not have permission to access this page.

- Explore available packages + Explore available packages

diff --git a/fedcode/templates/404.html b/fedcode/templates/404.html index 1cebca3..196bb50 100644 --- a/fedcode/templates/404.html +++ b/fedcode/templates/404.html @@ -5,7 +5,7 @@ {% endblock %} {% block content %} -
+

@@ -14,7 +14,7 @@

Sorry, the page you're looking for does not exist.

- Explore available packages + Explore available packages

diff --git a/fedcode/views.py b/fedcode/views.py index 23d6f20..de95a09 100644 --- a/fedcode/views.py +++ b/fedcode/views.py @@ -234,7 +234,7 @@ def wrapper(request, *args, **kwargs): if hasattr(request.user, "service"): return view(request, *args, **kwargs) else: - return HttpResponseForbidden() + raise PermissionDenied("You are not authorized to view this page.") return wrapper @@ -887,11 +887,3 @@ def revoke_token(request): }, ) return JsonResponse(json.loads(r.content), status=r.status_code, content_type=AP_CONTENT_TYPE) - - -def permission_denied(request, exception=None): - return render(request, "403.html", {}) - - -def page_not_found(request, exception=None): - return render(request, "404.html", {}) diff --git a/federatedcode/settings.py b/federatedcode/settings.py index 9a5b8d6..bc7285b 100644 --- a/federatedcode/settings.py +++ b/federatedcode/settings.py @@ -280,6 +280,3 @@ "django.contrib.auth.backends.ModelBackend", "oauth2_provider.backends.OAuth2Backend", ) - -HANDLER403 = "fedcode.views.permission_denied" -HANDLER404 = "fedcode.views.page_not_found" From e8037f88c90a68c9eab4053b56d628a10cd23b48 Mon Sep 17 00:00:00 2001 From: Keshav Priyadarshi Date: Tue, 7 Jan 2025 13:44:41 +0530 Subject: [PATCH 2/6] Add template for handling 500 errors Signed-off-by: Keshav Priyadarshi --- fedcode/templates/500.html | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 fedcode/templates/500.html diff --git a/fedcode/templates/500.html b/fedcode/templates/500.html new file mode 100644 index 0000000..5877dee --- /dev/null +++ b/fedcode/templates/500.html @@ -0,0 +1,21 @@ +{% extends "base.html" %} + +{% block title %} +Something Went Wrong +{% endblock %} + +{% block content %} +
+
+
+

+ Oops! Something went wrong. +

+

+ We're experiencing some technical issues at the moment. Please try again later. +

+ Explore available packages +
+
+
+{% endblock %} \ No newline at end of file From beda12f092a8786049e6a173bf81ae91a2ddfad9 Mon Sep 17 00:00:00 2001 From: Keshav Priyadarshi Date: Tue, 7 Jan 2025 13:47:25 +0530 Subject: [PATCH 3/6] Use two-thirds width for create-repo page Signed-off-by: Keshav Priyadarshi --- fedcode/templates/create_repository.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fedcode/templates/create_repository.html b/fedcode/templates/create_repository.html index bc78b91..1bfdcb4 100644 --- a/fedcode/templates/create_repository.html +++ b/fedcode/templates/create_repository.html @@ -7,7 +7,7 @@ {% block content %}
-
+
{% if form.errors %}
@@ -19,6 +19,7 @@
{% endif %}

Add Git Repository

+
{% csrf_token %}
From aeca6b78c0367db7e64b2288151227adde0741c6 Mon Sep 17 00:00:00 2001 From: Keshav Priyadarshi Date: Tue, 7 Jan 2025 13:49:13 +0530 Subject: [PATCH 4/6] Use info style for 'Browse All Packages' button Signed-off-by: Keshav Priyadarshi --- fedcode/templates/home.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fedcode/templates/home.html b/fedcode/templates/home.html index 57ae7b1..14d99eb 100644 --- a/fedcode/templates/home.html +++ b/fedcode/templates/home.html @@ -17,11 +17,10 @@

My Packages

- {% if not page_note %}

Follow the packages to see the updates.

- Browse All Packages + Browse All Packages
{% else %}
@@ -80,4 +79,4 @@

My Packages

-{% endblock %} +{% endblock %} \ No newline at end of file From 3286e00e9fd7c350a492044816341ee2848717b9 Mon Sep 17 00:00:00 2001 From: Keshav Priyadarshi Date: Tue, 7 Jan 2025 13:50:49 +0530 Subject: [PATCH 5/6] Remove border-radius from the navbar Signed-off-by: Keshav Priyadarshi --- fedcode/templates/navbar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedcode/templates/navbar.html b/fedcode/templates/navbar.html index 78492ee..fee93d0 100644 --- a/fedcode/templates/navbar.html +++ b/fedcode/templates/navbar.html @@ -1,6 +1,6 @@ {% load static %} -