From 2790c4e31c72262f5ec50be9fb9835fbd350e373 Mon Sep 17 00:00:00 2001
From: DebaucheryLibrarian <DebaucheryLibrarian@unknown.name>
Date: Thu, 6 Jun 2024 02:49:00 +0200
Subject: [PATCH] Added footer with dmca and discord links.

---
 components/sidebar/sidebar.vue  | 4 +++-
 config/default.cjs              | 4 ++++
 pages/actors/@actorId/+Page.vue | 9 ++++++---
 pages/tags/+Page.vue            | 7 ++++---
 renderer/container.vue          | 4 ++++
 src/web/server.js               | 1 +
 6 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/components/sidebar/sidebar.vue b/components/sidebar/sidebar.vue
index 9771678..1bd34cc 100644
--- a/components/sidebar/sidebar.vue
+++ b/components/sidebar/sidebar.vue
@@ -70,6 +70,8 @@
 				</ul>
 			</div>
 
+			<Footer />
+
 			<div
 				class="footer"
 				@click="emit('sidebar')"
@@ -86,7 +88,7 @@
 <script setup>
 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 pageContext = inject('pageContext');
diff --git a/config/default.cjs b/config/default.cjs
index 6599a5b..2aa0da8 100755
--- a/config/default.cjs
+++ b/config/default.cjs
@@ -69,6 +69,10 @@ module.exports = {
 		type: 'notice', // notice, alert
 		enabled: false,
 	},
+	links: {
+		dmca: 'mailto:dmca@traxxx.me',
+		discord: 'https://discord.gg/gY6fnq6jJV',
+	},
 	stashes: {
 		nameLength: [2, 24],
 		namePattern: /^[a-zA-Z0-9!?$&\s_-]+$/,
diff --git a/pages/actors/@actorId/+Page.vue b/pages/actors/@actorId/+Page.vue
index 523f05d..2d5f722 100644
--- a/pages/actors/@actorId/+Page.vue
+++ b/pages/actors/@actorId/+Page.vue
@@ -58,14 +58,17 @@ const { actor } = pageProps;
 	display: flex;
 	flex-direction: column;
 	flex-grow: 1;
-	overflow: hidden;
+	position: relative;
 }
 
 .actor-header {
+	width: 100%;
     display: flex;
     justify-content: space-between;
     align-items: center;
-	position: relative;
+	position: sticky;
+	top: 0;
+	z-index: 1;
     color: var(--highlight-strong-30);
     background: var(--grey-dark-40);
 }
@@ -94,7 +97,7 @@ const { actor } = pageProps;
 	display: flex;
 	flex-direction: column;
 	flex-grow: 1;
-	overflow-y: auto;
+	/* overflow-y: auto; */
 }
 
 .bookmarks {
diff --git a/pages/tags/+Page.vue b/pages/tags/+Page.vue
index b99dcff..1007cd0 100644
--- a/pages/tags/+Page.vue
+++ b/pages/tags/+Page.vue
@@ -133,7 +133,7 @@ onMounted(() => {
 		categories.value.scrollLeft += event.deltaY;
 	});
 
-	content.value.addEventListener('scroll', () => calculateActiveCategory());
+	document.querySelector('#content').addEventListener('scroll', () => calculateActiveCategory());
 
 	window.addEventListener('popstate', () => {
 		if (window.location.hash) {
@@ -152,12 +152,10 @@ onMounted(() => {
 .page {
 	display: flex;
 	flex-direction: column;
-	overflow: hidden;
 }
 
 .content {
 	flex-grow: 1;
-	overflow-y: auto;
 }
 
 .categories {
@@ -165,6 +163,9 @@ onMounted(() => {
 	gap: .25rem;
 	flex-shrink: 0;
 	padding: .5rem 1rem;
+	position: sticky;
+	top: 0;
+	z-index: 1;
 	background: var(--grey-dark-40);
 	overflow-x: auto;
 	scrollbar-width: none;
diff --git a/renderer/container.vue b/renderer/container.vue
index c10ac55..e7fae47 100644
--- a/renderer/container.vue
+++ b/renderer/container.vue
@@ -13,6 +13,7 @@
 		<Header />
 
 		<div
+			id="content"
 			ref="content"
 			class="content"
 		>
@@ -24,6 +25,8 @@
 			/>
 
 			<slot @scroll="scroll" />
+
+			<Footer />
 		</div>
 
 		<BottomNavigation
@@ -56,6 +59,7 @@ import {
 import events from '#/src/events.js';
 
 import Header from '#/components/header/header.vue';
+import Footer from '#/components/footer/footer.vue';
 import Sidebar from '#/components/sidebar/sidebar.vue';
 import BottomNavigation from '#/components/footer/navigation.vue';
 
diff --git a/src/web/server.js b/src/web/server.js
index e559acd..306bb3a 100644
--- a/src/web/server.js
+++ b/src/web/server.js
@@ -199,6 +199,7 @@ export default async function initServer() {
 				maxAggregateSize: config.database.manticore.maxAggregateSize,
 				media: config.media,
 				psa: config.psa,
+				links: config.links,
 			},
 			meta: {
 				unseenNotifications,