refs #874 Move Toot and Notification to organisms

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'

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'

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'

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'

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'

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'

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'

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'

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'

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',

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 {

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 {

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>

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)
     }
   }
 }

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
   }
 })

src/renderer/store/molecules.ts

@@ -1,12 +0,0 @@
-import Toot, { TootState } from './molecules/Toot'
-
-export type MoleculesModuleState = {
-  Toot: TootState
-}
-
-export default {
-  namespaced: true,
-  modules: {
-    Toot
-  }
-}

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
+  }
+}