From ba7a8db0e8f70fa3ee29a0f8d3fd6a8e159ae85c Mon Sep 17 00:00:00 2001
From: Maja Komel <maja.komel@gmail.com>
Date: Tue, 10 Jul 2018 10:14:26 +0200
Subject: [PATCH] UX: show custom footer on user activity and preferences pages
 (#6080)

---
 .../javascripts/discourse/routes/preferences-apps.js.es6 | 5 +++++
 .../discourse/routes/preferences-emails.js.es6           | 5 +++++
 .../discourse/routes/preferences-profile.js.es6          | 5 +++++
 .../routes/preferences-second-factor-backup.js.es6       | 2 ++
 .../discourse/routes/preferences-second-factor.js.es6    | 2 ++
 .../javascripts/discourse/routes/preferences-tags.js.es6 | 5 +++++
 .../discourse/routes/user-activity-bookmarks.js.es6      | 9 ++++++++-
 .../discourse/routes/user-activity-likes-given.js.es6    | 9 ++++++++-
 .../discourse/routes/user-activity-replies.js.es6        | 9 ++++++++-
 9 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/routes/preferences-apps.js.es6
 create mode 100644 app/assets/javascripts/discourse/routes/preferences-emails.js.es6
 create mode 100644 app/assets/javascripts/discourse/routes/preferences-profile.js.es6
 create mode 100644 app/assets/javascripts/discourse/routes/preferences-tags.js.es6

diff --git a/app/assets/javascripts/discourse/routes/preferences-apps.js.es6 b/app/assets/javascripts/discourse/routes/preferences-apps.js.es6
new file mode 100644
index 0000000000..713d79e420
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/preferences-apps.js.es6
@@ -0,0 +1,5 @@
+import RestrictedUserRoute from "discourse/routes/restricted-user";
+
+export default RestrictedUserRoute.extend({
+  showFooter: true
+});
diff --git a/app/assets/javascripts/discourse/routes/preferences-emails.js.es6 b/app/assets/javascripts/discourse/routes/preferences-emails.js.es6
new file mode 100644
index 0000000000..713d79e420
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/preferences-emails.js.es6
@@ -0,0 +1,5 @@
+import RestrictedUserRoute from "discourse/routes/restricted-user";
+
+export default RestrictedUserRoute.extend({
+  showFooter: true
+});
diff --git a/app/assets/javascripts/discourse/routes/preferences-profile.js.es6 b/app/assets/javascripts/discourse/routes/preferences-profile.js.es6
new file mode 100644
index 0000000000..713d79e420
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/preferences-profile.js.es6
@@ -0,0 +1,5 @@
+import RestrictedUserRoute from "discourse/routes/restricted-user";
+
+export default RestrictedUserRoute.extend({
+  showFooter: true
+});
diff --git a/app/assets/javascripts/discourse/routes/preferences-second-factor-backup.js.es6 b/app/assets/javascripts/discourse/routes/preferences-second-factor-backup.js.es6
index 19d245c0c2..afe26e906a 100644
--- a/app/assets/javascripts/discourse/routes/preferences-second-factor-backup.js.es6
+++ b/app/assets/javascripts/discourse/routes/preferences-second-factor-backup.js.es6
@@ -1,6 +1,8 @@
 import RestrictedUserRoute from "discourse/routes/restricted-user";
 
 export default RestrictedUserRoute.extend({
+  showFooter: true,
+
   model() {
     return this.modelFor("user");
   },
diff --git a/app/assets/javascripts/discourse/routes/preferences-second-factor.js.es6 b/app/assets/javascripts/discourse/routes/preferences-second-factor.js.es6
index 8fd0e3a8d5..4bfa3a8491 100644
--- a/app/assets/javascripts/discourse/routes/preferences-second-factor.js.es6
+++ b/app/assets/javascripts/discourse/routes/preferences-second-factor.js.es6
@@ -1,6 +1,8 @@
 import RestrictedUserRoute from "discourse/routes/restricted-user";
 
 export default RestrictedUserRoute.extend({
+  showFooter: true,
+
   model() {
     return this.modelFor("user");
   },
diff --git a/app/assets/javascripts/discourse/routes/preferences-tags.js.es6 b/app/assets/javascripts/discourse/routes/preferences-tags.js.es6
new file mode 100644
index 0000000000..713d79e420
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/preferences-tags.js.es6
@@ -0,0 +1,5 @@
+import RestrictedUserRoute from "discourse/routes/restricted-user";
+
+export default RestrictedUserRoute.extend({
+  showFooter: true
+});
diff --git a/app/assets/javascripts/discourse/routes/user-activity-bookmarks.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-bookmarks.js.es6
index 49ad23d1bc..9ea0b7240e 100644
--- a/app/assets/javascripts/discourse/routes/user-activity-bookmarks.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-activity-bookmarks.js.es6
@@ -3,5 +3,12 @@ import UserAction from "discourse/models/user-action";
 
 export default UserActivityStreamRoute.extend({
   userActionType: UserAction.TYPES["bookmarks"],
-  noContentHelpKey: "user_activity.no_bookmarks"
+  noContentHelpKey: "user_activity.no_bookmarks",
+
+  actions: {
+    didTransition() {
+      this.controllerFor("application").set("showFooter", true);
+      return true;
+    }
+  }
 });
diff --git a/app/assets/javascripts/discourse/routes/user-activity-likes-given.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-likes-given.js.es6
index 148bd6ccae..1ba4104a81 100644
--- a/app/assets/javascripts/discourse/routes/user-activity-likes-given.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-activity-likes-given.js.es6
@@ -3,5 +3,12 @@ import UserAction from "discourse/models/user-action";
 
 export default UserActivityStreamRoute.extend({
   userActionType: UserAction.TYPES["likes_given"],
-  noContentHelpKey: "user_activity.no_likes_given"
+  noContentHelpKey: "user_activity.no_likes_given",
+
+  actions: {
+    didTransition() {
+      this.controllerFor("application").set("showFooter", true);
+      return true;
+    }
+  }
 });
diff --git a/app/assets/javascripts/discourse/routes/user-activity-replies.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-replies.js.es6
index 5917bd4558..3ffc76cd8a 100644
--- a/app/assets/javascripts/discourse/routes/user-activity-replies.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-activity-replies.js.es6
@@ -3,5 +3,12 @@ import UserAction from "discourse/models/user-action";
 
 export default UserActivityStreamRoute.extend({
   userActionType: UserAction.TYPES["posts"],
-  noContentHelpKey: "user_activity.no_replies"
+  noContentHelpKey: "user_activity.no_replies",
+
+  actions: {
+    didTransition() {
+      this.controllerFor("application").set("showFooter", true);
+      return true;
+    }
+  }
 });