zaid.marzguioui/myeasycms-v2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor join service and fix imports

Browse Source 
Join service was deleted and its functionality was integrated into the team-accounts API. General rearrangement and renaming of server-related files were made, particularly for billing-related services to ensure consistency. This made it necessary to fix import paths across multiple files.
This commit is contained in:
giancarlo
2024-04-22 12:52:09 +08:00
parent 56d532ab61
commit 7020e21193
11 changed files with 72 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/web/app/(dashboard)/home/(user)/billing/_components/personal-account-checkout-form.tsx
View File

@@ -20,7 +20,7 @@ import { Trans } from '@kit/ui/trans';
import billingConfig from '~/config/billing.config';
import { createPersonalAccountCheckoutSession } from '../server-actions';
import { createPersonalAccountCheckoutSession } from '../_lib/server/server-actions';
const EmbeddedCheckout = dynamic(
async () => {

4
apps/web/app/(dashboard)/home/(user)/billing/server-actions.ts → apps/web/app/(dashboard)/home/(user)/billing/_lib/server/server-actions.ts
View File

@@ -5,8 +5,8 @@ import { redirect } from 'next/navigation';
import { enhanceAction } from '@kit/next/actions';
import { getSupabaseServerActionClient } from '@kit/supabase/server-actions-client';
import { PersonalAccountCheckoutSchema } from './_lib/schema/personal-account-checkout.schema';
import { UserBillingService } from './_lib/server/user-billing.service';
import { PersonalAccountCheckoutSchema } from '../schema/personal-account-checkout.schema';
import { UserBillingService } from './user-billing.service';
/**
* @name createPersonalAccountCheckoutSession

2
apps/web/app/(dashboard)/home/(user)/billing/page.tsx
View File

@@ -16,7 +16,7 @@ import { createI18nServerInstance } from '~/lib/i18n/i18n.server';
import { withI18n } from '~/lib/i18n/with-i18n';
import { UserAccountHeader } from '../_components/user-account-header';
import { createPersonalAccountBillingPortalSession } from '../billing/server-actions';
import { createPersonalAccountBillingPortalSession } from '../billing/_lib/server/server-actions';
import { PersonalAccountCheckoutForm } from './_components/personal-account-checkout-form';
// user billing imports
import { loadPersonalAccountBillingPageData } from './_lib/server/personal-account-billing-page.loader';

2
apps/web/app/(dashboard)/home/[account]/billing/_components/team-account-checkout-form.tsx
View File

@@ -17,7 +17,7 @@ import { Trans } from '@kit/ui/trans';
import billingConfig from '~/config/billing.config';
import { createTeamAccountCheckoutSession } from '../server-actions';
import { createTeamAccountCheckoutSession } from '../_lib/server/server-actions';
const EmbeddedCheckout = dynamic(
async () => {

0
apps/web/app/(dashboard)/home/[account]/_lib/schema/team-billing.schema.ts → apps/web/app/(dashboard)/home/[account]/billing/_lib/schema/team-billing.schema.ts
View File

4
apps/web/app/(dashboard)/home/[account]/billing/server-actions.ts → apps/web/app/(dashboard)/home/[account]/billing/_lib/server/server-actions.ts
View File

@@ -10,8 +10,8 @@ import { getSupabaseServerActionClient } from '@kit/supabase/server-actions-clie
import {
TeamBillingPortalSchema,
TeamCheckoutSchema,
} from '../_lib/schema/team-billing.schema';
import { TeamBillingService } from '../_lib/server/team-billing.service';
} from '../schema/team-billing.schema';
import { TeamBillingService } from './team-billing.service';
/**
* @name createTeamAccountCheckoutSession

2
apps/web/app/(dashboard)/home/[account]/_lib/server/team-billing.service.ts → apps/web/app/(dashboard)/home/[account]/billing/_lib/server/team-billing.service.ts
View File

@@ -16,7 +16,7 @@ import billingConfig from '~/config/billing.config';
import pathsConfig from '~/config/paths.config';
import { Database } from '~/lib/database.types';
import { TeamCheckoutSchema } from '../../_lib/schema/team-billing.schema';
import { TeamCheckoutSchema } from '../schema/team-billing.schema';
export class TeamBillingService {
private readonly namespace = 'billing.team-account';

2
apps/web/app/(dashboard)/home/[account]/billing/page.tsx
View File

@@ -18,8 +18,8 @@ import { withI18n } from '~/lib/i18n/with-i18n';
import { AccountLayoutHeader } from '../_components/account-layout-header';
import { loadTeamAccountBillingPage } from '../_lib/server/team-account-billing-page.loader';
import { loadTeamWorkspace } from '../_lib/server/team-account-workspace.loader';
import { createBillingPortalSession } from '../billing/server-actions';
import { TeamAccountCheckoutForm } from './_components/team-account-checkout-form';
import { createBillingPortalSession } from './_lib/server/server-actions';
interface Params {
params: {