-
-
-
{post.title}
-
by {post.firstname} {post.lastname}
+ {#if loading}
+
+
Loading...
+
+ {:else}
+
+ {#each $posts as post (post.post_id)}
+ -
+
+
+
+
{post.title}
+ by {post.first_name} {post.last_name}
+
-
{@html post.content}
-
-
- {#if openedCommentsPostId === post.id}
-
- {#each post.comments as comment}
- -
- {comment.commenter}: {@html comment.comment}
-
- {/each}
-
-
+
{@html post.content}
+
- {/if}
-
- {/each}
-
+ {#if openedCommentsId === post.post_id}
+
+ {#each post.comments as comment}
+ -
+ {comment.first_name}
+ {comment.last_name}: {@html comment.content}
+
+ {/each}
+
+
+
+ {/if}
+
+ {/each}
+
+ {/if}
+
+
diff --git a/client/src/routes/(app)/settings/+page.svelte b/client/src/routes/(app)/settings/+page.svelte
index 5c909b4..cc6cf2a 100644
--- a/client/src/routes/(app)/settings/+page.svelte
+++ b/client/src/routes/(app)/settings/+page.svelte
@@ -4,6 +4,12 @@
import { goto } from "$app/navigation";
let backendUrl;
+ let showAlert = false;
+ let validationError = "";
+ let userForm;
+ let file;
+
+ $: userForm = $user;
onMount(() => {
backendUrl = `http://${window.location.hostname}:3001/`;
@@ -29,52 +35,14 @@
}
}
- let showAlert = false;
- let validationError = "";
-
- let userForm = $user;
- let file;
-
- function updateUser(newData) {
- user.update((u) => {
- return { ...u, ...newData };
- });
- }
-
function handleFileChange(event) {
file = event.target.files[0];
}
- async function saveChanges() {
+ async function handleSaveChanges() {
try {
- // First, send JSON data
- const response = await fetch(`${backendUrl}updateUser`, {
- method: "POST",
- headers: {
- "Content-Type": "application/json",
- },
- body: JSON.stringify(userForm),
- });
-
- if (!response.ok) {
- throw new Error("Failed to save changes");
- }
-
- // Then, send the image as FormData if it exists
- if (file) {
- const formData = new FormData();
- formData.append("avatar", file, file.name);
-
- const imgResponse = await fetch(`${backendUrl}updateUserAvatar`, {
- method: "POST",
- body: formData,
- });
-
- if (!imgResponse.ok) {
- throw new Error("Failed to upload image");
- }
- }
-
+ await saveUserData();
+ if (file) await uploadAvatar();
console.log("Changes and image upload successful:", userForm);
updateUser(userForm);
} catch (err) {
@@ -83,6 +51,37 @@
validationError = err.message || "Something went wrong";
}
}
+
+ async function saveUserData() {
+ const response = await fetch(`${backendUrl}updateUser`, {
+ method: "POST",
+ credentials: "include",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify(userForm)
+ });
+ if (!response.ok) throw new Error("Failed to save changes");
+ }
+
+ async function uploadAvatar() {
+ const formData = new FormData();
+ formData.append("avatar", file, file.name);
+ const imgResponse = await fetch(`${backendUrl}updateUserAvatar`, {
+ method: "POST",
+ credentials: "include",
+ body: formData
+ });
+ if (!imgResponse.ok) throw new Error("Failed to upload image");
+ }
+
+ async function deleteUser() {
+ const response = await fetch(`${backendUrl}user`, {
+ method: "DELETE",
+ credentials: "include",
+ });
+ if (!response.ok) throw new Error("Failed to delete user");
+
+ goto("/");
+ }
@@ -90,7 +89,7 @@