From b0ecec2e18526e3674a7b445a41d9b37ef735a09 Mon Sep 17 00:00:00 2001 From: sokumon Date: Wed, 1 Jan 2025 03:26:56 +0530 Subject: [PATCH 1/2] fix: center me page and fix logout --- frappe/public/js/frappe-web.bundle.js | 1 + frappe/public/js/frappe/utils/logout.js | 11 +++++++++++ frappe/www/logout.html | 11 +++++++++++ frappe/www/logout.py | 7 +++++++ frappe/www/me.css | 10 ++++++++++ frappe/www/third_party_apps.html | 10 ++++++++++ frappe/www/update-password.html | 13 +++++++++++++ 7 files changed, 63 insertions(+) create mode 100644 frappe/public/js/frappe/utils/logout.js create mode 100644 frappe/www/logout.html create mode 100644 frappe/www/logout.py create mode 100644 frappe/www/me.css diff --git a/frappe/public/js/frappe-web.bundle.js b/frappe/public/js/frappe-web.bundle.js index 36064767fb..077a2c1c86 100644 --- a/frappe/public/js/frappe-web.bundle.js +++ b/frappe/public/js/frappe-web.bundle.js @@ -24,3 +24,4 @@ import "./bootstrap-4-web.bundle"; import "../../website/js/website.js"; import "./frappe/socketio_client.js"; +import "./frappe/utils/logout.js"; diff --git a/frappe/public/js/frappe/utils/logout.js b/frappe/public/js/frappe/utils/logout.js new file mode 100644 index 0000000000..9bae42a4fd --- /dev/null +++ b/frappe/public/js/frappe/utils/logout.js @@ -0,0 +1,11 @@ +frappe.logout = function () { + frappe.call({ + method: "logout", + callback: function (r) { + if (r.exc) { + return; + } + window.location.href = "/login"; + }, + }); +}; diff --git a/frappe/www/logout.html b/frappe/www/logout.html new file mode 100644 index 0000000000..3da20f1bfe --- /dev/null +++ b/frappe/www/logout.html @@ -0,0 +1,11 @@ +{% from "frappe/templates/includes/avatar_macro.html" import avatar %} +{% extends "templates/web.html" %} +{% block navbar %}{% endblock %} +{% block footer %}{% endblock %} +{% block page_content %} + +{% endblock %} \ No newline at end of file diff --git a/frappe/www/logout.py b/frappe/www/logout.py new file mode 100644 index 0000000000..20b97422af --- /dev/null +++ b/frappe/www/logout.py @@ -0,0 +1,7 @@ +import frappe + +no_cache = 1 + + +def get_context(context): + pass diff --git a/frappe/www/me.css b/frappe/www/me.css new file mode 100644 index 0000000000..4465fd6798 --- /dev/null +++ b/frappe/www/me.css @@ -0,0 +1,10 @@ +.container { + display: flex; + flex-direction: column; + justify-content: center; + height: 100vh; + max-width: 100vw; + padding: 0; + margin: 0; + background: var(--bg-light-gray); +} \ No newline at end of file diff --git a/frappe/www/third_party_apps.html b/frappe/www/third_party_apps.html index e12e529b39..6ee076e85e 100644 --- a/frappe/www/third_party_apps.html +++ b/frappe/www/third_party_apps.html @@ -84,5 +84,15 @@ body { align-items: center; } +.container { + display: flex; + flex-direction: column; + justify-content: center; + height: 100vh; + max-width: 100vw; + padding: 0; + margin: 0; +} + {% endblock %} diff --git a/frappe/www/update-password.html b/frappe/www/update-password.html index 633282a75e..bd13302bca 100644 --- a/frappe/www/update-password.html +++ b/frappe/www/update-password.html @@ -12,6 +12,19 @@ background-color: var(--subtle-fg); font-size: var(--text-base); } + .container { + display: flex; + flex-direction: column; + justify-content: center; + height: 100vh; + max-width: 100vw; + padding: 0; + margin: 0; + } + /* styling the signup link */ + .portal-section, .pb-0{ + display: block; + }
From 7c8c1e73a4974ee17df982a18575a68e8cc912a1 Mon Sep 17 00:00:00 2001 From: Akhil Narang Date: Wed, 1 Jan 2025 10:41:41 +0530 Subject: [PATCH 2/2] chore: format Signed-off-by: Akhil Narang --- frappe/www/logout.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/www/logout.html b/frappe/www/logout.html index 3da20f1bfe..bd884c4202 100644 --- a/frappe/www/logout.html +++ b/frappe/www/logout.html @@ -4,8 +4,8 @@ {% block footer %}{% endblock %} {% block page_content %} -{% endblock %} \ No newline at end of file +{% endblock %}