From 3d862068c0b49808768ad23cd7b7a97185b57a01 Mon Sep 17 00:00:00 2001
From: AkiraFukushima <h3.poteto@gmail.com>
Date: Sun, 14 Jul 2019 18:55:38 +0900
Subject: [PATCH] refs #874 Move Toot and Notification to organisms

---
 .../TimelineSpace/Contents/DirectMessages.vue   |  2 +-
 .../TimelineSpace/Contents/Favourites.vue       |  2 +-
 .../TimelineSpace/Contents/Hashtag/Tag.vue      |  2 +-
 .../components/TimelineSpace/Contents/Home.vue  |  2 +-
 .../TimelineSpace/Contents/Lists/Show.vue       |  2 +-
 .../components/TimelineSpace/Contents/Local.vue |  2 +-
 .../TimelineSpace/Contents/Mentions.vue         |  2 +-
 .../TimelineSpace/Contents/Notifications.vue    |  2 +-
 .../TimelineSpace/Contents/Public.vue           |  2 +-
 .../TimelineSpace/Contents/Search/Toots.vue     |  2 +-
 .../SideBar/AccountProfile/Timeline.vue         |  2 +-
 .../Contents/SideBar/TootDetail.vue             |  2 +-
 src/renderer/components/molecules/Toot/Poll.vue |  9 +++++++--
 .../{molecules => organisms}/Notification.vue   |  0
 .../Notification/Favourite.vue                  |  0
 .../Notification/Follow.vue                     |  0
 .../Notification/Mention.vue                    |  0
 .../Notification/Reblog.vue                     |  0
 .../{molecules => organisms}/Toot.vue           | 17 ++++++++++-------
 src/renderer/store/index.ts                     |  6 +++---
 src/renderer/store/molecules.ts                 | 12 ------------
 src/renderer/store/organisms.ts                 | 12 ++++++++++++
 .../store/{molecules => organisms}/Toot.ts      |  0
 23 files changed, 44 insertions(+), 36 deletions(-)
 rename src/renderer/components/{molecules => organisms}/Notification.vue (100%)
 rename src/renderer/components/{molecules => organisms}/Notification/Favourite.vue (100%)
 rename src/renderer/components/{molecules => organisms}/Notification/Follow.vue (100%)
 rename src/renderer/components/{molecules => organisms}/Notification/Mention.vue (100%)
 rename src/renderer/components/{molecules => organisms}/Notification/Reblog.vue (100%)
 rename src/renderer/components/{molecules => organisms}/Toot.vue (97%)
 delete mode 100644 src/renderer/store/molecules.ts
 create mode 100644 src/renderer/store/organisms.ts
 rename src/renderer/store/{molecules => organisms}/Toot.ts (100%)

diff --git a/src/renderer/components/TimelineSpace/Contents/DirectMessages.vue b/src/renderer/components/TimelineSpace/Contents/DirectMessages.vue
index 2f28ba3a..d53f5a04 100644
--- a/src/renderer/components/TimelineSpace/Contents/DirectMessages.vue
+++ b/src/renderer/components/TimelineSpace/Contents/DirectMessages.vue
@@ -28,7 +28,7 @@
 
 <script>
 import { mapState, mapGetters } from 'vuex'
-import Toot from '~/src/renderer/components/molecules/Toot'
+import Toot from '~/src/renderer/components/organisms/Toot'
 import scrollTop from '../../utils/scroll'
 import reloadable from '~/src/renderer/components/mixins/reloadable'
 import { Event } from '~/src/renderer/components/event'
diff --git a/src/renderer/components/TimelineSpace/Contents/Favourites.vue b/src/renderer/components/TimelineSpace/Contents/Favourites.vue
index ce4a0d9e..ff57ab02 100644
--- a/src/renderer/components/TimelineSpace/Contents/Favourites.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Favourites.vue
@@ -25,7 +25,7 @@
 
 <script>
 import { mapState, mapGetters } from 'vuex'
-import Toot from '~/src/renderer/components/molecules/Toot'
+import Toot from '~/src/renderer/components/organisms/Toot'
 import scrollTop from '../../utils/scroll'
 import reloadable from '~/src/renderer/components/mixins/reloadable'
 import { Event } from '~/src/renderer/components/event'
diff --git a/src/renderer/components/TimelineSpace/Contents/Hashtag/Tag.vue b/src/renderer/components/TimelineSpace/Contents/Hashtag/Tag.vue
index 7b68e571..a0402810 100644
--- a/src/renderer/components/TimelineSpace/Contents/Hashtag/Tag.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Hashtag/Tag.vue
@@ -28,7 +28,7 @@
 
 <script>
 import { mapState, mapGetters } from 'vuex'
