modularised webserver and auth systems

internal/view/component/account/changebio.templ

@@ -3,11 +3,11 @@ package account
 import "projectreshoot/pkg/contexts"
 
 templ ChangeBio(err string, bio string) {
+	{{ user := contexts.CurrentUser(ctx) }}
 	{{
-	user := contexts.GetUser(ctx)
-	if bio == "" {
-		bio = user.Bio
-	}
+		if bio == "" {
+			bio = user.Bio
+		}
 	}}
 	<form
 		hx-post="/change-bio"
@@ -16,40 +16,39 @@ templ ChangeBio(err string, bio string) {
 		x-data={ templ.JSFuncCall("bioComponent", bio, user.Bio, err).CallInline }
 	>
 		<script>
-            function bioComponent(newBio, oldBio, err) {
-                return {
-                    bio: newBio,
-                    initialBio: oldBio, 
-                    err: err,
-                    bioLenText: '', 
-                    updateTextArea() {
-                        this.$nextTick(() => {
-                            if (this.$refs.bio) {
-                                this.$refs.bio.style.height = 'auto';
-                                this.$refs.bio.style.height = `
-                                    ${this.$refs.bio.scrollHeight+20}px`;
-                            };
-                            this.bioLenText = `${this.bio.length}/128`;
-                        });
-                    },
-                    resetBio() {
-                        this.bio = this.initialBio;
-                        this.err = "",
-                        this.updateTextArea();
-                    },
-                    init() {
-                        this.$nextTick(() => {
-                            // this timeout makes sure the textarea resizes on 
-                            // page render correctly. seems 20ms is the sweet
-                            // spot between a noticable delay and not working
-                            setTimeout(() => {
-                                this.updateTextArea();
-                            }, 20);
-                        });
-                    }
-                };
-            }
-        </script>
+			function bioComponent(newBio, oldBio, err) {
+				return {
+					bio: newBio,
+					initialBio: oldBio,
+					err: err,
+					bioLenText: "",
+					updateTextArea() {
+						this.$nextTick(() => {
+							if (this.$refs.bio) {
+								this.$refs.bio.style.height = "auto";
+								this.$refs.bio.style.height = `
+                                    ${this.$refs.bio.scrollHeight + 20}px`;
+							}
+							this.bioLenText = `${this.bio.length}/128`;
+						});
+					},
+					resetBio() {
+						this.bio = this.initialBio;
+						((this.err = ""), this.updateTextArea());
+					},
+					init() {
+						this.$nextTick(() => {
+							// this timeout makes sure the textarea resizes on
+							// page render correctly. seems 20ms is the sweet
+							// spot between a noticable delay and not working
+							setTimeout(() => {
+								this.updateTextArea();
+							}, 20);
+						});
+					},
+				};
+			}
+		</script>
 		<div
 			class="flex flex-col"
 		>

internal/view/component/account/changeusername.templ

@@ -3,11 +3,11 @@ package account
 import "projectreshoot/pkg/contexts"
 
 templ ChangeUsername(err string, username string) {
+	{{ user := contexts.CurrentUser(ctx) }}
 	{{
-	user := contexts.GetUser(ctx)
-	if username == "" {
-		username = user.Username
-	}
+		if username == "" {
+			username = user.Username
+		}
 	}}
 	<form
 		hx-post="/change-username"
@@ -18,18 +18,18 @@ templ ChangeUsername(err string, username string) {
                     ).CallInline }
 	>
 		<script>
-            function usernameComponent(newUsername, oldUsername, err) {
-                return {
-                    username: newUsername,
-                    initialUsername: oldUsername, 
-                    err: err,
-                    resetUsername() {
-                        this.username = this.initialUsername;
-                        this.err = "";
-                    },
-                };
-            }
-        </script>
+			function usernameComponent(newUsername, oldUsername, err) {
+				return {
+					username: newUsername,
+					initialUsername: oldUsername,
+					err: err,
+					resetUsername() {
+						this.username = this.initialUsername;
+						this.err = "";
+					},
+				};
+			}
+		</script>
 		<div
 			class="flex flex-col sm:flex-row"
 		>

internal/view/component/account/container.templ

@@ -8,7 +8,7 @@ templ AccountContainer(subpage string) {
 		@resize.window="big = window.innerWidth >= 768"
 	>
 		@SelectMenu(subpage)
-		<div class="mt-5 w-full md:ml-[200px] ml-[40px] transition-all duration-300">
+		<div class="mt-5 w-full md:ml-[200px] ml-10 transition-all duration-300">
 			<div
 				class="pl-5 text-2xl text-subtext1 border-b 
                     border-overlay0 w-[90%] mx-auto"

internal/view/component/nav/navbar.templ

@@ -21,7 +21,7 @@ templ Navbar() {
 	<div x-data="{ open: false }">
 		<header class="bg-crust">
 			<div
-				class="mx-auto flex h-16 max-w-screen-xl items-center gap-8
+				class="mx-auto flex h-16 max-w-7xl items-center gap-8
                 px-4 sm:px-6 lg:px-8"
 			>
 				<a class="block" href="/">

internal/view/component/nav/navbarright.templ

@@ -23,7 +23,7 @@ func getProfileItems() []ProfileItem {
 
 // Returns the right portion of the navbar
 templ navRight() {
-	{{ user := contexts.GetUser(ctx) }}
+	{{ user := contexts.CurrentUser(ctx) }}
 	{{ items := getProfileItems() }}
 	<div class="flex items-center gap-2">
 		<div class="sm:flex sm:gap-2">

internal/view/component/nav/sidenav.templ

@@ -4,7 +4,7 @@ import "projectreshoot/pkg/contexts"
 
 // Returns the mobile version of the navbar thats only visible when activated
 templ sideNav(navItems []NavItem) {
-	{{ user := contexts.GetUser(ctx) }}
+	{{ user := contexts.CurrentUser(ctx) }}
 	<div
 		x-show="open"
 		x-transition