From e75e13f04332770316bdec912cb66b01b14d8b67 Mon Sep 17 00:00:00 2001
From: AkiraFukushima <h3.poteto@gmail.com>
Date: Wed, 14 Nov 2018 21:44:33 +0900
Subject: [PATCH 1/2] refactor: Cage Cards components in molecules according to
 atomic design

---
 .../TimelineSpace/Contents/DirectMessages.vue        |  2 +-
 .../components/TimelineSpace/Contents/Favourites.vue |  2 +-
 .../TimelineSpace/Contents/Hashtag/Tag.vue           |  2 +-
 .../components/TimelineSpace/Contents/Home.vue       |  2 +-
 .../components/TimelineSpace/Contents/Lists/Edit.vue |  2 +-
 .../components/TimelineSpace/Contents/Lists/Show.vue |  2 +-
 .../components/TimelineSpace/Contents/Local.vue      |  2 +-
 .../TimelineSpace/Contents/Notifications.vue         |  2 +-
 .../components/TimelineSpace/Contents/Public.vue     |  2 +-
 .../TimelineSpace/Contents/Search/Account.vue        |  2 +-
 .../Contents/SideBar/AccountProfile/Followers.vue    |  2 +-
 .../Contents/SideBar/AccountProfile/Follows.vue      |  2 +-
 .../Contents/SideBar/AccountProfile/Timeline.vue     |  2 +-
 .../TimelineSpace/Contents/SideBar/TootDetail.vue    |  2 +-
 .../Contents/Cards => molecules}/Notification.vue    |  0
 .../Cards => molecules}/Notification/Favourite.vue   |  0
 .../Cards => molecules}/Notification/Follow.vue      |  0
 .../Cards => molecules}/Notification/Mention.vue     |  0
 .../Cards => molecules}/Notification/Reblog.vue      |  0
 .../Contents/Cards => molecules}/Toot.vue            | 12 ++++++------
 .../Contents/Cards => molecules}/User.vue            |  0
 src/renderer/store/TimelineSpace/Contents.js         |  2 --
 src/renderer/store/TimelineSpace/Contents/Cards.js   | 10 ----------
 src/renderer/store/index.js                          |  4 +++-
 src/renderer/store/molecules.js                      |  8 ++++++++
 .../Contents/Cards => molecules}/Toot.js             |  0
 26 files changed, 31 insertions(+), 33 deletions(-)
 rename src/renderer/components/{TimelineSpace/Contents/Cards => molecules}/Notification.vue (100%)
 rename src/renderer/components/{TimelineSpace/Contents/Cards => molecules}/Notification/Favourite.vue (100%)
 rename src/renderer/components/{TimelineSpace/Contents/Cards => molecules}/Notification/Follow.vue (100%)
 rename src/renderer/components/{TimelineSpace/Contents/Cards => molecules}/Notification/Mention.vue (100%)
 rename src/renderer/components/{TimelineSpace/Contents/Cards => molecules}/Notification/Reblog.vue (100%)
 rename src/renderer/components/{TimelineSpace/Contents/Cards => molecules}/Toot.vue (97%)
 rename src/renderer/components/{TimelineSpace/Contents/Cards => molecules}/User.vue (100%)
 delete mode 100644 src/renderer/store/TimelineSpace/Contents/Cards.js
 create mode 100644 src/renderer/store/molecules.js
 rename src/renderer/store/{TimelineSpace/Contents/Cards => molecules}/Toot.js (100%)

diff --git a/src/renderer/components/TimelineSpace/Contents/DirectMessages.vue b/src/renderer/components/TimelineSpace/Contents/DirectMessages.vue
index 4f3656d8..1ea06d0a 100644
--- a/src/renderer/components/TimelineSpace/Contents/DirectMessages.vue
+++ b/src/renderer/components/TimelineSpace/Contents/DirectMessages.vue
@@ -30,7 +30,7 @@
 
 <script>
 import { mapState, mapGetters } from 'vuex'
-import Toot from './Cards/Toot'
+import Toot from '~/src/renderer/components/molecules/Toot'
 import scrollTop from '../../utils/scroll'
 import reloadable from '~/src/renderer/components/mixins/reloadable'
 
