wwi21seb-projekt · Nora01K · Jul 2, 2024 · Jul 2, 2024 · Jul 2, 2024 · Jul 2, 2024
diff --git a/src/components/Post.svelte b/src/components/Post.svelte
@@ -13,7 +13,7 @@
 	import ProfilePicture from './ProfilePicture.svelte';
 	import type { Comments } from '$lib/types/Comment';
 
-	export let postData;
+	export let postData: PostStructure;
 	export let currentUsername: string | undefined;
 
 	const toastStore = getToastStore();
@@ -147,15 +147,15 @@
 	async function setShowButton() {
 		showNoComments = !showNoComments;
 		if (showNoComments) {
-			commentData = await fetchComments(limit, postData.postId, offset);
+			commentData = (await fetchComments(limit, postData.postId, offset)) as Comments;
 		}
 	}
 
-	function commentSendButton() {
+	async function commentSendButton() {
 		sendComment(post.postId, commentText);
 		commentText = '';
 		click++;
-		commentData = fetchComments(limit, postData.postId, offset);
+		commentData = (await fetchComments(limit, postData.postId, offset)) as Comments;
 	}
 </script>
 
@@ -253,6 +253,15 @@
 							</div>
 						</header>
 						<section class="p-4">
+							{#if post.repost.picture?.url}
+								<div class="flex justify-center">
+									<img
+										class="max-h-[375px] rounded-md object-contain"
+										src={post.repost.picture?.url}
+										alt=""
+									/>
+								</div>
+							{/if}
 							<p class="h-[10vh] p-1 text-lg" title="repostPostcontent">
 								{#each newRepostPost as { hashtagClass, text, wordID } (wordID)}
 									<span class="{hashtagClass} text-[0.75rem]">{text} </span>
@@ -297,7 +306,6 @@
 							title="commentInput"
 							bind:value={commentText}
 							placeholder={$t('post.postComment.placeholder')}
-							rows="1"
 							maxlength="128"
 						/>
 					</label>
@@ -310,7 +318,7 @@
 	</div>
 	{#if (loginToken != '' || loginToken == undefined) && showNoComments}
 		{#key click}
-			<Commentsection postId={post.postId} {commentData} />
+			<Commentsection postId={post.postId} commentData={commentData ?? 404} />
 		{/key}
 	{/if}
 </main>
diff --git a/src/components/layout/Navbar.svelte b/src/components/layout/Navbar.svelte
@@ -89,7 +89,7 @@
 	}
 </script>
 
-<AppBar class="fixed top-0 left-0 right-0">
+<AppBar zIndex="9" class="fixed top-0 left-0 right-0">
 	<svelte:fragment slot="lead">
 		<div style="gap: 1rem; display: flex; align-items: center;">
 			<a href="/" on:click={play} on:keyup={play}>

diff --git a/src/components/modals/ModalChat.svelte b/src/components/modals/ModalChat.svelte
@@ -131,7 +131,7 @@
 	}
 </script>
 
-<div class="card w-[60vw] h-[80vh] p-2">
+<div class="card w-[60vw] h-[75vh] p-2">
 	<header class="h-[7%] flex flex-row justify-between items-center mb-2">
 		<button class="btn-sm variant-filled-primary rounded" on:click={openModalBeginChat}>
 			{$t('chat.button.add')}
@@ -224,10 +224,7 @@
 				</section>
 			{/if}
 			<div class="border-t border-surface-500/30 p-4" hidden={messageDisabeled}>
-				<form
-					class="input-group input-group-divider flex-row flex rounded-container-token"
-					onclick={sendMessage}
-				>
+				<form class="input-group input-group-divider flex-row flex rounded-container-token">
 					<textarea
 						on:keypress={(event) => {
 							if (event.key === 'Enter') {

diff --git a/src/components/popups/Settings.svelte b/src/components/popups/Settings.svelte
@@ -3,7 +3,7 @@
 	import { locale, t } from '../../i18n';
 	import { onMount } from 'svelte';
 	import { get } from 'svelte/store';
-	import { serverURL } from '$lib/Store';
+	import { serverURL, token } from '$lib/Store';
 	let language = '';
 	let server = get(serverURL);
 
@@ -27,11 +27,13 @@
 		<option value="de">{$t('settings.language.de')}</option>
 	</select>
 	<LightSwitch class="w-10 h-10 mt-2" />
-	<h5 class="h5 my-1">{$t('settings.server')}</h5>
-	<select value={server} on:input={changeServer} class="select" name="Server" id="Server">
-		<option value="https://alpha.c930.net/api">Server-alpha</option>
-		<option value="https://server-beta.de/api">Server-beta</option>
-		<option value="https://projekt-mockserver.mabu2807.de/api">Mockserver-Server</option>
-		<option value="http://localhost:3000/api">Mockserver-local</option>
-	</select>
+	{#if !$token}
+		<h5 class="h5 my-1">{$t('settings.server')}</h5>
+		<select value={server} on:input={changeServer} class="select" name="Server" id="Server">
+			<option value="https://alpha.c930.net/api">Server-alpha</option>
+			<option value="https://server-beta.de/api">Server-beta</option>
+			<option value="https://projekt-mockserver.mabu2807.de/api">Mockserver-Server</option>
+			<option value="http://localhost:3000/api">Mockserver-local</option>
+		</select>
+	{/if}
 </main>
diff --git a/src/lib/types/Post.ts b/src/lib/types/Post.ts
@@ -6,7 +6,7 @@ import type { Picture } from './Pictures';
 
 export type PostStructure = {
 	postId: UUID;
-	author: Author;
+	author: Author | undefined;
 	creationDate: string;
 	picture: Picture | undefined;
 	content: string;
@@ -22,18 +22,8 @@ export type TextColorPost = {
 	wordID: number;
 };
 
-export type PostUserProfilStructure = {
-	postId: UUID;
-	creationDate: string;
-	content: string;
-	picture: Picture | undefined;
-	likes: number;
-	liked: boolean;
-	location: GeoLocationCoords | undefined;
-};
-
 export type UserPostFetchResponse = {
-	records: PostUserProfilStructure[];
+	records: PostStructure[];
 	pagination: Pagination;
 	statusCode: number;
 };

diff --git a/src/lib/utils/Comments.ts b/src/lib/utils/Comments.ts
@@ -3,11 +3,7 @@ import { get } from 'svelte/store';
 import type { Comments } from '../types/Comment';
 import type { UUID } from 'crypto';
 
-export async function fetchComments(
-	limit: number,
-	postId: UUID,
-	offset: number
-): Promise<Comments | number> {
+export async function fetchComments(limit: number, postId: UUID, offset: number) {
 	let data: Comments = {
 		records: [],
 		pagination: {
@@ -40,9 +36,7 @@ export async function fetchComments(
 
 	if (response.status === 200) {
 		data = (await response.json()) as Comments;
-		return data;
-	} else {
-		return response.status;
+		return data as Comments;
 	}
 }
 export async function sendComment(postId: UUID, commentText: string) {

diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
@@ -25,10 +25,8 @@
 
 <Toast zIndex="10" />
 <Modal zIndex="8" components={modalRegistry} />
-<AppShell zIndex="-1">
+<AppShell>
 	<svelte:fragment slot="header"><Navbar /></svelte:fragment>
 	<slot />
-	<svelte:fragment slot="footer"
-		><div class="fixed left-0 bottom-0 right-0"><Footer /></div></svelte:fragment
-	>
+	<svelte:fragment slot="footer"><div class="w-screen"><Footer /></div></svelte:fragment>
 </AppShell>
diff --git a/src/routes/imprint/+page.svelte b/src/routes/imprint/+page.svelte
@@ -10,7 +10,7 @@
 	});
 </script>
 
-<main class="flex flex-col justify-center items-center mt-3 mb-[70px] mt-[90px]">
+<main class="flex flex-col justify-center items-center mt-[90px]">
 	<div class="card bg-red p-2 w-[80vw] mb-5">
 		<h1 class="font-bold text-2xl">{$t('imprint.frontend.header')}</h1>
 		<div class="mt-2">

diff --git a/src/routes/profile/+page.svelte b/src/routes/profile/+page.svelte
@@ -164,7 +164,7 @@
 
 <Toast zIndex="1100" />
 {#if profileData.statusCode == 200}
-	<main class=" flex flex-col items-center justify-start mb-[70px] mt-[90px]">
+	<main class=" flex flex-col items-center justify-start mt-[90px]">
 		<div
 			class=" w-full min-h-[35vh] flex flex-col md:flex-row justify-center items-center border-b-4 border-indigo-800"
 		>
@@ -283,8 +283,8 @@
 				<p class="text-2xl">{$t('profile.noPosts')}</p>
 			{:else}
 				<div class="flex flex-col items-center justify-start mt-3 mb-3 w-full">
-					{#each postsData.records as postData (postData.postId)}
-						<Post bind:postData currentUsername={usernameParams} />
+					{#each postsData.records as signlePostData (signlePostData.postId)}
+						<Post postData={signlePostData} currentUsername={usernameParams} />
 					{/each}
 					{#if postsData.records.length < postsData.pagination.records}
 						<button on:click={loadMorePosts} class="btn variant-filled"

diff --git a/src/routes/profile/followers/+page.svelte b/src/routes/profile/followers/+page.svelte
@@ -43,7 +43,7 @@
 	});
 </script>
 
-<main class="flex flex-col items-center mt-16 min-h-[70vh] mb-[70px] mt-[90px]">
+<main class="flex flex-col items-center min-h-[70vh] mt-[90px]">
 	<h2 class="h2 mb-10">{$t('profile.followers')}</h2>
 	<div class="mb-20">
 		{#if followerData.records.length == 0}

diff --git a/src/routes/profile/following/+page.svelte b/src/routes/profile/following/+page.svelte
@@ -44,7 +44,7 @@
 	});
 </script>
 
-<main class="flex flex-col items-center mt-16 min-h-[70vh] mb-[70px] mt-[90px]">
+<main class="flex flex-col items-center min-h-[70vh] mt-[90px]">
 	<h2 class="h2 mb-10">{$t('profile.following')}</h2>
 	<div class="mb-20">
 		{#if followingData.records.length == 0}

diff --git a/src/routes/register/+page.svelte b/src/routes/register/+page.svelte
@@ -197,7 +197,7 @@
 </script>
 
 <Toast />
-<main class=" flex flex-col justify-center items-center h-[90vh] mb-[70px] mt-[90px]">
+<main class=" flex flex-col justify-center items-center h-[90vh] mt-[90px]">
 	<div class="card lg:w-[40vw] md:w-[80vw] w-[95vw] h-[80vh] p-10">
 		<h1 class="h1 mb-14">{$t('register.header')}</h1>
 

diff --git a/src/routes/search/posts/+page.svelte b/src/routes/search/posts/+page.svelte
@@ -74,7 +74,7 @@
 </script>
 
 <main>
-	<div class="mb-[122px] w-3/5 min-h-screen mx-auto mt-[122px]">
+	<div class="mb-8 w-3/5 min-h-screen mx-auto mt-[122px]">
 		<div class="mb-8 flex justify-center items-center gap-4">
 			<a href="/search/users">
 				<Icon class="w-10 h-10" icon="mdi:account-search-outline" style="font-size: 32px" />

diff --git a/src/routes/search/users/+page.svelte b/src/routes/search/users/+page.svelte
@@ -31,7 +31,7 @@
 </script>
 
 <Toast zIndex="1100" />
-<div class="mt-8 w-3/5 min-h-screen mx-auto mb-[70px] mt-[122px]">
+<div class=" w-3/5 min-h-screen mx-auto mt-[122px]">
 	<div class="mb-8 flex justify-center items-center gap-4">
 		<a href="/search/users" data-sveltekit-preload-data="hover">
 			<Icon

diff --git a/src/routes/verify/+page.svelte b/src/routes/verify/+page.svelte
@@ -51,7 +51,7 @@
 	$: formCorrectCode = verifyInput.length == 6;
 </script>
 
-<main class="flex justify-center items-center w-screen h-screen mb-[70px] mt-[90px]">
+<main class="flex justify-center items-center w-screen h-screen mt-[90px]">
 	<div class="card lg:w-[40vw] md:w-[80vw] w-[95vw] h-[60vh] p-5">
 		<h2 class="h2">{$t('verify.header')}</h2>