summaryrefslogtreecommitdiff
path: root/src/web/app/common
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-02-24 06:29:21 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-02-24 07:55:11 +0900
commit482c86a25a68a20ca950d0dc5fa8a1e00bde6783 (patch)
tree94807741071df280efcd7d8a3c3b37cedda3975c /src/web/app/common
parentFix #1131 (diff)
downloadsharkey-482c86a25a68a20ca950d0dc5fa8a1e00bde6783.tar.gz
sharkey-482c86a25a68a20ca950d0dc5fa8a1e00bde6783.tar.bz2
sharkey-482c86a25a68a20ca950d0dc5fa8a1e00bde6783.zip
:v:
Diffstat (limited to 'src/web/app/common')
-rw-r--r--src/web/app/common/define-widget.ts5
-rw-r--r--src/web/app/common/views/components/index.ts2
-rw-r--r--src/web/app/common/views/components/widgets/profile.vue125
3 files changed, 3 insertions, 129 deletions
diff --git a/src/web/app/common/define-widget.ts b/src/web/app/common/define-widget.ts
index 826f9cc636..21821629ad 100644
--- a/src/web/app/common/define-widget.ts
+++ b/src/web/app/common/define-widget.ts
@@ -34,19 +34,20 @@ export default function<T extends object>(data: {
}
this.$watch('props', newProps => {
+ const w = (this as any).os.i.client_settings.mobile_home.find(w => w.id == this.id);
if (this.isMobile) {
(this as any).api('i/update_mobile_home', {
id: this.id,
data: newProps
}).then(() => {
- (this as any).os.i.client_settings.mobile_home.find(w => w.id == this.id).data = newProps;
+ w.data = newProps;
});
} else {
(this as any).api('i/update_home', {
id: this.id,
data: newProps
}).then(() => {
- (this as any).os.i.client_settings.home.find(w => w.id == this.id).data = newProps;
+ w.data = newProps;
});
}
}, {
diff --git a/src/web/app/common/views/components/index.ts b/src/web/app/common/views/components/index.ts
index e66a323266..5460d75779 100644
--- a/src/web/app/common/views/components/index.ts
+++ b/src/web/app/common/views/components/index.ts
@@ -25,7 +25,6 @@ import fileTypeIcon from './file-type-icon.vue';
import wAccessLog from './widgets/access-log.vue';
import wVersion from './widgets/version.vue';
import wRss from './widgets/rss.vue';
-import wProfile from './widgets/profile.vue';
import wServer from './widgets/server.vue';
import wBroadcast from './widgets/broadcast.vue';
import wCalendar from './widgets/calendar.vue';
@@ -65,7 +64,6 @@ Vue.component('mkw-slideshow', wSlideshow);
Vue.component('mkw-tips', wTips);
Vue.component('mkw-donation', wDonation);
Vue.component('mkw-broadcast', wBroadcast);
-Vue.component('mkw-profile', wProfile);
Vue.component('mkw-server', wServer);
Vue.component('mkw-rss', wRss);
Vue.component('mkw-version', wVersion);
diff --git a/src/web/app/common/views/components/widgets/profile.vue b/src/web/app/common/views/components/widgets/profile.vue
deleted file mode 100644
index 68cf469788..0000000000
--- a/src/web/app/common/views/components/widgets/profile.vue
+++ /dev/null
@@ -1,125 +0,0 @@
-<template>
-<div class="mkw-profile"
- :data-compact="props.design == 1 || props.design == 2"
- :data-melt="props.design == 2"
->
- <div class="banner"
- :style="os.i.banner_url ? `background-image: url(${os.i.banner_url}?thumbnail&size=256)` : ''"
- title="クリックでバナー編集"
- @click="os.apis.updateBanner"
- ></div>
- <img class="avatar"
- :src="`${os.i.avatar_url}?thumbnail&size=96`"
- @click="os.apis.updateAvatar"
- alt="avatar"
- title="クリックでアバター編集"
- v-user-preview="os.i.id"
- />
- <router-link class="name" :to="`/${os.i.username}`">{{ os.i.name }}</router-link>
- <p class="username">@{{ os.i.username }}</p>
-</div>
-</template>
-
-<script lang="ts">
-import define from '../../../../common/define-widget';
-export default define({
- name: 'profile',
- props: () => ({
- design: 0
- })
-}).extend({
- methods: {
- func() {
- if (this.props.design == 2) {
- this.props.design = 0;
- } else {
- this.props.design++;
- }
- }
- }
-});
-</script>
-
-<style lang="stylus" scoped>
-.mkw-profile
- overflow hidden
- background #fff
- border solid 1px rgba(0, 0, 0, 0.075)
- border-radius 6px
-
- &[data-compact]
- > .banner:before
- content ""
- display block
- width 100%
- height 100%
- background rgba(0, 0, 0, 0.5)
-
- > .avatar
- top ((100px - 58px) / 2)
- left ((100px - 58px) / 2)
- border none
- border-radius 100%
- box-shadow 0 0 16px rgba(0, 0, 0, 0.5)
-
- > .name
- position absolute
- top 0
- left 92px
- margin 0
- line-height 100px
- color #fff
- text-shadow 0 0 8px rgba(0, 0, 0, 0.5)
-
- > .username
- display none
-
- &[data-melt]
- background transparent !important
- border none !important
-
- > .banner
- visibility hidden
-
- > .avatar
- box-shadow none
-
- > .name
- color #666
- text-shadow none
-
- > .banner
- height 100px
- background-color #f5f5f5
- background-size cover
- background-position center
- cursor pointer
-
- > .avatar
- display block
- position absolute
- top 76px
- left 16px
- width 58px
- height 58px
- margin 0
- border solid 3px #fff
- border-radius 8px
- vertical-align bottom
- cursor pointer
-
- > .name
- display block
- margin 10px 0 0 84px
- line-height 16px
- font-weight bold
- color #555
-
- > .username
- display block
- margin 4px 0 8px 84px
- line-height 16px
- font-size 0.9em
- color #999
-
-</style>