From 2240df358837ffe8dead889d68ed882b8c942861 Mon Sep 17 00:00:00 2001
From: AkiraFukushima <h3.poteto@gmail.com>
Date: Tue, 3 Jul 2018 01:01:46 +0900
Subject: [PATCH 1/2] refs #341 Collapse side menu

---
 src/renderer/components/TimelineSpace.vue     | 20 +++++-
 .../components/TimelineSpace/SideMenu.vue     | 62 +++++++++++++++++--
 src/renderer/store/TimelineSpace/SideMenu.js  |  6 +-
 3 files changed, 80 insertions(+), 8 deletions(-)

diff --git a/src/renderer/components/TimelineSpace.vue b/src/renderer/components/TimelineSpace.vue
index d2b9143d..96ec6858 100644
--- a/src/renderer/components/TimelineSpace.vue
+++ b/src/renderer/components/TimelineSpace.vue
@@ -6,7 +6,7 @@
   element-loading-spinner="el-icon-loading"
   element-loading-background="rgba(0, 0, 0, 0.8)">
   <side-menu></side-menu>
-  <div class="page">
+  <div :class="collapse ? 'page-narrow':'page'">
     <header class="header" style="-webkit-app-region: drag;">
       <header-menu></header-menu>
     </header>
@@ -29,7 +29,8 @@ export default {
   components: { SideMenu, HeaderMenu, Modals, Contents },
   computed: {
     ...mapState({
-      loading: state => state.TimelineSpace.loading
+      loading: state => state.TimelineSpace.loading,
+      collapse: state => state.TimelineSpace.SideMenu.collapse
     })
   },
   created () {
@@ -126,4 +127,19 @@ export default {
   }
 }
 
+.page-narrow {
+  margin-left: 76px;
+  height: 100%;
+  box-sizing: border-box;
+
+  .header {
+    width: calc(100% - 141px);
+    position: fixed;
+    top: 0;
+    left: 141px;
+    height: 48px;
+    border-bottom: solid 1px var(--theme-border-color);
+  }
+}
+
 </style>
diff --git a/src/renderer/components/TimelineSpace/SideMenu.vue b/src/renderer/components/TimelineSpace/SideMenu.vue
index 53c341a0..ebd938f4 100644
--- a/src/renderer/components/TimelineSpace/SideMenu.vue
+++ b/src/renderer/components/TimelineSpace/SideMenu.vue
@@ -1,7 +1,10 @@
 <template>
   <div id="side_menu">
-    <div class="profile-wrapper" style="-webkit-app-region: drag;">
-      <div class="profile">
+    <div :class="collapse ? 'profile-wrapper narrow-menu':'profile-wrapper'" style="-webkit-app-region: drag;">
+      <div class="profile-narrow" v-if="collapse">
+        <img :src="account.avatar" class="avatar" />
+      </div>
+      <div class="profile-wide" v-else>
         <div>@{{ account.username }}
           <el-dropdown trigger="click" @command="handleProfile">
             <span class="el-dropdown-link">
@@ -14,14 +17,24 @@
         </div>
         <span>{{ account.domain }}</span>
       </div>
+      <div class="collapse">
+        <el-button type="text" class="release-collapse" @click="collapse = false" v-if="collapse">
+          <i class="el-icon-arrow-right"></i>
+        </el-button>
+        <el-button type="text" class="do-collapse" @click="collapse = true" v-else>
+          <i class="el-icon-arrow-left"></i>
+        </el-button>
+      </div>
+      <div class="clearfix"></div>
     </div>
     <el-menu
       :default-active="activeRoute()"
       :background-color="themeColor"
       text-color="#909399"
+      :collapse="collapse"
       active-text-color="#ffffff"
       :router="true"
-      class="el-menu-vertical timeline-menu">
+      :class="collapse ? 'el-menu-vertical timeline-menu narrow-menu':'el-menu-vertical timeline-menu'">
       <el-menu-item :index="`/${id()}/home`">
         <icon name="home"></icon>
         <span>Home</span>
@@ -84,7 +97,15 @@ export default {
       lists: state => state.TimelineSpace.SideMenu.lists,
       themeColor: state => state.App.theme.side_menu_color,
       overrideActivePath: state => state.TimelineSpace.SideMenu.overrideActivePath
-    })
+    }),
+    collapse: {
+      get () {
+        return this.$store.state.TimelineSpace.SideMenu.collapse
+      },
+      set (value) {
+        this.$store.commit('TimelineSpace/SideMenu/changeCollapse', value)
+      }
+    }
   },
   methods: {
     activeRoute () {
@@ -119,7 +140,8 @@ export default {
     height: 70px;
     font-size: 16px;
 
-    .profile {
+    .profile-wide {
+      float: left;
       color: #ffffff;
       font-weight: bold;
       padding: 20px 8px 10px 20px;
@@ -131,6 +153,32 @@ export default {
         cursor: pointer;
       }
     }
+
+    .profile-narrow {
+      float: left;
+
+      .avatar {
+        width: 36px;
+        height: 36px;
+        border-radius: 50%;
+        margin: 18px 12px;
+      }
+    }
+
+    .collapse {
+      float: right;
+      margin-top: 24px;
+
+      .do-collapse {
+        color: #606266;
+        padding: 0;
+      }
+
+      .release-collapse {
+        color: #606266;
+        padding: 0;
+      }
+    }
   }
 
   .timeline-menu /deep/ {
@@ -164,5 +212,9 @@ export default {
       font-size: 14px;
     }
   }
+
+  .narrow-menu {
+    width: 76px;
+  }
 }
 </style>
diff --git a/src/renderer/store/TimelineSpace/SideMenu.js b/src/renderer/store/TimelineSpace/SideMenu.js
index 421316b0..7b7bf791 100644
--- a/src/renderer/store/TimelineSpace/SideMenu.js
+++ b/src/renderer/store/TimelineSpace/SideMenu.js
@@ -7,7 +7,8 @@ const SideMenu = {
     unreadNotifications: false,
     unreadLocalTimeline: false,
     lists: [],
-    overrideActivePath: null
+    overrideActivePath: null,
+    collapse: false
   },
   mutations: {
     changeUnreadHomeTimeline (state, value) {
@@ -24,6 +25,9 @@ const SideMenu = {
     },
     updateOverrideActivePath (state, path) {
       state.overrideActivePath = path
+    },
+    changeCollapse (state, collapse) {
+      state.collapse = collapse
     }
   },
   actions: {

From 7ca65e89221d333714ece73b91d6e68dbfbea0c8 Mon Sep 17 00:00:00 2001
From: AkiraFukushima <h3.poteto@gmail.com>
Date: Tue, 3 Jul 2018 23:02:16 +0900
Subject: [PATCH 2/2] refs #341 Save collapse status and read it after launched

---
 src/main/index.js                             | 21 +++++++++++++++
 src/main/preferences.js                       | 10 +++++++
 .../components/TimelineSpace/SideMenu.vue     | 26 ++++++++++---------
 src/renderer/store/TimelineSpace/SideMenu.js  | 11 ++++++++
 4 files changed, 56 insertions(+), 12 deletions(-)

diff --git a/src/main/index.js b/src/main/index.js
index caff2336..d907383c 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -645,6 +645,27 @@ ipcMain.on('save-preferences', (event, data) => {
     })
 })
 
+ipcMain.on('change-collapse', (event, value) => {
+  const preferences = new Preferences(preferencesDBPath)
+  preferences.update(
+    {
+      state: {
+        collapse: value
+      }
+    })
+    .catch((err) => {
+      log.error(err)
+    })
+})
+
+ipcMain.on('get-collapse', (event, _) => {
+  const preferences = new Preferences(preferencesDBPath)
+  preferences.load()
+    .then((conf) => {
+      event.sender.send('response-get-collapse', conf.state.collapse)
+    })
+})
+
 // hashtag
 ipcMain.on('save-hashtag', (event, tag) => {
   const hashtags = new Hashtags(hashtagsDB)
diff --git a/src/main/preferences.js b/src/main/preferences.js
index d8fc14ec..ac3482b0 100644
--- a/src/main/preferences.js
+++ b/src/main/preferences.js
@@ -10,6 +10,9 @@ const Base = {
     theme: 'white',
     fontSize: 14,
     displayNameStyle: 0
+  },
+  state: {
+    collapse: false
   }
 }
 
@@ -47,4 +50,11 @@ export default class Preferences {
       })
     })
   }