diff --git a/src/renderer/components/TimelineSpace/Contents/Favourites.vue b/src/renderer/components/TimelineSpace/Contents/Favourites.vue
index ab0f0c8e..0e3b9c37 100644
--- a/src/renderer/components/TimelineSpace/Contents/Favourites.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Favourites.vue
@@ -27,7 +27,7 @@
 
 <script>
 import { mapState, mapGetters } from 'vuex'
-import Toot from './Cards/Toot'
+import Toot from '~/src/renderer/components/molecules/Toot'
 import scrollTop from '../../utils/scroll'
 import reloadable from '~/src/renderer/components/mixins/reloadable'
 
diff --git a/src/renderer/components/TimelineSpace/Contents/Hashtag/Tag.vue b/src/renderer/components/TimelineSpace/Contents/Hashtag/Tag.vue
index f1a3a077..900c0570 100644
--- a/src/renderer/components/TimelineSpace/Contents/Hashtag/Tag.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Hashtag/Tag.vue
@@ -29,7 +29,7 @@
 
 <script>
 import { mapState, mapGetters } from 'vuex'
-import Toot from '../Cards/Toot'
+import Toot from '~/src/renderer/components/molecules/Toot'
 import scrollTop from '../../../utils/scroll'
 import reloadable from '~/src/renderer/components/mixins/reloadable'
 
diff --git a/src/renderer/components/TimelineSpace/Contents/Home.vue b/src/renderer/components/TimelineSpace/Contents/Home.vue
index 027d1514..d6377453 100644
--- a/src/renderer/components/TimelineSpace/Contents/Home.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Home.vue
@@ -30,7 +30,7 @@
 
 <script>
 import { mapState, mapGetters } from 'vuex'
-import Toot from './Cards/Toot'
+import Toot from '~/src/renderer/components/molecules/Toot'
 import scrollTop from '../../utils/scroll'
 import reloadable from '~/src/renderer/components/mixins/reloadable'
 
diff --git a/src/renderer/components/TimelineSpace/Contents/Lists/Edit.vue b/src/renderer/components/TimelineSpace/Contents/Lists/Edit.vue
index 59358ac1..9fa4142c 100644
--- a/src/renderer/components/TimelineSpace/Contents/Lists/Edit.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Lists/Edit.vue
@@ -13,7 +13,7 @@
 
 <script>
 import { mapState } from 'vuex'
