chore: fix auth routes

src/evently.client/src/lib/services/auth-service.ts

@@ -1,3 +1,4 @@
+import { redirect } from "@tanstack/react-router";
 import axios from "axios";
 import { Account } from "~/lib/domains/entities";
 
@@ -23,3 +24,21 @@ export async function getAccount(): Promise<Account | null> {
 	}
 	return null;
 }
+
+/**
+ * Validate against the user's `Account` in the route context.
+ * Redirect to login page if authentication fails.
+ * Tightly coupled with TanStack framework
+ * @param account
+ */
+export async function guardRoute(account: Account | null): Promise<void> {
+	if (account == null) {
+		throw redirect({
+			to: "/login",
+			replace: true,
+			search: {
+				redirect: location.href
+			}
+		});
+	}
+}

src/evently.client/src/routes/(auth)/bookings/route.tsx → src/evently.client/src/routes/_auth.tsx

@@ -1,6 +1,6 @@
 import { createFileRoute, Outlet, redirect } from "@tanstack/react-router";
 
-export const Route = createFileRoute("/(auth)/bookings")({
+export const Route = createFileRoute("/_auth")({
 	beforeLoad: ({ context }) => {
 		if (context.account == null) {
 			throw redirect({

src/evently.client/src/routes/(auth)/bookings/attending/index.tsx → src/evently.client/src/routes/bookings/(auth)/attending/index.tsx

@@ -6,7 +6,7 @@ import { Card, Tabs, TabState } from "~/lib/components";
 import cloneDeep from "lodash.clonedeep";
 import { useQuery } from "@tanstack/react-query";
 
-export const Route = createFileRoute("/(auth)/bookings/attending/")({
+export const Route = createFileRoute("/bookings/(auth)/attending/")({
 	loader: ({ context }) => ({ account: context.account }),
 	component: GetBookingsPage,
 	pendingComponent: () => (

src/evently.client/src/routes/(auth)/bookings/hosting/$gatheringId/dashboard.index.tsx → src/evently.client/src/routes/bookings/(auth)/hosting/$gatheringId/dashboard.index.tsx

@@ -12,7 +12,7 @@ import { BookingsTable, Jumbotron, StatsCard } from "./-components";
 import { useInterval } from "usehooks-ts";
 import type { PageResult } from "~/lib/domains/interfaces";
 
-export const Route = createFileRoute("/(auth)/bookings/hosting/$gatheringId/dashboard/")({
+export const Route = createFileRoute("/bookings/(auth)/hosting/$gatheringId/dashboard/")({
 	loader: async ({ params }) => {
 		const gatheringId: number = parseInt(params.gatheringId);
 		const gathering: Gathering = (await getGathering(gatheringId)) ?? new Gathering();

src/evently.client/src/routes/(auth)/bookings/hosting/$gatheringId/dashboard.scan.tsx → src/evently.client/src/routes/bookings/(auth)/hosting/$gatheringId/dashboard.scan.tsx

@@ -7,7 +7,7 @@ import { ToastContent, ToastStatus, toastStyles } from "~/lib/domains/models";
 import { useForm } from "@tanstack/react-form";
 import { FieldErrMsg as FieldInfo } from "~/lib/components";
 
-export const Route = createFileRoute("/(auth)/bookings/hosting/$gatheringId/dashboard/scan")({
+export const Route = createFileRoute("/bookings/(auth)/hosting/$gatheringId/dashboard/scan")({
 	component: RouteComponent
 });
 

src/evently.client/src/routes/(auth)/bookings/hosting/index.tsx → src/evently.client/src/routes/bookings/(auth)/hosting/index.tsx

@@ -6,7 +6,7 @@ import { Card, Tabs, TabState } from "~/lib/components";
 import { useQuery } from "@tanstack/react-query";
 import cloneDeep from "lodash.clonedeep";
 
-export const Route = createFileRoute("/(auth)/bookings/hosting/")({
+export const Route = createFileRoute("/bookings/(auth)/hosting/")({
 	component: GetHostedGatheringsPage,
 	pendingComponent: () => (
 		<div className="h-full">

src/evently.client/src/routes/bookings/(auth)/route.tsx

@@ -0,0 +1,15 @@
+import { createFileRoute, Outlet } from "@tanstack/react-router";
+import { guardRoute } from "~/lib/services";
+
+export const Route = createFileRoute("/bookings/(auth)")({
+	beforeLoad: ({ context }) => guardRoute(context.account),
+	component: AuthLayout
+});
+
+function AuthLayout() {
+	return (
+		<>
+			<Outlet />
+		</>
+	);
+}

src/evently.client/src/routes/(auth)/gatherings/$gatheringId/update.tsx → src/evently.client/src/routes/gatherings/$gatheringId/(auth).update.tsx

@@ -5,11 +5,11 @@ import { fetchFile, getCategories, getGathering, sleep, updateGathering } from "
 import {
 	useGatheringForm,
 	type GatheringForm as IGatheringForm
-} from "~/routes/(auth)/gatherings/-services";
+} from "~/routes/gatherings/-services";
 import { GatheringReqDto, ToastContent } from "~/lib/domains/models";
-import { GatheringForm } from "~/routes/(auth)/gatherings/-components";
+import { GatheringForm } from "~/routes/gatherings/-components";
 
-export const Route = createFileRoute("/(auth)/gatherings/$gatheringId/update")({
+export const Route = createFileRoute("/gatherings/$gatheringId/(auth)/update")({
 	loader: async ({ params }) => {
 		const gatheringId: number = parseInt(params.gatheringId);
 		let gathering: Gathering | null = await getGathering(gatheringId);

src/evently.client/src/routes/(auth)/gatherings/create.tsx → src/evently.client/src/routes/gatherings/(auth).create.tsx

@@ -4,9 +4,9 @@ import { useState, type JSX } from "react";
 import { createGathering, getCategories, sleep } from "~/lib/services";
 import { useGatheringForm, type GatheringForm as IGatheringForm } from "./-services";
 import { GatheringReqDto, ToastContent } from "~/lib/domains/models";
-import { GatheringForm } from "~/routes/(auth)/gatherings/-components";
+import { GatheringForm } from "~/routes/gatherings/-components";
 
-export const Route = createFileRoute("/(auth)/gatherings/create")({
+export const Route = createFileRoute("/gatherings/(auth)/create")({
 	loader: async () => {
 		const categories: Category[] = await getCategories();
 		return { categories };

src/evently.client/src/routes/gatherings/(auth).route.tsx

@@ -0,0 +1,15 @@
+import { createFileRoute, Outlet } from "@tanstack/react-router";
+import { guardRoute } from "~/lib/services";
+
+export const Route = createFileRoute("/gatherings/(auth)")({
+	beforeLoad: ({ context }) => guardRoute(context.account),
+	component: AuthLayout
+});
+
+function AuthLayout() {
+	return (
+		<>
+			<Outlet />
+		</>
+	);
+}