code refactor

Author: michaltarasiuk

src/app/[locale]/[channel]/(auth)/_actions/sign-in.ts

@@ -11,9 +11,8 @@ import {
   setRefreshTokenCookie,
 } from "@/modules/account/utils/cookies";
 import {toValidationErrors} from "@/modules/account/utils/validation-errors";
-import {BasePathnameSchema} from "@/utils/base-pathname";
 import {isDefined} from "@/utils/is-defined";
-import {joinPathSegments} from "@/utils/pathname";
+import {BasePathnameSchema, joinPathSegments} from "@/utils/pathname";
 
 const SigninMutation = graphql(`
   mutation Signin($email: String!, $password: String!) {

src/app/[locale]/[channel]/(auth)/_actions/sign-up.ts

@@ -8,8 +8,7 @@ import {getClient} from "@/graphql/apollo-client";
 import {graphql} from "@/graphql/codegen";
 import {localeToLanguageCode} from "@/i18n/utils/locale-to-language-code";
 import {toValidationErrors} from "@/modules/account/utils/validation-errors";
-import {BasePathnameSchema} from "@/utils/base-pathname";
-import {joinPathSegments} from "@/utils/pathname";
+import {BasePathnameSchema, joinPathSegments} from "@/utils/pathname";
 
 import {signIn} from "./sign-in";
 

src/app/[locale]/[channel]/(auth)/confirm-account/route.ts

@@ -4,9 +4,8 @@ import {Routes} from "@/consts/routes";
 import {getClient} from "@/graphql/apollo-client";
 import {graphql} from "@/graphql/codegen";
 import type {ConfirmAccountMutationVariables} from "@/graphql/codegen/graphql";
-import {getBasePathname} from "@/utils/base-pathname";
 import {isDefined} from "@/utils/is-defined";
-import {joinPathSegments} from "@/utils/pathname";
+import {getBasePathname, joinPathSegments} from "@/utils/pathname";
 
 const ConfirmAccountMutation = graphql(`
   mutation ConfirmAccount($email: String!, $token: String!) {

src/app/[locale]/[channel]/checkout/(steps)/_actions/update-billing.ts

@@ -9,9 +9,8 @@ import {graphql} from "@/graphql/codegen";
 import {getCheckoutId} from "@/modules/checkout/utils/cookies";
 import {toValidationErrors} from "@/modules/checkout/utils/validation-errors";
 import {AddressSchema} from "@/utils/address";
-import {BasePathnameSchema} from "@/utils/base-pathname";
 import {isDefined} from "@/utils/is-defined";
-import {joinPathSegments} from "@/utils/pathname";
+import {BasePathnameSchema, joinPathSegments} from "@/utils/pathname";
 
 const BillingAddressUpdateMutation = graphql(`
   mutation BillingAddressUpdate($id: ID!, $billingAddress: AddressInput!) {

src/app/[locale]/[channel]/checkout/(steps)/_actions/update-delivery.ts

@@ -8,9 +8,8 @@ import {getClient} from "@/graphql/apollo-client";
 import {graphql} from "@/graphql/codegen";
 import {getCheckoutId} from "@/modules/checkout/utils/cookies";
 import {toValidationErrors} from "@/modules/checkout/utils/validation-errors";
-import {BasePathnameSchema} from "@/utils/base-pathname";
 import {isDefined} from "@/utils/is-defined";
-import {joinPathSegments} from "@/utils/pathname";
+import {BasePathnameSchema, joinPathSegments} from "@/utils/pathname";
 
 const DeliveryMethodUpdateMutation = graphql(`
   mutation DeliveryMethodUpdate($id: ID!, $deliveryMethodId: ID!) {

src/app/[locale]/[channel]/checkout/(steps)/_actions/update-information.ts

@@ -14,9 +14,8 @@ import type {
 import {getCheckoutId} from "@/modules/checkout/utils/cookies";
 import {toValidationErrors} from "@/modules/checkout/utils/validation-errors";
 import {AddressSchema} from "@/utils/address";
-import {BasePathnameSchema} from "@/utils/base-pathname";
 import {isDefined} from "@/utils/is-defined";
-import {joinPathSegments} from "@/utils/pathname";
+import {BasePathnameSchema, joinPathSegments} from "@/utils/pathname";
 
 const EmailUpdateMutation = graphql(`
   mutation EmailUpdate($id: ID!, $email: String!) {

src/components/Heading.tsx

@@ -55,7 +55,7 @@ export function SkeletonHeading(props: Pick<HeadingProps, "level">) {
     <div
       aria-hidden
       className={cn(
-        "flex h-[1lh] w-full max-w-40 items-center",
+        "flex h-[1lh] w-full max-w-38 items-center",
         heading(level === 1 || level === 2 ? {level} : {}),
       )}>
       <Skeleton className={cn("h-[1em] w-full")} />

src/utils/base-pathname.ts

@@ -1,3 +1,19 @@
+import * as z from "zod";
+
+import {DefaultLocale, Locales} from "@/i18n/consts";
+import {DefaultChannel} from "@/modules/channel/consts";
+
+export const BasePathnameSchema = z.object({
+  locale: z.enum(Locales),
+  channel: z.string(),
+});
+
+export function getBasePathname(pathname: string) {
+  const [locale = DefaultLocale, channel = DefaultChannel] =
+    splitPathSegments(pathname);
+  return [locale, channel] as const;
+}
+
 export function joinPathSegments(...segments: string[]) {
   function trimLeadingSlash(s: string) {
     return s.startsWith("/") ? s.slice(1) : s;