fixed merge conflicts

src/lib/auth.ts

@@ -11,7 +11,7 @@ export function createToken(userData) {
 	return jwt.sign(userData, SECRET, { expiresIn: EXPIRES_IN });
 }
 
-export function decryptToken(token) {
+export function decryptToken(token: string) {
 	return jwt.verify(token, SECRET);
 }
 

src/lib/components/ui/Alert.svelte

@@ -46,7 +46,7 @@
 	}
 </style>
 
-<script>
+<script lang="ts">
 	export let type = 'info';
 	let classNames = '';
 	export { classNames as class };

src/lib/components/ui/Button.svelte

@@ -173,7 +173,7 @@
 	}
 </style>
 
-<script>
+<script lang="ts">
 	export let href = null;
 	export let type = 'button';
 	export let size = 'md';

src/lib/components/ui/DeleteIconButton.svelte

@@ -11,7 +11,7 @@
 	}
 </style>
 
-<script>
+<script lang="ts">
 	import { page } from '$app/stores';
 	import Trash from '$lib/icons/Trash.svelte';
 	import Panel from '$lib/components/ui/Panel.svelte';

src/lib/components/ui/Modal/Modal.svelte

@@ -41,7 +41,7 @@
 	}
 </style>
 
-<script>
+<script lang="ts">
 	import { fade } from 'svelte/transition';
 	export let size = 'xl'; // https://tailwindcss.com/docs/max-width#class-reference
 	export let open = false;

src/lib/components/ui/Modal/ModalContent.svelte

@@ -15,7 +15,7 @@
 	}
 </style>
 
-<script>
+<script lang="ts">
 	export let scroll = true;
 	export let padding = true;
 

src/lib/components/ui/Notification.svelte

@@ -1,4 +1,4 @@
-<script>
+<script lang="ts">
 	export let title = 'Erfolgreich';
 	export let show = false;
 

src/lib/components/ui/Panel.svelte

@@ -5,7 +5,7 @@
 	}
 </style>
 
-<script>
+<script lang="ts">
 	export let padding = 'p-6';
 	export let shadow = true;
 	let classNames = '';

src/lib/components/ui/Select.svelte

@@ -6,7 +6,7 @@
 	}
 </style>
 
-<script>
+<script lang="ts">
 	import { clickOutside } from '$lib/helpers/clickOutside.js';
 	import Check from '$lib/icons/Check.svelte';
 	import Selector from '$lib/icons/Selector.svelte';

src/lib/config.js

@@ -1,3 +0,0 @@
-import { readFileSync } from 'fs';
-
-export default JSON.parse(readFileSync('./config.json'));

src/lib/config.ts

@@ -0,0 +1,3 @@
+import { readFileSync } from 'fs';
+
+export default JSON.parse(readFileSync('./config.json').toString());

src/lib/helper/caseNumberOccupied.ts

@@ -0,0 +1,17 @@
+import { client } from '$lib/minio';
+
+export default async function caseNumberOccupied (caseNumber: string): Promise<boolean> {
+	const prefix = `${caseNumber}/config.json`;
+	const promise: Promise<boolean> = new Promise((resolve) => {
+		const stream = client.listObjectsV2('tatort', prefix, false, '');
+		stream.on('data', () => {
+			stream.destroy();
+			resolve(true);
+		});
+		stream.on('end', () => {
+			resolve(false);
+		});
+	});
+
+	return promise;
+}

src/lib/helper/shortenFileSize.ts

@@ -2,12 +2,7 @@ const KILO = 1024;
 const MEGA = KILO * KILO;
 const GIGA = MEGA * KILO;
 
-/**
- * Shortens the size in bytes
- * @param {number} size
- * @returns{string}
- */
-export default function shortenFileSize(size) {
+export default function shortenFileSize(size: number): string {
 	const giga = Math.floor(size / GIGA);
 	let remainder = size % GIGA;
 	const mega = Math.floor(remainder / MEGA);

src/lib/helper/timeElapsed.ts

@@ -4,12 +4,7 @@ const DAY = 24 * HOUR;
 const YEAR = 365 * DAY;
 const MONTH = YEAR / 12;
 
-/**
- * get readable string of time elapsed since date
- * @param {Date} date
- * @returns string
- */
-export default function timeElapsed(date) {
+export default function timeElapsed(date: Date): string {
 	const now = new Date();
 	const age = Math.floor((now.getTime() - date.getTime()) / 1000);