From fd3bb6159e4ec07aa78a947f39f8b7e6aa9dd285 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Sat, 26 Jan 2019 16:09:30 +0530
Subject: [PATCH] fix: Deprecate profile page

- Route to My Account page
---
 frappe/hooks.py                  |  3 +-
 frappe/templates/web.html        |  4 ++-
 frappe/www/about.html            |  2 +-
 frappe/www/me.html               | 55 ++++++++++----------------------
 frappe/www/profile.html          | 35 --------------------
 frappe/www/third_party_apps.html |  8 ++---
 6 files changed, 27 insertions(+), 80 deletions(-)
 delete mode 100644 frappe/www/profile.html

diff --git a/frappe/hooks.py b/frappe/hooks.py
index 67ab997661..037c074f9f 100644
--- a/frappe/hooks.py
+++ b/frappe/hooks.py
@@ -54,7 +54,8 @@ web_include_css = [
 website_route_rules = [
 	{"from_route": "/blog/<category>", "to_route": "Blog Post"},
 	{"from_route": "/kb/<category>", "to_route": "Help Article"},
-	{"from_route": "/newsletters", "to_route": "Newsletter"}
+	{"from_route": "/newsletters", "to_route": "Newsletter"},
+	{"from_route": "/profile", "to_route": "me"},
 ]
 
 write_file_keys = ["file_url", "file_name"]
diff --git a/frappe/templates/web.html b/frappe/templates/web.html
index 586c51b57a..b4276072fd 100644
--- a/frappe/templates/web.html
+++ b/frappe/templates/web.html
@@ -37,8 +37,10 @@ id="page-{{ name or route }}" data-path="{{ pathname }}" {%- if page_or_generato
 {% if show_sidebar %}
 <div class="container">
 	<div class="row" {{ container_attributes() }}>
-			<div class="pt-4 col-sm-2 border-right sidebar-column">
+			<div class="pt-4 col-sm-2 border-right sidebar-column d-none d-sm-block">
+				{% block page_sidebar %}
 				{% include "templates/includes/web_sidebar.html" %}
+				{% endblock %}
 			</div>
 		<div class="col-sm-10 main-column">
 			{{ main_content() }}
diff --git a/frappe/www/about.html b/frappe/www/about.html
index 14ac0a216d..94f7561a82 100644
--- a/frappe/www/about.html
+++ b/frappe/www/about.html
@@ -2,7 +2,7 @@
 
 {% block title %}About Us{% endblock %}
 {% block page_sidebar %}
-{% include "templates/pages/web_sidebar.html" %}
+{% include "templates/includes/web_sidebar.html" %}
 {% endblock %}
 {% block page_content %}
 
diff --git a/frappe/www/me.html b/frappe/www/me.html
index 68cb09153d..402fdecf59 100644
--- a/frappe/www/me.html
+++ b/frappe/www/me.html
@@ -3,48 +3,27 @@
 {% block title %}{{ _("My Account") }}{% endblock %}
 {% block header %}<h1>{{ _("My Account") }}</h1>{% endblock %}
 
-{% block page_sidebar %}
-{% include "templates/pages/web_sidebar.html" %}
-{% endblock %}
-
 {% block page_content %}
-
 <!-- no-cache -->
-<div class="row your-account-info hidden-xs" style="min-height: 400px; padding-bottom: 50px;">
+<div class="row your-account-info d-none d-sm-block">
 	<div class="col-sm-4">
-			<span class="user-image-myaccount"></span>
-			<div>
-				<ul class="list-unstyled">
-					<li><a href="/update-password">
-						<h6 class="text-muted">{{ _("Reset Password") }}</h6>
-					</a></li>
-					<li><a href="/update-profile?name={{ user }}">
-						<h6 class="text-muted">{{ _("Edit Profile") }}</h6>
-					</a></li>
-					<li><a href="/third_party_apps">
-						<h6 class="text-muted">{{ _("Manage Third Party Apps") }}</h6>
-					</a></li>
-				</ul>
-			</div>
-		</div>
-	<div class="col-sm-8 pull-left">
-		<div class="row">
-			<div class="col-xs-4 text-right text-muted">{{ _("Name") }}</div>
-			<div class="col-xs-8">{{ fullname }}</div>
-		</div>
+		<ul class="list-unstyled">
+			<li><a href="/update-password">{{ _("Reset Password") }}</a></li>
+			<li><a href="/update-profile?name={{ user }}">{{ _("Edit Profile") }}</a></li>
+			<li><a href="/third_party_apps">{{ _("Manage Third Party Apps") }}</a></li>
+		</ul>
 	</div>
 </div>
-<div class="col-xs-12 hide" style="min-height: 400px; padding: 10px 0 0 0">
-	<ul class="list-group">
-		<a class="list-group-item" href="/profile">
-            {{ _("Profile") }}
-		</a>
-		{% for item in sidebar_items -%}
-			<a class="list-group-item" href="{{ item.route }}"
-				{% if item.target %}target="{{ item.target }}"{% endif %}>
-				{{ _(item.title or item.label) }}
-			</a>
-		{%- endfor %}
-	</ul>
+<div class="row d-block d-sm-none">
+	<div class="col-12">
+		<ul class="list-group">
+			{% for item in sidebar_items -%}
+				<a class="list-group-item" href="{{ item.route }}"
+					{% if item.target %}target="{{ item.target }}"{% endif %}>
+					{{ _(item.title or item.label) }}
+				</a>
+			{%- endfor %}
+		</ul>
+	</div>
 </div>
 {% endblock %}
diff --git a/frappe/www/profile.html b/frappe/www/profile.html
deleted file mode 100644
index 8a57e5f9a5..0000000000
--- a/frappe/www/profile.html
+++ /dev/null
@@ -1,35 +0,0 @@
-{% extends "templates/web.html" %}
-
-{% block title %}{{ _("Profile") }}{% endblock %}
-{% block header %}<h1>{{ _("Profile") }}</h1>{% endblock %}
-
-{% block page_sidebar %}
-{% include "templates/pages/web_sidebar.html" %}
-{% endblock %}
-
-{% block page_content %}
-
-<div class="row your-account-info {% if pathname=="me" %} hidden-xs {% endif %} " style="min-height: 400px; padding-bottom: 50px;">
-	<div class="col-sm-4">
-			<span class="user-image-myaccount"></span>
-			<div>
-				<ul class="list-unstyled">
-					<li><a href="/update-password">
-						<h6 class="text-muted">{{ _("Reset Password") }}</h6>
-					</a></li>
-					<li><a href="/update-profile?name={{ user }}">
-						<h6 class="text-muted">{{ _("Edit Profile") }}</h6>
-					</a></li>
-
-				</ul>
-			</div>
-		</div>
-	<div class="col-sm-8 pull-left">
-		<div class="row">
-			<div class="col-xs-4 text-right text-muted">{{ _("Name") }}</div>
-			<div class="col-xs-8">{{ fullname }}</div>
-		</div>
-	</div>
-</div>
-
-{% endblock %}
\ No newline at end of file
diff --git a/frappe/www/third_party_apps.html b/frappe/www/third_party_apps.html
index baf62fa641..6f928d6161 100644
--- a/frappe/www/third_party_apps.html
+++ b/frappe/www/third_party_apps.html
@@ -6,7 +6,7 @@
 {% endblock %}
 
 {% block page_sidebar %}
-{% include "templates/pages/web_sidebar.html" %}
+{% include "templates/includes/web_sidebar.html" %}
 {% endblock %}
 
 {% block style %}
@@ -26,7 +26,7 @@
 				<div class="well">
 					<div class="text-muted">{{ _("This will log out {0} from all other devices".format(app.app_name)) }}</div>
 					<div class="padding"></div>
-					<div class="text-right">						
+					<div class="text-right">
 						<button class="btn btn-default" onclick="location.href = '/third_party_apps';">Cancel</button>
 						<button class="btn btn-danger btn-delete-app" data-client_id="{{ app.client_id }}">Revoke</button>
 					</div>
@@ -46,7 +46,7 @@
 				<small class="text-right">
 					{{ _("logged in") }}&nbsp;{{ frappe.utils.pretty_date(app.creation) }}
 				</small>
-			</div>			
+			</div>
 			<div class="col-xs-2 text-right small text-muted">
 				<a class="btn btn-xs btn-link" href="/third_party_apps?app={{ app.name }}">{{ _("Revoke") }}</a>
 			</div>
@@ -54,7 +54,7 @@
 	</div>
 	{% endfor %}
 {% else %}
-	<div class="text-center text-muted">
+	<div class="text-muted">
 		{{ _("No Active Sessions")}}
 	</div>
 {% endif %}