ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 6691-add-using-DKIM-by-nodemailer

Browse Source
This commit is contained in:
Wolfgang Huß 2023-08-23 14:59:01 +02:00
commit 90ab066caf
5 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webapp/components/Chat/Chat.vue
View File

@ -334,9 +334,7 @@ export default {
;[...this.messages, ...Message].forEach((m) => { ;[...this.messages, ...Message].forEach((m) => {
if (m.senderId !== this.currentUser.id) m.seen = true if (m.senderId !== this.currentUser.id) m.seen = true
m.date = new Date(m.date).toDateString() m.date = new Date(m.date).toDateString()
if (!m.avatar?.startsWith('/api/')) { m.avatar = this.$filters.proxyApiUrl(m.avatar)
m.avatar = this.$filters.proxyApiUrl(m.avatar)
}
msgs[m.indexId] = m msgs[m.indexId] = m
}) })
this.messages = msgs.filter(Boolean) this.messages = msgs.filter(Boolean)

4
webapp/components/FilterMenu/FilterMenuSection.vue
View File

@ -80,10 +80,6 @@ export default {
@media only screen and (max-width: 630px) { @media only screen and (max-width: 630px) {
flex-direction: column; flex-direction: column;
> .title {
text-align: center;
}
// > .sidebar { // > .sidebar {
// max-width: none; // max-width: none;
// } // }

9
webapp/components/FilterMenu/PostTypeFilter.vue
View File

@ -2,7 +2,7 @@
<filter-menu-section <filter-menu-section
:title="$t('filter-menu.post-type')" :title="$t('filter-menu.post-type')"
:divider="false" :divider="false"
class="following-filter post-type-filter" class="post-type-filter"
> >
<template #filter-follower> <template #filter-follower>
<li class="item all-item"> <li class="item all-item">
@ -65,9 +65,10 @@ export default {
<style lang="scss"> <style lang="scss">
.post-type-filter { .post-type-filter {
& .filter-list { & .filter-list {
display: grid; display: flex;
grid-template-columns: repeat(3, 10%); flex-basis: 100%;
padding-left: 0px; flex-grow: 1;
padding-left: $space-base;
} }
} }
</style> </style>

2
webapp/pages/map.vue
View File

@ -270,7 +270,7 @@ export default {
}, },
group: { group: {
linkTitle: '&' + e.features[0].properties.slug, linkTitle: '&' + e.features[0].properties.slug,
link: `/group/${e.features[0].properties.id}/${e.features[0].properties.slug}`, link: `/groups/${e.features[0].properties.id}/${e.features[0].properties.slug}`,
}, },
event: { event: {
linkTitle: e.features[0].properties.slug, linkTitle: e.features[0].properties.slug,

1
webapp/plugins/vue-filters.js
View File

@ -98,6 +98,7 @@ export default ({ app = {} }) => {
proxyApiUrl: (input) => { proxyApiUrl: (input) => {
const url = input && (input.url || input) const url = input && (input.url || input)
if (!url) return url if (!url) return url
if (url.startsWith('/api/')) return url
return url.startsWith('/') ? url.replace('/', '/api/') : url return url.startsWith('/') ? url.replace('/', '/api/') : url
}, },
}) })