diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-03-07 17:48:32 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-03-07 17:48:32 +0900 |
| commit | 161fd4afab323ca6bf491def473f84bb7557b481 (patch) | |
| tree | 4c8a2215dc9d3e3b817bbd82ca9b8f88fb0a0420 /src/web/app/desktop | |
| parent | wip (diff) | |
| download | misskey-161fd4afab323ca6bf491def473f84bb7557b481.tar.gz misskey-161fd4afab323ca6bf491def473f84bb7557b481.tar.bz2 misskey-161fd4afab323ca6bf491def473f84bb7557b481.zip | |
wip
Diffstat (limited to 'src/web/app/desktop')
| -rw-r--r-- | src/web/app/desktop/views/components/game-window.vue | 24 | ||||
| -rw-r--r-- | src/web/app/desktop/views/components/ui.header.nav.vue | 19 | ||||
| -rw-r--r-- | src/web/app/desktop/views/widgets/channel.channel.vue | 2 |
3 files changed, 38 insertions, 7 deletions
diff --git a/src/web/app/desktop/views/components/game-window.vue b/src/web/app/desktop/views/components/game-window.vue new file mode 100644 index 0000000000..bf339092aa --- /dev/null +++ b/src/web/app/desktop/views/components/game-window.vue @@ -0,0 +1,24 @@ +<template> +<mk-window ref="window" width="500px" height="560px" @closed="$destroy"> + <span slot="header" :class="$style.header">%fa:gamepad%オセロ</span> + <mk-othello :class="$style.content"/> +</mk-window> +</template> + +<script lang="ts"> +import Vue from 'vue'; +export default Vue.extend({ + +}); +</script> + +<style lang="stylus" module> +.header + > [data-fa] + margin-right 4px + +.content + height 100% + overflow auto + +</style> diff --git a/src/web/app/desktop/views/components/ui.header.nav.vue b/src/web/app/desktop/views/components/ui.header.nav.vue index a5b6ecd6fa..54045db8d4 100644 --- a/src/web/app/desktop/views/components/ui.header.nav.vue +++ b/src/web/app/desktop/views/components/ui.header.nav.vue @@ -15,6 +15,13 @@ <template v-if="hasUnreadMessagingMessages">%fa:circle%</template> </a> </li> + <li class="game"> + <a @click="game"> + %fa:gamepad% + <p>ゲーム</p> + <template v-if="hasGameInvitations">%fa:circle%</template> + </a> + </li> </template> <li class="ch"> <a :href="chUrl" target="_blank"> @@ -22,12 +29,6 @@ <p>%i18n:desktop.tags.mk-ui-header-nav.ch%</p> </a> </li> - <li class="info"> - <a href="https://twitter.com/misskey_xyz" target="_blank"> - %fa:info% - <p>%i18n:desktop.tags.mk-ui-header-nav.info%</p> - </a> - </li> </ul> </div> </template> @@ -36,11 +37,13 @@ import Vue from 'vue'; import { chUrl } from '../../../config'; import MkMessagingWindow from './messaging-window.vue'; +import MkGameWindow from './game-window.vue'; export default Vue.extend({ data() { return { hasUnreadMessagingMessages: false, + hasGameInvitations: false, connection: null, connectionId: null, chUrl @@ -80,6 +83,10 @@ export default Vue.extend({ messaging() { (this as any).os.new(MkMessagingWindow); + }, + + game() { + (this as any).os.new(MkGameWindow); } } }); diff --git a/src/web/app/desktop/views/widgets/channel.channel.vue b/src/web/app/desktop/views/widgets/channel.channel.vue index 70dac316cf..02cdf6de13 100644 --- a/src/web/app/desktop/views/widgets/channel.channel.vue +++ b/src/web/app/desktop/views/widgets/channel.channel.vue @@ -11,7 +11,7 @@ <script lang="ts"> import Vue from 'vue'; -import ChannelStream from '../../../common/scripts/streaming/channel-stream'; +import ChannelStream from '../../../common/scripts/streaming/channel'; import XForm from './channel.channel.form.vue'; import XPost from './channel.channel.post.vue'; |