-import Toot from '~/src/renderer/components/molecules/Toot'
+import Toot from '~/src/renderer/components/organisms/Toot'
 import scrollTop from '../../../utils/scroll'
 import reloadable from '~/src/renderer/components/mixins/reloadable'
 import { Event } from '~/src/renderer/components/event'
diff --git a/src/renderer/components/TimelineSpace/Contents/Home.vue b/src/renderer/components/TimelineSpace/Contents/Home.vue
index 80e4e2a8..8cfe87a8 100644
--- a/src/renderer/components/TimelineSpace/Contents/Home.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Home.vue
@@ -28,7 +28,7 @@
 
 <script>
 import { mapState, mapGetters } from 'vuex'
-import Toot from '~/src/renderer/components/molecules/Toot'
+import Toot from '~/src/renderer/components/organisms/Toot'
 import scrollTop from '../../utils/scroll'
 import reloadable from '~/src/renderer/components/mixins/reloadable'
 import { Event } from '~/src/renderer/components/event'
diff --git a/src/renderer/components/TimelineSpace/Contents/Lists/Show.vue b/src/renderer/components/TimelineSpace/Contents/Lists/Show.vue
index 36ddd0ea..e750727e 100644
--- a/src/renderer/components/TimelineSpace/Contents/Lists/Show.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Lists/Show.vue
@@ -28,7 +28,7 @@
 
 <script>
 import { mapState, mapGetters } from 'vuex'
-import Toot from '~/src/renderer/components/molecules/Toot'
+import Toot from '~/src/renderer/components/organisms/Toot'
 import scrollTop from '../../../utils/scroll'
 import reloadable from '~/src/renderer/components/mixins/reloadable'
 import { Event } from '~/src/renderer/components/event'
diff --git a/src/renderer/components/TimelineSpace/Contents/Local.vue b/src/renderer/components/TimelineSpace/Contents/Local.vue
index f5ddff93..569494dd 100644
--- a/src/renderer/components/TimelineSpace/Contents/Local.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Local.vue
@@ -28,7 +28,7 @@
 
 <script>
 import { mapState, mapGetters } from 'vuex'
-import Toot from '~/src/renderer/components/molecules/Toot'
+import Toot from '~/src/renderer/components/organisms/Toot'
 import scrollTop from '../../utils/scroll'
 import reloadable from '~/src/renderer/components/mixins/reloadable'
 import { Event } from '~/src/renderer/components/event'
diff --git a/src/renderer/components/TimelineSpace/Contents/Mentions.vue b/src/renderer/components/TimelineSpace/Contents/Mentions.vue
index cf9cda93..b08bb07e 100644
--- a/src/renderer/components/TimelineSpace/Contents/Mentions.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Mentions.vue
@@ -30,7 +30,7 @@
 
 <script>
 import { mapState, mapGetters } from 'vuex'
-import Notification from '~/src/renderer/components/molecules/Notification'
+import Notification from '~/src/renderer/components/organisms/Notification'
 import scrollTop from '../../utils/scroll'
 import reloadable from '~/src/renderer/components/mixins/reloadable'
 import { Event } from '~/src/renderer/components/event'
diff --git a/src/renderer/components/TimelineSpace/Contents/Notifications.vue b/src/renderer/components/TimelineSpace/Contents/Notifications.vue
index 88eb18e7..655b4625 100644
--- a/src/renderer/components/TimelineSpace/Contents/Notifications.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Notifications.vue
@@ -30,7 +30,7 @@
 
 <script>
 import { mapState, mapGetters } from 'vuex'
-import Notification from '~/src/renderer/components/molecules/Notification'
+import Notification from '~/src/renderer/components/organisms/Notification'
 import scrollTop from '../../utils/scroll'
 import reloadable from '~/src/renderer/components/mixins/reloadable'
 import { Event } from '~/src/renderer/components/event'
diff --git a/src/renderer/components/TimelineSpace/Contents/Public.vue b/src/renderer/components/TimelineSpace/Contents/Public.vue
index f5096fa2..e6f259c8 100644
--- a/src/renderer/components/TimelineSpace/Contents/Public.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Public.vue
@@ -28,7 +28,7 @@
 
 <script>
 import { mapState, mapGetters } from 'vuex'
-import Toot from '~/src/renderer/components/molecules/Toot'
+import Toot from '~/src/renderer/components/organisms/Toot'
 import scrollTop from '../../utils/scroll'
 import reloadable from '~/src/renderer/components/mixins/reloadable'
 import { Event } from '~/src/renderer/components/event'
diff --git a/src/renderer/components/TimelineSpace/Contents/Search/Toots.vue b/src/renderer/components/TimelineSpace/Contents/Search/Toots.vue
index 130de11d..fcedab72 100644
--- a/src/renderer/components/TimelineSpace/Contents/Search/Toots.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Search/Toots.vue
@@ -8,7 +8,7 @@
 
 <script>
 import { mapState } from 'vuex'
