diff --git a/.gitignore b/.gitignore index e26dbb3..07499ec 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ node_modules/ .pnpm-store/ .turbo/ dist/ +packages/config/dist/ .next/ coverage/ .env diff --git a/apps/admin/src/components/RecordContentEditor.tsx b/apps/admin/src/components/RecordContentEditor.tsx index 59dd01a..4361947 100644 --- a/apps/admin/src/components/RecordContentEditor.tsx +++ b/apps/admin/src/components/RecordContentEditor.tsx @@ -104,7 +104,7 @@ export function RecordContentEditor({ onClick={() => navigate("/admin/brand", { state: { - targetKey: visualSelection?.targetKey ?? "linjing-editorial.offerings.item", + targetKey: visualSelection?.targetKey ?? "offering.list.item", recordId: record.id, }, }) diff --git a/apps/admin/src/features/brand/BrandPage.tsx b/apps/admin/src/features/brand/BrandPage.tsx index e8258f9..0255455 100644 --- a/apps/admin/src/features/brand/BrandPage.tsx +++ b/apps/admin/src/features/brand/BrandPage.tsx @@ -48,6 +48,10 @@ export function BrandPage() { queryFn: () => client.getPublicTemplate(brand.data!.templateKey), enabled: Boolean(brand.data?.templateKey), }); + const templateCatalog = useQuery({ + queryKey: ["template-catalog"], + queryFn: () => client.listPublicTemplates(), + }); const save = useMutation({ mutationFn: (values: Partial) => client.updateAdminBrand(values), onSuccess: () => { @@ -190,10 +194,10 @@ export function BrandPage() { > setVisualTarget(key)} + onChange={(key) => setVisualTarget(key ?? null)} options={[ ...compatibleVisuals.map((visual) => ({ value: visual.key, label: visual.name })), ]} @@ -354,18 +368,18 @@ export function WorkspacePage() { setPreviewVisual(key)} options={(templateCatalog.data?.visuals ?? []) - .filter((item) => supportsIndustry(item, previewIndustry)) + .filter((item) => supportsIndustry(item, previewIndustryKey ?? "")) .map((item) => ({ value: item.key, label: item.name }))} /> diff --git a/apps/api/src/admin.dto.ts b/apps/api/src/admin.dto.ts index 8328c4c..0f35681 100644 --- a/apps/api/src/admin.dto.ts +++ b/apps/api/src/admin.dto.ts @@ -11,10 +11,12 @@ import { Max, Min, } from "class-validator"; +import { brandTemplateKeys } from "@personal-brand/config"; +import type { BrandTemplateKey } from "@personal-brand/config"; export class UpdateBrandDto { @IsOptional() @IsString() name?: string; - @IsOptional() @IsIn(["food", "personal", "doors"]) templateKey?: "food" | "personal" | "doors"; + @IsOptional() @IsIn(brandTemplateKeys) templateKey?: BrandTemplateKey; @IsOptional() @IsString() tagline?: string; @IsOptional() @IsString() description?: string; @IsOptional() @IsString() avatarUrl?: string; @@ -101,8 +103,8 @@ export class UpdateBookingTagsDto { } export class InstallTemplateDto { - @IsIn(["personal", "food", "doors"]) - templateKey!: "personal" | "food" | "doors"; + @IsIn(brandTemplateKeys) + templateKey!: BrandTemplateKey; } export class UpdateCapabilityInstallationDto { diff --git a/apps/api/src/brand-release-api.service.ts b/apps/api/src/brand-release-api.service.ts index dada1b1..513e972 100644 --- a/apps/api/src/brand-release-api.service.ts +++ b/apps/api/src/brand-release-api.service.ts @@ -6,6 +6,7 @@ import { } from "@nestjs/common"; import { Prisma } from "@prisma/client"; import { + defaultBrandTemplateKey, getBrandTemplate, getVisualTemplate, isVisualTemplateCompatible, @@ -67,7 +68,7 @@ export class BrandReleaseApiService { const visualKey = typeof config.visualTemplateKey === "string" ? config.visualTemplateKey - : getDefaultVisualTemplateKey(brand?.templateKey ?? "personal"); + : getDefaultVisualTemplateKey(brand?.templateKey ?? defaultBrandTemplateKey); const visual = getVisualTemplate(visualKey); const packageManifest = getTemplatePackageManifestForVisualKey(visualKey); const [offerings, forms, trustItems] = await Promise.all([ diff --git a/apps/api/src/brand-release.service.ts b/apps/api/src/brand-release.service.ts index 4e5314d..a204c20 100644 --- a/apps/api/src/brand-release.service.ts +++ b/apps/api/src/brand-release.service.ts @@ -1,6 +1,7 @@ import { Injectable } from "@nestjs/common"; import { Prisma } from "@prisma/client"; import { + defaultBrandTemplateKey, getBrandTemplate, getVisualTemplate, getVisualTemplateManifest, @@ -44,7 +45,7 @@ export async function buildBrandReleaseSnapshot( database.trustContent.findMany({ where: { brandId }, orderBy: { sortOrder: "asc" } }), database.capabilityInstallation.findMany({ where: { brandId } }), ]); - const templateKey = installation?.templateKey ?? brand?.templateKey ?? "personal"; + const templateKey = installation?.templateKey ?? brand?.templateKey ?? defaultBrandTemplateKey; const config = brand?.config && typeof brand.config === "object" && !Array.isArray(brand.config) ? (brand.config as Record) @@ -52,7 +53,7 @@ export async function buildBrandReleaseSnapshot( const visualKey = typeof config.visualTemplateKey === "string" ? config.visualTemplateKey - : getDefaultVisualTemplateKey(brand?.templateKey ?? "personal"); + : getDefaultVisualTemplateKey(brand?.templateKey ?? defaultBrandTemplateKey); const jsonObject = (value: object): Record => JSON.parse(JSON.stringify(value)) as Record; return { diff --git a/apps/api/src/modules/admin/admin-config.controller.ts b/apps/api/src/modules/admin/admin-config.controller.ts index 0592092..25b5412 100644 --- a/apps/api/src/modules/admin/admin-config.controller.ts +++ b/apps/api/src/modules/admin/admin-config.controller.ts @@ -22,6 +22,7 @@ import { UpdateTrustContentDto, } from "../../admin.dto.js"; import { + defaultVisualTemplateKey, getBrandTemplate, getVisualTemplate, isVisualTemplateCompatible, @@ -278,7 +279,7 @@ export class AdminConfigController { const currentKey = typeof config.visualTemplateKey === "string" ? config.visualTemplateKey - : "linjing-editorial"; + : defaultVisualTemplateKey; const current = getVisualTemplate(currentKey); return { current: current diff --git a/apps/api/src/modules/public/public-workspace.snapshot-assembler.ts b/apps/api/src/modules/public/public-workspace.snapshot-assembler.ts index ce8d341..d7b26a5 100644 --- a/apps/api/src/modules/public/public-workspace.snapshot-assembler.ts +++ b/apps/api/src/modules/public/public-workspace.snapshot-assembler.ts @@ -2,6 +2,7 @@ import type { BrandReleaseSnapshot } from "../../brand-release.service.js"; import type { Prisma } from "@prisma/client"; import { capabilityPlugins, + defaultBrandTemplateKey, type BrandTemplateKey, getBrandTemplate, getDefaultVisualTemplateKey, @@ -96,7 +97,7 @@ export function assemblePublicWorkspace(input: { asString(releaseSnapshot.templateKey) || asString(installationData.templateKey) || asString(brandData.templateKey) || - "personal"; + defaultBrandTemplateKey; const template = releaseSnapshot.templateDefinition ?? getBrandTemplate(templateKey); const capabilityData = asArray(releaseSnapshot.capabilities) as Array>; const capabilities = capabilityData.length diff --git a/apps/api/src/modules/public/public.controller.ts b/apps/api/src/modules/public/public.controller.ts index ccdc70c..9d49604 100644 --- a/apps/api/src/modules/public/public.controller.ts +++ b/apps/api/src/modules/public/public.controller.ts @@ -2,12 +2,16 @@ import { BadRequestException, Controller, Get, Param, Query } from "@nestjs/comm import { PublicBrandContextService } from "./public-brand-context.service.js"; import { BrandReleaseService } from "../../brand-release.service.js"; import { + defaultBrandTemplateKey, + defaultVisualTemplateKey, brandTemplates, + brandTemplateKeys, getBrandTemplate, getVisualTemplate, isVisualTemplateCompatible, resolveCapabilities, visualTemplates, + visualTemplateKeys, } from "@personal-brand/config"; @Controller("public") @@ -74,15 +78,15 @@ export class PublicTemplateController { @Get() list(): unknown { return { - industries: Object.values(brandTemplates), - visuals: Object.values(visualTemplates), + industries: brandTemplateKeys.map((key) => brandTemplates[key]), + visuals: visualTemplateKeys.map((key) => visualTemplates[key]), }; } @Get("preview") preview( - @Query("industry") industry = "personal", - @Query("visual") visual = "linjing-editorial", + @Query("industry") industry = defaultBrandTemplateKey, + @Query("visual") visual = defaultVisualTemplateKey, ): unknown { const industryTemplate = getBrandTemplate(industry); const visualTemplate = getVisualTemplate(visual); diff --git a/apps/api/src/modules/workspace/admin-workspace.service.ts b/apps/api/src/modules/workspace/admin-workspace.service.ts index 9a93bc7..da0283f 100644 --- a/apps/api/src/modules/workspace/admin-workspace.service.ts +++ b/apps/api/src/modules/workspace/admin-workspace.service.ts @@ -1,6 +1,7 @@ import { Injectable } from "@nestjs/common"; import { PrismaService } from "../../prisma.service.js"; import { + defaultBrandTemplateKey, getDefaultVisualTemplateKey, getTemplatePackageManifestForVisualKey, } from "@personal-brand/config"; @@ -28,7 +29,7 @@ export class AdminWorkspaceService { const templateKey = typeof config.visualTemplateKey === "string" ? config.visualTemplateKey - : getDefaultVisualTemplateKey(brand?.templateKey ?? "personal"); + : getDefaultVisualTemplateKey(brand?.templateKey ?? defaultBrandTemplateKey); const manifest = getTemplatePackageManifestForVisualKey(templateKey); return { diff --git a/apps/api/src/template-workspace.service.ts b/apps/api/src/template-workspace.service.ts index 8c7e4b5..9ec9689 100644 --- a/apps/api/src/template-workspace.service.ts +++ b/apps/api/src/template-workspace.service.ts @@ -1,6 +1,8 @@ import { BadRequestException, Injectable } from "@nestjs/common"; import { Prisma } from "@prisma/client"; import { + type BrandTemplateKey, + defaultBrandTemplateKey, getBrandTemplate, getVisualTemplate, getVisualTemplateManifest, @@ -9,7 +11,6 @@ import { isVisualTemplateCompatible, } from "@personal-brand/config"; import type { CreateTrustContentDto, UpdateTrustContentDto } from "./admin.dto.js"; -import type { BrandTemplateKey } from "@personal-brand/types"; import { PrismaService } from "./prisma.service.js"; @Injectable() @@ -27,7 +28,7 @@ export class TemplateWorkspaceService { const visualKey = typeof config.visualTemplateKey === "string" ? config.visualTemplateKey - : getDefaultVisualTemplateKey(brand?.templateKey ?? "personal"); + : getDefaultVisualTemplateKey(brand?.templateKey ?? defaultBrandTemplateKey); return ( getTemplatePackageManifestForVisualKey(visualKey)?.trustContentTypes?.map( (item) => item.type, @@ -72,10 +73,12 @@ export class TemplateWorkspaceService { select: { templateKey: true }, }), ]); - const key = installation?.templateKey ?? brand?.templateKey ?? "personal"; - return getBrandTemplate(key) ? (key as BrandTemplateKey) : "personal"; + const key = + getBrandTemplate(installation?.templateKey ?? brand?.templateKey ?? defaultBrandTemplateKey) + ?.key ?? defaultBrandTemplateKey; + return key; } - async install(brandId: string, templateKey: "personal" | "food" | "doors") { + async install(brandId: string, templateKey: BrandTemplateKey) { const template = getBrandTemplate(templateKey); if (!template) throw new BadRequestException("行业模板不存在"); const [existing, brand] = await Promise.all([ diff --git a/apps/taro/src/components/Inquiry.tsx b/apps/taro/src/components/Inquiry.tsx index 5972bdb..46e5b6c 100644 --- a/apps/taro/src/components/Inquiry.tsx +++ b/apps/taro/src/components/Inquiry.tsx @@ -34,7 +34,8 @@ export function Inquiry({ const [sending, setSending] = useState(false); const busy = useRef(false); const p = presentation(workspace, "inquiry"); - const food = workspace.brand.visualTemplateKey === "acheng-campus-food"; + const compactFieldKeys = new Set(["people", "date", "budget", "delivery"]); + const compactForm = Boolean(form?.fields.some((field) => compactFieldKeys.has(field.key))); useDidShow(() => { const query = takeQuery("inquiry"); if (query.offeringId) setOfferingId(query.offeringId); @@ -82,7 +83,7 @@ export function Inquiry({ } } return ( - + {p.eyebrow} {p.title || "提交咨询"} @@ -98,10 +99,10 @@ export function Inquiry({ const value = values[field.key]; const stringValue = typeof value === "string" ? value : ""; const chips = - food && field.key === "type" && ["select", "radio"].includes(field.type); + compactForm && field.key === "type" && ["select", "radio"].includes(field.type); return ( diff --git a/packages/api-client/src/resources/template.ts b/packages/api-client/src/resources/template.ts index 15483ee..055741c 100644 --- a/packages/api-client/src/resources/template.ts +++ b/packages/api-client/src/resources/template.ts @@ -57,7 +57,7 @@ export interface TemplateMethods { templateContent: AdminTemplateContent | null; }>; getAdminPreviewWorkspace(): Promise; - installAdminTemplate(templateKey: "personal" | "food" | "doors"): Promise; + installAdminTemplate(templateKey: BrandTemplateKey): Promise; listAdminCapabilities(): Promise; updateAdminCapability( key: string, @@ -111,8 +111,7 @@ export function templateMethods({ request }: { request: RequestFn }): TemplateMe description: String(visual.description ?? ""), supportedIndustryTemplates: Array.isArray(visual.supportedIndustryTemplates) ? visual.supportedIndustryTemplates.filter( - (item): item is BrandTemplateKey => - item === "personal" || item === "food" || item === "doors", + (item): item is BrandTemplateKey => typeof item === "string", ) : [], variants: diff --git a/packages/api-client/src/types/template-definition.ts b/packages/api-client/src/types/template-definition.ts index ed49e90..90ee178 100644 --- a/packages/api-client/src/types/template-definition.ts +++ b/packages/api-client/src/types/template-definition.ts @@ -1,5 +1,5 @@ export interface BrandTemplateDefinition { - key: "personal" | "food" | "doors"; + key: string; version: string; name: string; description: string; diff --git a/packages/config/src/brand-templates.ts b/packages/config/src/brand-templates.ts index c2f546a..4a6943d 100644 --- a/packages/config/src/brand-templates.ts +++ b/packages/config/src/brand-templates.ts @@ -135,5 +135,9 @@ export function isBrandTemplateKey(value: string): value is BrandTemplateKey { } export function getBrandTemplate(key: string): BrandTemplateDefinition | undefined { - return isBrandTemplateKey(key) ? brandTemplates[key] : undefined; + return isBrandTemplateKey(key) ? brandTemplates[key as keyof typeof brandTemplates] : undefined; } + +export const defaultBrandTemplateKey = "personal" satisfies BrandTemplateKey; + +export const brandTemplateKeys = Object.keys(brandTemplates); diff --git a/packages/config/src/template-keys.ts b/packages/config/src/template-keys.ts index 37a9855..cc53333 100644 --- a/packages/config/src/template-keys.ts +++ b/packages/config/src/template-keys.ts @@ -1,3 +1,3 @@ -export type BrandTemplateKey = "personal" | "food" | "doors"; -export type VisualTemplateKey = "linjing-editorial" | "acheng-campus-food"; +export type BrandTemplateKey = string; +export type VisualTemplateKey = string; export type CapabilityKey = "offerings" | "inquiry" | "booking" | "quote-request"; diff --git a/packages/config/src/template-sample-content.ts b/packages/config/src/template-sample-content.ts index 3214fd3..16783ba 100644 --- a/packages/config/src/template-sample-content.ts +++ b/packages/config/src/template-sample-content.ts @@ -130,15 +130,15 @@ const personalSampleContent: TemplateSampleContent = { capabilityKey: "inquiry", }; -export const templateSampleContent: Record = { +export const templateSampleContent = { personal: personalSampleContent, food: foodSampleContent, doors: doorsSampleContent, -}; +} as const; export function getTemplateSampleContent(templateKey: string): TemplateSampleContent | undefined { const packageSample = templatePackageRegistry.find((item) => - item.supportedIndustryTemplates.includes(templateKey as BrandTemplateKey), - )?.sampleContent?.[templateKey as BrandTemplateKey]; + item.supportedIndustryTemplates.includes(templateKey), + )?.sampleContent?.[templateKey]; return packageSample ?? templateSampleContent[templateKey as keyof typeof templateSampleContent]; } diff --git a/packages/config/src/visual-manifests.ts b/packages/config/src/visual-manifests.ts index 1b80009..6fbbc2f 100644 --- a/packages/config/src/visual-manifests.ts +++ b/packages/config/src/visual-manifests.ts @@ -1,4 +1,3 @@ -import type { BrandTemplateKey } from "./template-keys.js"; import type { VisualTemplateKey } from "./template-keys.js"; import type { VisualTemplateDefinition, VisualTemplateManifest } from "./brand-contracts.js"; @@ -269,14 +268,12 @@ export const visualTemplateManifests: Record - visualTemplates[key].supportedIndustryTemplates.includes( - industryTemplateKey as BrandTemplateKey, - ), - ) ?? "linjing-editorial" + getVisualTemplate(key)?.supportedIndustryTemplates.includes(industryTemplateKey), + ) ?? defaultVisualTemplateKey ); } + +export const defaultVisualTemplateKey = "linjing-editorial" satisfies VisualTemplateKey; diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts index abe4261..e121201 100644 --- a/packages/types/src/index.ts +++ b/packages/types/src/index.ts @@ -3,12 +3,7 @@ export type BookingRequestType = "package" | "private_chef" | "inquiry"; export type ContactPreference = "wechat" | "phone" | "none"; export type FulfillmentType = "pickup" | "delivery"; export type OrderStatus = BookingStatus; -export type BrandTemplateKey = "food" | "personal" | "doors"; -export const BRAND_TEMPLATE = { - FOOD: "food", - PERSONAL: "personal", - DOORS: "doors", -} as const satisfies Record, BrandTemplateKey>; +export type BrandTemplateKey = string; export const HTTP_STATUS = { OK: 200,