DatseMultimediaSites
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/syuilo/misskey into develop

This commit is contained in:
syuilo 2020-07-31 19:09:49 +09:00
parent 2522e7388d 09cfd620bb
commit feed6c7acc
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.dockerignore
View File

@ -10,3 +10,4 @@ docker-compose.yml
elasticsearch/ elasticsearch/
node_modules/ node_modules/
redis/ redis/
files/

34
src/client/app.vue
View File

@ -18,8 +18,10 @@
</transition> </transition>
</div> </div>
<div class="sub"> <div class="sub">
<button v-if="widgetsEditMode" class="_button edit active" @click="widgetsEditMode = false"><fa :icon="faGripVertical"/></button> <template v-if="$store.getters.isSignedIn">
<button v-else class="_button edit" @click="widgetsEditMode = true"><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>
</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: [], name: 'calendar',
right: [{ id: 'b', place: 'right', data: {}
}, {
name: 'trends',
id: 'c', place: 'right', data: {}
}];
if (this.$route.name !== 'index') {
right.unshift({
name: 'welcome', name: 'welcome',
id: 'a', place: 'right', data: {} id: 'a', place: 'right', data: {}
}, { });
name: 'calendar', }
id: 'b', place: 'right', data: {}
}, { return {
name: 'trends', left: [],
id: 'c', place: 'right', data: {} right,
}],
mobile: [], mobile: [],
}; };
} }