@designcrowd/library.brand-page 5.14.0 → 5.14.1-flacky-nav-13

package/lib/src/{CreatedOnBrandCrowd-de-de-D0CkHfXG.js → CreatedOnBrandCrowd-de-de-CCRrBZM2.js}

@@ -1,5 +1,5 @@
 import { createElementBlock as e, openBlock as l, createStaticVNode as a } from "vue";
-import { _ as t } from "./lib-B8KtxX1Y.js";
+import { _ as t } from "./lib-BrBG5gRu.js";
 const i = {}, h = {
   width: "275",
   height: "36",

package/lib/src/{CreatedOnBrandCrowd-en-us-Bie_S3_0.js → CreatedOnBrandCrowd-en-us-BlR-fd12.js}

@@ -1,5 +1,5 @@
 import { createElementBlock as e, openBlock as l, createStaticVNode as a } from "vue";
-import { _ as t } from "./lib-B8KtxX1Y.js";
+import { _ as t } from "./lib-BrBG5gRu.js";
 const i = {}, h = {
   width: "251",
   height: "36",

package/lib/src/{CreatedOnBrandCrowd-es-es-BJIn_e1h.js → CreatedOnBrandCrowd-es-es-BtG_geHF.js}

@@ -1,5 +1,5 @@
 import { createElementBlock as e, openBlock as l, createStaticVNode as a } from "vue";
-import { _ as t } from "./lib-B8KtxX1Y.js";
+import { _ as t } from "./lib-BrBG5gRu.js";
 const i = {}, h = {
   width: "250",
   height: "36",

package/lib/src/{CreatedOnBrandCrowd-fr-fr-X9J7z9Qo.js → CreatedOnBrandCrowd-fr-fr-Ce0a7XLa.js}

@@ -1,5 +1,5 @@
 import { createElementBlock as e, openBlock as l, createStaticVNode as a } from "vue";
-import { _ as t } from "./lib-B8KtxX1Y.js";
+import { _ as t } from "./lib-BrBG5gRu.js";
 const i = {}, h = {
   width: "237",
   height: "36",

package/lib/src/{CreatedOnBrandCrowd-pt-pt-DJVAw13V.js → CreatedOnBrandCrowd-pt-pt-BdFaD1Ki.js}

@@ -1,5 +1,5 @@
 import { createElementBlock as e, openBlock as l, createStaticVNode as a } from "vue";
-import { _ as t } from "./lib-B8KtxX1Y.js";
+import { _ as t } from "./lib-BrBG5gRu.js";
 const i = {}, h = {
   width: "263",
   height: "36",

package/lib/src/{CreatedOnDcom-de-de-BPpWDeUI.js → CreatedOnDcom-de-de-B94kxoDv.js}

@@ -1,5 +1,5 @@
 import { createElementBlock as H, openBlock as V, createStaticVNode as t } from "vue";
-import { _ as e } from "./lib-B8KtxX1Y.js";
+import { _ as e } from "./lib-BrBG5gRu.js";
 const M = {}, Z = {
   width: "242",
   height: "36",

package/lib/src/{CreatedOnDcom-en-us-DHFLppGF.js → CreatedOnDcom-en-us-BYiWjKqv.js}

@@ -1,5 +1,5 @@
 import { createElementBlock as H, openBlock as V, createStaticVNode as t } from "vue";
-import { _ as e } from "./lib-B8KtxX1Y.js";
+import { _ as e } from "./lib-BrBG5gRu.js";
 const i = {}, M = {
   width: "231",
   height: "36",

package/lib/src/{CreatedOnDcom-es-es-DxwMrKji.js → CreatedOnDcom-es-es-D7gzuHyn.js}

@@ -1,5 +1,5 @@
 import { createElementBlock as H, openBlock as V, createStaticVNode as t } from "vue";
-import { _ as e } from "./lib-B8KtxX1Y.js";
+import { _ as e } from "./lib-BrBG5gRu.js";
 const M = {}, Z = {
   width: "230",
   height: "36",

package/lib/src/{CreatedOnDcom-fr-fr-Zh7tbbrd.js → CreatedOnDcom-fr-fr-DT5EOEYa.js}

@@ -1,5 +1,5 @@
 import { createElementBlock as H, openBlock as V, createStaticVNode as t } from "vue";
-import { _ as e } from "./lib-B8KtxX1Y.js";
+import { _ as e } from "./lib-BrBG5gRu.js";
 const i = {}, l = {
   width: "216",
   height: "36",

package/lib/src/{CreatedOnDcom-pt-pt-CTfT63LR.js → CreatedOnDcom-pt-pt-CXprKfiq.js}

@@ -1,5 +1,5 @@
 import { createElementBlock as H, openBlock as V, createStaticVNode as t } from "vue";
-import { _ as M } from "./lib-B8KtxX1Y.js";
+import { _ as M } from "./lib-BrBG5gRu.js";
 const Z = {}, e = {
   width: "232",
   height: "36",

package/lib/src/brand-page/constants/logo.constants.d.ts

@@ -5,3 +5,4 @@ export declare const LOGO_VARIATION: {
     TEXT_ONLY_WITH_TRANSPARENT_BACKGROUND: number;
 };
 export declare const DEFAULT_LOGO_VARIATION: number;
+export declare const LOGO_MIGRATION_VERSION = 6;

package/lib/src/brand-page/constants/logo.constants.js

@@ -5,3 +5,5 @@ export const LOGO_VARIATION = {
     TEXT_ONLY_WITH_TRANSPARENT_BACKGROUND: 3,
 };
 export const DEFAULT_LOGO_VARIATION = LOGO_VARIATION.LOGO_WITH_TRANSPARENT_BACKGROUND;
+// migrating logo images to a fixed height
+export const LOGO_MIGRATION_VERSION = 6;

package/lib/src/brand-page/utils/migration/migration-01.d.ts

@@ -20,4 +20,4 @@ export declare const migrateConvertLineHeightOnFooterStyles: (brandPageModel: Br
 export declare const migration01: (brandPageModel: BrandPageModel, options: {
     logoImage?: LogoImageModel;
     isUserDraft: boolean;
-}) => BrandPageModel;
+}) => Promise<BrandPageModel>;

package/lib/src/brand-page/utils/migration/migration-01.js

@@ -857,7 +857,7 @@ export const migrateConvertLineHeightOnFooterStyles = (brandPageModel) => {
         };
     }
 };
-export const migration01 = (brandPageModel, options) => {
+export const migration01 = async (brandPageModel, options) => {
     if (!brandPageModel.brandPageType) {
         brandPageModel.brandPageType = BRAND_PAGE_TYPES.default;
     }

package/lib/src/brand-page/utils/migration/migration-02.d.ts

@@ -3,4 +3,4 @@ export declare const convertLetterSpacingRemToEm: (fontSizeInEmOrRem: string | u
 export declare const migration02: (brandPageModel: BrandPageModel, options: {
     logoImage?: LogoImageModel;
     isUserDraft: boolean;
-}) => BrandPageModel;
+}) => Promise<BrandPageModel>;

package/lib/src/brand-page/utils/migration/migration-02.js

@@ -31,7 +31,7 @@ const handleConversion = (style) => {
     }
     style.letterSpacing = convertLetterSpacingRemToEm(style.fontSize, style.letterSpacing);
 };
-export const migration02 = (brandPageModel, options) => {
+export const migration02 = async (brandPageModel, options) => {
     handleConversion(brandPageModel.pageHeaderDesktop?.navigation?.defaultButtonStyle);
     handleConversion(brandPageModel.pageHeaderMobile?.navigation?.defaultButtonStyle);
     handleConversion(brandPageModel.pageFooterDesktop?.copyrightStyle);

package/lib/src/brand-page/utils/migration/migration-03.d.ts

@@ -2,4 +2,4 @@ import { type BrandPageModel, type LogoImageModel } from '../..';
 export declare const migration03: (brandPageModel: BrandPageModel, options: {
     logoImage?: LogoImageModel;
     isUserDraft: boolean;
-}) => BrandPageModel;
+}) => Promise<BrandPageModel>;

package/lib/src/brand-page/utils/migration/migration-03.js

@@ -28,7 +28,7 @@ const migrateApplyAutoScaleProperty = (brandPageType, textStyle) => {
     textStyle.applyAutoScale =
         brandPageType && brandPageType === BRAND_PAGE_TYPES.brandSite;
 };
-export const migration03 = (brandPageModel, options) => {
+export const migration03 = async (brandPageModel, options) => {
     handleRecursiveFontSizeMigration(brandPageModel.pageHeaderDesktop);
     handleRecursiveFontSizeMigration(brandPageModel.pageHeaderMobile);
     handleRecursiveFontSizeMigration(brandPageModel.pageFooterDesktop);

package/lib/src/brand-page/utils/migration/migration-04.d.ts

@@ -2,4 +2,4 @@ import { type BrandPageModel, type LogoImageModel } from '../..';
 export declare const migration04: (brandPageModel: BrandPageModel, options: {
     logoImage?: LogoImageModel;
     isUserDraft: boolean;
-}) => BrandPageModel;
+}) => Promise<BrandPageModel>;

package/lib/src/brand-page/utils/migration/migration-04.js

@@ -86,7 +86,7 @@ const updateUserUploadedImageUrls = (content) => {
         });
     }
 };
-export const migration04 = (brandPageModel, options) => {
+export const migration04 = async (brandPageModel, options) => {
     if (brandPageModel.faviconUrl &&
         isUserUploadedImage(brandPageModel.faviconUrl)) {
         brandPageModel.faviconUrl = removeUserImageExtension(brandPageModel.faviconUrl);

package/lib/src/brand-page/utils/migration/migration-05.d.ts

@@ -1,2 +1,5 @@
-import { type BrandPageModel } from '../..';
-export declare const migration05: (brandPageModel: BrandPageModel) => BrandPageModel;
+import { type BrandPageModel, type LogoImageModel } from '../..';
+export declare const migration05: (brandPageModel: BrandPageModel, options: {
+    logoImage?: LogoImageModel;
+    isUserDraft: boolean;
+}) => Promise<BrandPageModel>;

package/lib/src/brand-page/utils/migration/migration-05.js

@@ -1,6 +1,6 @@
 import {} from '../..';
 import { isTextContent } from '../model.util';
-export const migration05 = (brandPageModel) => {
+export const migration05 = async (brandPageModel, options) => {
     brandPageModel.pages.forEach((page) => {
         page.contents.forEach((content) => {
             if (isTextContent(content)) {

package/lib/src/brand-page/utils/migration/migration-06.d.ts

@@ -0,0 +1,4 @@
+import { type BrandPageModel } from '../..';
+export declare const migration06: (brandPageModel: BrandPageModel, options: {
+    skipMigration06?: boolean;
+}) => Promise<BrandPageModel>;

package/lib/src/brand-page/utils/migration/migration-06.js

@@ -0,0 +1,56 @@
+import { DEFAULT_LOGO_HEIGHT, DEFAULT_LOGO_WIDTH, PageFooterDesktop, PageFooterMobile, PageHeaderDesktop, PageHeaderMobile, } from '../..';
+import { FabricRenderClient } from '../../../clients/fabric-render-client';
+const calculateConstrainedDimensions = (logoData, maxWidth, maxHeight) => {
+    const maxWidthRem = parseFloat(maxWidth);
+    const maxHeightRem = parseFloat(maxHeight);
+    const logoAspectRatio = logoData.width / logoData.height;
+    let actualHeight;
+    if (logoAspectRatio >= 1) {
+        actualHeight = maxWidthRem / logoAspectRatio;
+    }
+    else {
+        actualHeight = maxHeightRem;
+    }
+    const actualHeightRem = `${Math.ceil(actualHeight)}rem`;
+    return { width: actualHeightRem, height: actualHeightRem };
+};
+export const migration06 = async (brandPageModel, options) => {
+    if (options.skipMigration06 !== undefined && options.skipMigration06) {
+        return brandPageModel;
+    }
+    try {
+        const fabricClient = FabricRenderClient.getInstance();
+        // Define all sections that need logo data
+        const sections = [
+            { name: 'pageHeaderDesktop', config: brandPageModel.pageHeaderDesktop },
+            { name: 'pageHeaderMobile', config: brandPageModel.pageHeaderMobile },
+            { name: 'pageFooterDesktop', config: brandPageModel.pageFooterDesktop },
+            { name: 'pageFooterMobile', config: brandPageModel.pageFooterMobile },
+        ].filter((section) => section.config);
+        // Fetch logo data for all sections in parallel
+        const logoDataPromises = sections.map(async (section) => {
+            const logoData = section.config?.logoTemplateImage?.logoTemplateToken
+                ? await fabricClient.getLogoSvgUrlByLogoTemplateImageAsync(section.config.logoTemplateImage)
+                : await fabricClient.getLogoSvgUrlByLogoImageAsync(section.config.logoImage);
+            return {
+                sectionName: section.name,
+                logoData,
+                config: section.config,
+            };
+        });
+        const results = await Promise.all(logoDataPromises);
+        // Apply dimensions to each section
+        results.forEach(({ sectionName, logoData, config }) => {
+            if (logoData && logoData.width && logoData.height && config) {
+                const currentMaxWidth = config.logoImageWidth || DEFAULT_LOGO_WIDTH;
+                const currentMaxHeight = config.logoImageHeight || DEFAULT_LOGO_HEIGHT;
+                const dimensions = calculateConstrainedDimensions(logoData, currentMaxWidth, currentMaxHeight);
+                config.logoImageHeight = dimensions.height;
+            }
+        });
+    }
+    catch (error) {
+        console.warn('Migration 06: Failed to fetch logo dimensions:', error);
+    }
+    return brandPageModel;
+};

package/lib/src/brand-page/utils/migration.util.d.ts

@@ -3,4 +3,8 @@ export declare const GetLatestModelVersion: () => number;
 export declare const migrateBrandPageModel: (brandPageModel: BrandPageModel, options: {
     logoImage?: LogoImageModel;
     isUserDraft: boolean;
-}) => BrandPageModel;
+    isServerRender: boolean;
+}) => Promise<{
+    brandPageModel: BrandPageModel;
+    useOldLogoRenderSize: boolean;
+}>;

package/lib/src/brand-page/utils/migration.util.js

@@ -1,3 +1,4 @@
+import { LOGO_MIGRATION_VERSION } from '../constants';
 import {} from '../models';
 import { migration01 } from './migration/migration-01';
 import { migration02 } from './migration/migration-02';
@@ -5,6 +6,7 @@ import { migration03 } from './migration/migration-03';
 import { migration04 } from './migration/migration-04';
 import { migration05 } from './migration/migration-05';
 import { migration051 } from './migration/migration-051';
+import { migration06 } from './migration/migration-06';
 import { migration052 } from './migration/migration-052';
 const MIGRATION_TABLE = [
     {
@@ -35,19 +37,29 @@ const MIGRATION_TABLE = [
         version: 5.2,
         migrateFn: migration052,
     },
+    {
+        version: 6,
+        migrateFn: migration06,
+    },
 ];
 export const GetLatestModelVersion = () => Math.max(...MIGRATION_TABLE.map((x) => x.version));
-export const migrateBrandPageModel = (brandPageModel, options) => {
+export const migrateBrandPageModel = async (brandPageModel, options) => {
     let modelVersion = brandPageModel.v;
+    let useOldLogoRenderSize = false;
     if (!modelVersion) {
         modelVersion = 0;
     }
-    MIGRATION_TABLE.forEach((x) => {
+    for (const x of MIGRATION_TABLE) {
         if (modelVersion < x.version) {
-            brandPageModel = x.migrateFn(brandPageModel, options);
+            if (options.isServerRender && x.version === LOGO_MIGRATION_VERSION) {
+                useOldLogoRenderSize = true;
+            }
+            else {
+                brandPageModel = await x.migrateFn(brandPageModel, options);
+            }
         }
-    });
+    }
     // Set the model to latest version
     brandPageModel.v = GetLatestModelVersion();
-    return brandPageModel;
+    return { brandPageModel, useOldLogoRenderSize };
 };

package/lib/src/brand-page/utils/view-model.util.d.ts

@@ -8,10 +8,10 @@ export declare const mapToTextViewModel: (content: TextContent, styles: PageStyl
 export declare const mapToBannerSectionViewModel: (content: BannerSectionContent, styles: PageStyles) => BannerSectionViewModel;
 export declare const mapToImagesSectionViewModel: (content: ImagesSectionContent, styles: PageStyles, brandPageType: BrandPageType) => TextImageSectionViewModel;
 export declare const mapToBookingSectionViewModel: (content: BookingSectionContent, styles: PageStyles) => BookingSectionViewModel;
-export declare const mapToPageHeaderViewModel: (pageHeader: PageHeaderDesktop | PageHeaderMobile, pageStyles: PageStyles, pages: PageViewModel[]) => PageHeaderViewModel;
-export declare const mapToPageFooterViewModel: (pageFooter: PageFooterDesktop | PageFooterMobile, pageStyles: PageStyles) => PageFooterViewModel;
+export declare const mapToPageHeaderViewModel: (pageHeader: PageHeaderDesktop | PageHeaderMobile, pageStyles: PageStyles, pages: PageViewModel[], useOldLogoRenderSize?: boolean) => PageHeaderViewModel;
+export declare const mapToPageFooterViewModel: (pageFooter: PageFooterDesktop | PageFooterMobile, pageStyles: PageStyles, useOldLogoRenderSize?: boolean) => PageFooterViewModel;
 export declare const mapToViewModel: (styles: PageStyles, brandPageType: BrandPageType) => (content: Content) => ContentViewModel | undefined;
-export declare const getBrandPageViewModelFromBrandPageModel: (model: BrandPageModel, brandPageToken: string | undefined, showBrandCrowdLogo?: boolean) => BrandPageViewModel;
+export declare const getBrandPageViewModelFromBrandPageModel: (model: BrandPageModel, brandPageToken: string | undefined, showBrandCrowdLogo?: boolean, useOldLogoRenderSize?: boolean) => BrandPageViewModel;
 export declare const isLogoViewModel: (viewModel: ContentViewModel) => viewModel is LogoViewModel;
 /** for service.brand-page website preview by logo draft token */
 export declare const applyLogoImageToBrandPageViewModel: (viewModel: BrandPageViewModel, logoImage: LogoImageModel) => BrandPageViewModel;

package/lib/src/brand-page/utils/view-model.util.js

@@ -115,7 +115,7 @@ export const mapToImageGalleryViewModel = (content, globalStyles) => {
         styles: galleryStyles?.galleryType ? galleryStyles : globalStyles,
     };
 };
-const mapToLogoViewModel = (content, globalStyles, options) => {
+const mapToLogoViewModel = (content, globalStyles, useOldLogoRenderSize, options) => {
     let background;
     if (content.backgroundStyle?.background &&
         isHexTransparent(content.backgroundStyle.background)) {
@@ -158,6 +158,7 @@ const mapToLogoViewModel = (content, globalStyles, options) => {
             },
         },
         isVisible: content.isLogoVisible,
+        useOldLogoRenderSize,
     });
 };
 const mapToVideoViewModel = (content, styles) => {
@@ -525,7 +526,7 @@ export const mapToBookingSectionViewModel = (content, styles) => {
         isFullWidth: true,
     }, styles);
 };
-export const mapToPageHeaderViewModel = (pageHeader, pageStyles, pages) => {
+export const mapToPageHeaderViewModel = (pageHeader, pageStyles, pages, useOldLogoRenderSize = false) => {
     const viewport = pageHeader.viewport;
     const logoContent = {
         id: 'page-header-logo',
@@ -554,7 +555,7 @@ export const mapToPageHeaderViewModel = (pageHeader, pageStyles, pages) => {
     }), {});
     return {
         displayStyle: pageHeader.displayStyle,
-        logo: mapToLogoViewModel(logoContent, logoStyles),
+        logo: mapToLogoViewModel(logoContent, logoStyles, useOldLogoRenderSize),
         pages: pages.filter((p) => !p.isHidden),
         navigation: viewport === VIEWPORTS.mobile
             ? new NavigationMobile({
@@ -574,7 +575,7 @@ export const mapToPageHeaderViewModel = (pageHeader, pageStyles, pages) => {
         backgroundColorEnabled: pageHeader.backgroundColorEnabled,
     };
 };
-export const mapToPageFooterViewModel = (pageFooter, pageStyles) => {
+export const mapToPageFooterViewModel = (pageFooter, pageStyles, useOldLogoRenderSize = false) => {
     const { logoImageBase64Url, logoImage, logoTemplateImage, logoImageHeight, logoImageWidth, isLogoVisible, } = pageFooter;
     const logoContent = {
         id: 'page-header-logo',
@@ -598,7 +599,7 @@ export const mapToPageFooterViewModel = (pageFooter, pageStyles) => {
         copyrightStyle,
         displayStyle: pageFooter.displayStyle,
         iconStyle: Object.assign({ fill: pageStyles.textStyles?.style.color }, pageFooter.iconStyle),
-        logo: mapToLogoViewModel(logoContent, logoStyles),
+        logo: mapToLogoViewModel(logoContent, logoStyles, useOldLogoRenderSize),
         socialLinks: pageFooter.socialLinks,
         textFontFamily: pageFooter.textFontFamily,
     };
@@ -613,7 +614,7 @@ export const mapToViewModel = (styles, brandPageType) => (content) => {
             if (brandPageType === BRAND_PAGE_TYPES.brandSite) {
                 return undefined;
             }
-            return mapToLogoViewModel(content, styles.logoStyles, {
+            return mapToLogoViewModel(content, styles.logoStyles, false, {
                 height: DEFAULT_LOGO_HEIGHT,
                 width: DEFAULT_LOGO_WIDTH,
             });
@@ -670,7 +671,7 @@ export const mapToViewModel = (styles, brandPageType) => (content) => {
             assertUnreachable();
     }
 };
-export const getBrandPageViewModelFromBrandPageModel = (model, brandPageToken, showBrandCrowdLogo = true) => {
+export const getBrandPageViewModelFromBrandPageModel = (model, brandPageToken, showBrandCrowdLogo = true, useOldLogoRenderSize = false) => {
     const pages = model.pages.map((p) => {
         const contents = p.contents
             .map(mapToViewModel(model.styles, model.brandPageType || BRAND_PAGE_TYPES.default))
@@ -687,10 +688,10 @@ export const getBrandPageViewModelFromBrandPageModel = (model, brandPageToken, s
         pages,
         showBrandCrowdLogo,
         styles: model.styles,
-        headerViewModelDesktop: mapToPageHeaderViewModel(model.pageHeaderDesktop, model.styles, pages),
-        headerViewModelMobile: mapToPageHeaderViewModel(model.pageHeaderMobile, model.styles, pages),
-        footerViewModelDesktop: mapToPageFooterViewModel(model.pageFooterDesktop, model.styles),
-        footerViewModelMobile: mapToPageFooterViewModel(model.pageFooterMobile, model.styles),
+        headerViewModelDesktop: mapToPageHeaderViewModel(model.pageHeaderDesktop, model.styles, pages, useOldLogoRenderSize),
+        headerViewModelMobile: mapToPageHeaderViewModel(model.pageHeaderMobile, model.styles, pages, useOldLogoRenderSize),
+        footerViewModelDesktop: mapToPageFooterViewModel(model.pageFooterDesktop, model.styles, useOldLogoRenderSize),
+        footerViewModelMobile: mapToPageFooterViewModel(model.pageFooterMobile, model.styles, useOldLogoRenderSize),
         brandPageType: model.brandPageType || BRAND_PAGE_TYPES.default,
         faviconUrl: model.faviconUrl,
         ogImageUrl: model.ogImageUrl,

package/lib/src/brand-page/view-models.d.ts

@@ -32,6 +32,7 @@ export interface LogoViewModel extends ContentViewModel {
     logoImageWidth: string | undefined;
     /** @deprecated */
     imageStyle?: LogoStyles['imageStyle'];
+    useOldLogoRenderSize?: boolean;
 }
 export interface ProfileViewModel extends ContentViewModel, Omit<ProfileContent, 'type'> {
     containerStyle?: BrandPageCssStyle;

package/lib/src/brand-page-maker/components/brand-page-maker/BrandPageMaker.stories.d.ts

@@ -27,6 +27,8 @@ export declare const SampleBanner: {
 export declare const SamplePersonalised: () => any;
 export declare const SamplePublished: Story;
 export declare const SamplePublishedWithCustomDomain: Story;
+export declare const SamplePublishedBrandSiteWithLogo: Story;
+export declare const SamplePublishedBrandSiteWithLogo2: Story;
 export declare const SamplePublishedBrandSite: Story;
 export declare const SampleProfile: {
     (): any;

package/lib/src/brand-page-maker/components/brand-page-maker/BrandPageMaker.stories.js

@@ -6,7 +6,7 @@ import * as uuid from 'uuid';
 import { createMemoryHistory, createRouter } from 'vue-router';
 import { brandPageApiClient } from '@designcrowd/fe-shared-lib';
 import BrandPageMaker from './BrandPageMaker.vue';
-import { ADMIN_PREVIEW_LOGO_TEMPLATE_MODELS, BRAND_PAGE, brandPagePaymentConfigBrandPageToken, brandPagePaymentConfigsResponse, brandPageBackgroundColor, brandPageBackgroundColorWithShapes, brandPageBackgroundGradient, brandPageBackgroundGradientWithShapes, brandPageBackgroundImage, brandPageBackgroundImageWithShapes, brandPageEmpty, requestPaymentPaymentOptions, userFeatures, supportMePaymentOptions, BRAND_PAGE_MULTI_PAGE, PERSONALISATION_CONTENT, BRAND_PAGE_PERSONALISED, PUBLISHED_DESIGN_DRAFT_TOKEN, BRAND_SITE, CUSTOM_DOMAIN_DESIGN_DRAFT_TOKEN, brandPageCustom, BRAND_CONTACT, BRAND_SITE_SAMPLE, } from './__fixtures__';
+import { ADMIN_PREVIEW_LOGO_TEMPLATE_MODELS, BRAND_PAGE, brandPagePaymentConfigBrandPageToken, brandPagePaymentConfigsResponse, brandPageBackgroundColor, brandPageBackgroundColorWithShapes, brandPageBackgroundGradient, brandPageBackgroundGradientWithShapes, brandPageBackgroundImage, brandPageBackgroundImageWithShapes, brandPageEmpty, requestPaymentPaymentOptions, userFeatures, supportMePaymentOptions, BRAND_PAGE_MULTI_PAGE, PERSONALISATION_CONTENT, BRAND_PAGE_PERSONALISED, PUBLISHED_DESIGN_DRAFT_TOKEN, BRAND_SITE, BRAND_SITE_SAMPLE_WITH_LOGO, CUSTOM_DOMAIN_DESIGN_DRAFT_TOKEN, brandPageCustom, BRAND_CONTACT, BRAND_SITE_SAMPLE, } from './__fixtures__';
 import { gradientLogoDesignAttributes, LOGO_IMAGE_URL, logoVariationImageUrls, sampleLogoTheme, simpleLogoDesignAttributes, } from '../../../__fixtures__';
 import { BRAND_PAGE_TYPES, CONTENT_TEXT_STYLE_PROPERTY_KEYS, CONTENT_TYPES, DISPLAY_STYLE_PREVIEW, PageStyles, BrandPageModel, PageHeaderDesktop, NavigationMobile, NavigationDesktop, NAVIGATION_DISPLAY, TEXT_STYLE_TYPES, VIEWPORTS, GalleryStyles, GALLERY_TYPES, SENSITIVE_CONTENT_TYPES, } from '../../../brand-page';
 import {} from './BrandPageMaker.mixin';
@@ -468,6 +468,102 @@ export const SamplePublishedWithCustomDomain = {
         pinia: setupStoryPinia(),
     }),
 };
+export const SamplePublishedBrandSiteWithLogo = {
+    name: 'Sample (published brandsite with logo)',
+    render: () => ({
+        setup() {
+            InitialiseMakerStores({});
+            const containerStore = useBrandPageContainerStore();
+            containerStore.$patch({
+                isSellDomainNameEnabled: true,
+                baseFabricRenderUrl: FABRIC_RENDER_BASE_URL,
+            });
+            containerStore.setBrandPageStatus('Published');
+            containerStore.setDesignDraftToken({
+                designDraftToken: CUSTOM_DOMAIN_DESIGN_DRAFT_TOKEN,
+            });
+            containerStore.brandPageBaseUrl = 'https://brand.site';
+            containerStore.setSlug({
+                slug: 'my-page',
+            });
+        },
+        components: {
+            BrandPageMaker,
+        },
+        data() {
+            return {
+                viewModel: {
+                    brandPageData: JSON.stringify(BRAND_SITE_SAMPLE_WITH_LOGO),
+                    isSaving: false,
+                    logoDraftDesignAttributes: simpleLogoDesignAttributes,
+                    logoVariationImageUrls,
+                    baseBrandPageUrl: 'https://brand.site',
+                    features: userFeatures,
+                    initialCategories: {},
+                },
+                show: false,
+            };
+        },
+        template: `
+      <BrandPageMaker v-if="show" :view-model="viewModel"/>
+    `,
+        pinia: setupStoryPinia(),
+        async beforeMount() {
+            await setLocaleAsync('en-US');
+            this.show = true;
+        },
+    }),
+};
+export const SamplePublishedBrandSiteWithLogo2 = {
+    name: 'Sample (published brandsite with logo2)',
+    render: () => ({
+        setup() {
+            InitialiseMakerStores({});
+            const containerStore = useBrandPageContainerStore();
+            containerStore.$patch({
+                isSellDomainNameEnabled: true,
+                baseFabricRenderUrl: FABRIC_RENDER_BASE_URL,
+            });
+            containerStore.setBrandPageStatus('Published');
+            containerStore.setDesignDraftToken({
+                designDraftToken: CUSTOM_DOMAIN_DESIGN_DRAFT_TOKEN,
+            });
+            containerStore.brandPageBaseUrl = 'https://brand.site';
+            containerStore.setSlug({
+                slug: 'my-page',
+            });
+        },
+        components: {
+            BrandPageMaker,
+        },
+        data() {
+            const BRAND_SITE_SAMPLE_WITH_LOGO_MODIFIED = {
+                ...BRAND_SITE_SAMPLE_WITH_LOGO,
+                v: 5.1,
+            };
+            return {
+                viewModel: {
+                    brandPageData: JSON.stringify(BRAND_SITE_SAMPLE_WITH_LOGO_MODIFIED),
+                    isSaving: false,
+                    logoDraftDesignAttributes: simpleLogoDesignAttributes,
+                    logoVariationImageUrls,
+                    baseBrandPageUrl: 'https://brand.site',
+                    features: userFeatures,
+                    initialCategories: {},
+                },
+                show: false,
+            };
+        },
+        template: `
+      <BrandPageMaker v-if="show" :view-model="viewModel"/>
+    `,
+        pinia: setupStoryPinia(),
+        async beforeMount() {
+            await setLocaleAsync('en-US');
+            this.show = true;
+        },
+    }),
+};
 export const SamplePublishedBrandSite = {
     name: 'Sample (published brandsite)',
     render: () => ({
@@ -1137,7 +1233,7 @@ SampleAdminMode.story = {
     name: 'Sample (admin mode)',
 };
 export const SampleAdminModeBrandSite = {
-    name: 'Sample (admin mode brandsite)',
+    name: 'Sample (admin mode brandsite1)',
     render: () => ({
         setup() {
             InitialiseMakerStores({ isAdmin: true });