@designcrowd/library.brand-page 5.16.42-nav-sync-7 → 5.16.42
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-BdDXDIfJ.js → CreatedOnBrandCrowd-de-de-2yOEYkJj.js} +1 -1
- package/lib/src/{CreatedOnBrandCrowd-en-us-BOf9iHwE.js → CreatedOnBrandCrowd-en-us-C3ZcstVb.js} +1 -1
- package/lib/src/{CreatedOnBrandCrowd-es-es-BciNq3M_.js → CreatedOnBrandCrowd-es-es-CUVbeolm.js} +1 -1
- package/lib/src/{CreatedOnBrandCrowd-fr-fr-4waVaxTe.js → CreatedOnBrandCrowd-fr-ca-CWrEm5XF.js} +1 -1
- package/lib/src/{CreatedOnBrandCrowd-fr-ca-4waVaxTe.js → CreatedOnBrandCrowd-fr-fr-CWrEm5XF.js} +1 -1
- package/lib/src/{CreatedOnBrandCrowd-pt-pt-D4cDuWcC.js → CreatedOnBrandCrowd-pt-br-5WAjD7l3.js} +1 -1
- package/lib/src/{CreatedOnBrandCrowd-pt-br-D4cDuWcC.js → CreatedOnBrandCrowd-pt-pt-5WAjD7l3.js} +1 -1
- package/lib/src/{CreatedOnDcom-de-de-BF14gXDC.js → CreatedOnDcom-de-de-B4b3caW2.js} +1 -1
- package/lib/src/{CreatedOnDcom-en-us-BVjP-5HH.js → CreatedOnDcom-en-us-DaLELZyT.js} +1 -1
- package/lib/src/{CreatedOnDcom-es-es-mj9S3IPI.js → CreatedOnDcom-es-es-p5JZJPXb.js} +1 -1
- package/lib/src/{CreatedOnDcom-fr-ca-DhnuAP-y.js → CreatedOnDcom-fr-ca-DcaNqreO.js} +1 -1
- package/lib/src/{CreatedOnDcom-fr-fr-c3Pnhw5B.js → CreatedOnDcom-fr-fr-DKzy6dez.js} +1 -1
- package/lib/src/{CreatedOnDcom-pt-br-z9JKhJM_.js → CreatedOnDcom-pt-br-DXK8qDlO.js} +1 -1
- package/lib/src/{CreatedOnDcom-pt-pt-C-KHYOqo.js → CreatedOnDcom-pt-pt-ChGL1q2P.js} +1 -1
- package/lib/src/brand-page/components/page/Page.stories.js +0 -3
- package/lib/src/brand-page/models/index.d.ts +0 -18
- package/lib/src/brand-page/models/index.js +0 -12
- package/lib/src/brand-page/utils/index.d.ts +0 -1
- package/lib/src/brand-page/utils/index.js +0 -1
- package/lib/src/brand-page/utils/migration.util.js +0 -6
- package/lib/src/brand-page/utils/route.util.d.ts +1 -1
- package/lib/src/brand-page/utils/view-model.util.d.ts +2 -5
- package/lib/src/brand-page/utils/view-model.util.js +0 -26
- package/lib/src/brand-page/view-models.d.ts +0 -28
- package/lib/src/brand-page-maker/components/brand-page-maker/BrandPageMaker.mixin.d.ts +1 -1
- package/lib/src/brand-page-maker/components/brandpage-maker-page/BrandPageMakerPage.mixin.d.ts +1 -1
- package/lib/src/brand-page-maker/components/preview/Preview.stories.js +0 -4
- package/lib/src/brand-page-maker/stores/brandpage-maker/brandpage-maker-store.js +2 -17
- package/lib/src/css/library.brand-page-brandCrowd.min.css +16 -16
- package/lib/src/css/library.brand-page-brandPage.min.css +16 -16
- package/lib/src/css/library.brand-page-designCom.min.css +16 -16
- package/lib/src/css/library.brand-page-preview.min.css +16 -16
- package/lib/src/index.d.ts +1 -1
- package/lib/src/index.mjs +121 -123
- package/lib/src/{lib-bWLHjvRI.js → lib-hXQaBPKF.js} +14597 -14835
- package/lib/src/lib.js +1 -1
- package/lib/src/shared/content-settings/components/content-settings/ContentSettings.mixin.d.ts +1 -2
- package/lib/src/shared/content-settings/components/content-settings/ReplaceImageSettingsForContent.mixin.d.ts +1 -1
- package/lib/src/shared/content-settings/components/content-settings-item/ContentSettingsItemField.mixin.d.ts +1 -1
- package/lib/src/shared/content-settings/components/page-dropdown-field/PageDropdownField.mixin.d.ts +1 -1
- package/lib/src/shared/content-settings/components/payment-config-field/PaymentConfigField.mixin.d.ts +1 -1
- package/lib/src/shared/logo-settings/components/LogoSettings.mixin.d.ts +1 -1
- package/lib/src/shared/page-settings/components/new-page-modal/NewPageModal.mixin.d.ts +1 -15
- package/lib/src/shared/page-settings/components/new-page-modal/NewPageModal.mixin.js +1 -15
- package/lib/src/shared/page-settings/components/page-settings/PageSettings.mixin.d.ts +1 -15
- package/lib/src/shared/page-settings/components/page-settings/PageSettings.mixin.js +0 -31
- package/lib/src/shared/page-settings/components/page-settings-section-styles/PageSettingsSectionStyles.mixin.d.ts +1 -2
- package/lib/src/shared/page-settings/models.d.ts +0 -1
- package/lib/src/shared/page-settings/store/page-settings-store.d.ts +1 -1
- package/lib/src/shared/page-settings/store/page-settings-store.js +1 -3
- package/package.json +4 -5
- package/src/brand-page/components/page/Page.stories.ts +0 -3
- package/src/brand-page/components/page/Page.vue +0 -14
- package/src/brand-page/components/social-links/SocialLinks.vue.test.ts +0 -1
- package/src/brand-page/components/text-wrapper/TextWrapper.vue +1 -1
- package/src/brand-page/models/index.ts +0 -30
- package/src/brand-page/utils/__snapshots__/migration.util.test.ts.snap +3 -57
- package/src/brand-page/utils/__snapshots__/migration2.util.test.ts.snap +0 -4
- package/src/brand-page/utils/__snapshots__/model.util.test.ts.snap +0 -8
- package/src/brand-page/utils/index.ts +0 -1
- package/src/brand-page/utils/logo.util.test.ts +0 -5
- package/src/brand-page/utils/migration.util.test.ts +0 -15
- package/src/brand-page/utils/migration.util.ts +0 -6
- package/src/brand-page/utils/route.util.ts +1 -1
- package/src/brand-page/utils/view-model.util.ts +0 -81
- package/src/brand-page/view-models.ts +0 -33
- package/src/brand-page-maker/components/preview/Preview.stories.ts +0 -4
- package/src/brand-page-maker/stores/brandpage-maker/brandpage-maker-store.test.ts +2 -2
- package/src/brand-page-maker/stores/brandpage-maker/brandpage-maker-store.ts +1 -22
- package/src/lib.ts +0 -1
- package/src/shared/logo-settings/store/logo-settings-store.test.ts +0 -2
- package/src/shared/page-settings/components/new-page-modal/NewPageModal.mixin.ts +1 -18
- package/src/shared/page-settings/components/page-settings/PageSettings.mixin.ts +0 -55
- package/src/shared/page-settings/models.ts +0 -1
- package/src/shared/page-settings/store/page-settings-store.test.ts +0 -1
- package/src/shared/page-settings/store/page-settings-store.ts +2 -6
- package/lib/src/brand-page/utils/migration/migration-12.d.ts +0 -2
- package/lib/src/brand-page/utils/migration/migration-12.js +0 -30
- package/lib/src/shared/page-navigation/store/page-navigation-store.d.ts +0 -18
- package/lib/src/shared/page-navigation/store/page-navigation-store.js +0 -118
- package/src/brand-page/utils/migration/migration-12.ts +0 -43
- package/src/shared/page-navigation/store/page-navigation-store.ts +0 -168
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { vi } from 'vitest';
|
|
2
1
|
import { migrateBrandPageModel } from './migration.util';
|
|
3
2
|
import { migrateNewLogoLogic } from './migration/migration-01';
|
|
4
3
|
import {
|
|
@@ -32,21 +31,7 @@ import {
|
|
|
32
31
|
TEXT_ONLY,
|
|
33
32
|
} from '../constants';
|
|
34
33
|
|
|
35
|
-
let indexForUuid = 0;
|
|
36
|
-
|
|
37
|
-
vi.mock('uuid', () => ({
|
|
38
|
-
v4: () => {
|
|
39
|
-
indexForUuid += 1;
|
|
40
|
-
|
|
41
|
-
return `mocked-uuid-${indexForUuid}`;
|
|
42
|
-
},
|
|
43
|
-
}));
|
|
44
|
-
|
|
45
34
|
describe('migration.util', () => {
|
|
46
|
-
beforeEach(() => {
|
|
47
|
-
indexForUuid = 0;
|
|
48
|
-
});
|
|
49
|
-
|
|
50
35
|
const getBsModel: () => BrandPageModel = () => {
|
|
51
36
|
return {
|
|
52
37
|
pages: [
|
|
@@ -13,7 +13,6 @@ import { migration08 } from './migration/migration-08';
|
|
|
13
13
|
import { migration09 } from './migration/migration-09';
|
|
14
14
|
import { migration10 } from './migration/migration-10';
|
|
15
15
|
import { migration11 } from './migration/migration-11';
|
|
16
|
-
import { migration12 } from './migration/migration-12';
|
|
17
16
|
|
|
18
17
|
export interface MigrationData {
|
|
19
18
|
brandPageModel: BrandPageModel;
|
|
@@ -111,11 +110,6 @@ const MIGRATION_TABLE = [
|
|
|
111
110
|
migrateFn: migration11,
|
|
112
111
|
description: 'Remove backgroundColorEnabled flag from page headers',
|
|
113
112
|
},
|
|
114
|
-
{
|
|
115
|
-
version: 12,
|
|
116
|
-
migrateFn: migration12,
|
|
117
|
-
description: 'Migrating nav model to support sub nav feature',
|
|
118
|
-
},
|
|
119
113
|
] as MigrationTableItem[];
|
|
120
114
|
|
|
121
115
|
export const GetLatestModelVersion = () =>
|
|
@@ -41,9 +41,6 @@ import type {
|
|
|
41
41
|
GettyVideoMedia,
|
|
42
42
|
AbstractMedia,
|
|
43
43
|
BackgroundStyles,
|
|
44
|
-
NavModel,
|
|
45
|
-
NavRoute,
|
|
46
|
-
NavOrder,
|
|
47
44
|
} from '../models';
|
|
48
45
|
import { ButtonStyles, SENSITIVE_CONTENT_TYPES, VIEWPORTS } from '../models';
|
|
49
46
|
import {
|
|
@@ -84,8 +81,6 @@ import type {
|
|
|
84
81
|
GettyVideoViewModel,
|
|
85
82
|
PageStylesViewModel,
|
|
86
83
|
BackgroundStylesViewModel,
|
|
87
|
-
NavViewModel,
|
|
88
|
-
NavItemViewModel,
|
|
89
84
|
} from '../view-models';
|
|
90
85
|
import { isHexTransparent, setRgbAlpha } from './color.util';
|
|
91
86
|
import type { ContentTextStylePropertyKey } from '../constants';
|
|
@@ -119,14 +114,11 @@ import { generateGoogleFontUrl } from './font-loader.util';
|
|
|
119
114
|
import { isValidSvgUrl } from './image.util';
|
|
120
115
|
import { isLogoContent } from './model.util';
|
|
121
116
|
import { getBoxShadowValue } from './button.util';
|
|
122
|
-
import { getRouteNameByPageIndex, getRouteParamsByPage } from './route.util';
|
|
123
117
|
|
|
124
118
|
const BUTTON_BORDER_RADIUS = '9999px';
|
|
125
119
|
const CONTENT_BORDER_RADIUS = '48px';
|
|
126
120
|
const PROFILE_PADDING_TOP = '1rem';
|
|
127
121
|
|
|
128
|
-
const MAX_SUB_NAV_DEPTH = 1;
|
|
129
|
-
|
|
130
122
|
const applyContentBorderRadius = (styles: BrandPageCssStyle | undefined) => {
|
|
131
123
|
return {
|
|
132
124
|
...styles,
|
|
@@ -996,69 +988,6 @@ export const mapToBookingSectionViewModel = (
|
|
|
996
988
|
);
|
|
997
989
|
};
|
|
998
990
|
|
|
999
|
-
// Recursively build the nav item view model for each page/sub page in the nav
|
|
1000
|
-
const buildNavItemViewModel = (
|
|
1001
|
-
order: NavOrder,
|
|
1002
|
-
routes: NavRoute[],
|
|
1003
|
-
parentPath: string,
|
|
1004
|
-
isFirstPage: boolean,
|
|
1005
|
-
brandPageSlug?: string,
|
|
1006
|
-
isCustomDomain?: boolean,
|
|
1007
|
-
depth = 0,
|
|
1008
|
-
): NavItemViewModel => {
|
|
1009
|
-
const route = routes.find((r) => r.id === order.routeId);
|
|
1010
|
-
const pageSlug = route?.pageSlug ?? '';
|
|
1011
|
-
const relativePath = parentPath ? `${parentPath}/${pageSlug}` : pageSlug;
|
|
1012
|
-
|
|
1013
|
-
return {
|
|
1014
|
-
displayName: route?.displayName ?? '',
|
|
1015
|
-
routeName: getRouteNameByPageIndex(
|
|
1016
|
-
Boolean(isCustomDomain),
|
|
1017
|
-
isFirstPage ? 0 : 9999,
|
|
1018
|
-
),
|
|
1019
|
-
routeParams: getRouteParamsByPage(
|
|
1020
|
-
Boolean(isCustomDomain),
|
|
1021
|
-
brandPageSlug ?? '',
|
|
1022
|
-
pageSlug,
|
|
1023
|
-
),
|
|
1024
|
-
relativePath,
|
|
1025
|
-
isHidden: route?.isHidden ?? false,
|
|
1026
|
-
nestedNavItems:
|
|
1027
|
-
depth >= MAX_SUB_NAV_DEPTH
|
|
1028
|
-
? []
|
|
1029
|
-
: order.subRoutes.map((subRoute) =>
|
|
1030
|
-
buildNavItemViewModel(
|
|
1031
|
-
subRoute,
|
|
1032
|
-
routes,
|
|
1033
|
-
relativePath,
|
|
1034
|
-
false,
|
|
1035
|
-
brandPageSlug,
|
|
1036
|
-
isCustomDomain,
|
|
1037
|
-
depth + 1,
|
|
1038
|
-
),
|
|
1039
|
-
),
|
|
1040
|
-
};
|
|
1041
|
-
};
|
|
1042
|
-
|
|
1043
|
-
export const mapToNavViewModel = (
|
|
1044
|
-
nav: NavModel,
|
|
1045
|
-
brandPageSlug?: string,
|
|
1046
|
-
isCustomDomain?: boolean,
|
|
1047
|
-
): NavViewModel => {
|
|
1048
|
-
return {
|
|
1049
|
-
navItems: nav.orders.map((order, idx) =>
|
|
1050
|
-
buildNavItemViewModel(
|
|
1051
|
-
order,
|
|
1052
|
-
nav.routes,
|
|
1053
|
-
'',
|
|
1054
|
-
idx === 0,
|
|
1055
|
-
brandPageSlug,
|
|
1056
|
-
isCustomDomain,
|
|
1057
|
-
),
|
|
1058
|
-
),
|
|
1059
|
-
};
|
|
1060
|
-
};
|
|
1061
|
-
|
|
1062
991
|
export const mapToPageStyleViewModel = (
|
|
1063
992
|
pageStyles: PageStyles,
|
|
1064
993
|
options: ViewModelMappingOptions,
|
|
@@ -1357,8 +1286,6 @@ export const mapToViewModel =
|
|
|
1357
1286
|
|
|
1358
1287
|
interface ViewModelMappingOptions {
|
|
1359
1288
|
useOldLogoRenderSize?: boolean;
|
|
1360
|
-
isCustomDomain?: boolean;
|
|
1361
|
-
brandPageSlug?: string;
|
|
1362
1289
|
getVideoUrls?: (token: string) => {
|
|
1363
1290
|
videoUrl: string;
|
|
1364
1291
|
previewImageUrl: string;
|
|
@@ -1415,23 +1342,15 @@ export const getBrandPageViewModelFromBrandPageModel = (
|
|
|
1415
1342
|
return {
|
|
1416
1343
|
title: p.title,
|
|
1417
1344
|
slug: p.slug,
|
|
1418
|
-
id: p.id,
|
|
1419
1345
|
contents,
|
|
1420
1346
|
isHidden: Boolean(p?.isHidden),
|
|
1421
1347
|
} as PageViewModel;
|
|
1422
1348
|
});
|
|
1423
1349
|
|
|
1424
|
-
const nav = mapToNavViewModel(
|
|
1425
|
-
model.nav,
|
|
1426
|
-
options.brandPageSlug,
|
|
1427
|
-
options.isCustomDomain,
|
|
1428
|
-
);
|
|
1429
|
-
|
|
1430
1350
|
return {
|
|
1431
1351
|
brandPageToken,
|
|
1432
1352
|
pages,
|
|
1433
1353
|
showBrandCrowdLogo,
|
|
1434
|
-
nav,
|
|
1435
1354
|
styles: mapToPageStyleViewModel(model.styles, options),
|
|
1436
1355
|
headerViewModelDesktop: mapToPageHeaderViewModel(
|
|
1437
1356
|
model.pageHeaderDesktop,
|
|
@@ -77,7 +77,6 @@ export interface ContentViewModel {
|
|
|
77
77
|
}
|
|
78
78
|
|
|
79
79
|
export interface PageViewModel {
|
|
80
|
-
id: string;
|
|
81
80
|
title: string;
|
|
82
81
|
slug: string;
|
|
83
82
|
contents: ContentViewModel[];
|
|
@@ -304,43 +303,11 @@ export interface PageStylesViewModel {
|
|
|
304
303
|
galleryStyles: GalleryStyles; // TODO(jyao): Convert to view model
|
|
305
304
|
}
|
|
306
305
|
|
|
307
|
-
export interface NavRouteViewModel {
|
|
308
|
-
id: string;
|
|
309
|
-
pageId: string;
|
|
310
|
-
route: string;
|
|
311
|
-
}
|
|
312
|
-
|
|
313
|
-
export interface NavOrderViewModel {
|
|
314
|
-
routeId: string;
|
|
315
|
-
isHidden: boolean;
|
|
316
|
-
fullPath: string;
|
|
317
|
-
subRoutes: NavOrderViewModel[];
|
|
318
|
-
}
|
|
319
|
-
|
|
320
|
-
export interface NavItemRouteParams {
|
|
321
|
-
slug: string;
|
|
322
|
-
pageSlug?: string;
|
|
323
|
-
}
|
|
324
|
-
|
|
325
|
-
export interface NavItemViewModel {
|
|
326
|
-
displayName: string;
|
|
327
|
-
routeName: string;
|
|
328
|
-
routeParams: NavItemRouteParams;
|
|
329
|
-
isHidden: boolean;
|
|
330
|
-
relativePath: string;
|
|
331
|
-
nestedNavItems: NavItemViewModel[]; // For sub navigation
|
|
332
|
-
}
|
|
333
|
-
|
|
334
|
-
export interface NavViewModel {
|
|
335
|
-
navItems: NavItemViewModel[];
|
|
336
|
-
}
|
|
337
|
-
|
|
338
306
|
export interface BrandPageViewModel {
|
|
339
307
|
brandPageToken?: string;
|
|
340
308
|
showBrandCrowdLogo: boolean;
|
|
341
309
|
styles: PageStylesViewModel;
|
|
342
310
|
pages: PageViewModel[];
|
|
343
|
-
nav: NavViewModel;
|
|
344
311
|
brandPageType: BrandPageType;
|
|
345
312
|
headerViewModelDesktop: PageHeaderViewModel;
|
|
346
313
|
headerViewModelMobile: PageHeaderViewModel;
|
|
@@ -31,7 +31,6 @@ const pageStyles = new PageStyles();
|
|
|
31
31
|
const pages = [
|
|
32
32
|
{
|
|
33
33
|
title: '',
|
|
34
|
-
id: '',
|
|
35
34
|
slug: '',
|
|
36
35
|
isHidden: false,
|
|
37
36
|
contents: brandPageData
|
|
@@ -77,9 +76,6 @@ const viewModel: BrandPageViewModel = {
|
|
|
77
76
|
isSavingEnabled: true,
|
|
78
77
|
hideBranding: false,
|
|
79
78
|
},
|
|
80
|
-
nav: {
|
|
81
|
-
navItems: [],
|
|
82
|
-
},
|
|
83
79
|
};
|
|
84
80
|
|
|
85
81
|
export const SampleDesktop = (): Component => {
|
|
@@ -147,7 +147,7 @@ describe('brand page maker store module', () => {
|
|
|
147
147
|
};
|
|
148
148
|
|
|
149
149
|
await store.initialisePages({
|
|
150
|
-
pages: [{
|
|
150
|
+
pages: [{ title: '', slug: '', contents: [contactFormContent] }],
|
|
151
151
|
sections: {
|
|
152
152
|
[PAGE_SECTIONS.header]: {
|
|
153
153
|
[VIEWPORTS.desktop]: new PageHeaderDesktop(),
|
|
@@ -190,7 +190,7 @@ describe('brand page maker store module', () => {
|
|
|
190
190
|
};
|
|
191
191
|
|
|
192
192
|
await store.initialisePages({
|
|
193
|
-
pages: [{
|
|
193
|
+
pages: [{ title: '', slug: '', contents: [contactFormContent] }],
|
|
194
194
|
sections: {
|
|
195
195
|
[PAGE_SECTIONS.header]: {
|
|
196
196
|
[VIEWPORTS.desktop]: new PageHeaderDesktop(),
|
|
@@ -22,7 +22,6 @@ import {
|
|
|
22
22
|
CONTENT_TYPES,
|
|
23
23
|
NavigationDesktop,
|
|
24
24
|
NavigationMobile,
|
|
25
|
-
NavModel,
|
|
26
25
|
} from '../../../brand-page';
|
|
27
26
|
import type {
|
|
28
27
|
DesignTemplateType,
|
|
@@ -42,7 +41,6 @@ import { useUiStyleSettingsStore } from '../../../shared/style-settings/store';
|
|
|
42
41
|
import { useUiNavigationStyleSettingsStore } from '../../../shared/navigation-style-settings/store';
|
|
43
42
|
import { useUiBackgroundSettingsStore } from '../../../shared/background-settings/store';
|
|
44
43
|
import { useShopConfigStore } from '../../../shared/ecommerce-settings/store/shop-settings-store';
|
|
45
|
-
import { usePageNavigationStore } from '../../../shared/page-navigation/store/page-navigation-store';
|
|
46
44
|
import {
|
|
47
45
|
applyLogoThemeToBrandPageModel,
|
|
48
46
|
migrateBrandPageModel,
|
|
@@ -533,10 +531,6 @@ export const useBrandPageMakerStore = defineStore('brandPageMaker', {
|
|
|
533
531
|
brandPageModel.pageFooterMobile = model.pageFooterMobile;
|
|
534
532
|
brandPageModel.pages = model.pages;
|
|
535
533
|
|
|
536
|
-
const pageNavigationStore = usePageNavigationStore();
|
|
537
|
-
|
|
538
|
-
pageNavigationStore.setNav({ nav: brandPageModel.nav });
|
|
539
|
-
|
|
540
534
|
navigationStyleSettingsStore.initialise({ reset: true });
|
|
541
535
|
|
|
542
536
|
styleSettingsStore.initialise({
|
|
@@ -1027,10 +1021,6 @@ export const useBrandPageMakerStore = defineStore('brandPageMaker', {
|
|
|
1027
1021
|
brandPageModel.cookieOptions?.isCookiePreviewEnabled,
|
|
1028
1022
|
});
|
|
1029
1023
|
|
|
1030
|
-
const pageNavigationStore = usePageNavigationStore();
|
|
1031
|
-
|
|
1032
|
-
pageNavigationStore.setNav({ nav: brandPageModel.nav });
|
|
1033
|
-
|
|
1034
1024
|
this.setSavingEnabled({
|
|
1035
1025
|
isSavingEnabled:
|
|
1036
1026
|
brandPageModel.saveContactSettings?.isSavingEnabled ?? true,
|
|
@@ -1268,7 +1258,6 @@ export const useBrandPageMakerStore = defineStore('brandPageMaker', {
|
|
|
1268
1258
|
const styleSettingsStore = useUiStyleSettingsStore();
|
|
1269
1259
|
const navigationStyleSettingsStore = useUiNavigationStyleSettingsStore();
|
|
1270
1260
|
const shopStore = useShopConfigStore();
|
|
1271
|
-
const pageNavigationStore = usePageNavigationStore();
|
|
1272
1261
|
|
|
1273
1262
|
const pages = pageSettingsStore.pages.map((p) => ({
|
|
1274
1263
|
...p,
|
|
@@ -1282,9 +1271,7 @@ export const useBrandPageMakerStore = defineStore('brandPageMaker', {
|
|
|
1282
1271
|
const buttonStyles = styleSettingsStore.buttonStyles;
|
|
1283
1272
|
const textStyles = styleSettingsStore.textStyles;
|
|
1284
1273
|
const galleryStyles = styleSettingsStore.galleryStyles;
|
|
1285
|
-
const navigation = navigationStyleSettingsStore.navigation;
|
|
1286
|
-
|
|
1287
|
-
const pageNavStructure = pageNavigationStore.nav;
|
|
1274
|
+
const navigation = navigationStyleSettingsStore.navigation;
|
|
1288
1275
|
|
|
1289
1276
|
return {
|
|
1290
1277
|
v: GetLatestModelVersion(),
|
|
@@ -1321,7 +1308,6 @@ export const useBrandPageMakerStore = defineStore('brandPageMaker', {
|
|
|
1321
1308
|
cookieOptions: this.cookieOptions,
|
|
1322
1309
|
saveContactSettings: this.saveContactSettings,
|
|
1323
1310
|
paymentConfig: shopStore.paymentConfig,
|
|
1324
|
-
nav: pageNavStructure,
|
|
1325
1311
|
};
|
|
1326
1312
|
},
|
|
1327
1313
|
brandPageToken(): string | undefined {
|
|
@@ -1419,7 +1405,6 @@ export const useBrandPageMakerStore = defineStore('brandPageMaker', {
|
|
|
1419
1405
|
const userStore = useBrandPageMakerUserStore();
|
|
1420
1406
|
const uiStore = useUiStore();
|
|
1421
1407
|
const videoStore = useVideoStore();
|
|
1422
|
-
const brandPageContainerStore = useBrandPageContainerStore();
|
|
1423
1408
|
|
|
1424
1409
|
if (userStore.isAdmin && uiStore.logoTheme) {
|
|
1425
1410
|
const themedBrandPage = applyLogoThemeToBrandPageModel(
|
|
@@ -1436,8 +1421,6 @@ export const useBrandPageMakerStore = defineStore('brandPageMaker', {
|
|
|
1436
1421
|
getVideoUrls: videoStore.getVideoUrlsForToken,
|
|
1437
1422
|
getS3VideoUrls: videoStore.getOptimisedS3VideoUrlsForToken,
|
|
1438
1423
|
setVideoUrlsWithToken: videoStore.setVideoUrlsWithToken,
|
|
1439
|
-
isCustomDomain: brandPageContainerStore.isCustomDomainEnabled,
|
|
1440
|
-
brandPageSlug: brandPageContainerStore.brandPageSlug,
|
|
1441
1424
|
},
|
|
1442
1425
|
);
|
|
1443
1426
|
}
|
|
@@ -1465,8 +1448,6 @@ export const useBrandPageMakerStore = defineStore('brandPageMaker', {
|
|
|
1465
1448
|
getVideoUrls: videoStore.getVideoUrlsForToken,
|
|
1466
1449
|
getS3VideoUrls: videoStore.getOptimisedS3VideoUrlsForToken,
|
|
1467
1450
|
setVideoUrlsWithToken: videoStore.setVideoUrlsWithToken,
|
|
1468
|
-
isCustomDomain: brandPageContainerStore.isCustomDomainEnabled,
|
|
1469
|
-
brandPageSlug: brandPageContainerStore.brandPageSlug,
|
|
1470
1451
|
},
|
|
1471
1452
|
);
|
|
1472
1453
|
}
|
|
@@ -1480,8 +1461,6 @@ export const useBrandPageMakerStore = defineStore('brandPageMaker', {
|
|
|
1480
1461
|
getVideoUrls: videoStore.getVideoUrlsForToken,
|
|
1481
1462
|
getS3VideoUrls: videoStore.getOptimisedS3VideoUrlsForToken,
|
|
1482
1463
|
setVideoUrlsWithToken: videoStore.setVideoUrlsWithToken,
|
|
1483
|
-
isCustomDomain: brandPageContainerStore.isCustomDomainEnabled,
|
|
1484
|
-
brandPageSlug: brandPageContainerStore.brandPageSlug,
|
|
1485
1464
|
},
|
|
1486
1465
|
);
|
|
1487
1466
|
},
|
package/src/lib.ts
CHANGED
|
@@ -22,7 +22,6 @@ export {
|
|
|
22
22
|
isUrlType,
|
|
23
23
|
HEADER_DISPLAY,
|
|
24
24
|
NAVIGATION_DISPLAY,
|
|
25
|
-
STYLE_THEME_KEYS,
|
|
26
25
|
} from './brand-page/constants';
|
|
27
26
|
export * from './brand-page-maker/constants';
|
|
28
27
|
export * as BackgroundShapeStarterKit from './brand-page-maker/components/brand-page-maker/starter-kits/background-shapes';
|
|
@@ -23,7 +23,6 @@ const LOGO_VERSION_TWO_URL =
|
|
|
23
23
|
|
|
24
24
|
function createPage(pageNo): ContentPage {
|
|
25
25
|
return {
|
|
26
|
-
id: `page-${pageNo}`,
|
|
27
26
|
title: `Page ${pageNo}`,
|
|
28
27
|
slug: `page${pageNo}`,
|
|
29
28
|
contents: [
|
|
@@ -160,7 +159,6 @@ describe('logo store module', () => {
|
|
|
160
159
|
pages: [
|
|
161
160
|
PAGE_ONE,
|
|
162
161
|
{
|
|
163
|
-
id: 'page-2',
|
|
164
162
|
slug: 'page-2',
|
|
165
163
|
title: 'Page 2',
|
|
166
164
|
contents: [],
|
|
@@ -2,21 +2,16 @@ import { defineComponent, computed } from 'vue';
|
|
|
2
2
|
import { getPageTitleError } from '../../utils';
|
|
3
3
|
import { useUiPageSettingsStore } from '../../store';
|
|
4
4
|
import { useEventTracker } from '../../../../brand-page-maker/composables/useEventTracker';
|
|
5
|
-
import { usePageNavigationStore } from '../../../page-navigation/store/page-navigation-store';
|
|
6
|
-
import type { NavRoute } from '../../../../brand-page';
|
|
7
|
-
import { v4 as uuid } from 'uuid';
|
|
8
5
|
|
|
9
6
|
export default defineComponent({
|
|
10
7
|
setup() {
|
|
11
8
|
const pageSettingsStore = useUiPageSettingsStore();
|
|
12
|
-
const pageNavigationStore = usePageNavigationStore();
|
|
13
9
|
|
|
14
10
|
return {
|
|
15
11
|
isNewPageModalVisible: computed(
|
|
16
12
|
() => pageSettingsStore.isNewPageModalVisible,
|
|
17
13
|
),
|
|
18
14
|
pageSettingsStore,
|
|
19
|
-
pageNavigationStore,
|
|
20
15
|
};
|
|
21
16
|
},
|
|
22
17
|
data() {
|
|
@@ -53,19 +48,7 @@ export default defineComponent({
|
|
|
53
48
|
return;
|
|
54
49
|
}
|
|
55
50
|
|
|
56
|
-
|
|
57
|
-
title: this.newPageTitle,
|
|
58
|
-
});
|
|
59
|
-
|
|
60
|
-
const newRoute: NavRoute = {
|
|
61
|
-
id: uuid(),
|
|
62
|
-
pageId: newPage.id,
|
|
63
|
-
pageSlug: newPage.slug,
|
|
64
|
-
isHidden: false,
|
|
65
|
-
displayName: newPage.title,
|
|
66
|
-
};
|
|
67
|
-
|
|
68
|
-
this.pageNavigationStore.addNavRoute(newRoute);
|
|
51
|
+
this.pageSettingsStore.addNewPage({ title: this.newPageTitle });
|
|
69
52
|
|
|
70
53
|
const eventTracker = useEventTracker();
|
|
71
54
|
|
|
@@ -40,7 +40,6 @@ import {
|
|
|
40
40
|
styleSettingsTr,
|
|
41
41
|
} from '../../../../composables/useTranslate';
|
|
42
42
|
import { WEBSITE_UPGRADE_CONTEXT_TYPES } from '@designcrowd/fe-shared-lib';
|
|
43
|
-
import { usePageNavigationStore } from '../../../page-navigation/store/page-navigation-store';
|
|
44
43
|
|
|
45
44
|
export interface PageField {
|
|
46
45
|
pageTitle: string;
|
|
@@ -65,7 +64,6 @@ export default defineComponent({
|
|
|
65
64
|
const navigationSettingsStore = useUiNavigationStyleSettingsStore();
|
|
66
65
|
const brandPageContainerStore = useBrandPageContainerStore();
|
|
67
66
|
const eventTracker = useEventTracker();
|
|
68
|
-
const pageNavigationStore = usePageNavigationStore();
|
|
69
67
|
|
|
70
68
|
const updatePages = (pageFields: PageField[]) => {
|
|
71
69
|
pageSettingsStore.setPages({ pages: pageFields.map((p) => p.page) });
|
|
@@ -99,17 +97,6 @@ export default defineComponent({
|
|
|
99
97
|
eventTracker.sendWebsiteManageReorderPageEvent(
|
|
100
98
|
pageSettingsStore.pages[ev.newIndex].title,
|
|
101
99
|
);
|
|
102
|
-
|
|
103
|
-
// After drag, the moved page is now at newIndex
|
|
104
|
-
const pageId = pageSettingsStore.pages[ev.newIndex].id;
|
|
105
|
-
|
|
106
|
-
const navRouteId = pageNavigationStore.routes.find(
|
|
107
|
-
(route) => route.pageId === pageId,
|
|
108
|
-
)?.id;
|
|
109
|
-
|
|
110
|
-
if (navRouteId) {
|
|
111
|
-
pageNavigationStore.updateOrder(navRouteId, ev.newIndex);
|
|
112
|
-
}
|
|
113
100
|
}
|
|
114
101
|
|
|
115
102
|
isDraggingPage.value = false;
|
|
@@ -150,11 +137,9 @@ export default defineComponent({
|
|
|
150
137
|
uiStore,
|
|
151
138
|
userStore,
|
|
152
139
|
pageSettingsStore,
|
|
153
|
-
pageNavigationStore,
|
|
154
140
|
contentSettingsStore,
|
|
155
141
|
navigationSettingsStore,
|
|
156
142
|
brandPageContainerStore,
|
|
157
|
-
|
|
158
143
|
viewport: computed(() => brandPageMakerStore.viewport),
|
|
159
144
|
isDraggingPage,
|
|
160
145
|
onDraggingStart,
|
|
@@ -254,22 +239,6 @@ export default defineComponent({
|
|
|
254
239
|
this.pageSettingsStore.pages[index]?.isHidden,
|
|
255
240
|
);
|
|
256
241
|
|
|
257
|
-
const pageId = this.pageSettingsStore.pages[index]?.id;
|
|
258
|
-
|
|
259
|
-
// TODO(jyao): Remove this later since we won't be using page id anymore!
|
|
260
|
-
if (pageId) {
|
|
261
|
-
const navRouteId = this.pageNavigationStore.routes.find(
|
|
262
|
-
(route) => route.pageId === pageId,
|
|
263
|
-
)?.id;
|
|
264
|
-
|
|
265
|
-
if (navRouteId) {
|
|
266
|
-
this.pageNavigationStore.updateRouteVisibility(
|
|
267
|
-
navRouteId,
|
|
268
|
-
!currentPageVisibility,
|
|
269
|
-
);
|
|
270
|
-
}
|
|
271
|
-
}
|
|
272
|
-
|
|
273
242
|
this.pageSettingsStore.setPageVisibility({
|
|
274
243
|
isHidden: !currentPageVisibility,
|
|
275
244
|
index: index,
|
|
@@ -283,19 +252,6 @@ export default defineComponent({
|
|
|
283
252
|
onConfirmDeletePage(pageIndex: number) {
|
|
284
253
|
this.pageFields.splice(pageIndex, 1);
|
|
285
254
|
|
|
286
|
-
const pageId = this.pageSettingsStore.pages[pageIndex]?.id;
|
|
287
|
-
|
|
288
|
-
// TODO(jyao): Remove this later since we won't be using page id anymore!
|
|
289
|
-
if (pageId) {
|
|
290
|
-
const navRouteId = this.pageNavigationStore.routes.find(
|
|
291
|
-
(route) => route.pageId === pageId,
|
|
292
|
-
)?.id;
|
|
293
|
-
|
|
294
|
-
if (navRouteId) {
|
|
295
|
-
this.pageNavigationStore.removeNavRoute(navRouteId);
|
|
296
|
-
}
|
|
297
|
-
}
|
|
298
|
-
|
|
299
255
|
this.updatePages(this.pageFields);
|
|
300
256
|
|
|
301
257
|
this.eventTracker.sendWebsiteManageRemovePageEvent(
|
|
@@ -326,21 +282,10 @@ export default defineComponent({
|
|
|
326
282
|
this.pageSettingsStore.setSelectedSectionName({ sectionName });
|
|
327
283
|
},
|
|
328
284
|
onPageTitleInput(index: number, title: string) {
|
|
329
|
-
const page = this.pageSettingsStore.pages[index];
|
|
330
|
-
|
|
331
285
|
this.pageSettingsStore.setPageTitle({
|
|
332
286
|
pageIndex: index,
|
|
333
287
|
pageTitle: title,
|
|
334
288
|
});
|
|
335
|
-
|
|
336
|
-
if (page) {
|
|
337
|
-
// TODO(jyao): Remove this later since we won't be using page id anymore!
|
|
338
|
-
const routeId = this.pageNavigationStore.routes.find(
|
|
339
|
-
(route) => route.pageId === page.id,
|
|
340
|
-
)?.id;
|
|
341
|
-
|
|
342
|
-
this.pageNavigationStore.onDisplayNameChange(routeId, title);
|
|
343
|
-
}
|
|
344
289
|
},
|
|
345
290
|
onBackButtonClick() {
|
|
346
291
|
this.contentSettingsStore.popMode();
|
|
@@ -4,7 +4,6 @@ import type { PageSettingsStateSectionStyles } from './store';
|
|
|
4
4
|
import type { NavigationStyleConfigOption } from '../../brand-page-maker/models/navigation-style-configs';
|
|
5
5
|
|
|
6
6
|
export interface ContentPage {
|
|
7
|
-
id: string;
|
|
8
7
|
title: string;
|
|
9
8
|
slug: string;
|
|
10
9
|
contents: ContentItem<Content>[];
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { defineStore } from 'pinia';
|
|
2
2
|
import type { ContentItem } from '../../content-settings/models';
|
|
3
|
-
|
|
4
3
|
import {
|
|
5
4
|
PageHeaderDesktop,
|
|
6
5
|
PageHeaderMobile,
|
|
@@ -19,7 +18,6 @@ import type {
|
|
|
19
18
|
BrandPagePaymentConfig,
|
|
20
19
|
BrandPagePaymentConfigCurrency,
|
|
21
20
|
} from '../../../brand-page';
|
|
22
|
-
import { v4 as uuid } from 'uuid';
|
|
23
21
|
import type { ContentPage } from '../models';
|
|
24
22
|
import { PAGE_SECTIONS } from '../models';
|
|
25
23
|
import { navigateToPageBySlug } from '../../../brand-page-maker/routing';
|
|
@@ -433,7 +431,7 @@ export const useUiPageSettingsStore = defineStore('uiPageSettings', {
|
|
|
433
431
|
this.setCurrentPageIndex({ pageIndex });
|
|
434
432
|
navigateToPageBySlug(this.pages[this.currentPageIndex].slug);
|
|
435
433
|
},
|
|
436
|
-
addNewPage(payload: { title: string }):
|
|
434
|
+
addNewPage(payload: { title: string }): void {
|
|
437
435
|
const logoSettingsStore = useUiLogoSettingsStore();
|
|
438
436
|
const brandPageMakerStore = useBrandPageMakerStore();
|
|
439
437
|
|
|
@@ -442,7 +440,7 @@ export const useUiPageSettingsStore = defineStore('uiPageSettings', {
|
|
|
442
440
|
this.pages.map((p) => p.slug),
|
|
443
441
|
);
|
|
444
442
|
|
|
445
|
-
const newPage = {
|
|
443
|
+
const newPage = { title: payload.title, slug, contents: [] };
|
|
446
444
|
|
|
447
445
|
// Insert new page after the non-hidden page
|
|
448
446
|
const visiblePages = this.pages.filter((page) => !page.isHidden);
|
|
@@ -457,8 +455,6 @@ export const useUiPageSettingsStore = defineStore('uiPageSettings', {
|
|
|
457
455
|
if (brandPageMakerStore.isBrandPageOrIsBrandContact) {
|
|
458
456
|
logoSettingsStore.addDefaultLogoContentToCurrentPage();
|
|
459
457
|
}
|
|
460
|
-
|
|
461
|
-
return newPage;
|
|
462
458
|
},
|
|
463
459
|
setSelectedSectionName({
|
|
464
460
|
sectionName,
|
|
@@ -1,30 +0,0 @@
|
|
|
1
|
-
import { v4 as uuid } from 'uuid';
|
|
2
|
-
import { NavModel } from '../../models';
|
|
3
|
-
export const migration12 = async (migrationResult) => {
|
|
4
|
-
const { brandPageModel } = migrationResult;
|
|
5
|
-
const pages = brandPageModel.pages;
|
|
6
|
-
// Add uuid to each page as id
|
|
7
|
-
pages.forEach((page) => {
|
|
8
|
-
if (!page.id) {
|
|
9
|
-
page.id = uuid();
|
|
10
|
-
}
|
|
11
|
-
});
|
|
12
|
-
const routes = [];
|
|
13
|
-
const orders = [];
|
|
14
|
-
pages.forEach((page) => {
|
|
15
|
-
const routeId = uuid();
|
|
16
|
-
routes.push({
|
|
17
|
-
id: routeId,
|
|
18
|
-
pageId: page.id,
|
|
19
|
-
pageSlug: page.slug,
|
|
20
|
-
isHidden: page.isHidden ?? false,
|
|
21
|
-
displayName: page.title,
|
|
22
|
-
});
|
|
23
|
-
orders.push({
|
|
24
|
-
routeId,
|
|
25
|
-
subRoutes: [],
|
|
26
|
-
});
|
|
27
|
-
});
|
|
28
|
-
brandPageModel.nav = new NavModel({ routes, orders });
|
|
29
|
-
return migrationResult;
|
|
30
|
-
};
|
|
@@ -1,18 +0,0 @@
|
|
|
1
|
-
import { NavModel, type NavOrder, type NavRoute } from '../../../brand-page';
|
|
2
|
-
export interface PageNavigationState {
|
|
3
|
-
routes: NavRoute[];
|
|
4
|
-
orders: NavOrder[];
|
|
5
|
-
}
|
|
6
|
-
export declare const usePageNavigationStore: import("pinia").StoreDefinition<"pageNavigation", PageNavigationState, {
|
|
7
|
-
nav(): NavModel;
|
|
8
|
-
}, {
|
|
9
|
-
setNav({ nav }: {
|
|
10
|
-
nav: NavModel;
|
|
11
|
-
}): void;
|
|
12
|
-
addNavRoute(newRoute: NavRoute, parentRouteId?: string): void;
|
|
13
|
-
removeNavRoute(routeId: string): void;
|
|
14
|
-
onDisplayNameChange(routeId: string, newDisplayName: string): void;
|
|
15
|
-
updateRouteVisibility(routeId: string, isHidden: boolean): void;
|
|
16
|
-
reorderVisibleAndHiddenRoutes(): void;
|
|
17
|
-
updateOrder(routeIdToReorder: string, newIndex: number): void;
|
|
18
|
-
}>;
|