From 85ef5e5f019ba9a7373f58c37bd432e867d21cf5 Mon Sep 17 00:00:00 2001 From: AkiraFukushima Date: Wed, 20 Apr 2022 00:57:25 +0900 Subject: [PATCH] Fix issues which are blocking rendering --- .npmrc | 1 + package.json | 3 +- src/renderer/components/Login.vue | 2 +- src/renderer/components/Login/LoginForm.vue | 2 +- src/renderer/components/Preferences.vue | 2 +- src/renderer/components/Settings.vue | 2 +- src/renderer/components/TimelineSpace.vue | 36 ++-- .../TimelineSpace/Contents/Bookmarks.vue | 4 +- .../TimelineSpace/Contents/DirectMessages.vue | 4 +- .../TimelineSpace/Contents/Favourites.vue | 4 +- .../TimelineSpace/Contents/Hashtag.vue | 23 +-- .../TimelineSpace/Contents/Hashtag/Tag.vue | 4 +- .../TimelineSpace/Contents/Lists/Show.vue | 4 +- .../TimelineSpace/Contents/Local.vue | 4 +- .../TimelineSpace/Contents/Mentions.vue | 4 +- .../TimelineSpace/Contents/Notifications.vue | 4 +- .../TimelineSpace/Contents/Public.vue | 4 +- .../TimelineSpace/Contents/Search.vue | 83 +++----- .../TimelineSpace/Contents/SideBar.vue | 2 +- .../TimelineSpace/Modals/AddListMember.vue | 2 +- .../TimelineSpace/Modals/ImageViewer.vue | 8 +- .../components/TimelineSpace/Modals/Jump.vue | 9 +- .../TimelineSpace/Modals/NewToot.vue | 3 +- .../TimelineSpace/Modals/NewToot/Status.vue | 17 -- .../components/TimelineSpace/SideMenu.vue | 14 +- .../organisms/Notification/Favourite.vue | 169 ++++------------- .../organisms/Notification/Follow.vue | 49 ++--- .../organisms/Notification/FollowRequest.vue | 49 ++--- .../organisms/Notification/PollExpired.vue | 169 ++++------------- .../organisms/Notification/PollVote.vue | 169 ++++------------- .../organisms/Notification/Quote.vue | 179 ++++-------------- .../organisms/Notification/Reaction.vue | 169 ++++------------- .../organisms/Notification/Reblog.vue | 166 ++++------------ src/renderer/main.js | 4 +- yarn.lock | 36 +--- 35 files changed, 363 insertions(+), 1041 deletions(-) create mode 100644 .npmrc diff --git a/.npmrc b/.npmrc new file mode 100644 index 00000000..076d681c --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +@h3poteto:registry=https://npm.pkg.github.com diff --git a/package.json b/package.json index 0c909ff2..e915d890 100644 --- a/package.json +++ b/package.json @@ -109,8 +109,7 @@ "vue-popperjs": "^2.3.0", "vue-resize": "^2.0.0-alpha.1", "vue-router": "^4.0.14", - "vue-shortkey": "^3.1.7", - "vue-virtual-scroller": "^2.0.0-alpha.1", + "@h3poteto/vue-virtual-scroller": "2.0.0-alpha.1", "vuex": "^4.0.2", "vuex-router-sync": "^6.0.0-rc.1" }, diff --git a/src/renderer/components/Login.vue b/src/renderer/components/Login.vue index d87a36c2..441a6e46 100644 --- a/src/renderer/components/Login.vue +++ b/src/renderer/components/Login.vue @@ -10,7 +10,7 @@ -
+
diff --git a/src/renderer/components/Login/LoginForm.vue b/src/renderer/components/Login/LoginForm.vue index 2fda3b64..0607c516 100644 --- a/src/renderer/components/Login/LoginForm.vue +++ b/src/renderer/components/Login/LoginForm.vue @@ -9,7 +9,7 @@ :model="form" > - +

{{ $t('login.proxy_info') }}{{ $t('login.proxy_here') }} diff --git a/src/renderer/components/Preferences.vue b/src/renderer/components/Preferences.vue index f6f2b6c1..a3b1940f 100644 --- a/src/renderer/components/Preferences.vue +++ b/src/renderer/components/Preferences.vue @@ -13,7 +13,7 @@ -

+
-
+
@@ -39,18 +37,18 @@ export default { data() { return { dropTarget: null, - droppableVisible: false, + droppableVisible: false } }, computed: { ...mapState({ - loading: (state) => state.TimelineSpace.loading, - collapse: (state) => state.TimelineSpace.SideMenu.collapse, + loading: state => state.TimelineSpace.loading, + collapse: state => state.TimelineSpace.SideMenu.collapse }), ...mapGetters('TimelineSpace/Modals', ['modalOpened']), shortcutEnabled: function () { return !this.modalOpened - }, + } }, async created() { this.$store.dispatch('TimelineSpace/Contents/SideBar/close') @@ -88,20 +86,17 @@ export default { await this.clear() try { - await this.$store.dispatch( - 'TimelineSpace/initLoad', - this.$route.params.id - ) + await this.$store.dispatch('TimelineSpace/initLoad', this.$route.params.id) } catch (err) { if (err instanceof AccountLoadError) { this.$message({ message: this.$t('message.account_load_error'), - type: 'error', + type: 'error' }) } else if (err instanceof TimelineFetchError) { this.$message({ message: this.$t('message.timeline_fetch_error'), - type: 'error', + type: 'error' }) } } @@ -112,17 +107,14 @@ export default { e.preventDefault() e.stopPropagation() this.droppableVisible = false - if ( - e.dataTransfer.files.item(0) === null || - e.dataTransfer.files.item(0) === undefined - ) { + if (e.dataTransfer.files.item(0) === null || e.dataTransfer.files.item(0) === undefined) { return false } const file = e.dataTransfer.files.item(0) if (!file.type.includes('image') && !file.type.includes('video')) { this.$message({ message: this.$t('validation.new_toot.attach_image'), - type: 'error', + type: 'error' }) return false } @@ -133,16 +125,16 @@ export default { .then(() => { Event.$emit('image-uploaded') }) - .catch((err) => { + .catch(err => { if (err instanceof NewTootAttachLength) { this.$message({ message: this.$t('validation.new_toot.attach_length', { max: 4 }), - type: 'error', + type: 'error' }) } else { this.$message({ message: this.$t('message.attach_error'), - type: 'error', + type: 'error' }) } }) @@ -168,8 +160,8 @@ export default { this.$store.commit('TimelineSpace/Modals/Shortcut/changeModal', true) break } - }, - }, + } + } } diff --git a/src/renderer/components/TimelineSpace/Contents/Bookmarks.vue b/src/renderer/components/TimelineSpace/Contents/Bookmarks.vue index c19b1f31..f4bda562 100644 --- a/src/renderer/components/TimelineSpace/Contents/Bookmarks.vue +++ b/src/renderer/components/TimelineSpace/Contents/Bookmarks.vue @@ -1,6 +1,6 @@