From 9acf6d12955e8c96901d75eb3dbaf43b1b0e7d02 Mon Sep 17 00:00:00 2001 From: giancarlo Date: Fri, 10 May 2024 20:52:41 +0700 Subject: [PATCH] Revert "Rename 'team-account-workspace.loader' to 'load-user-workspace'" This reverts commit 543a95c867b78b66d09f6b006de1f036d0f770cb. --- .../home/[account]/_components/team-account-navigation-menu.tsx | 2 +- ...{load-user-workspace.ts => team-account-workspace.loader.ts} | 0 apps/web/app/home/[account]/billing/page.tsx | 2 +- apps/web/app/home/[account]/layout.tsx | 2 +- .../home/[account]/members/_lib/server/members-page.loader.ts | 2 +- apps/web/app/home/[account]/members/page.tsx | 2 +- apps/web/app/home/[account]/settings/page.tsx | 2 +- 7 files changed, 6 insertions(+), 6 deletions(-) rename apps/web/app/home/[account]/_lib/server/{load-user-workspace.ts => team-account-workspace.loader.ts} (100%) diff --git a/apps/web/app/home/[account]/_components/team-account-navigation-menu.tsx b/apps/web/app/home/[account]/_components/team-account-navigation-menu.tsx index 48dcaaa19..199b164ee 100644 --- a/apps/web/app/home/[account]/_components/team-account-navigation-menu.tsx +++ b/apps/web/app/home/[account]/_components/team-account-navigation-menu.tsx @@ -9,7 +9,7 @@ import { getTeamAccountSidebarConfig } from '~/config/team-account-navigation.co import { TeamAccountAccountsSelector } from '~/home/[account]/_components/team-account-accounts-selector'; // local imports -import { TeamAccountWorkspace } from '../_lib/server/load-user-workspace'; +import { TeamAccountWorkspace } from '../_lib/server/team-account-workspace.loader'; import { TeamAccountNotifications } from './team-account-notifications'; export function TeamAccountNavigationMenu(props: { diff --git a/apps/web/app/home/[account]/_lib/server/load-user-workspace.ts b/apps/web/app/home/[account]/_lib/server/team-account-workspace.loader.ts similarity index 100% rename from apps/web/app/home/[account]/_lib/server/load-user-workspace.ts rename to apps/web/app/home/[account]/_lib/server/team-account-workspace.loader.ts diff --git a/apps/web/app/home/[account]/billing/page.tsx b/apps/web/app/home/[account]/billing/page.tsx index 49ed6e38b..0351b8d15 100644 --- a/apps/web/app/home/[account]/billing/page.tsx +++ b/apps/web/app/home/[account]/billing/page.tsx @@ -17,8 +17,8 @@ import { withI18n } from '~/lib/i18n/with-i18n'; // local imports import { TeamAccountLayoutPageHeader } from '../_components/team-account-layout-page-header'; -import { loadTeamWorkspace } from '../_lib/server/load-user-workspace'; import { loadTeamAccountBillingPage } from '../_lib/server/team-account-billing-page.loader'; +import { loadTeamWorkspace } from '../_lib/server/team-account-workspace.loader'; import { TeamAccountCheckoutForm } from './_components/team-account-checkout-form'; import { createBillingPortalSession } from './_lib/server/server-actions'; diff --git a/apps/web/app/home/[account]/layout.tsx b/apps/web/app/home/[account]/layout.tsx index 8e4ea0f35..7be08f0ad 100644 --- a/apps/web/app/home/[account]/layout.tsx +++ b/apps/web/app/home/[account]/layout.tsx @@ -18,7 +18,7 @@ import { withI18n } from '~/lib/i18n/with-i18n'; import { TeamAccountLayoutMobileNavigation } from './_components/team-account-layout-mobile-navigation'; import { TeamAccountLayoutSidebar } from './_components/team-account-layout-sidebar'; import { TeamAccountNavigationMenu } from './_components/team-account-navigation-menu'; -import { loadTeamWorkspace } from './_lib/server/load-user-workspace'; +import { loadTeamWorkspace } from './_lib/server/team-account-workspace.loader'; interface Params { account: string; diff --git a/apps/web/app/home/[account]/members/_lib/server/members-page.loader.ts b/apps/web/app/home/[account]/members/_lib/server/members-page.loader.ts index 3570d00da..76d415c8c 100644 --- a/apps/web/app/home/[account]/members/_lib/server/members-page.loader.ts +++ b/apps/web/app/home/[account]/members/_lib/server/members-page.loader.ts @@ -4,7 +4,7 @@ import { SupabaseClient } from '@supabase/supabase-js'; import { Database } from '~/lib/database.types'; -import { loadTeamWorkspace } from '../../../_lib/server/load-user-workspace'; +import { loadTeamWorkspace } from '../../../_lib/server/team-account-workspace.loader'; /** * Load data for the members page diff --git a/apps/web/app/home/[account]/members/page.tsx b/apps/web/app/home/[account]/members/page.tsx index 380ea4957..7f76e45b3 100644 --- a/apps/web/app/home/[account]/members/page.tsx +++ b/apps/web/app/home/[account]/members/page.tsx @@ -18,7 +18,7 @@ import { If } from '@kit/ui/if'; import { PageBody } from '@kit/ui/page'; import { Trans } from '@kit/ui/trans'; -import { loadTeamWorkspace } from '~/home/[account]/_lib/server/load-user-workspace'; +import { loadTeamWorkspace } from '~/home/[account]/_lib/server/team-account-workspace.loader'; import { createI18nServerInstance } from '~/lib/i18n/i18n.server'; import { withI18n } from '~/lib/i18n/with-i18n'; diff --git a/apps/web/app/home/[account]/settings/page.tsx b/apps/web/app/home/[account]/settings/page.tsx index 54385f778..b7ccdbac5 100644 --- a/apps/web/app/home/[account]/settings/page.tsx +++ b/apps/web/app/home/[account]/settings/page.tsx @@ -7,7 +7,7 @@ import { createI18nServerInstance } from '~/lib/i18n/i18n.server'; // local imports import { TeamAccountLayoutPageHeader } from '../_components/team-account-layout-page-header'; -import { loadTeamWorkspace } from '../_lib/server/load-user-workspace'; +import { loadTeamWorkspace } from '../_lib/server/team-account-workspace.loader'; export const generateMetadata = async () => { const i18n = await createI18nServerInstance();