From c758d103bdb0cb0ac2945722c0666d309cd19a75 Mon Sep 17 00:00:00 2001 From: Xiaofeng An Date: Tue, 5 Feb 2019 13:47:27 -0500 Subject: [PATCH 01/28] 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 9b866be89d..e54e49fa96 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 85d42ccae2..6fbebd9ef8 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 f80d8ba20f..51c3026b93 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 02/28] 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 6fbebd9ef8..7bbface6a3 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 03/28] 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 e54e49fa96..9b866be89d 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 7bbface6a3..85d42ccae2 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 85e0a05528..2bbb05f3f9 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 e3eea3bdb6..74909f6d0b 100644 --- a/src/components/timeline/timeline.vue +++ b/src/components/timeline/timeline.vue @@ -1,33 +1,42 @@