From 362e95263df3d0f564030d30aa3390ea33fde0a1 Mon Sep 17 00:00:00 2001
From: Xeltica <7106976+Xeltica@users.noreply.github.com>
Date: Thu, 30 Jul 2020 23:56:17 +0900
Subject: [PATCH] =?UTF-8?q?=E9=9D=9E=E3=83=AD=E3=82=B0=E3=82=A4=E3=83=B3?=
=?UTF-8?q?=E6=99=82=E3=81=AB=E3=82=A6=E3=82=A7=E3=83=AB=E3=82=AB=E3=83=A0?=
=?UTF-8?q?=E3=83=A1=E3=83=83=E3=82=BB=E3=83=BC=E3=82=B8=E3=81=8C=E8=A2=AB?=
=?UTF-8?q?=E3=82=8B=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3=20(#6509?=
=?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* fix #6493
* Fix indentation
---
src/client/app.vue | 34 +++++++++++++++++++++-------------
1 file changed, 21 insertions(+), 13 deletions(-)
diff --git a/src/client/app.vue b/src/client/app.vue
index 093e65d16e..dcd393db32 100644
--- a/src/client/app.vue
+++ b/src/client/app.vue
@@ -18,8 +18,10 @@
</transition>
</div>
<div class="sub">
- <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 v-if="$store.getters.isSignedIn">
+ <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">
<fa :icon="faSearch"/>
<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) {
const widgets = this.$store.state.deviceUser.widgets;
return {
@@ -150,18 +152,24 @@ export default Vue.extend({
mobile: widgets.filter(x => x.place === 'mobile'),
};
} else {
- return {
- left: [],
- right: [{
+ const right = [{
+ name: 'calendar',
+ id: 'b', place: 'right', data: {}
+ }, {
+ name: 'trends',
+ id: 'c', place: 'right', data: {}
+ }];
+
+ if (this.$route.name !== 'index') {
+ right.unshift({
name: 'welcome',
id: 'a', place: 'right', data: {}
- }, {
- name: 'calendar',
- id: 'b', place: 'right', data: {}
- }, {
- name: 'trends',
- id: 'c', place: 'right', data: {}
- }],
+ });
+ }
+
+ return {
+ left: [],
+ right,
mobile: [],
};
}
--
GitLab