Merge branch 'develop' of https://github.com/syuilo/misskey into develop
This commit is contained in:
commit
feed6c7acc
|
@ -10,3 +10,4 @@ docker-compose.yml
|
||||||
elasticsearch/
|
elasticsearch/
|
||||||
node_modules/
|
node_modules/
|
||||||
redis/
|
redis/
|
||||||
|
files/
|
||||||
|
|
|
@ -18,8 +18,10 @@
|
||||||
</transition>
|
</transition>
|
||||||
</div>
|
</div>
|
||||||
<div class="sub">
|
<div class="sub">
|
||||||
|
<template v-if="$store.getters.isSignedIn">
|
||||||
<button v-if="widgetsEditMode" class="_button edit active" @click="widgetsEditMode = false"><fa :icon="faGripVertical"/></button>
|
<button v-if="widgetsEditMode" class="_button edit active" @click="widgetsEditMode = false"><fa :icon="faGripVertical"/></button>
|
||||||
<button v-else class="_button edit" @click="widgetsEditMode = true"><fa :icon="faGripVertical"/></button>
|
<button v-else class="_button edit" @click="widgetsEditMode = true"><fa :icon="faGripVertical"/></button>
|
||||||
|
</template>
|
||||||
<div class="search">
|
<div class="search">
|
||||||
<fa :icon="faSearch"/>
|
<fa :icon="faSearch"/>
|
||||||
<input type="search" :placeholder="$t('search')" v-model="searchQuery" v-autocomplete="{ model: 'searchQuery' }" :disabled="searchWait" @keypress="searchKeypress"/>
|
<input type="search" :placeholder="$t('search')" v-model="searchQuery" v-autocomplete="{ model: 'searchQuery' }" :disabled="searchWait" @keypress="searchKeypress"/>
|
||||||
|
@ -141,7 +143,7 @@ export default Vue.extend({
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
widgets(): any[] {
|
widgets(): any {
|
||||||
if (this.$store.getters.isSignedIn) {
|
if (this.$store.getters.isSignedIn) {
|
||||||
const widgets = this.$store.state.deviceUser.widgets;
|
const widgets = this.$store.state.deviceUser.widgets;
|
||||||
return {
|
return {
|
||||||
|
@ -150,18 +152,24 @@ export default Vue.extend({
|
||||||
mobile: widgets.filter(x => x.place === 'mobile'),
|
mobile: widgets.filter(x => x.place === 'mobile'),
|
||||||
};
|
};
|
||||||
} else {
|
} else {
|
||||||
return {
|
const right = [{
|
||||||
left: [],
|
|
||||||
right: [{
|
|
||||||
name: 'welcome',
|
|
||||||
id: 'a', place: 'right', data: {}
|
|
||||||
}, {
|
|
||||||
name: 'calendar',
|
name: 'calendar',
|
||||||
id: 'b', place: 'right', data: {}
|
id: 'b', place: 'right', data: {}
|
||||||
}, {
|
}, {
|
||||||
name: 'trends',
|
name: 'trends',
|
||||||
id: 'c', place: 'right', data: {}
|
id: 'c', place: 'right', data: {}
|
||||||
}],
|
}];
|
||||||
|
|
||||||
|
if (this.$route.name !== 'index') {
|
||||||
|
right.unshift({
|
||||||
|
name: 'welcome',
|
||||||
|
id: 'a', place: 'right', data: {}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
left: [],
|
||||||
|
right,
|
||||||
mobile: [],
|
mobile: [],
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue