1
0
mirror of https://github.com/misskey-dev/misskey synced 2024-11-30 15:58:24 +09:00
This commit is contained in:
syuilo 2018-02-20 23:22:19 +09:00
parent 648e691b8c
commit 7779e04fc5
2 changed files with 15 additions and 9 deletions

View File

@ -1,5 +1,5 @@
<template> <template>
<div class="mk-profile-setting"> <div class="profile">
<label class="avatar ui from group"> <label class="avatar ui from group">
<p>%i18n:desktop.tags.mk-profile-setting.avatar%</p> <p>%i18n:desktop.tags.mk-profile-setting.avatar%</p>
<img class="avatar" :src="`${os.i.avatar_url}?thumbnail&size=64`" alt="avatar"/> <img class="avatar" :src="`${os.i.avatar_url}?thumbnail&size=64`" alt="avatar"/>
@ -32,12 +32,18 @@ import notify from '../../scripts/notify';
export default Vue.extend({ export default Vue.extend({
data() { data() {
return { return {
name: (this as any).os.i.name, name: null,
location: (this as any).os.i.location, location: null,
description: (this as any).os.i.description, description: null,
birthday: (this as any).os.i.birthday, birthday: null,
}; };
}, },
created() {
this.name = (this as any).os.i.name;
this.location = (this as any).os.i.profile.location;
this.description = (this as any).os.i.description;
this.birthday = (this as any).os.i.profile.birthday;
},
methods: { methods: {
updateAvatar() { updateAvatar() {
(this as any).apis.chooseDriveFile({ (this as any).apis.chooseDriveFile({
@ -61,7 +67,7 @@ export default Vue.extend({
</script> </script>
<style lang="stylus" scoped> <style lang="stylus" scoped>
.mk-profile-setting .profile
> .avatar > .avatar
> img > img
display inline-block display inline-block

View File

@ -15,7 +15,7 @@
<div class="pages"> <div class="pages">
<section class="profile" v-show="page == 'profile'"> <section class="profile" v-show="page == 'profile'">
<h1>%i18n:desktop.tags.mk-settings.profile%</h1> <h1>%i18n:desktop.tags.mk-settings.profile%</h1>
<mk-profile-setting/> <x-profile/>
</section> </section>
<section class="web" v-show="page == 'web'"> <section class="web" v-show="page == 'web'">
@ -73,11 +73,11 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import MkProfileSetting from './profile-setting.vue'; import XProfile from './settings.profile.vue';
export default Vue.extend({ export default Vue.extend({
components: { components: {
'mk-profie-setting': MkProfileSetting 'x-profile': XProfile
}, },
data() { data() {
return { return {