From f2c6dd658130be3dbef260dfa03d6bb7c67b7236 Mon Sep 17 00:00:00 2001 From: dev92341 Date: Tue, 5 Feb 2019 03:57:11 -0800 Subject: [PATCH 01/49] Add option to hide features panel --- src/App.js | 3 ++- src/App.vue | 2 +- src/modules/config.js | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/App.js b/src/App.js index 83a61d39..18bff2dd 100644 --- a/src/App.js +++ b/src/App.js @@ -81,7 +81,8 @@ export default { }, unseenNotificationsCount () { return this.unseenNotifications.length - } + }, + showFeaturesPanel () { return this.$store.state.config.showFeaturesPanel } }, methods: { scrollToTop () { diff --git a/src/App.vue b/src/App.vue index 833608ea..b999d889 100644 --- a/src/App.vue +++ b/src/App.vue @@ -29,7 +29,7 @@ - + diff --git a/src/modules/config.js b/src/modules/config.js index c9528f6f..526a7021 100644 --- a/src/modules/config.js +++ b/src/modules/config.js @@ -30,7 +30,8 @@ const defaultState = { interfaceLanguage: browserLocale, scopeCopy: undefined, // instance default subjectLineBehavior: undefined, // instance default - alwaysShowSubjectInput: undefined // instance default + alwaysShowSubjectInput: undefined, // instance default + showFeaturesPanel: true } const config = { From 1ee762cf6e09c12c21d5ba23295a128db493f6fc Mon Sep 17 00:00:00 2001 From: dev92341 Date: Tue, 5 Feb 2019 04:32:00 -0800 Subject: [PATCH 02/49] Add option to hide features panel --- src/App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.vue b/src/App.vue index b999d889..082c6cb6 100644 --- a/src/App.vue +++ b/src/App.vue @@ -29,7 +29,7 @@ - + From e3da156162ce04d987935eeb4649f0aa51590cf2 Mon Sep 17 00:00:00 2001 From: dev92341 Date: Tue, 5 Feb 2019 06:12:14 -0800 Subject: [PATCH 03/49] Add option to hide features panel (About page) --- src/components/about/about.js | 3 +++ src/components/about/about.vue | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/about/about.js b/src/components/about/about.js index b4433b4e..b1ce3c7d 100644 --- a/src/components/about/about.js +++ b/src/components/about/about.js @@ -7,6 +7,9 @@ const About = { InstanceSpecificPanel, FeaturesPanel, TermsOfServicePanel + }, + computed: { + showFeaturesPanel () { return this.$store.state.config.showFeaturesPanel } } } diff --git a/src/components/about/about.vue b/src/components/about/about.vue index bf87e0b8..13dec87c 100644 --- a/src/components/about/about.vue +++ b/src/components/about/about.vue @@ -1,7 +1,7 @@ From c758d103bdb0cb0ac2945722c0666d309cd19a75 Mon Sep 17 00:00:00 2001 From: Xiaofeng An Date: Tue, 5 Feb 2019 13:47:27 -0500 Subject: [PATCH 04/49] fix #308 - show login hint above timeline when user is not logged in --- .../public_timeline/public_timeline.js | 3 ++- .../public_timeline/public_timeline.vue | 25 ++++++++++++++++++- src/i18n/en.json | 3 ++- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/src/components/public_timeline/public_timeline.js b/src/components/public_timeline/public_timeline.js index 9b866be8..e54e49fa 100644 --- a/src/components/public_timeline/public_timeline.js +++ b/src/components/public_timeline/public_timeline.js @@ -4,7 +4,8 @@ const PublicTimeline = { Timeline }, computed: { - timeline () { return this.$store.state.statuses.timelines.public } + timeline () { return this.$store.state.statuses.timelines.public }, + currentUser () { return this.$store.state.users.currentUser } }, created () { this.$store.dispatch('startFetching', 'public') diff --git a/src/components/public_timeline/public_timeline.vue b/src/components/public_timeline/public_timeline.vue index 85d42cca..6fbebd9e 100644 --- a/src/components/public_timeline/public_timeline.vue +++ b/src/components/public_timeline/public_timeline.vue @@ -1,5 +1,28 @@ + + diff --git a/src/i18n/en.json b/src/i18n/en.json index f80d8ba2..51c3026b 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -28,7 +28,8 @@ "password": "Password", "placeholder": "e.g. lain", "register": "Register", - "username": "Username" + "username": "Username", + "hint": "Log in to join discussion" }, "nav": { "about": "About", From bf642ebab7a202939d1be96d83ad250804b58656 Mon Sep 17 00:00:00 2001 From: Xiaofeng An Date: Tue, 5 Feb 2019 13:48:12 -0500 Subject: [PATCH 05/49] fix #308 - hide login hint on desktop --- src/components/public_timeline/public_timeline.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/components/public_timeline/public_timeline.vue b/src/components/public_timeline/public_timeline.vue index 6fbebd9e..7bbface6 100644 --- a/src/components/public_timeline/public_timeline.vue +++ b/src/components/public_timeline/public_timeline.vue @@ -18,6 +18,10 @@ .login-hint { text-align: center; + + @media all and (min-width: 801px) { + display: none; + } a { display: inline-block; From d2436fb9e5f8f512914033a2df33c57545d277a6 Mon Sep 17 00:00:00 2001 From: Xiaofeng An Date: Tue, 5 Feb 2019 15:43:56 -0500 Subject: [PATCH 06/49] move hint inside Timeline component --- .../public_timeline/public_timeline.js | 3 +- .../public_timeline/public_timeline.vue | 29 +------- src/components/timeline/timeline.js | 3 +- src/components/timeline/timeline.vue | 73 ++++++++++++------- 4 files changed, 52 insertions(+), 56 deletions(-) diff --git a/src/components/public_timeline/public_timeline.js b/src/components/public_timeline/public_timeline.js index e54e49fa..9b866be8 100644 --- a/src/components/public_timeline/public_timeline.js +++ b/src/components/public_timeline/public_timeline.js @@ -4,8 +4,7 @@ const PublicTimeline = { Timeline }, computed: { - timeline () { return this.$store.state.statuses.timelines.public }, - currentUser () { return this.$store.state.users.currentUser } + timeline () { return this.$store.state.statuses.timelines.public } }, created () { this.$store.dispatch('startFetching', 'public') diff --git a/src/components/public_timeline/public_timeline.vue b/src/components/public_timeline/public_timeline.vue index 7bbface6..85d42cca 100644 --- a/src/components/public_timeline/public_timeline.vue +++ b/src/components/public_timeline/public_timeline.vue @@ -1,32 +1,5 @@ - - diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js index 85e0a055..2bbb05f3 100644 --- a/src/components/timeline/timeline.js +++ b/src/components/timeline/timeline.js @@ -39,7 +39,8 @@ const Timeline = { body: ['timeline-body'].concat(!this.embedded ? ['panel-body'] : []), footer: ['timeline-footer'].concat(!this.embedded ? ['panel-footer'] : []) } - } + }, + currentUser () { return this.$store.state.users.currentUser } }, components: { Status, diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue index e3eea3bd..74909f6d 100644 --- a/src/components/timeline/timeline.vue +++ b/src/components/timeline/timeline.vue @@ -1,33 +1,42 @@