refactor(web): move router utils to hoc folder

Author: zobweyt

apps/web/src/utils/router/guest.tsx renamed to apps/web/src/hoc/session/guest.tsx

@@ -2,7 +2,7 @@ import { createAsync, Navigate, type RouteSectionProps, useSearchParams } from "
 import { JSX, Match, Switch } from "solid-js";
 import { getIsLoggedIn } from "~/lib/session";
 
-export function guest(children: (props: RouteSectionProps) => JSX.Element, fallback: string = "/settings") {
+export default function guest(children: (props: RouteSectionProps) => JSX.Element, fallback: string = "/settings") {
   return (props: RouteSectionProps) => {
     const [params] = useSearchParams();
     const redirect = params.redirect;

apps/web/src/hoc/session/index.ts

@@ -0,0 +1,4 @@
+import guest from "./guest";
+import protect from "./protect";
+
+export { guest, protect };

apps/web/src/utils/router/protect.tsx renamed to apps/web/src/hoc/session/protect.tsx

@@ -2,7 +2,7 @@ import { createAsync, Navigate, type RouteSectionProps } from "@solidjs/router";
 import { JSX, Match, Switch } from "solid-js";
 import { getIsLoggedIn } from "~/lib/session";
 
-export function protect(children: (props: RouteSectionProps) => JSX.Element, fallback: string = "/login") {
+export default function protect(children: (props: RouteSectionProps) => JSX.Element, fallback: string = "/login") {
   return (props: RouteSectionProps) => {
     const redirect = encodeURIComponent(props.location.pathname);
     const isLoggedIn = createAsync(() => getIsLoggedIn(), { deferStream: true });

apps/web/src/routes/(app)/library/(library).tsx

@@ -1,7 +1,7 @@
 import { Container, Heading, Stack } from "@quotepedia/solid";
 import { EmojiPicker } from "~/components/emoji-picker/EmojiPicker";
+import { protect } from "~/hoc/session";
 import { useTranslator } from "~/lib/i18n";
-import { protect } from "~/utils/router";
 
 export default protect(() => {
   const t = useTranslator();

apps/web/src/routes/(app)/settings/account/(account).tsx

@@ -1,8 +1,8 @@
-import { Button, Container, Heading, NavigationBar } from "@quotepedia/solid";
+import { Button, Container, NavigationBar } from "@quotepedia/solid";
 import { A } from "@solidjs/router";
-import { useScopedTranslator } from "~/lib/i18n";
-import { protect } from "~/utils/router";
 import { AccountInfoSection, AccountSecuritySection } from "~/components/settings";
+import { protect } from "~/hoc/session";
+import { useScopedTranslator } from "~/lib/i18n";
 
 export default protect(() => {
   const t = useScopedTranslator("settings");

apps/web/src/routes/(app)/settings/account/update-email.tsx

@@ -1,5 +1,5 @@
 import { UpdateEmailStepper } from "~/components/update-email";
-import { protect } from "~/utils/router";
+import { protect } from "~/hoc/session";
 
 export default protect(() => {
   return <UpdateEmailStepper />;

apps/web/src/routes/(app)/settings/account/update-password.tsx

@@ -1,5 +1,5 @@
 import { UpdatePasswordStepper } from "~/components/update-password";
-import { protect } from "~/utils/router";
+import { protect } from "~/hoc/session";
 
 export default protect(() => {
   return <UpdatePasswordStepper />;

apps/web/src/routes/(auth).tsx

@@ -1,5 +1,5 @@
 import type { RouteSectionProps } from "@solidjs/router";
-import { guest } from "~/utils/router";
+import { guest } from "~/hoc/session";
 
 export default guest((props: RouteSectionProps) => {
   return props.children;

apps/web/src/utils/router/index.ts

@@ -1,4 +1,2 @@
-export * from "./guest";
-export * from "./protect";
 export * from "./query";
 export * from "./utils";