@designcrowd/library.brand-page 5.14.2-flacky-nav-14 → 5.14.2-ml3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/src/{CreatedOnBrandCrowd-de-de-C2c1FQGf.js → CreatedOnBrandCrowd-de-de-DxLeSo0D.js} +1 -1
- package/lib/src/{CreatedOnBrandCrowd-en-us-Cks6Jqvc.js → CreatedOnBrandCrowd-en-us-p9-PKTfD.js} +1 -1
- package/lib/src/{CreatedOnBrandCrowd-es-es-DH8PrvuY.js → CreatedOnBrandCrowd-es-es-Dg1DkZwL.js} +1 -1
- package/lib/src/{CreatedOnBrandCrowd-fr-fr-DF8Jbj0Z.js → CreatedOnBrandCrowd-fr-fr-r6Ers47p.js} +1 -1
- package/lib/src/{CreatedOnBrandCrowd-pt-pt-BwY8Z3h2.js → CreatedOnBrandCrowd-pt-pt-CRvyq6iB.js} +1 -1
- package/lib/src/{CreatedOnDcom-de-de-BcxMTDdt.js → CreatedOnDcom-de-de-DfCzyu8K.js} +1 -1
- package/lib/src/{CreatedOnDcom-en-us-CWkGPIq5.js → CreatedOnDcom-en-us-CP6lT2IJ.js} +1 -1
- package/lib/src/{CreatedOnDcom-es-es-qScwKYog.js → CreatedOnDcom-es-es-CABw9-cD.js} +1 -1
- package/lib/src/{CreatedOnDcom-fr-fr-CdAeulis.js → CreatedOnDcom-fr-fr-DIN2-W0Q.js} +1 -1
- package/lib/src/{CreatedOnDcom-pt-pt-BAi_UyIx.js → CreatedOnDcom-pt-pt-BLTdvqrM.js} +1 -1
- package/lib/src/brand-page/constants/logo.constants.d.ts +0 -1
- package/lib/src/brand-page/constants/logo.constants.js +0 -2
- package/lib/src/brand-page/utils/migration/migration-01.d.ts +2 -3
- package/lib/src/brand-page/utils/migration/migration-01.js +2 -3
- package/lib/src/brand-page/utils/migration/migration-02.d.ts +3 -4
- package/lib/src/brand-page/utils/migration/migration-02.js +2 -3
- package/lib/src/brand-page/utils/migration/migration-03.d.ts +3 -4
- package/lib/src/brand-page/utils/migration/migration-03.js +2 -3
- package/lib/src/brand-page/utils/migration/migration-04.d.ts +3 -4
- package/lib/src/brand-page/utils/migration/migration-04.js +2 -3
- package/lib/src/brand-page/utils/migration/migration-05.d.ts +2 -6
- package/lib/src/brand-page/utils/migration/migration-05.js +2 -3
- package/lib/src/brand-page/utils/migration/migration-051.d.ts +3 -3
- package/lib/src/brand-page/utils/migration/migration-051.js +2 -3
- package/lib/src/brand-page/utils/migration/migration-052.d.ts +3 -3
- package/lib/src/brand-page/utils/migration/migration-052.js +2 -3
- package/lib/src/brand-page/utils/migration.util.d.ts +1 -6
- package/lib/src/brand-page/utils/migration.util.js +6 -16
- package/lib/src/brand-page/utils/view-model.util.d.ts +3 -3
- package/lib/src/brand-page/utils/view-model.util.js +11 -12
- package/lib/src/brand-page/view-models.d.ts +0 -1
- package/lib/src/brand-page-maker/components/brand-page-maker/BrandPageMaker.stories.d.ts +0 -1
- package/lib/src/brand-page-maker/components/brand-page-maker/BrandPageMaker.stories.js +2 -48
- package/lib/src/brand-page-maker/components/brand-page-maker/__fixtures__/brand-page-examples.d.ts +0 -1122
- package/lib/src/brand-page-maker/components/brand-page-maker/__fixtures__/brand-page-examples.js +0 -1058
- package/lib/src/brand-page-maker/stores/brandpage-maker/brandpage-maker-store.js +1 -2
- package/lib/src/brand-page-maker/stores/route/localised-route-store.js +6 -0
- package/lib/src/css/library.brand-page-brandCrowd.min.css +6 -3
- package/lib/src/css/library.brand-page-brandPage.min.css +6 -3
- package/lib/src/css/library.brand-page-designCom.min.css +6 -3
- package/lib/src/css/library.brand-page-preview.min.css +6 -3
- package/lib/src/index.mjs +1 -1
- package/lib/src/{lib-DcY5D4Az.js → lib-OVp_vdPB.js} +5868 -5977
- package/lib/src/shared/page-settings/store/page-settings-store.js +1 -1
- package/lib/src/shared/template-settings/store/template-settings-store.js +1 -2
- package/package.json +1 -1
- package/src/brand-page/components/logo/Logo.vue +1 -24
- package/src/brand-page/components/logo/LogoRender.vue +13 -38
- package/src/brand-page/constants/logo.constants.ts +0 -3
- package/src/brand-page/utils/__snapshots__/migration.util.test.ts.snap +1112 -1121
- package/src/brand-page/utils/__snapshots__/migration2.util.test.ts.snap +413 -416
- package/src/brand-page/utils/migration/logo/migration.util.logo.test.ts +3 -3
- package/src/brand-page/utils/migration/migration-01.ts +4 -7
- package/src/brand-page/utils/migration/migration-02.ts +4 -7
- package/src/brand-page/utils/migration/migration-03.ts +4 -7
- package/src/brand-page/utils/migration/migration-04.ts +4 -7
- package/src/brand-page/utils/migration/migration-05.ts +3 -16
- package/src/brand-page/utils/migration/migration-051.ts +3 -6
- package/src/brand-page/utils/migration/migration-052.ts +3 -6
- package/src/brand-page/utils/migration.util.test.ts +157 -274
- package/src/brand-page/utils/migration.util.ts +9 -26
- package/src/brand-page/utils/migration2.util.test.ts +2 -7
- package/src/brand-page/utils/view-model.util.ts +6 -20
- package/src/brand-page/view-models.ts +0 -1
- package/src/brand-page-maker/components/brand-page-maker/BrandPageMaker.stories.ts +1 -52
- package/src/brand-page-maker/components/brand-page-maker/__fixtures__/brand-page-examples.ts +0 -1090
- package/src/brand-page-maker/stores/brandpage-maker/brandpage-maker-store.ts +1 -2
- package/src/brand-page-maker/stores/route/localised-route-store.ts +6 -0
- package/src/shared/page-settings/store/page-settings-store.ts +0 -1
- package/src/shared/template-settings/store/template-settings-store.ts +1 -2
- package/lib/src/brand-page/utils/migration/migration-06.d.ts +0 -4
- package/lib/src/brand-page/utils/migration/migration-06.js +0 -59
- package/src/brand-page/utils/migration/migration-06.test.ts +0 -384
- package/src/brand-page/utils/migration/migration-06.ts +0 -106
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import type { BrandPageModel, LogoImageModel } from '../../';
|
|
2
|
-
import { type MigrationData } from '../../utils';
|
|
3
2
|
export declare const applyTextContentTextToTextItemsMigration: (brandPageModel: BrandPageModel) => void;
|
|
4
3
|
export declare const migrateProfileContentToHaveTextStyles: (brandPageModel: BrandPageModel) => void;
|
|
5
4
|
export declare const migrateMailingListContentToHaveTextStyles: (brandPageModel: BrandPageModel) => void;
|
|
@@ -18,7 +17,7 @@ export declare const migrateNewLogoLogic: (brandPageModel: BrandPageModel, isUse
|
|
|
18
17
|
export declare const migrateGlobalTextStylesToHaveMissingStyles: (brandPageModel: BrandPageModel) => void;
|
|
19
18
|
export declare const migrateConvertLineHeightOnNavigationStyles: (brandPageModel: BrandPageModel) => void;
|
|
20
19
|
export declare const migrateConvertLineHeightOnFooterStyles: (brandPageModel: BrandPageModel) => void;
|
|
21
|
-
export declare const migration01: (
|
|
20
|
+
export declare const migration01: (brandPageModel: BrandPageModel, options: {
|
|
22
21
|
logoImage?: LogoImageModel;
|
|
23
22
|
isUserDraft: boolean;
|
|
24
|
-
}) =>
|
|
23
|
+
}) => BrandPageModel;
|
|
@@ -857,8 +857,7 @@ export const migrateConvertLineHeightOnFooterStyles = (brandPageModel) => {
|
|
|
857
857
|
};
|
|
858
858
|
}
|
|
859
859
|
};
|
|
860
|
-
export const migration01 =
|
|
861
|
-
const { brandPageModel } = migrationResult;
|
|
860
|
+
export const migration01 = (brandPageModel, options) => {
|
|
862
861
|
if (!brandPageModel.brandPageType) {
|
|
863
862
|
brandPageModel.brandPageType = BRAND_PAGE_TYPES.default;
|
|
864
863
|
}
|
|
@@ -891,5 +890,5 @@ export const migration01 = async (migrationResult, options) => {
|
|
|
891
890
|
migrateConvertLineHeightOnNavigationStyles(brandPageModel);
|
|
892
891
|
migrateConvertLineHeightOnFooterStyles(brandPageModel);
|
|
893
892
|
migrateLogoImage(brandPageModel, options.logoImage);
|
|
894
|
-
return
|
|
893
|
+
return brandPageModel;
|
|
895
894
|
};
|
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
import { type LogoImageModel } from '../..';
|
|
2
|
-
import type { MigrationData } from '../migration.util';
|
|
1
|
+
import { type BrandPageModel, type LogoImageModel } from '../..';
|
|
3
2
|
export declare const convertLetterSpacingRemToEm: (fontSizeInEmOrRem: string | undefined, letterSpacingRemValue: string | undefined) => string | undefined;
|
|
4
|
-
export declare const migration02: (
|
|
3
|
+
export declare const migration02: (brandPageModel: BrandPageModel, options: {
|
|
5
4
|
logoImage?: LogoImageModel;
|
|
6
5
|
isUserDraft: boolean;
|
|
7
|
-
}) =>
|
|
6
|
+
}) => BrandPageModel;
|
|
@@ -31,8 +31,7 @@ const handleConversion = (style) => {
|
|
|
31
31
|
}
|
|
32
32
|
style.letterSpacing = convertLetterSpacingRemToEm(style.fontSize, style.letterSpacing);
|
|
33
33
|
};
|
|
34
|
-
export const migration02 =
|
|
35
|
-
const { brandPageModel } = migrationResult;
|
|
34
|
+
export const migration02 = (brandPageModel, options) => {
|
|
36
35
|
handleConversion(brandPageModel.pageHeaderDesktop?.navigation?.defaultButtonStyle);
|
|
37
36
|
handleConversion(brandPageModel.pageHeaderMobile?.navigation?.defaultButtonStyle);
|
|
38
37
|
handleConversion(brandPageModel.pageFooterDesktop?.copyrightStyle);
|
|
@@ -128,5 +127,5 @@ export const migration02 = async (migrationResult, options) => {
|
|
|
128
127
|
}
|
|
129
128
|
});
|
|
130
129
|
});
|
|
131
|
-
return
|
|
130
|
+
return brandPageModel;
|
|
132
131
|
};
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import { type LogoImageModel } from '../..';
|
|
2
|
-
|
|
3
|
-
export declare const migration03: (migrationResult: MigrationData, options: {
|
|
1
|
+
import { type BrandPageModel, type LogoImageModel } from '../..';
|
|
2
|
+
export declare const migration03: (brandPageModel: BrandPageModel, options: {
|
|
4
3
|
logoImage?: LogoImageModel;
|
|
5
4
|
isUserDraft: boolean;
|
|
6
|
-
}) =>
|
|
5
|
+
}) => BrandPageModel;
|
|
@@ -28,8 +28,7 @@ const migrateApplyAutoScaleProperty = (brandPageType, textStyle) => {
|
|
|
28
28
|
textStyle.applyAutoScale =
|
|
29
29
|
brandPageType && brandPageType === BRAND_PAGE_TYPES.brandSite;
|
|
30
30
|
};
|
|
31
|
-
export const migration03 =
|
|
32
|
-
const { brandPageModel } = migrationResult;
|
|
31
|
+
export const migration03 = (brandPageModel, options) => {
|
|
33
32
|
handleRecursiveFontSizeMigration(brandPageModel.pageHeaderDesktop);
|
|
34
33
|
handleRecursiveFontSizeMigration(brandPageModel.pageHeaderMobile);
|
|
35
34
|
handleRecursiveFontSizeMigration(brandPageModel.pageFooterDesktop);
|
|
@@ -117,5 +116,5 @@ export const migration03 = async (migrationResult, options) => {
|
|
|
117
116
|
}
|
|
118
117
|
});
|
|
119
118
|
});
|
|
120
|
-
return
|
|
119
|
+
return brandPageModel;
|
|
121
120
|
};
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import { type LogoImageModel } from '../..';
|
|
2
|
-
|
|
3
|
-
export declare const migration04: (migrationResult: MigrationData, options: {
|
|
1
|
+
import { type BrandPageModel, type LogoImageModel } from '../..';
|
|
2
|
+
export declare const migration04: (brandPageModel: BrandPageModel, options: {
|
|
4
3
|
logoImage?: LogoImageModel;
|
|
5
4
|
isUserDraft: boolean;
|
|
6
|
-
}) =>
|
|
5
|
+
}) => BrandPageModel;
|
|
@@ -86,8 +86,7 @@ const updateUserUploadedImageUrls = (content) => {
|
|
|
86
86
|
});
|
|
87
87
|
}
|
|
88
88
|
};
|
|
89
|
-
export const migration04 =
|
|
90
|
-
const { brandPageModel } = migrationResult;
|
|
89
|
+
export const migration04 = (brandPageModel, options) => {
|
|
91
90
|
if (brandPageModel.faviconUrl &&
|
|
92
91
|
isUserUploadedImage(brandPageModel.faviconUrl)) {
|
|
93
92
|
brandPageModel.faviconUrl = removeUserImageExtension(brandPageModel.faviconUrl);
|
|
@@ -112,5 +111,5 @@ export const migration04 = async (migrationResult, options) => {
|
|
|
112
111
|
}
|
|
113
112
|
});
|
|
114
113
|
}
|
|
115
|
-
return
|
|
114
|
+
return brandPageModel;
|
|
116
115
|
};
|
|
@@ -1,6 +1,2 @@
|
|
|
1
|
-
import { type
|
|
2
|
-
|
|
3
|
-
export declare const migration05: (migrationResult: MigrationData, options: {
|
|
4
|
-
logoImage?: LogoImageModel;
|
|
5
|
-
isUserDraft: boolean;
|
|
6
|
-
}) => Promise<MigrationData>;
|
|
1
|
+
import { type BrandPageModel } from '../..';
|
|
2
|
+
export declare const migration05: (brandPageModel: BrandPageModel) => BrandPageModel;
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import {} from '../..';
|
|
2
2
|
import { isTextContent } from '../model.util';
|
|
3
|
-
export const migration05 =
|
|
4
|
-
const { brandPageModel } = migrationResult;
|
|
3
|
+
export const migration05 = (brandPageModel) => {
|
|
5
4
|
brandPageModel.pages.forEach((page) => {
|
|
6
5
|
page.contents.forEach((content) => {
|
|
7
6
|
if (isTextContent(content)) {
|
|
@@ -14,5 +13,5 @@ export const migration05 = async (migrationResult, options) => {
|
|
|
14
13
|
}
|
|
15
14
|
});
|
|
16
15
|
});
|
|
17
|
-
return
|
|
16
|
+
return brandPageModel;
|
|
18
17
|
};
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type
|
|
2
|
-
export declare const migration051: (
|
|
1
|
+
import { type BrandPageModel } from '../..';
|
|
2
|
+
export declare const migration051: (brandPageModel: BrandPageModel, options: {
|
|
3
3
|
isUserDraft: boolean;
|
|
4
|
-
}) =>
|
|
4
|
+
}) => BrandPageModel;
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import {} from '../..';
|
|
2
|
-
export const migration051 = (
|
|
3
|
-
const { brandPageModel } = migrationResult;
|
|
2
|
+
export const migration051 = (brandPageModel, options) => {
|
|
4
3
|
if (!options.isUserDraft) {
|
|
5
4
|
brandPageModel.pageFooterDesktop?.socialLinks?.forEach((link) => {
|
|
6
5
|
if (link.imageUrl === 'twitter') {
|
|
@@ -15,5 +14,5 @@ export const migration051 = (migrationResult, options) => {
|
|
|
15
14
|
}
|
|
16
15
|
});
|
|
17
16
|
}
|
|
18
|
-
return
|
|
17
|
+
return brandPageModel;
|
|
19
18
|
};
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type
|
|
2
|
-
export declare const migration052: (
|
|
1
|
+
import { type BrandPageModel } from '../..';
|
|
2
|
+
export declare const migration052: (brandPageModel: BrandPageModel, options: {
|
|
3
3
|
isUserDraft: boolean;
|
|
4
|
-
}) =>
|
|
4
|
+
}) => BrandPageModel;
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import {} from '../..';
|
|
2
|
-
export const migration052 = (
|
|
3
|
-
const { brandPageModel } = migrationResult;
|
|
2
|
+
export const migration052 = (brandPageModel, options) => {
|
|
4
3
|
brandPageModel.pages.forEach((page) => {
|
|
5
4
|
page.contents.forEach((content) => {
|
|
6
5
|
// Casting content type to string to avoid adding placeholder types in CONTENT_SETTINGS_CONFIGS
|
|
@@ -11,5 +10,5 @@ export const migration052 = (migrationResult, options) => {
|
|
|
11
10
|
}
|
|
12
11
|
});
|
|
13
12
|
});
|
|
14
|
-
return
|
|
13
|
+
return brandPageModel;
|
|
15
14
|
};
|
|
@@ -1,11 +1,6 @@
|
|
|
1
1
|
import { type BrandPageModel, type LogoImageModel } from '../models';
|
|
2
|
-
export interface MigrationData {
|
|
3
|
-
brandPageModel: BrandPageModel;
|
|
4
|
-
useOldLogoRenderSize: boolean;
|
|
5
|
-
}
|
|
6
2
|
export declare const GetLatestModelVersion: () => number;
|
|
7
3
|
export declare const migrateBrandPageModel: (brandPageModel: BrandPageModel, options: {
|
|
8
4
|
logoImage?: LogoImageModel;
|
|
9
5
|
isUserDraft: boolean;
|
|
10
|
-
|
|
11
|
-
}) => Promise<MigrationData>;
|
|
6
|
+
}) => BrandPageModel;
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { LOGO_MIGRATION_VERSION } from '../constants';
|
|
2
1
|
import {} from '../models';
|
|
3
2
|
import { migration01 } from './migration/migration-01';
|
|
4
3
|
import { migration02 } from './migration/migration-02';
|
|
@@ -6,7 +5,6 @@ import { migration03 } from './migration/migration-03';
|
|
|
6
5
|
import { migration04 } from './migration/migration-04';
|
|
7
6
|
import { migration05 } from './migration/migration-05';
|
|
8
7
|
import { migration051 } from './migration/migration-051';
|
|
9
|
-
import { migration06 } from './migration/migration-06';
|
|
10
8
|
import { migration052 } from './migration/migration-052';
|
|
11
9
|
const MIGRATION_TABLE = [
|
|
12
10
|
{
|
|
@@ -37,27 +35,19 @@ const MIGRATION_TABLE = [
|
|
|
37
35
|
version: 5.2,
|
|
38
36
|
migrateFn: migration052,
|
|
39
37
|
},
|
|
40
|
-
{
|
|
41
|
-
version: 6,
|
|
42
|
-
migrateFn: migration06,
|
|
43
|
-
},
|
|
44
38
|
];
|
|
45
39
|
export const GetLatestModelVersion = () => Math.max(...MIGRATION_TABLE.map((x) => x.version));
|
|
46
|
-
export const migrateBrandPageModel =
|
|
40
|
+
export const migrateBrandPageModel = (brandPageModel, options) => {
|
|
47
41
|
let modelVersion = brandPageModel.v;
|
|
48
|
-
let migrationResult = {
|
|
49
|
-
brandPageModel,
|
|
50
|
-
useOldLogoRenderSize: false,
|
|
51
|
-
};
|
|
52
42
|
if (!modelVersion) {
|
|
53
43
|
modelVersion = 0;
|
|
54
44
|
}
|
|
55
|
-
|
|
45
|
+
MIGRATION_TABLE.forEach((x) => {
|
|
56
46
|
if (modelVersion < x.version) {
|
|
57
|
-
|
|
47
|
+
brandPageModel = x.migrateFn(brandPageModel, options);
|
|
58
48
|
}
|
|
59
|
-
}
|
|
49
|
+
});
|
|
60
50
|
// Set the model to latest version
|
|
61
|
-
|
|
62
|
-
return
|
|
51
|
+
brandPageModel.v = GetLatestModelVersion();
|
|
52
|
+
return brandPageModel;
|
|
63
53
|
};
|
|
@@ -8,10 +8,10 @@ export declare const mapToTextViewModel: (content: TextContent, styles: PageStyl
|
|
|
8
8
|
export declare const mapToBannerSectionViewModel: (content: BannerSectionContent, styles: PageStyles) => BannerSectionViewModel;
|
|
9
9
|
export declare const mapToImagesSectionViewModel: (content: ImagesSectionContent, styles: PageStyles, brandPageType: BrandPageType) => TextImageSectionViewModel;
|
|
10
10
|
export declare const mapToBookingSectionViewModel: (content: BookingSectionContent, styles: PageStyles) => BookingSectionViewModel;
|
|
11
|
-
export declare const mapToPageHeaderViewModel: (pageHeader: PageHeaderDesktop | PageHeaderMobile, pageStyles: PageStyles, pages: PageViewModel[]
|
|
12
|
-
export declare const mapToPageFooterViewModel: (pageFooter: PageFooterDesktop | PageFooterMobile, pageStyles: PageStyles
|
|
11
|
+
export declare const mapToPageHeaderViewModel: (pageHeader: PageHeaderDesktop | PageHeaderMobile, pageStyles: PageStyles, pages: PageViewModel[]) => PageHeaderViewModel;
|
|
12
|
+
export declare const mapToPageFooterViewModel: (pageFooter: PageFooterDesktop | PageFooterMobile, pageStyles: PageStyles) => PageFooterViewModel;
|
|
13
13
|
export declare const mapToViewModel: (styles: PageStyles, brandPageType: BrandPageType) => (content: Content) => ContentViewModel | undefined;
|
|
14
|
-
export declare const getBrandPageViewModelFromBrandPageModel: (model: BrandPageModel, brandPageToken: string | undefined, showBrandCrowdLogo?: boolean
|
|
14
|
+
export declare const getBrandPageViewModelFromBrandPageModel: (model: BrandPageModel, brandPageToken: string | undefined, showBrandCrowdLogo?: boolean) => BrandPageViewModel;
|
|
15
15
|
export declare const isLogoViewModel: (viewModel: ContentViewModel) => viewModel is LogoViewModel;
|
|
16
16
|
/** for service.brand-page website preview by logo draft token */
|
|
17
17
|
export declare const applyLogoImageToBrandPageViewModel: (viewModel: BrandPageViewModel, logoImage: LogoImageModel) => BrandPageViewModel;
|
|
@@ -115,7 +115,7 @@ export const mapToImageGalleryViewModel = (content, globalStyles) => {
|
|
|
115
115
|
styles: galleryStyles?.galleryType ? galleryStyles : globalStyles,
|
|
116
116
|
};
|
|
117
117
|
};
|
|
118
|
-
const mapToLogoViewModel = (content, globalStyles,
|
|
118
|
+
const mapToLogoViewModel = (content, globalStyles, options) => {
|
|
119
119
|
let background;
|
|
120
120
|
if (content.backgroundStyle?.background &&
|
|
121
121
|
isHexTransparent(content.backgroundStyle.background)) {
|
|
@@ -158,7 +158,6 @@ const mapToLogoViewModel = (content, globalStyles, useOldLogoRenderSize, options
|
|
|
158
158
|
},
|
|
159
159
|
},
|
|
160
160
|
isVisible: content.isLogoVisible,
|
|
161
|
-
useOldLogoRenderSize,
|
|
162
161
|
});
|
|
163
162
|
};
|
|
164
163
|
const mapToVideoViewModel = (content, styles) => {
|
|
@@ -526,7 +525,7 @@ export const mapToBookingSectionViewModel = (content, styles) => {
|
|
|
526
525
|
isFullWidth: true,
|
|
527
526
|
}, styles);
|
|
528
527
|
};
|
|
529
|
-
export const mapToPageHeaderViewModel = (pageHeader, pageStyles, pages
|
|
528
|
+
export const mapToPageHeaderViewModel = (pageHeader, pageStyles, pages) => {
|
|
530
529
|
const viewport = pageHeader.viewport;
|
|
531
530
|
const logoContent = {
|
|
532
531
|
id: 'page-header-logo',
|
|
@@ -555,7 +554,7 @@ export const mapToPageHeaderViewModel = (pageHeader, pageStyles, pages, useOldLo
|
|
|
555
554
|
}), {});
|
|
556
555
|
return {
|
|
557
556
|
displayStyle: pageHeader.displayStyle,
|
|
558
|
-
logo: mapToLogoViewModel(logoContent, logoStyles
|
|
557
|
+
logo: mapToLogoViewModel(logoContent, logoStyles),
|
|
559
558
|
pages: pages.filter((p) => !p.isHidden),
|
|
560
559
|
navigation: viewport === VIEWPORTS.mobile
|
|
561
560
|
? new NavigationMobile({
|
|
@@ -575,7 +574,7 @@ export const mapToPageHeaderViewModel = (pageHeader, pageStyles, pages, useOldLo
|
|
|
575
574
|
backgroundColorEnabled: pageHeader.backgroundColorEnabled,
|
|
576
575
|
};
|
|
577
576
|
};
|
|
578
|
-
export const mapToPageFooterViewModel = (pageFooter, pageStyles
|
|
577
|
+
export const mapToPageFooterViewModel = (pageFooter, pageStyles) => {
|
|
579
578
|
const { logoImageBase64Url, logoImage, logoTemplateImage, logoImageHeight, logoImageWidth, isLogoVisible, } = pageFooter;
|
|
580
579
|
const logoContent = {
|
|
581
580
|
id: 'page-header-logo',
|
|
@@ -599,7 +598,7 @@ export const mapToPageFooterViewModel = (pageFooter, pageStyles, useOldLogoRende
|
|
|
599
598
|
copyrightStyle,
|
|
600
599
|
displayStyle: pageFooter.displayStyle,
|
|
601
600
|
iconStyle: Object.assign({ fill: pageStyles.textStyles?.style.color }, pageFooter.iconStyle),
|
|
602
|
-
logo: mapToLogoViewModel(logoContent, logoStyles
|
|
601
|
+
logo: mapToLogoViewModel(logoContent, logoStyles),
|
|
603
602
|
socialLinks: pageFooter.socialLinks,
|
|
604
603
|
textFontFamily: pageFooter.textFontFamily,
|
|
605
604
|
};
|
|
@@ -614,7 +613,7 @@ export const mapToViewModel = (styles, brandPageType) => (content) => {
|
|
|
614
613
|
if (brandPageType === BRAND_PAGE_TYPES.brandSite) {
|
|
615
614
|
return undefined;
|
|
616
615
|
}
|
|
617
|
-
return mapToLogoViewModel(content, styles.logoStyles,
|
|
616
|
+
return mapToLogoViewModel(content, styles.logoStyles, {
|
|
618
617
|
height: DEFAULT_LOGO_HEIGHT,
|
|
619
618
|
width: DEFAULT_LOGO_WIDTH,
|
|
620
619
|
});
|
|
@@ -671,7 +670,7 @@ export const mapToViewModel = (styles, brandPageType) => (content) => {
|
|
|
671
670
|
assertUnreachable();
|
|
672
671
|
}
|
|
673
672
|
};
|
|
674
|
-
export const getBrandPageViewModelFromBrandPageModel = (model, brandPageToken, showBrandCrowdLogo = true
|
|
673
|
+
export const getBrandPageViewModelFromBrandPageModel = (model, brandPageToken, showBrandCrowdLogo = true) => {
|
|
675
674
|
const pages = model.pages.map((p) => {
|
|
676
675
|
const contents = p.contents
|
|
677
676
|
.map(mapToViewModel(model.styles, model.brandPageType || BRAND_PAGE_TYPES.default))
|
|
@@ -688,10 +687,10 @@ export const getBrandPageViewModelFromBrandPageModel = (model, brandPageToken, s
|
|
|
688
687
|
pages,
|
|
689
688
|
showBrandCrowdLogo,
|
|
690
689
|
styles: model.styles,
|
|
691
|
-
headerViewModelDesktop: mapToPageHeaderViewModel(model.pageHeaderDesktop, model.styles, pages
|
|
692
|
-
headerViewModelMobile: mapToPageHeaderViewModel(model.pageHeaderMobile, model.styles, pages
|
|
693
|
-
footerViewModelDesktop: mapToPageFooterViewModel(model.pageFooterDesktop, model.styles
|
|
694
|
-
footerViewModelMobile: mapToPageFooterViewModel(model.pageFooterMobile, model.styles
|
|
690
|
+
headerViewModelDesktop: mapToPageHeaderViewModel(model.pageHeaderDesktop, model.styles, pages),
|
|
691
|
+
headerViewModelMobile: mapToPageHeaderViewModel(model.pageHeaderMobile, model.styles, pages),
|
|
692
|
+
footerViewModelDesktop: mapToPageFooterViewModel(model.pageFooterDesktop, model.styles),
|
|
693
|
+
footerViewModelMobile: mapToPageFooterViewModel(model.pageFooterMobile, model.styles),
|
|
695
694
|
brandPageType: model.brandPageType || BRAND_PAGE_TYPES.default,
|
|
696
695
|
faviconUrl: model.faviconUrl,
|
|
697
696
|
ogImageUrl: model.ogImageUrl,
|
|
@@ -32,7 +32,6 @@ export interface LogoViewModel extends ContentViewModel {
|
|
|
32
32
|
logoImageWidth: string | undefined;
|
|
33
33
|
/** @deprecated */
|
|
34
34
|
imageStyle?: LogoStyles['imageStyle'];
|
|
35
|
-
useOldLogoRenderSize?: boolean;
|
|
36
35
|
}
|
|
37
36
|
export interface ProfileViewModel extends ContentViewModel, Omit<ProfileContent, 'type'> {
|
|
38
37
|
containerStyle?: BrandPageCssStyle;
|
|
@@ -27,7 +27,6 @@ export declare const SampleBanner: {
|
|
|
27
27
|
export declare const SamplePersonalised: () => any;
|
|
28
28
|
export declare const SamplePublished: Story;
|
|
29
29
|
export declare const SamplePublishedWithCustomDomain: Story;
|
|
30
|
-
export declare const SamplePublishedBrandSiteWithLogo: Story;
|
|
31
30
|
export declare const SamplePublishedBrandSite: Story;
|
|
32
31
|
export declare const SampleProfile: {
|
|
33
32
|
(): any;
|
|
@@ -6,7 +6,7 @@ import * as uuid from 'uuid';
|
|
|
6
6
|
import { createMemoryHistory, createRouter } from 'vue-router';
|
|
7
7
|
import { brandPageApiClient } from '@designcrowd/fe-shared-lib';
|
|
8
8
|
import BrandPageMaker from './BrandPageMaker.vue';
|
|
9
|
-
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,
|
|
9
|
+
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__';
|
|
10
10
|
import { gradientLogoDesignAttributes, LOGO_IMAGE_URL, logoVariationImageUrls, sampleLogoTheme, simpleLogoDesignAttributes, } from '../../../__fixtures__';
|
|
11
11
|
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';
|
|
12
12
|
import {} from './BrandPageMaker.mixin';
|
|
@@ -469,52 +469,6 @@ export const SamplePublishedWithCustomDomain = {
|
|
|
469
469
|
pinia: setupStoryPinia(),
|
|
470
470
|
}),
|
|
471
471
|
};
|
|
472
|
-
export const SamplePublishedBrandSiteWithLogo = {
|
|
473
|
-
name: 'Sample (published brandsite with logo)',
|
|
474
|
-
render: () => ({
|
|
475
|
-
setup() {
|
|
476
|
-
InitialiseMakerStores({});
|
|
477
|
-
const containerStore = useBrandPageContainerStore();
|
|
478
|
-
containerStore.$patch({
|
|
479
|
-
isSellDomainNameEnabled: true,
|
|
480
|
-
baseFabricRenderUrl: FABRIC_RENDER_BASE_URL,
|
|
481
|
-
});
|
|
482
|
-
containerStore.setBrandPageStatus('Published');
|
|
483
|
-
containerStore.setDesignDraftToken({
|
|
484
|
-
designDraftToken: CUSTOM_DOMAIN_DESIGN_DRAFT_TOKEN,
|
|
485
|
-
});
|
|
486
|
-
containerStore.brandPageBaseUrl = 'https://brand.site';
|
|
487
|
-
containerStore.setSlug({
|
|
488
|
-
slug: 'my-page',
|
|
489
|
-
});
|
|
490
|
-
},
|
|
491
|
-
components: {
|
|
492
|
-
BrandPageMaker,
|
|
493
|
-
},
|
|
494
|
-
data() {
|
|
495
|
-
return {
|
|
496
|
-
viewModel: {
|
|
497
|
-
brandPageData: JSON.stringify(BRAND_SITE_SAMPLE_WITH_LOGO),
|
|
498
|
-
isSaving: false,
|
|
499
|
-
logoDraftDesignAttributes: simpleLogoDesignAttributes,
|
|
500
|
-
logoVariationImageUrls,
|
|
501
|
-
baseBrandPageUrl: 'https://brand.site',
|
|
502
|
-
features: userFeatures,
|
|
503
|
-
initialCategories: {},
|
|
504
|
-
},
|
|
505
|
-
show: false,
|
|
506
|
-
};
|
|
507
|
-
},
|
|
508
|
-
template: `
|
|
509
|
-
<BrandPageMaker v-if="show" :view-model="viewModel"/>
|
|
510
|
-
`,
|
|
511
|
-
pinia: setupStoryPinia(),
|
|
512
|
-
async beforeMount() {
|
|
513
|
-
await setLocaleAsync('en-US');
|
|
514
|
-
this.show = true;
|
|
515
|
-
},
|
|
516
|
-
}),
|
|
517
|
-
};
|
|
518
472
|
export const SamplePublishedBrandSite = {
|
|
519
473
|
name: 'Sample (published brandsite)',
|
|
520
474
|
render: () => ({
|
|
@@ -1184,7 +1138,7 @@ SampleAdminMode.story = {
|
|
|
1184
1138
|
name: 'Sample (admin mode)',
|
|
1185
1139
|
};
|
|
1186
1140
|
export const SampleAdminModeBrandSite = {
|
|
1187
|
-
name: 'Sample (admin mode
|
|
1141
|
+
name: 'Sample (admin mode brandsite)',
|
|
1188
1142
|
render: () => ({
|
|
1189
1143
|
setup() {
|
|
1190
1144
|
InitialiseMakerStores({ isAdmin: true });
|