diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2020-10-17 20:12:00 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-17 20:12:00 +0900 |
| commit | 7199e6f4e0b3a2c2bc198e689c3e0cd0d0f0354a (patch) | |
| tree | 2263a06acec7fa21882366bae26d1a983ce21135 /src/client/pages/room | |
| parent | CW の input でも投稿ショートカットが動作するように (#6690) (diff) | |
| download | misskey-7199e6f4e0b3a2c2bc198e689c3e0cd0d0f0354a.tar.gz misskey-7199e6f4e0b3a2c2bc198e689c3e0cd0d0f0354a.tar.bz2 misskey-7199e6f4e0b3a2c2bc198e689c3e0cd0d0f0354a.zip | |
Migrate to Vue3 (#6587)
* Update reaction.vue
* fix bug
* wip
* wip
* wjio
* wip
* Revert "wip"
This reverts commit e427f2160adf4e8a4147006e25a89854edab0033.
* wip
* wip
* wip
* Update init.ts
* Update drive-window.vue
* wip
* wip
* Use PascalCase for components
* Use PascalCase for components
* update dep
* wip
* wip
* wip
* Update init.ts
* wip
* Update paging.ts
* Update test.vue
* watch deep
* wip
* lint
* wip
* wip
* wip
* wip
* wiop
* wip
* Update webpack.config.ts
* alllow null poll
* wip
* wip
* wip
* wiop
* UI redesign & refactor (#6714)
* wip
* wip
* wip
* wip
* wip
* Update drive.vue
* Update word-mute.vue
* wip
* wip
* wip
* clean up
* wip
* Update default.vue
* wip
* Update notes.vue
* Update mfm.ts
* Update index.home.vue
* Update post-form.vue
* Update post-form-attaches.vue
* wip
* Update post-form.vue
* Update sidebar.vue
* wip
* wip
* Update index.vue
* wip
* Update default.vue
* Update index.vue
* Update index.vue
* wip
* Update post-form-attaches.vue
* Update note.vue
* wip
* clean up
* Update notes.vue
* wip
* wip
* Update ja-JP.yml
* wip
* wip
* Update index.vue
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* Update default.vue
* wip
* Update _dark.json5
* wip
* wip
* wip
* clean up
* wip
* wip
* Update index.vue
* Update test.vue
* wip
* wip
* fix
* wip
* wip
* wip
* wip
* clena yop
* wip
* wip
* Update store.ts
* Update messaging-room.vue
* Update default.widgets.vue
* fix
* wip
* wip
* Update modal.vue
* wip
* Update os.ts
* Update os.ts
* Update deck.vue
* Update init.ts
* wip
* Update ja-JP.yml
* v-sizeは単にwindowのresizeを監視するだけで良いかもしれない
* Update modal.vue
* wip
* Update tooltip.ts
* wip
* wip
* wip
* wip
* wip
* Update image-viewer.vue
* wip
* wip
* Update style.scss
* Update style.scss
* Update visitor.vue
* wip
* Update init.ts
* Update init.ts
* wip
* wip
* Update visitor.vue
* Update visitor.vue
* Update visitor.vue
* Update visitor.vue
* wip
* wip
* Update modal.vue
* Update header.vue
* Update menu.vue
* Update about.vue
* Update about-misskey.vue
* wip
* wip
* Update visitor.vue
* Update tooltip.ts
* wip
* Update drive.vue
* wip
* Update style.scss
* Update header.vue
* wip
* wip
* Update users.user.vue
* Update announcements.vue
* wip
* wip
* wip
* Update emojis.vue
* wip
* Update emojis.vue
* Update style.scss
* Update users.vue
* wip
* Update style.scss
* wip
* Update welcome.entrance.vue
* Update radio.vue
* Update size.ts
* Update emoji-edit-dialog.vue
* wip
* Update emojis.vue
* wip
* Update emojis.vue
* Update emojis.vue
* Update emojis.vue
* wip
* wip
* wip
* wip
* Update file-dialog.vue
* wip
* wip
* Update token-generate-window.vue
* Update notification-setting-window.vue
* wip
* wip
* Update _error_.vue
* Update ja-JP.yml
* wip
* wip
* Update store.ts
* Update emojis.vue
* Update emojis.vue
* Update emojis.vue
* Update announcements.vue
* Update store.ts
* wip
* Update page-editor.vue
* wip
* wip
* Update modal.vue
* wip
* Update select-file.ts
* Update timeline.vue
* Update emojis.vue
* Update os.ts
* wip
* Update user-select.vue
* Update mfm.ts
* Update get-file-info.ts
* Update drive.vue
* Update init.ts
* Update mfm.ts
* wip
* wip
* Update window.vue
* Update note.vue
* wip
* wip
* Update user-info.vue
* wip
* wip
* wip
* wip
* wip
* Update header.vue
* Update header.vue
* wip
* Update explore.vue
* wip
* wip
* wip
* Update webpack.config.ts
* wip
* wip
* wip
* wip
* wip
* wip
* Update autocomplete.ts
* wip
* wip
* wip
* Update toast.vue
* wip
* Update post-form-dialog.vue
* wip
* wip
* wip
* wip
* wip
* Update users.vue
* wip
* Update explore.vue
* wip
* wip
* wip
* Update package.json
* wip
* Update icon-dialog.vue
* wip
* wip
* Update user-preview.ts
* wip
* wip
* wip
* wip
* wip
* Update instance.vue
* Update user-name.vue
* Update federation.vue
* Update instance.vue
* wip
* wip
* Update tag.vue
* wip
* wip
* wip
* wip
* wip
* Update instance.vue
* wip
* Update os.ts
* Update os.ts
* wip
* wip
* wip
* Update router.ts
* wip
* Update init.ts
* Update note.vue
* Update messages.vue
* wip
* wip
* wip
* wip
* wip
* google
* wip
* wip
* wip
* wip
* Update theme-editor.vue
* wip
* wip
* Update room.vue
* Update channel-editor.vue
* wip
* Update window.vue
* Update window.vue
* wip
* Update window.vue
* Update window.vue
* wip
* Update menu.vue
* wip
* wip
* wip
* wip
* Update messaging-room.vue
* wip
* Update post-form.vue
* Update default.widgets.vue
* Update window.vue
* wip
Diffstat (limited to 'src/client/pages/room')
| -rw-r--r-- | src/client/pages/room/preview.vue | 5 | ||||
| -rw-r--r-- | src/client/pages/room/room.vue | 80 |
2 files changed, 41 insertions, 44 deletions
diff --git a/src/client/pages/room/preview.vue b/src/client/pages/room/preview.vue index 22228cf8cb..b0e600d4fb 100644 --- a/src/client/pages/room/preview.vue +++ b/src/client/pages/room/preview.vue @@ -3,10 +3,11 @@ </template> <script lang="ts"> -import Vue from 'vue'; +import { defineComponent } from 'vue'; import * as THREE from 'three'; +import * as os from '@/os'; -export default Vue.extend({ +export default defineComponent({ data() { return { selected: null, diff --git a/src/client/pages/room/room.vue b/src/client/pages/room/room.vue index e20b9e2002..89e141c436 100644 --- a/src/client/pages/room/room.vue +++ b/src/client/pages/room/room.vue @@ -1,22 +1,14 @@ <template> <div class="hveuntkp"> - <portal to="avatar" v-if="user"><mk-avatar class="avatar" :user="user" :disable-preview="true"/></portal> - <portal to="title" v-if="user"> - <mfm - :text="$t('_rooms.roomOf', { user: user.name || user.username })" - :plain="true" :nowrap="true" :custom-emojis="user.emojis" :is-note="false" - /> - </portal> - - <div class="controller _card _vMargin" v-if="objectSelected"> + <div class="controller _section" v-if="objectSelected"> <div class="_content"> <p class="name">{{ selectedFurnitureName }}</p> - <x-preview ref="preview"/> + <XPreview ref="preview"/> <template v-if="selectedFurnitureInfo.props"> <div v-for="k in Object.keys(selectedFurnitureInfo.props)" :key="k"> <p>{{ k }}</p> <template v-if="selectedFurnitureInfo.props[k] === 'image'"> - <mk-button @click="chooseImage(k, $event)">{{ $t('_rooms.chooseImage') }}</mk-button> + <MkButton @click="chooseImage(k, $event)">{{ $t('_rooms.chooseImage') }}</MkButton> </template> <template v-else-if="selectedFurnitureInfo.props[k] === 'color'"> <input type="color" :value="selectedFurnitureProps ? selectedFurnitureProps[k] : null" @change="updateColor(k, $event)"/> @@ -25,54 +17,55 @@ </template> </div> <div class="_content"> - <mk-button inline @click="translate()" :primary="isTranslateMode"><fa :icon="faArrowsAlt"/> {{ $t('_rooms.translate') }}</mk-button> - <mk-button inline @click="rotate()" :primary="isRotateMode"><fa :icon="faUndo"/> {{ $t('_rooms.rotate') }}</mk-button> - <mk-button inline v-if="isTranslateMode || isRotateMode" @click="exit()"><fa :icon="faBan"/> {{ $t('_rooms.exit') }}</mk-button> + <MkButton inline @click="translate()" :primary="isTranslateMode"><Fa :icon="faArrowsAlt"/> {{ $t('_rooms.translate') }}</MkButton> + <MkButton inline @click="rotate()" :primary="isRotateMode"><Fa :icon="faUndo"/> {{ $t('_rooms.rotate') }}</MkButton> + <MkButton inline v-if="isTranslateMode || isRotateMode" @click="exit()"><Fa :icon="faBan"/> {{ $t('_rooms.exit') }}</MkButton> </div> <div class="_content"> - <mk-button @click="remove()"><fa :icon="faTrashAlt"/> {{ $t('_rooms.remove') }}</mk-button> + <MkButton @click="remove()"><Fa :icon="faTrashAlt"/> {{ $t('_rooms.remove') }}</MkButton> </div> </div> - <div class="menu _card _vMargin" v-if="isMyRoom"> + <div class="menu _section" v-if="isMyRoom"> <div class="_content"> - <mk-button @click="add()"><fa :icon="faBoxOpen"/> {{ $t('_rooms.addFurniture') }}</mk-button> + <MkButton @click="add()"><Fa :icon="faBoxOpen"/> {{ $t('_rooms.addFurniture') }}</MkButton> </div> <div class="_content"> - <mk-select :value="roomType" @input="updateRoomType($event)"> + <MkSelect :value="roomType" @update:value="updateRoomType($event)"> <template #label>{{ $t('_rooms.roomType') }}</template> <option value="default">{{ $t('_rooms._roomType.default') }}</option> <option value="washitsu">{{ $t('_rooms._roomType.washitsu') }}</option> - </mk-select> + </MkSelect> <label v-if="roomType === 'default'"> <span>{{ $t('_rooms.carpetColor') }}</span> <input type="color" :value="carpetColor" @change="updateCarpetColor($event)"/> </label> </div> <div class="_content"> - <mk-button inline :disabled="!changed" primary @click="save()"><fa :icon="faSave"/> {{ $t('save') }}</mk-button> - <mk-button inline @click="clear()"><fa :icon="faBroom"/> {{ $t('_rooms.clear') }}</mk-button> + <MkButton inline :disabled="!changed" primary @click="save()"><Fa :icon="faSave"/> {{ $t('save') }}</MkButton> + <MkButton inline @click="clear()"><Fa :icon="faBroom"/> {{ $t('_rooms.clear') }}</MkButton> </div> </div> </div> </template> <script lang="ts"> -import Vue from 'vue'; -import { Room } from '../../scripts/room/room'; +import { computed, defineComponent } from 'vue'; +import { Room } from '@/scripts/room/room'; import parseAcct from '../../../misc/acct/parse'; import XPreview from './preview.vue'; -const storeItems = require('../../scripts/room/furnitures.json5'); +const storeItems = require('@/scripts/room/furnitures.json5'); import { faBoxOpen, faUndo, faArrowsAlt, faBan, faBroom } from '@fortawesome/free-solid-svg-icons'; import { faSave, faTrashAlt } from '@fortawesome/free-regular-svg-icons'; import { query as urlQuery } from '../../../prelude/url'; -import MkButton from '../../components/ui/button.vue'; -import MkSelect from '../../components/ui/select.vue'; -import { selectFile } from '../../scripts/select-file'; +import MkButton from '@/components/ui/button.vue'; +import MkSelect from '@/components/ui/select.vue'; +import { selectFile } from '@/scripts/select-file'; +import * as os from '@/os'; let room: Room; -export default Vue.extend({ +export default defineComponent({ components: { XPreview, MkButton, @@ -88,6 +81,12 @@ export default Vue.extend({ data() { return { + INFO: computed(() => this.user ? { + header: [{ + title: this.$t('room'), + avatar: this.user, + }], + } : null), user: null, objectSelected: false, selectedFurnitureName: null, @@ -106,13 +105,13 @@ export default Vue.extend({ async mounted() { window.addEventListener('beforeunload', this.beforeunload); - this.user = await this.$root.api('users/show', { + this.user = await os.api('users/show', { ...parseAcct(this.acct) }); this.isMyRoom = this.$store.getters.isSignedIn && (this.$store.state.i.id === this.user.id); - const roomInfo = await this.$root.api('room/show', { + const roomInfo = await os.api('room/show', { userId: this.user.id }); @@ -141,7 +140,7 @@ export default Vue.extend({ beforeRouteLeave(to, from, next) { if (this.changed) { - this.$root.dialog({ + os.dialog({ type: 'warning', text: this.$t('leaveConfirm'), showCancelButton: true @@ -157,7 +156,7 @@ export default Vue.extend({ } }, - beforeDestroy() { + beforeUnmount() { room.destroy(); window.removeEventListener('beforeunload', this.beforeunload); }, @@ -171,7 +170,7 @@ export default Vue.extend({ }, async add() { - const { canceled, result: id } = await this.$root.dialog({ + const { canceled, result: id } = await os.dialog({ type: null, title: this.$t('_rooms.addFurniture'), select: { @@ -194,16 +193,13 @@ export default Vue.extend({ }, save() { - this.$root.api('room/update', { + os.api('room/update', { room: room.getRoomInfo() }).then(() => { this.changed = false; - this.$root.dialog({ - type: 'success', - iconOnly: true, autoClose: true - }); + os.success(); }).catch((e: any) => { - this.$root.dialog({ + os.dialog({ type: 'error', text: e.message }); @@ -211,7 +207,7 @@ export default Vue.extend({ }, clear() { - this.$root.dialog({ + os.dialog({ type: 'warning', text: this.$t('_rooms.clearConfirm'), showCancelButton: true @@ -223,7 +219,7 @@ export default Vue.extend({ }, chooseImage(key, e) { - selectFile(this, e.currentTarget || e.target, null, false).then(file => { + selectFile(e.currentTarget || e.target, null, false).then(file => { room.updateProp(key, `/proxy/?${urlQuery({ url: file.thumbnailUrl })}`); this.$refs.preview.selected(room.getSelectedObject()); this.changed = true; @@ -285,7 +281,7 @@ export default Vue.extend({ position: relative; min-height: 500px; - > ::v-deep canvas { + > ::v-deep(canvas) { display: block; } } |