Compare commits

..

No commits in common. "0fec78ec81c3de597549dc5a4afac842db0f98bc" and "4ea48dafb938d740bbaa5d89f460e8fee89fd14f" have entirely different histories.

9 changed files with 19 additions and 15 deletions

View file

@ -133,8 +133,11 @@ export default {
userBackground() {
return this.currentUser.background_image
},
instanceBackground() {
return this.mergedConfig.hideInstanceWallpaper ? null : this.background
},
background() {
return this.userBackground || (this.mergedConfig.hideInstanceWallpaper ? null : this.instanceBackground)
return this.userBackground || this.instanceBackground
},
bgStyle() {
if (this.background) {
@ -201,7 +204,7 @@ export default {
]),
...mapState(useInstanceStore, ['styleDataUsed', 'private']),
...mapState(useInstanceStore, {
instanceBackground: (store) => store.instanceIdentity.background,
background: (store) => store.instanceIdentity.background,
showFeaturesPanel: (store) => store.instanceIdentity.showFeaturesPanel,
showInstanceSpecificPanel: (store) =>
store.instanceIdentity.showInstanceSpecificPanel,

View file

@ -201,7 +201,7 @@ const getInstancePanel = async ({ store }) => {
if (res.ok) {
const html = await res.text()
useInstanceStore().set({
path: 'instanceIdentity.instanceSpecificPanelContent',
name: 'instanceIdentity.instanceSpecificPanelContent',
value: html,
})
} else {

View file

@ -33,7 +33,7 @@
</router-link>
<div class="item right actions">
<search-bar
v-if="currentUser || !private"
v-if="currentUser || !privateMode"
@toggled="onSearchBarToggled"
@click.stop
/>

View file

@ -16,9 +16,10 @@ export const ListsMenuContent = {
...mapPiniaState(useListsStore, {
lists: getListEntries,
}),
...mapPiniaState(useInstanceStore, ['private','federating']),
...mapState({
currentUser: (state) => state.users.currentUser,
privateMode: (state) => useInstanceStore().private,
federating: (state) => useInstanceStore().federating,
}),
},
}

View file

@ -112,9 +112,8 @@ const NavPanel = {
unreadAnnouncementCount: 'unreadAnnouncementCount',
supportsAnnouncements: (store) => store.supportsAnnouncements,
}),
...mapPiniaState(useInstanceStore, ['federating']),
...mapPiniaState(useInstanceStore, ['private', 'federating']),
...mapPiniaState(useInstanceStore, {
privateMode: (store) => store.private,
pleromaChatMessagesAvailable: (store) =>
store.featureSet.pleromaChatMessagesAvailable,
bookmarkFolders: (store) =>

View file

@ -79,6 +79,12 @@ const SideDrawer = {
followRequestCount() {
return this.$store.state.api.followRequests.length
},
privateMode() {
return useInstanceStore().private
},
federating() {
return useInstanceStore().federating
},
timelinesRoute() {
let name
if (useInterfaceStore().lastTimeline) {

View file

@ -47,7 +47,7 @@
</router-link>
</li>
<li
v-if="currentUser || !private"
v-if="currentUser || !privateMode"
@click="toggleDrawer"
>
<router-link
@ -166,7 +166,7 @@
</ul>
<ul>
<li
v-if="currentUser || !private"
v-if="currentUser || !privateMode"
@click="toggleDrawer"
>
<router-link

View file

@ -39,7 +39,7 @@ const setSettings = async () => {
const locale = vuexState.config.interfaceLanguage || 'en'
i18n.locale = locale
const notificationsNativeArray = Object.entries(
vuexState.config.notificationNative || {},
vuexState.config.notificationNative,
)
state.webPushAlwaysShowNotifications =
vuexState.config.webPushAlwaysShowNotifications

View file

@ -88,11 +88,6 @@ export default defineConfig(async ({ mode, command }) => {
changeOrigin: true,
cookieDomainRewrite: 'localhost',
},
'/instance': {
target,
changeOrigin: true,
cookieDomainRewrite: 'localhost',
},
'/socket': {
target,
changeOrigin: true,