diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/pages/drive.vue | 1 | ||||
| -rw-r--r-- | src/client/pages/user/index.vue | 1 | ||||
| -rw-r--r-- | src/client/scripts/paging.ts | 12 | ||||
| -rw-r--r-- | src/client/ui/chat/date-separated-list.vue | 22 | ||||
| -rw-r--r-- | src/client/ui/chat/index.vue | 9 | ||||
| -rw-r--r-- | src/client/ui/chat/notes.vue | 2 |
6 files changed, 36 insertions, 11 deletions
diff --git a/src/client/pages/drive.vue b/src/client/pages/drive.vue index 753114f725..9ee1ea8859 100644 --- a/src/client/pages/drive.vue +++ b/src/client/pages/drive.vue @@ -20,7 +20,6 @@ export default defineComponent({ [symbols.PAGE_INFO]: { title: computed(() => this.folder ? this.folder.name : this.$ts.drive), icon: 'fas fa-cloud', - menu: () => this.$refs.drive.getMenu() }, folder: null, }; diff --git a/src/client/pages/user/index.vue b/src/client/pages/user/index.vue index f5c5a0694c..f614910782 100644 --- a/src/client/pages/user/index.vue +++ b/src/client/pages/user/index.vue @@ -282,7 +282,6 @@ export default defineComponent({ share: { title: this.user.name, }, - menu: () => getUserMenu(this.user), } : null), user: null, error: null, diff --git a/src/client/scripts/paging.ts b/src/client/scripts/paging.ts index bcb0d7f2b0..194c2e8003 100644 --- a/src/client/scripts/paging.ts +++ b/src/client/scripts/paging.ts @@ -94,7 +94,11 @@ export default (opts) => ({ for (let i = 0; i < items.length; i++) { const item = items[i]; markRaw(item); - if (i === 3) item._shouldInsertAd_ = true; + if (this.pagination.reversed) { + if (i === items.length - 2) item._shouldInsertAd_ = true; + } else { + if (i === 3) item._shouldInsertAd_ = true; + } } if (!this.pagination.noPaging && (items.length > (this.pagination.limit || 10))) { items.pop(); @@ -133,7 +137,11 @@ export default (opts) => ({ for (let i = 0; i < items.length; i++) { const item = items[i]; markRaw(item); - if (i === 10) item._shouldInsertAd_ = true; + if (this.pagination.reversed) { + if (i === items.length - 9) item._shouldInsertAd_ = true; + } else { + if (i === 10) item._shouldInsertAd_ = true; + } } if (items.length > SECOND_FETCH_LIMIT) { items.pop(); diff --git a/src/client/ui/chat/date-separated-list.vue b/src/client/ui/chat/date-separated-list.vue index bc7fc91d38..12638cd230 100644 --- a/src/client/ui/chat/date-separated-list.vue +++ b/src/client/ui/chat/date-separated-list.vue @@ -1,17 +1,23 @@ <script lang="ts"> -import { defineComponent, h, TransitionGroup } from 'vue'; +import { defineComponent, h, PropType, TransitionGroup } from 'vue'; +import MkAd from '@client/components/global/ad.vue'; export default defineComponent({ props: { items: { - type: Array, + type: Array as PropType<{ id: string; createdAt: string; _shouldInsertAd_: boolean; }[]>, required: true, }, reversed: { type: Boolean, required: false, default: false - } + }, + ad: { + type: Boolean, + required: false, + default: false + }, }, methods: { @@ -66,7 +72,15 @@ export default defineComponent({ return [el, separator]; } else { - return el; + if (this.ad && item._shouldInsertAd_) { + return [h(MkAd, { + class: 'a', // advertiseの意(ブロッカー対策) + key: item.id + ':ad', + prefer: ['horizontal', 'horizontal-big'], + }), el]; + } else { + return el; + } } })); }, diff --git a/src/client/ui/chat/index.vue b/src/client/ui/chat/index.vue index fed2b803b7..6e433de126 100644 --- a/src/client/ui/chat/index.vue +++ b/src/client/ui/chat/index.vue @@ -55,6 +55,7 @@ <MkA to="/my/favorites" class="item"><i class="fas fa-star icon"></i>{{ $ts.favorites }}</MkA> </div> </div> + <MkAd class="a" prefer="square"/> </div> <footer class="footer"> <div class="left"> @@ -351,7 +352,7 @@ export default defineComponent({ flex-direction: column; width: 250px; height: 100vh; - border-right: solid 0.5px var(--divider); + border-right: solid 4px var(--divider); > .header, > .footer { $padding: 8px; @@ -498,6 +499,10 @@ export default defineComponent({ } } } + + > .a { + margin: 12px; + } } } @@ -591,7 +596,7 @@ export default defineComponent({ > .side { width: 350px; - border-left: solid 0.5px var(--divider); + border-left: solid 4px var(--divider); &.widgets.sideViewOpening { @media (max-width: 1400px) { diff --git a/src/client/ui/chat/notes.vue b/src/client/ui/chat/notes.vue index 3ced6d8b3c..6690baf584 100644 --- a/src/client/ui/chat/notes.vue +++ b/src/client/ui/chat/notes.vue @@ -16,7 +16,7 @@ </MkButton> </div> - <XList ref="notes" :items="notes" v-slot="{ item: note }" :direction="reversed ? 'up' : 'down'" :reversed="reversed"> + <XList ref="notes" :items="notes" v-slot="{ item: note }" :direction="reversed ? 'up' : 'down'" :reversed="reversed" :ad="true"> <XNote :note="note" @update:note="updated(note, $event)" :key="note._featuredId_ || note._prId_ || note.id"/> </XList> |