From a83572471d25909cd4cff7af01a4856b911d8b97 Mon Sep 17 00:00:00 2001 From: AkiraFukushima Date: Fri, 30 Mar 2018 16:48:32 +0900 Subject: [PATCH 1/4] refs #116 Show account profile in side bar --- .../components/TimelineSpace/Contents.vue | 2 +- .../TimelineSpace/Contents/Cards/Toot.vue | 6 +- .../TimelineSpace/Contents/SideBar.vue | 22 +++- .../Contents/SideBar/AccountProfile.vue | 106 ++++++++++++++++++ .../store/TimelineSpace/Contents/SideBar.js | 16 ++- .../Contents/SideBar/AccountProfile.js | 18 +++ 6 files changed, 164 insertions(+), 6 deletions(-) create mode 100644 src/renderer/components/TimelineSpace/Contents/SideBar/AccountProfile.vue create mode 100644 src/renderer/store/TimelineSpace/Contents/SideBar/AccountProfile.js diff --git a/src/renderer/components/TimelineSpace/Contents.vue b/src/renderer/components/TimelineSpace/Contents.vue index b076f4ca..018e4d7c 100644 --- a/src/renderer/components/TimelineSpace/Contents.vue +++ b/src/renderer/components/TimelineSpace/Contents.vue @@ -38,7 +38,7 @@ export default { .timeline-wrapper-with-side-bar { height: 100%; - width: -webkit-calc(100% - 180px); + width: -webkit-calc(100% - 320px); overflow: auto; } } diff --git a/src/renderer/components/TimelineSpace/Contents/Cards/Toot.vue b/src/renderer/components/TimelineSpace/Contents/Cards/Toot.vue index ec0f2072..78aca4f7 100644 --- a/src/renderer/components/TimelineSpace/Contents/Cards/Toot.vue +++ b/src/renderer/components/TimelineSpace/Contents/Cards/Toot.vue @@ -132,7 +132,9 @@ export default { this.$store.dispatch('TimelineSpace/Modals/ImageViewer/openModal', url) }, openUser (account) { - console.log(account) + this.$store.dispatch('TimelineSpace/Contents/SideBar/openAccountComponent') + this.$store.dispatch('TimelineSpace/Contents/SideBar/AccountProfile/changeAccount', account) + this.$store.commit('TimelineSpace/Contents/SideBar/changeOpenSideBar', true) } } } @@ -169,6 +171,7 @@ function findLink (target) { width: 36px; height: 36px; border-radius: 4px; + cursor: pointer; } } @@ -181,6 +184,7 @@ function findLink (target) { font-weight: 800; color: #303133; font-size: 14px; + cursor: pointer; } .timestamp { diff --git a/src/renderer/components/TimelineSpace/Contents/SideBar.vue b/src/renderer/components/TimelineSpace/Contents/SideBar.vue index ee61ac30..c7b93d6c 100644 --- a/src/renderer/components/TimelineSpace/Contents/SideBar.vue +++ b/src/renderer/components/TimelineSpace/Contents/SideBar.vue @@ -3,18 +3,23 @@
- side + + + diff --git a/src/renderer/store/TimelineSpace/Contents/SideBar.js b/src/renderer/store/TimelineSpace/Contents/SideBar.js index 29408fb9..9f1ac625 100644 --- a/src/renderer/store/TimelineSpace/Contents/SideBar.js +++ b/src/renderer/store/TimelineSpace/Contents/SideBar.js @@ -1,17 +1,31 @@ +import AccountProfile from './SideBar/AccountProfile' const SideBar = { namespaced: true, + modules: { + AccountProfile + }, state: { - openSideBar: false + openSideBar: false, + // 0: blank + // 1: account-profile + component: 0 }, mutations: { changeOpenSideBar (state, value) { state.openSideBar = value + }, + changeComponent (state, value) { + state.component = value } }, actions: { close ({ commit }) { commit('changeOpenSideBar', false) + commit('changeComponent', 0) + }, + openAccountComponent ({ commit }) { + commit('changeComponent', 1) } } } diff --git a/src/renderer/store/TimelineSpace/Contents/SideBar/AccountProfile.js b/src/renderer/store/TimelineSpace/Contents/SideBar/AccountProfile.js new file mode 100644 index 00000000..db88fef2 --- /dev/null +++ b/src/renderer/store/TimelineSpace/Contents/SideBar/AccountProfile.js @@ -0,0 +1,18 @@ +const AccountProfile = { + namespaced: true, + state: { + account: null + }, + mutations: { + changeAccount (state, account) { + state.account = account + } + }, + actions: { + changeAccount ({ commit }, account) { + commit('changeAccount', account) + } + } +} + +export default AccountProfile From 6561e7df0ae32cdc87b9b4cd9446587ebd60b43e Mon Sep 17 00:00:00 2001 From: AkiraFukushima Date: Fri, 30 Mar 2018 16:58:48 +0900 Subject: [PATCH 2/4] refs #116 Set background-image in account profile --- .../TimelineSpace/Contents/SideBar.vue | 4 ++ .../Contents/SideBar/AccountProfile.vue | 39 +++++++++++-------- 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/src/renderer/components/TimelineSpace/Contents/SideBar.vue b/src/renderer/components/TimelineSpace/Contents/SideBar.vue index c7b93d6c..266b8db8 100644 --- a/src/renderer/components/TimelineSpace/Contents/SideBar.vue +++ b/src/renderer/components/TimelineSpace/Contents/SideBar.vue @@ -46,6 +46,10 @@ export default { border-top: solid 1px #dcdfe6; border-bottom: solid 1px #dcdfe6; text-align: right; + + .el-icon-close { + cursor: pointer; + } } } diff --git a/src/renderer/components/TimelineSpace/Contents/SideBar/AccountProfile.vue b/src/renderer/components/TimelineSpace/Contents/SideBar/AccountProfile.vue index 14b53314..14aaf1ec 100644 --- a/src/renderer/components/TimelineSpace/Contents/SideBar/AccountProfile.vue +++ b/src/renderer/components/TimelineSpace/Contents/SideBar/AccountProfile.vue @@ -1,5 +1,6 @@ diff --git a/src/renderer/store/TimelineSpace/Contents/Favourites.js b/src/renderer/store/TimelineSpace/Contents/Favourites.js index c107ba70..5a695dcc 100644 --- a/src/renderer/store/TimelineSpace/Contents/Favourites.js +++ b/src/renderer/store/TimelineSpace/Contents/Favourites.js @@ -60,7 +60,6 @@ const Favourites = { access_token: rootState.TimelineSpace.account.accessToken, api_url: rootState.TimelineSpace.account.baseURL + '/api/v1' }) - console.log(last.id) // Note: Now this API's explanation and implementation are reversed. // So if the bug has resolved, please use max_id instead of since_id. // https://github.com/tootsuite/documentation/blob/master/Using-the-API/API.md#favourites From f9b40262978f81f9bb0edd5f5e7d68c82bed2b33 Mon Sep 17 00:00:00 2001 From: AkiraFukushima Date: Fri, 30 Mar 2018 17:36:45 +0900 Subject: [PATCH 4/4] refs #116 Open links in the default browser --- .../Contents/SideBar/AccountProfile.vue | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/src/renderer/components/TimelineSpace/Contents/SideBar/AccountProfile.vue b/src/renderer/components/TimelineSpace/Contents/SideBar/AccountProfile.vue index ae1e8aad..4cefad92 100644 --- a/src/renderer/components/TimelineSpace/Contents/SideBar/AccountProfile.vue +++ b/src/renderer/components/TimelineSpace/Contents/SideBar/AccountProfile.vue @@ -11,7 +11,7 @@ -
+
@@ -36,6 +36,7 @@