+
+  async update (obj) {
+    const current = await this.load()
+    const data = objectAssignDeep({}, current, obj)
+    const result = await this.save(data)
+    return result
+  }
 }
diff --git a/src/renderer/components/TimelineSpace/SideMenu.vue b/src/renderer/components/TimelineSpace/SideMenu.vue
index ebd938f4..0d268375 100644
--- a/src/renderer/components/TimelineSpace/SideMenu.vue
+++ b/src/renderer/components/TimelineSpace/SideMenu.vue
@@ -18,10 +18,10 @@
         <span>{{ account.domain }}</span>
       </div>
       <div class="collapse">
-        <el-button type="text" class="release-collapse" @click="collapse = false" v-if="collapse">
+        <el-button type="text" class="release-collapse" @click="releaseCollapse" v-if="collapse">
           <i class="el-icon-arrow-right"></i>
         </el-button>
-        <el-button type="text" class="do-collapse" @click="collapse = true" v-else>
+        <el-button type="text" class="do-collapse" @click="doCollapse" v-else>
           <i class="el-icon-arrow-left"></i>
         </el-button>
       </div>
@@ -96,16 +96,12 @@ export default {
       unreadLocalTimeline: state => state.TimelineSpace.SideMenu.unreadLocalTimeline,
       lists: state => state.TimelineSpace.SideMenu.lists,
       themeColor: state => state.App.theme.side_menu_color,
-      overrideActivePath: state => state.TimelineSpace.SideMenu.overrideActivePath
-    }),
-    collapse: {
-      get () {
-        return this.$store.state.TimelineSpace.SideMenu.collapse
-      },
-      set (value) {
-        this.$store.commit('TimelineSpace/SideMenu/changeCollapse', value)
-      }
-    }
+      overrideActivePath: state => state.TimelineSpace.SideMenu.overrideActivePath,
+      collapse: state => state.TimelineSpace.SideMenu.collapse
+    })
+  },
+  created () {
+    this.$store.dispatch('TimelineSpace/SideMenu/readCollapse')
   },
   methods: {
     activeRoute () {
@@ -124,6 +120,12 @@ export default {
           shell.openExternal(this.account.baseURL + '/settings/profile')
           break
       }
+    },
+    doCollapse () {
+      this.$store.dispatch('TimelineSpace/SideMenu/changeCollapse', true)
+    },
+    releaseCollapse () {
+      this.$store.dispatch('TimelineSpace/SideMenu/changeCollapse', false)
     }
   }
 }
diff --git a/src/renderer/store/TimelineSpace/SideMenu.js b/src/renderer/store/TimelineSpace/SideMenu.js
index 7b7bf791..255435c8 100644
--- a/src/renderer/store/TimelineSpace/SideMenu.js
+++ b/src/renderer/store/TimelineSpace/SideMenu.js
@@ -1,4 +1,5 @@
 import Mastodon from 'megalodon'
+import { ipcRenderer } from 'electron'
 
 const SideMenu = {
   namespaced: true,
@@ -47,6 +48,16 @@ const SideMenu = {
       commit('changeUnreadHomeTimeline', false)
       commit('changeUnreadNotifications', false)
       commit('changeUnreadLocalTimeline', false)
+    },
+    changeCollapse ({ commit }, value) {
+      commit('changeCollapse', value)
+      ipcRenderer.send('change-collapse', value)
+    },
+    readCollapse ({ commit }) {
+      ipcRenderer.send('get-collapse')
+      ipcRenderer.once('response-get-collapse', (event, value) => {
+        commit('changeCollapse', value)
+      })
     }
   }
 }