Oneric/akkoma-fe
1
0
Fork 0
forked from AkkomaGang/akkoma-fe
Code Pull requests Activity

Hide mentions of bubble timeline if empty

Browse source
This commit is contained in:
Sol Fisher Romanoff 2022-09-14 21:44:29 +03:00
parent f628483499
commit b936506f47
No known key found for this signature in database
GPG key ID: 9D3F2B64F2341B62
5 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/components/about/about.js
View file

@ -20,6 +20,9 @@ const About = {
return this.$store.state.instance.showInstanceSpecificPanel && return this.$store.state.instance.showInstanceSpecificPanel &&
!this.$store.getters.mergedConfig.hideISP && !this.$store.getters.mergedConfig.hideISP &&
this.$store.state.instance.instanceSpecificPanelContent this.$store.state.instance.instanceSpecificPanelContent
},
showLocalBubblePanel () {
return this.$store.state.instance.localBubbleInstances.length > 0
} }
} }
} }

2
src/components/about/about.vue
View file

@ -3,7 +3,7 @@
<instance-specific-panel v-if="showInstanceSpecificPanel" /> <instance-specific-panel v-if="showInstanceSpecificPanel" />
<staff-panel /> <staff-panel />
<terms-of-service-panel /> <terms-of-service-panel />
<LocalBubblePanel /> <LocalBubblePanel v-if="showLocalBubblePanel" />
<MRFTransparencyPanel /> <MRFTransparencyPanel />
<features-panel v-if="showFeaturesPanel" /> <features-panel v-if="showFeaturesPanel" />
</div> </div>

1
src/components/timeline_menu/timeline_menu.vue
View file

@ -135,7 +135,6 @@
a { a {
display: block; display: block;
padding: 0.6em 0.65em; padding: 0.6em 0.65em;
padding-bottom: 0;
&:hover { &:hover {
background-color: $fallback--lightBg; background-color: $fallback--lightBg;

3
src/components/timeline_menu/timeline_menu_content.js
View file

@ -23,7 +23,8 @@ const TimelineMenuContent = {
...mapState({ ...mapState({
currentUser: state => state.users.currentUser, currentUser: state => state.users.currentUser,
privateMode: state => state.instance.private, privateMode: state => state.instance.private,
federating: state => state.instance.federating federating: state => state.instance.federating,
showBubbleTimeline: state => (state.instance.localBubbleInstances.length > 0)
}) })
} }
} }

2
src/components/timeline_menu/timeline_menu_content.vue
View file

@ -16,7 +16,7 @@
>{{ $t("nav.home_timeline") }}</span> >{{ $t("nav.home_timeline") }}</span>
</router-link> </router-link>
</li> </li>
<li v-if="currentUser"> <li v-if="currentUser && showBubbleTimeline">
<router-link <router-link
class="menu-item" class="menu-item"
:to="{ name: 'bubble-timeline' }" :to="{ name: 'bubble-timeline' }"