Compare commits

..

No commits in common. "b426e25ed23bff18252587f219b6764c6794e0d7" and "c9087edd3ca06b61a381d08f795e2dbf6b46ff79" have entirely different histories.

8 changed files with 10 additions and 25 deletions

View File

@ -70,8 +70,6 @@
</ul> </ul>
</div> </div>
<Footer />
<div <div
class="footer" class="footer"
@click="emit('sidebar')" @click="emit('sidebar')"
@ -88,7 +86,7 @@
<script setup> <script setup>
import { computed, inject } from 'vue'; import { computed, inject } from 'vue';
import logo from '#/assets/img/logo.svg?raw'; // eslint-disable-line import/no-unresolved import logo from '../../assets/img/logo.svg?raw'; // eslint-disable-line import/no-unresolved
const emit = defineEmits(['sidebar']); const emit = defineEmits(['sidebar']);
const pageContext = inject('pageContext'); const pageContext = inject('pageContext');

View File

@ -69,10 +69,6 @@ module.exports = {
type: 'notice', // notice, alert type: 'notice', // notice, alert
enabled: false, enabled: false,
}, },
links: {
dmca: 'mailto:dmca@traxxx.me',
discord: 'https://discord.gg/gY6fnq6jJV',
},
stashes: { stashes: {
nameLength: [2, 24], nameLength: [2, 24],
namePattern: /^[a-zA-Z0-9!?$&\s_-]+$/, namePattern: /^[a-zA-Z0-9!?$&\s_-]+$/,

4
package-lock.json generated
View File

@ -1,11 +1,11 @@
{ {
"name": "traxxx-web", "name": "traxxx-web",
"version": "0.23.4", "version": "0.23.3",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"version": "0.23.4", "version": "0.23.3",
"dependencies": { "dependencies": {
"@brillout/json-serializer": "^0.5.8", "@brillout/json-serializer": "^0.5.8",
"@dicebear/collection": "^7.0.5", "@dicebear/collection": "^7.0.5",

View File

@ -77,5 +77,5 @@
"postcss-custom-media": "^10.0.2", "postcss-custom-media": "^10.0.2",
"postcss-nesting": "^12.0.2" "postcss-nesting": "^12.0.2"
}, },
"version": "0.23.4" "version": "0.23.3"
} }

View File

@ -58,17 +58,14 @@ const { actor } = pageProps;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
flex-grow: 1; flex-grow: 1;
position: relative; overflow: hidden;
} }
.actor-header { .actor-header {
width: 100%;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
position: sticky; position: relative;
top: 0;
z-index: 1;
color: var(--highlight-strong-30); color: var(--highlight-strong-30);
background: var(--grey-dark-40); background: var(--grey-dark-40);
} }
@ -97,7 +94,7 @@ const { actor } = pageProps;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
flex-grow: 1; flex-grow: 1;
/* overflow-y: auto; */ overflow-y: auto;
} }
.bookmarks { .bookmarks {

View File

@ -133,7 +133,7 @@ onMounted(() => {
categories.value.scrollLeft += event.deltaY; categories.value.scrollLeft += event.deltaY;
}); });
document.querySelector('#content').addEventListener('scroll', () => calculateActiveCategory()); content.value.addEventListener('scroll', () => calculateActiveCategory());
window.addEventListener('popstate', () => { window.addEventListener('popstate', () => {
if (window.location.hash) { if (window.location.hash) {
@ -152,10 +152,12 @@ onMounted(() => {
.page { .page {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
overflow: hidden;
} }
.content { .content {
flex-grow: 1; flex-grow: 1;
overflow-y: auto;
} }
.categories { .categories {
@ -163,9 +165,6 @@ onMounted(() => {
gap: .25rem; gap: .25rem;
flex-shrink: 0; flex-shrink: 0;
padding: .5rem 1rem; padding: .5rem 1rem;
position: sticky;
top: 0;
z-index: 1;
background: var(--grey-dark-40); background: var(--grey-dark-40);
overflow-x: auto; overflow-x: auto;
scrollbar-width: none; scrollbar-width: none;

View File

@ -13,7 +13,6 @@
<Header /> <Header />
<div <div
id="content"
ref="content" ref="content"
class="content" class="content"
> >
@ -25,8 +24,6 @@
/> />
<slot @scroll="scroll" /> <slot @scroll="scroll" />
<Footer />
</div> </div>
<BottomNavigation <BottomNavigation
@ -59,7 +56,6 @@ import {
import events from '#/src/events.js'; import events from '#/src/events.js';
import Header from '#/components/header/header.vue'; import Header from '#/components/header/header.vue';
import Footer from '#/components/footer/footer.vue';
import Sidebar from '#/components/sidebar/sidebar.vue'; import Sidebar from '#/components/sidebar/sidebar.vue';
import BottomNavigation from '#/components/footer/navigation.vue'; import BottomNavigation from '#/components/footer/navigation.vue';

View File

@ -199,7 +199,6 @@ export default async function initServer() {
maxAggregateSize: config.database.manticore.maxAggregateSize, maxAggregateSize: config.database.manticore.maxAggregateSize,
media: config.media, media: config.media,
psa: config.psa, psa: config.psa,
links: config.links,
}, },
meta: { meta: {
unseenNotifications, unseenNotifications,