-import User from '../Cards/User'
+import User from '~/src/renderer/components/molecules/User'
 
 export default {
   name: 'edit-list',
diff --git a/src/renderer/components/TimelineSpace/Contents/Lists/Show.vue b/src/renderer/components/TimelineSpace/Contents/Lists/Show.vue
index 80d0a203..6590c3c7 100644
--- a/src/renderer/components/TimelineSpace/Contents/Lists/Show.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Lists/Show.vue
@@ -29,7 +29,7 @@
 
 <script>
 import { mapState, mapGetters } from 'vuex'
-import Toot from '../Cards/Toot'
+import Toot from '~/src/renderer/components/molecules/Toot'
 import scrollTop from '../../../utils/scroll'
 import reloadable from '~/src/renderer/components/mixins/reloadable'
 
diff --git a/src/renderer/components/TimelineSpace/Contents/Local.vue b/src/renderer/components/TimelineSpace/Contents/Local.vue
index 057cbe49..2dca3a8c 100644
--- a/src/renderer/components/TimelineSpace/Contents/Local.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Local.vue
@@ -30,7 +30,7 @@
 
 <script>
 import { mapState, mapGetters } from 'vuex'
-import Toot from './Cards/Toot'
+import Toot from '~/src/renderer/components/molecules/Toot'
 import scrollTop from '../../utils/scroll'
 import reloadable from '~/src/renderer/components/mixins/reloadable'
 
diff --git a/src/renderer/components/TimelineSpace/Contents/Notifications.vue b/src/renderer/components/TimelineSpace/Contents/Notifications.vue
index a6137f67..121e6b83 100644
--- a/src/renderer/components/TimelineSpace/Contents/Notifications.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Notifications.vue
@@ -28,7 +28,7 @@
 
 <script>
 import { mapState, mapGetters } from 'vuex'
-import Notification from './Cards/Notification'
+import Notification from '~/src/renderer/components/molecules/Notification'
 import scrollTop from '../../utils/scroll'
 import reloadable from '~/src/renderer/components/mixins/reloadable'
 
diff --git a/src/renderer/components/TimelineSpace/Contents/Public.vue b/src/renderer/components/TimelineSpace/Contents/Public.vue
index b9653dcd..a9047f4f 100644
--- a/src/renderer/components/TimelineSpace/Contents/Public.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Public.vue
@@ -30,7 +30,7 @@
 
 <script>
 import { mapState, mapGetters } from 'vuex'
-import Toot from './Cards/Toot'
+import Toot from '~/src/renderer/components/molecules/Toot'
 import scrollTop from '../../utils/scroll'
 import reloadable from '~/src/renderer/components/mixins/reloadable'
 
diff --git a/src/renderer/components/TimelineSpace/Contents/Search/Account.vue b/src/renderer/components/TimelineSpace/Contents/Search/Account.vue
index 4d605c6d..5b3dca36 100644
--- a/src/renderer/components/TimelineSpace/Contents/Search/Account.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Search/Account.vue
@@ -8,7 +8,7 @@
 
 <script>
 import { mapState } from 'vuex'
-import User from '../Cards/User'
+import User from '~/src/renderer/components/molecules/User'
 
 export default {
   name: 'search-account',
diff --git a/src/renderer/components/TimelineSpace/Contents/SideBar/AccountProfile/Followers.vue b/src/renderer/components/TimelineSpace/Contents/SideBar/AccountProfile/Followers.vue
index d893965b..17f8c591 100644
--- a/src/renderer/components/TimelineSpace/Contents/SideBar/AccountProfile/Followers.vue
+++ b/src/renderer/components/TimelineSpace/Contents/SideBar/AccountProfile/Followers.vue
@@ -13,7 +13,7 @@
 
 <script>
 import { mapState } from 'vuex'
-import User from '../../Cards/User'
+import User from '~/src/renderer/components/molecules/User'
 
 export default {
   name: 'followers',
diff --git a/src/renderer/components/TimelineSpace/Contents/SideBar/AccountProfile/Follows.vue b/src/renderer/components/TimelineSpace/Contents/SideBar/AccountProfile/Follows.vue
index 745ac15a..29082e72 100644
--- a/src/renderer/components/TimelineSpace/Contents/SideBar/AccountProfile/Follows.vue
+++ b/src/renderer/components/TimelineSpace/Contents/SideBar/AccountProfile/Follows.vue
@@ -13,7 +13,7 @@
 
 <script>
 import { mapState } from 'vuex'
-import User from '../../Cards/User'
+import User from '~/src/renderer/components/molecules/User'
 
 export default {
   name: 'follows',
diff --git a/src/renderer/components/TimelineSpace/Contents/SideBar/AccountProfile/Timeline.vue b/src/renderer/components/TimelineSpace/Contents/SideBar/AccountProfile/Timeline.vue
index 9257e03e..182f66a8 100644
--- a/src/renderer/components/TimelineSpace/Contents/SideBar/AccountProfile/Timeline.vue
+++ b/src/renderer/components/TimelineSpace/Contents/SideBar/AccountProfile/Timeline.vue
@@ -10,7 +10,7 @@
 
 <script>
 import { mapState } from 'vuex'
-import Toot from '../../Cards/Toot'
+import Toot from '~/src/renderer/components/molecules/Toot'
 
 export default {
   name: 'timeline',
diff --git a/src/renderer/components/TimelineSpace/Contents/SideBar/TootDetail.vue b/src/renderer/components/TimelineSpace/Contents/SideBar/TootDetail.vue
index 16bb54a1..09b7dce2 100644
--- a/src/renderer/components/TimelineSpace/Contents/SideBar/TootDetail.vue
+++ b/src/renderer/components/TimelineSpace/Contents/SideBar/TootDetail.vue
@@ -14,7 +14,7 @@
 
 <script>
 import { mapState } from 'vuex'
-import Toot from '../Cards/Toot'
+import Toot from '~/src/renderer/components/molecules/Toot'
 
 export default {
   name: 'toot-detail',
diff --git a/src/renderer/components/TimelineSpace/Contents/Cards/Notification.vue b/src/renderer/components/molecules/Notification.vue
similarity index 100%
rename from src/renderer/components/TimelineSpace/Contents/Cards/Notification.vue
rename to src/renderer/components/molecules/Notification.vue
diff --git a/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Favourite.vue b/src/renderer/components/molecules/Notification/Favourite.vue
similarity index 100%
rename from src/renderer/components/TimelineSpace/Contents/Cards/Notification/Favourite.vue
rename to src/renderer/components/molecules/Notification/Favourite.vue
diff --git a/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Follow.vue b/src/renderer/components/molecules/Notification/Follow.vue
similarity index 100%
rename from src/renderer/components/TimelineSpace/Contents/Cards/Notification/Follow.vue
rename to src/renderer/components/molecules/Notification/Follow.vue
diff --git a/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Mention.vue b/src/renderer/components/molecules/Notification/Mention.vue
similarity index 100%
rename from src/renderer/components/TimelineSpace/Contents/Cards/Notification/Mention.vue
rename to src/renderer/components/molecules/Notification/Mention.vue
diff --git a/src/renderer/components/TimelineSpace/Contents/Cards/Notification/Reblog.vue b/src/renderer/components/molecules/Notification/Reblog.vue
similarity index 100%
rename from src/renderer/components/TimelineSpace/Contents/Cards/Notification/Reblog.vue
rename to src/renderer/components/molecules/Notification/Reblog.vue
diff --git a/src/renderer/components/TimelineSpace/Contents/Cards/Toot.vue b/src/renderer/components/molecules/Toot.vue
similarity index 97%
rename from src/renderer/components/TimelineSpace/Contents/Cards/Toot.vue
rename to src/renderer/components/molecules/Toot.vue
index e1cb25c1..f23871f1 100644
--- a/src/renderer/components/TimelineSpace/Contents/Cards/Toot.vue
+++ b/src/renderer/components/molecules/Toot.vue
@@ -300,12 +300,12 @@ export default {
       this.$refs.popper.doClose()
     },
     block (message) {
-      this.$store.dispatch('TimelineSpace/Contents/Cards/Toot/block', this.originalMessage(message).account)
+      this.$store.dispatch('molecules/Toot/block', this.originalMessage(message).account)
       this.$refs.popper.doClose()
     },
     changeReblog (message) {
       if (message.reblogged) {
-        this.$store.dispatch('TimelineSpace/Contents/Cards/Toot/unreblog', message)
+        this.$store.dispatch('molecules/Toot/unreblog', message)
           .then((data) => {
             this.$emit('update', data)
           })
@@ -316,7 +316,7 @@ export default {
             })
           })
       } else {
-        this.$store.dispatch('TimelineSpace/Contents/Cards/Toot/reblog', message)
+        this.$store.dispatch('molecules/Toot/reblog', message)
           .then((data) => {
             this.$emit('update', data)
           })
@@ -330,7 +330,7 @@ export default {
     },
     changeFavourite (message) {
       if (message.favourited) {
-        this.$store.dispatch('TimelineSpace/Contents/Cards/Toot/removeFavourite', message)
+        this.$store.dispatch('molecules/Toot/removeFavourite', message)
           .then((data) => {
             this.$emit('update', data)
           })
@@ -341,7 +341,7 @@ export default {
             })
           })
       } else {
-        this.$store.dispatch('TimelineSpace/Contents/Cards/Toot/addFavourite', message)
+        this.$store.dispatch('molecules/Toot/addFavourite', message)
           .then((data) => {
             this.$emit('update', data)
           })
@@ -389,7 +389,7 @@ export default {
       return this.$store.state.TimelineSpace.account.accountId === this.originalMessage(message).account.id
     },
     deleteToot (message) {
-      this.$store.dispatch('TimelineSpace/Contents/Cards/Toot/deleteToot', message)
+      this.$store.dispatch('molecules/Toot/deleteToot', message)
         .then((message) => {
           this.$emit('delete', message)
         })
diff --git a/src/renderer/components/TimelineSpace/Contents/Cards/User.vue b/src/renderer/components/molecules/User.vue
similarity index 100%
rename from src/renderer/components/TimelineSpace/Contents/Cards/User.vue
rename to src/renderer/components/molecules/User.vue
diff --git a/src/renderer/store/TimelineSpace/Contents.js b/src/renderer/store/TimelineSpace/Contents.js
index c76dbc34..d1758451 100644
--- a/src/renderer/store/TimelineSpace/Contents.js
+++ b/src/renderer/store/TimelineSpace/Contents.js
@@ -6,7 +6,6 @@ import Local from './Contents/Local'
 import Public from './Contents/Public'
 import Search from './Contents/Search'
 import Lists from './Contents/Lists'
-import Cards from './Contents/Cards'
 import Hashtag from './Contents/Hashtag'
 import DirectMessages from './Contents/DirectMessages'
 
@@ -22,7 +21,6 @@ const Contents = {
     Public,
     Search,
     Lists,
-    Cards,
     Hashtag
   }
 }
diff --git a/src/renderer/store/TimelineSpace/Contents/Cards.js b/src/renderer/store/TimelineSpace/Contents/Cards.js
deleted file mode 100644
index b49b2a96..00000000
--- a/src/renderer/store/TimelineSpace/Contents/Cards.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import Toot from './Cards/Toot'
-
-const Cards = {
-  namespaced: true,
-  modules: {
-    Toot
-  }
-}
-
-export default Cards
diff --git a/src/renderer/store/index.js b/src/renderer/store/index.js
index 682396c7..b5c006ac 100644
--- a/src/renderer/store/index.js
+++ b/src/renderer/store/index.js
@@ -9,6 +9,7 @@ import Authorize from './Authorize'
 import TimelineSpace from './TimelineSpace'
 import Preferences from './Preferences'
 import Settings from './Settings'
+import molecules from './molecules'
 
 Vue.use(Vuex)
 
@@ -24,6 +25,7 @@ export default new Vuex.Store({
     Authorize,
     TimelineSpace,
     Preferences,
-    Settings
+    Settings,
+    molecules
   }
 })
diff --git a/src/renderer/store/molecules.js b/src/renderer/store/molecules.js
new file mode 100644
index 00000000..f0ee7f2a
--- /dev/null
+++ b/src/renderer/store/molecules.js
@@ -0,0 +1,8 @@
+import Toot from './molecules/Toot'
+
+export default {
+  namespaced: true,
+  modules: {
+    Toot
+  }
+}
diff --git a/src/renderer/store/TimelineSpace/Contents/Cards/Toot.js b/src/renderer/store/molecules/Toot.js
similarity index 100%
rename from src/renderer/store/TimelineSpace/Contents/Cards/Toot.js
rename to src/renderer/store/molecules/Toot.js

From fd212203179938b44f19d7c85d6c93633d06e438 Mon Sep 17 00:00:00 2001
From: AkiraFukushima <h3.poteto@gmail.com>
Date: Wed, 14 Nov 2018 21:53:35 +0900
Subject: [PATCH 2/2] [stylelint] Fix css style in molecules components

---
 src/renderer/components/molecules/Notification/Reblog.vue | 2 +-
 src/renderer/components/molecules/Toot.vue                | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/renderer/components/molecules/Notification/Reblog.vue b/src/renderer/components/molecules/Notification/Reblog.vue
index cf044aad..8be4593e 100644
--- a/src/renderer/components/molecules/Notification/Reblog.vue
+++ b/src/renderer/components/molecules/Notification/Reblog.vue
@@ -298,7 +298,7 @@ export default {
     }
 
     .detail {
-      margin: 8px 8px 0 42px;;
+      margin: 8px 8px 0 42px;
       color: #909399;
 
       .toot-header {
diff --git a/src/renderer/components/molecules/Toot.vue b/src/renderer/components/molecules/Toot.vue
index f23871f1..1b0fc0e1 100644
--- a/src/renderer/components/molecules/Toot.vue
+++ b/src/renderer/components/molecules/Toot.vue
@@ -570,6 +570,7 @@ export default {
       .media {
         float: left;
         margin-right: 8px;
+
         img {
           cursor: zoom-in;
           max-width: 200px;