-import Toot from '~/src/renderer/components/molecules/Toot'
+import Toot from '~/src/renderer/components/organisms/Toot'
 
 export default {
   name: 'search-account',
diff --git a/src/renderer/components/TimelineSpace/Contents/SideBar/AccountProfile/Timeline.vue b/src/renderer/components/TimelineSpace/Contents/SideBar/AccountProfile/Timeline.vue
index a5eed463..f28a5d18 100644
--- a/src/renderer/components/TimelineSpace/Contents/SideBar/AccountProfile/Timeline.vue
+++ b/src/renderer/components/TimelineSpace/Contents/SideBar/AccountProfile/Timeline.vue
@@ -38,7 +38,7 @@
 
 <script>
 import { mapState, mapGetters } from 'vuex'
-import Toot from '~/src/renderer/components/molecules/Toot'
+import Toot from '~/src/renderer/components/organisms/Toot'
 import { Event } from '~/src/renderer/components/event'
 
 export default {
diff --git a/src/renderer/components/TimelineSpace/Contents/SideBar/TootDetail.vue b/src/renderer/components/TimelineSpace/Contents/SideBar/TootDetail.vue
index bc1bf02e..6939a33b 100644
--- a/src/renderer/components/TimelineSpace/Contents/SideBar/TootDetail.vue
+++ b/src/renderer/components/TimelineSpace/Contents/SideBar/TootDetail.vue
@@ -47,7 +47,7 @@
 
 <script>
 import { mapState, mapGetters } from 'vuex'
-import Toot from '~/src/renderer/components/molecules/Toot'
+import Toot from '~/src/renderer/components/organisms/Toot'
 import { Event } from '~/src/renderer/components/event'
 
 export default {
diff --git a/src/renderer/components/molecules/Toot/Poll.vue b/src/renderer/components/molecules/Toot/Poll.vue
index a51e6798..c9cc05a9 100644
--- a/src/renderer/components/molecules/Toot/Poll.vue
+++ b/src/renderer/components/molecules/Toot/Poll.vue
@@ -5,7 +5,7 @@
         <el-radio v-model="pollRadio" :label="option.title">{{ option.title }}</el-radio>
       </li>
     </ul>
-    <el-button type="success">Vote</el-button>
+    <el-button type="success" @click="vote" :disabled="pollRadio === null">Vote</el-button>
     {{ poll.votes_count }} votes,
     until {{ parseDatetime(poll.expires_at, now) }}
   </div>
@@ -19,7 +19,7 @@ import TimeFormat from '~/src/constants/timeFormat'
 export default {
   data() {
     return {
-      pollRadio: '',
+      pollRadio: null,
       now: Date.now()
     }
   },
@@ -45,6 +45,11 @@ export default {
           return moment(datetime).from(epoch)
       }
     },
+    vote() {
+      if (this.pollRadio !== null) {
+        this.$emit('vote', [this.pollRadio])
+      }
+    }
   }
 }
 </script>
diff --git a/src/renderer/components/molecules/Notification.vue b/src/renderer/components/organisms/Notification.vue
similarity index 100%
rename from src/renderer/components/molecules/Notification.vue
rename to src/renderer/components/organisms/Notification.vue
diff --git a/src/renderer/components/molecules/Notification/Favourite.vue b/src/renderer/components/organisms/Notification/Favourite.vue
similarity index 100%
rename from src/renderer/components/molecules/Notification/Favourite.vue
rename to src/renderer/components/organisms/Notification/Favourite.vue
diff --git a/src/renderer/components/molecules/Notification/Follow.vue b/src/renderer/components/organisms/Notification/Follow.vue
similarity index 100%
rename from src/renderer/components/molecules/Notification/Follow.vue
rename to src/renderer/components/organisms/Notification/Follow.vue
diff --git a/src/renderer/components/molecules/Notification/Mention.vue b/src/renderer/components/organisms/Notification/Mention.vue
similarity index 100%
rename from src/renderer/components/molecules/Notification/Mention.vue
rename to src/renderer/components/organisms/Notification/Mention.vue
diff --git a/src/renderer/components/molecules/Notification/Reblog.vue b/src/renderer/components/organisms/Notification/Reblog.vue
similarity index 100%
rename from src/renderer/components/molecules/Notification/Reblog.vue
rename to src/renderer/components/organisms/Notification/Reblog.vue
diff --git a/src/renderer/components/molecules/Toot.vue b/src/renderer/components/organisms/Toot.vue
similarity index 97%
rename from src/renderer/components/molecules/Toot.vue
rename to src/renderer/components/organisms/Toot.vue
index 94d062cc..3b4257ae 100644
--- a/src/renderer/components/molecules/Toot.vue
+++ b/src/renderer/components/organisms/Toot.vue
@@ -60,7 +60,7 @@
             </el-button>
           </div>
           <div class="content" v-show="isShowContent" v-html="status()" @click.capture.prevent="tootClick"></div>
-          <Poll v-show="isShowContent" v-if="poll" :poll="poll"></Poll>
+          <Poll v-show="isShowContent" v-if="poll" :poll="poll" @vote="vote"></Poll>
         </div>
         <div class="attachments">
           <el-button v-show="sensitive && !isShowAttachments" class="show-sensitive" type="info" @click="showAttachments = true">
@@ -416,13 +416,13 @@ export default {
       this.$refs.popper.doClose()
     },
     block() {
-      this.$store.dispatch('molecules/Toot/block', this.originalMessage.account)
+      this.$store.dispatch('organisms/Toot/block', this.originalMessage.account)
       this.$refs.popper.doClose()
     },
     changeReblog(message) {
       if (message.reblogged) {
         this.$store
-          .dispatch('molecules/Toot/unreblog', message)
+          .dispatch('organisms/Toot/unreblog', message)
           .then(data => {
             this.$emit('update', data)
           })
@@ -435,7 +435,7 @@ export default {
           })
       } else {
         this.$store
-          .dispatch('molecules/Toot/reblog', message)
+          .dispatch('organisms/Toot/reblog', message)
           .then(data => {
             this.$emit('update', data)
           })
@@ -451,7 +451,7 @@ export default {
     changeFavourite(message) {
       if (message.favourited) {
         this.$store
-          .dispatch('molecules/Toot/removeFavourite', message)
+          .dispatch('organisms/Toot/removeFavourite', message)
           .then(data => {
             this.$emit('update', data)
           })
@@ -464,7 +464,7 @@ export default {
           })
       } else {
         this.$store
-          .dispatch('molecules/Toot/addFavourite', message)
+          .dispatch('organisms/Toot/addFavourite', message)
           .then(data => {
             this.$emit('update', data)
           })
@@ -494,7 +494,7 @@ export default {
     },
     deleteToot(message) {
       this.$store
-        .dispatch('molecules/Toot/deleteToot', message)
+        .dispatch('organisms/Toot/deleteToot', message)
         .then(message => {
           this.$emit('delete', message)
         })
@@ -554,6 +554,9 @@ export default {
           this.showAttachments = !this.showAttachments
           break
       }
+    },
+    vote(choices) {
+      console.log(choices)
     }
   }
 }
diff --git a/src/renderer/store/index.ts b/src/renderer/store/index.ts
index 6a63be85..b060fee0 100644
--- a/src/renderer/store/index.ts
+++ b/src/renderer/store/index.ts
@@ -10,7 +10,7 @@ import Authorize, { AuthorizeState } from './Authorize'
 import TimelineSpace, { TimelineSpaceModuleState } from './TimelineSpace'
 import Preferences, { PreferencesModuleState } from './Preferences'
 import Settings, { SettingsModuleState } from './Settings'
-import molecules, { MoleculesModuleState } from './molecules'
+import organisms, { OrganismsModuleState } from './organisms'
 
 Vue.use(Vuex)
 
@@ -22,7 +22,7 @@ export type RootState = {
   TimelineSpace: TimelineSpaceModuleState
   Preferences: PreferencesModuleState
   Settings: SettingsModuleState
-  molecules: MoleculesModuleState
+  molecules: OrganismsModuleState
   route: Route
 }
 
@@ -37,6 +37,6 @@ export default new Vuex.Store({
     TimelineSpace,
     Preferences,
     Settings,
-    molecules
+    organisms
   }
 })
diff --git a/src/renderer/store/molecules.ts b/src/renderer/store/molecules.ts
deleted file mode 100644
index fb62384a..00000000
--- a/src/renderer/store/molecules.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import Toot, { TootState } from './molecules/Toot'
-
-export type MoleculesModuleState = {
-  Toot: TootState
-}
-
-export default {
-  namespaced: true,
-  modules: {
-    Toot
-  }
-}
diff --git a/src/renderer/store/organisms.ts b/src/renderer/store/organisms.ts
new file mode 100644
index 00000000..0e870746
--- /dev/null
+++ b/src/renderer/store/organisms.ts
@@ -0,0 +1,12 @@
+import Toot, { TootState } from './organisms/Toot'
+
+export type OrganismsModuleState = {
+  Toot: TootState
+}
+
+export default {
+  namespaced: true,
+  modules: {
+    Toot
+  }
+}
diff --git a/src/renderer/store/molecules/Toot.ts b/src/renderer/store/organisms/Toot.ts
similarity index 100%
rename from src/renderer/store/molecules/Toot.ts
rename to src/renderer/store/organisms/Toot.ts