mirror/cherrypick
1
1
Fork 0
mirror of https://github.com/kokonect-link/cherrypick synced 2024-12-13 22:28:58 +09:00
Code

wip

Browse Source
This commit is contained in:
syuilo 2021-02-15 21:00:37 +09:00
parent 0336d640ec
commit 70826d326b
2 changed files with 77 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/client/ui/chat/index.vue
View File

@ -24,25 +24,25 @@
</div> </div>
</div> </div>
<div class="container" v-if="lists"> <div class="container" v-if="lists">
<div class="header">{{ $ts.lists }}</div> <div class="header">{{ $ts.lists }}<button class="_button add"><Fa :icon="faPlus"/></button></div>
<div class="body"> <div class="body">
<MkA v-for="list in lists" :key="list.id" :to="`/my/list/${ list.id }`" class="item" :class="{ active: tl === `list:${ list.id }` }"><Fa :icon="faListUl" class="icon"/>{{ list.name }}</MkA> <MkA v-for="list in lists" :key="list.id" :to="`/my/list/${ list.id }`" class="item" :class="{ active: tl === `list:${ list.id }` }"><Fa :icon="faListUl" class="icon"/>{{ list.name }}</MkA>
</div> </div>
</div> </div>
<div class="container" v-if="antennas"> <div class="container" v-if="antennas">
<div class="header">{{ $ts.antennas }}</div> <div class="header">{{ $ts.antennas }}<button class="_button add"><Fa :icon="faPlus"/></button></div>
<div class="body"> <div class="body">
<MkA v-for="antenna in antennas" :key="antenna.id" :to="`/my/antenna/${ antenna.id }`" class="item" :class="{ active: tl === `antenna:${ antenna.id }` }"><Fa :icon="faSatellite" class="icon"/>{{ antenna.name }}</MkA> <MkA v-for="antenna in antennas" :key="antenna.id" :to="`/my/antenna/${ antenna.id }`" class="item" :class="{ active: tl === `antenna:${ antenna.id }` }"><Fa :icon="faSatellite" class="icon"/>{{ antenna.name }}</MkA>
</div> </div>
</div> </div>
<div class="container" v-if="followedChannels"> <div class="container" v-if="followedChannels">
<div class="header">{{ $ts.channel }}</div> <div class="header">{{ $ts.channel }}<button class="_button add"><Fa :icon="faPlus"/></button></div>
<div class="body"> <div class="body">
<MkA v-for="channel in followedChannels" :key="channel.id" :to="`/channels/${ channel.id }`" class="item" :class="{ active: tl === `channel:${ channel.id }`, read: !channel.hasUnreadNote }"><Fa :icon="faSatelliteDish" class="icon"/>{{ channel.name }}</MkA> <MkA v-for="channel in followedChannels" :key="channel.id" :to="`/channels/${ channel.id }`" class="item" :class="{ active: tl === `channel:${ channel.id }`, read: !channel.hasUnreadNote }"><Fa :icon="faSatelliteDish" class="icon"/>{{ channel.name }}</MkA>
</div> </div>
</div> </div>
<div class="container" v-if="featuredChannels"> <div class="container" v-if="featuredChannels">
<div class="header">{{ $ts.channel }}</div> <div class="header">{{ $ts.channel }}<button class="_button add"><Fa :icon="faPlus"/></button></div>
<div class="body"> <div class="body">
<MkA v-for="channel in featuredChannels" :key="channel.id" :to="`/channels/${ channel.id }`" class="item" :class="{ active: tl === `channel:${ channel.id }` }"><Fa :icon="faSatelliteDish" class="icon"/>{{ channel.name }}</MkA> <MkA v-for="channel in featuredChannels" :key="channel.id" :to="`/channels/${ channel.id }`" class="item" :class="{ active: tl === `channel:${ channel.id }` }"><Fa :icon="faSatelliteDish" class="icon"/>{{ channel.name }}</MkA>
</div> </div>
@ -79,10 +79,18 @@
<Fa :icon="faShareAlt" class="icon"/> <Fa :icon="faShareAlt" class="icon"/>
<div class="title">{{ $ts._timelines.global }}</div> <div class="title">{{ $ts._timelines.global }}</div>
</template> </template>
<template v-else-if="tl.startsWith('channel:')">
<Fa :icon="faSatelliteDish" class="icon"/>
<div class="title" v-if="currentChannel">{{ currentChannel.name }}</div>
<div class="description" v-if="currentChannel">{{ currentChannel.description }}</div>
</template>
</div> </div>
<div class="right"> <div class="right">
<XHeaderClock/> <XHeaderClock/>
<button class="_button search">
<Fa :icon="faSearch"/>
</button>
</div> </div>
</header> </header>
<div class="body"> <div class="body">
@ -103,7 +111,7 @@
<script lang="ts"> <script lang="ts">
import { defineComponent, defineAsyncComponent } from 'vue'; import { defineComponent, defineAsyncComponent } from 'vue';
import { faLayerGroup, faBars, faHome, faCircle, faWindowMaximize, faColumns, faPencilAlt, faShareAlt, faSatelliteDish, faListUl, faSatellite, faCog } from '@fortawesome/free-solid-svg-icons'; import { faLayerGroup, faBars, faHome, faCircle, faWindowMaximize, faColumns, faPencilAlt, faShareAlt, faSatelliteDish, faListUl, faSatellite, faCog, faSearch, faPlus } from '@fortawesome/free-solid-svg-icons';
import { faBell } from '@fortawesome/free-regular-svg-icons'; import { faBell } from '@fortawesome/free-regular-svg-icons';
import { instanceName } from '@/config'; import { instanceName } from '@/config';
import XSidebar from '@/components/sidebar.vue'; import XSidebar from '@/components/sidebar.vue';
@ -157,8 +165,9 @@ export default defineComponent({
antennas: null, antennas: null,
followedChannels: null, followedChannels: null,
featuredChannels: null, featuredChannels: null,
currentChannel: null,
menuDef: sidebarDef, menuDef: sidebarDef,
faLayerGroup, faBars, faBell, faHome, faCircle, faPencilAlt, faShareAlt, faSatelliteDish, faListUl, faSatellite, faCog, faLayerGroup, faBars, faBell, faHome, faCircle, faPencilAlt, faShareAlt, faSatelliteDish, faListUl, faSatellite, faCog, faSearch, faPlus,
}; };
}, },
@ -178,6 +187,14 @@ export default defineComponent({
os.api('channels/featured').then(channels => { os.api('channels/featured').then(channels => {
this.featuredChannels = channels; this.featuredChannels = channels;
}); });
this.$watch('tl', () => {
if (this.tl.startsWith('channel:')) {
os.api('channels/show', { channelId: this.tl.replace('channel:', '') }).then(channel => {
this.currentChannel = channel;
});
}
}, { immediate: true });
}, },
methods: { methods: {
@ -313,6 +330,7 @@ export default defineComponent({
> .body { > .body {
flex: 1; flex: 1;
min-width: 0; min-width: 0;
padding: 8px 0;
overflow: auto; overflow: auto;
> .container { > .container {
@ -321,9 +339,14 @@ export default defineComponent({
} }
> .header { > .header {
display: flex;
font-size: 0.9em; font-size: 0.9em;
padding: 8px 16px; padding: 8px 16px;
opacity: 0.7; opacity: 0.7;
> .add {
margin-left: auto;
}
} }
> .body { > .body {
@ -349,7 +372,7 @@ export default defineComponent({
} }
> .icon { > .icon {
margin-right: 6px; margin-right: 8px;
opacity: 0.6; opacity: 0.6;
} }
} }
@ -381,7 +404,8 @@ export default defineComponent({
> .left { > .left {
display: flex; display: flex;
font-weight: bold; flex: 1;
min-width: 0;
> .icon { > .icon {
height: ($header-height - ($padding * 2)); height: ($header-height - ($padding * 2));
@ -391,11 +415,46 @@ export default defineComponent({
margin-right: 4px; margin-right: 4px;
opacity: 0.6; opacity: 0.6;
} }
> .title, > .description {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
min-width: 0;
}
> .title {
flex-shrink: 0;
font-weight: bold;
}
> .description {
margin-left: 16px;
opacity: 0.7;
font-size: 0.9em;
}
} }
> .right { > .right {
display: flex;
min-width: 0;
margin-left: auto; margin-left: auto;
padding: 0 8px; padding-left: 8px;
> .search {
height: ($header-height - ($padding * 2));
width: ($header-height - ($padding * 2));
padding: 10px;
box-sizing: border-box;
margin-left: 8px;
position: relative;
line-height: initial;
border-radius: 5px;
&:hover {
background: rgba(0, 0, 0, 0.05);
}
}
} }
} }

13
src/client/ui/chat/note.vue
View File

@ -4,7 +4,7 @@
v-if="!muted" v-if="!muted"
v-show="!isDeleted" v-show="!isDeleted"
:tabindex="!isDeleted ? '-1' : null" :tabindex="!isDeleted ? '-1' : null"
:class="{ renote: isRenote, operating }" :class="{ renote: isRenote, highlighted: appearNote._prId_ || appearNote._featuredId_, operating }"
v-hotkey="keymap" v-hotkey="keymap"
> >
<XSub :note="appearNote.reply" class="reply-to" v-if="appearNote.reply"/> <XSub :note="appearNote.reply" class="reply-to" v-if="appearNote.reply"/>
@ -902,10 +902,14 @@ export default defineComponent({
background: rgba(128, 255, 0, 0.05); background: rgba(128, 255, 0, 0.05);
} }
&.highlighted {
background: rgba(255, 128, 0, 0.05);
}
> .info { > .info {
display: flex; display: flex;
align-items: center; align-items: center;
padding: 16px 32px 8px 32px; padding: 12px 16px 4px 16px;
line-height: 24px; line-height: 24px;
font-size: 90%; font-size: 90%;
white-space: pre; white-space: pre;
@ -916,8 +920,9 @@ export default defineComponent({
} }
> .hide { > .hide {
margin-left: auto; margin-left: 16px;
color: inherit; color: inherit;
opacity: 0.7;
} }
} }
@ -933,7 +938,7 @@ export default defineComponent({
> .renote { > .renote {
display: flex; display: flex;
align-items: center; align-items: center;
padding: 12px 16px 8px 16px; padding: 12px 16px 4px 16px;
line-height: 28px; line-height: 28px;
white-space: pre; white-space: pre;
color: var(--renote); color: var(--renote);