@designcrowd/library.brand-page 6.1.6-use-isadminmaker-2 → 6.1.6
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-CPLDYp5f.js → CreatedOnBrandCrowd-de-de-COw1kYDh.js} +1 -1
- package/lib/src/{CreatedOnBrandCrowd-en-us-Br3HqLLr.js → CreatedOnBrandCrowd-en-us-JRm1p0it.js} +1 -1
- package/lib/src/{CreatedOnBrandCrowd-es-es-DwkIQVgN.js → CreatedOnBrandCrowd-es-es-D-G9uI6b.js} +1 -1
- package/lib/src/{CreatedOnBrandCrowd-fr-fr-DqeI8mF_.js → CreatedOnBrandCrowd-fr-ca-DQCScohj.js} +1 -1
- package/lib/src/{CreatedOnBrandCrowd-fr-ca-DqeI8mF_.js → CreatedOnBrandCrowd-fr-fr-DQCScohj.js} +1 -1
- package/lib/src/{CreatedOnBrandCrowd-pt-pt-bvgq_CN8.js → CreatedOnBrandCrowd-pt-br-4RazAfO7.js} +1 -1
- package/lib/src/{CreatedOnBrandCrowd-pt-br-bvgq_CN8.js → CreatedOnBrandCrowd-pt-pt-4RazAfO7.js} +1 -1
- package/lib/src/{CreatedOnDcom-de-de-nT3MnRXy.js → CreatedOnDcom-de-de-DqvLTbhq.js} +1 -1
- package/lib/src/{CreatedOnDcom-en-us-D2TYrEzJ.js → CreatedOnDcom-en-us-DG1X0ero.js} +1 -1
- package/lib/src/{CreatedOnDcom-es-es-Q-5tnP12.js → CreatedOnDcom-es-es-BxHAIikP.js} +1 -1
- package/lib/src/{CreatedOnDcom-fr-ca-txkwqCzm.js → CreatedOnDcom-fr-ca-BGXoViAC.js} +1 -1
- package/lib/src/{CreatedOnDcom-fr-fr-CUnJXLgr.js → CreatedOnDcom-fr-fr-CsvmeK2T.js} +1 -1
- package/lib/src/{CreatedOnDcom-pt-br-7XAwvP9H.js → CreatedOnDcom-pt-br-DvWm7MjO.js} +1 -1
- package/lib/src/{CreatedOnDcom-pt-pt-DjhLiioZ.js → CreatedOnDcom-pt-pt-Bhz2YEVP.js} +1 -1
- package/lib/src/brand-page-maker/components/action-bar/ActionBar.mixin.d.ts +1 -1
- package/lib/src/brand-page-maker/components/action-bar/ActionBar.mixin.js +1 -1
- package/lib/src/brand-page-maker/components/brand-page-maker/BrandPageMaker.mixin.d.ts +4 -1
- package/lib/src/brand-page-maker/components/brand-page-maker/BrandPageMaker.mixin.js +1 -1
- package/lib/src/brand-page-maker/components/brand-page-maker/BrandPageMaker.stories.js +6 -6
- package/lib/src/brand-page-maker/components/brand-page-maker/__fixtures__/store-fixture.d.ts +1 -1
- package/lib/src/brand-page-maker/components/brandpage-maker-page/BrandPageMakerPage.mixin.d.ts +4 -1
- package/lib/src/brand-page-maker/components/brandpage-maker-page/BrandPageMakerPage.mixin.js +2 -2
- package/lib/src/brand-page-maker/components/brandpage-settings/ReplaceImageSettingsForBrandPageSettings.mixin.d.ts +1 -1
- package/lib/src/brand-page-maker/components/brandpage-settings/ReplaceImageSettingsForBrandPageSettings.mixin.js +1 -1
- package/lib/src/brand-page-maker/components/navigation/Navigation.mixin.d.ts +3 -3
- package/lib/src/brand-page-maker/components/navigation/Navigation.mixin.js +1 -1
- package/lib/src/brand-page-maker/components/quick-link-bar/QuickLinkBar.mixin.d.ts +3 -0
- package/lib/src/brand-page-maker/components/seo-settings/SeoPageSettings.mixin.d.ts +3 -0
- package/lib/src/brand-page-maker/components/seo-settings/UrlSettings.mixin.d.ts +3 -0
- package/lib/src/brand-page-maker/components/seo-settings/UseExistingDomainModal.mixin.d.ts +3 -0
- package/lib/src/brand-page-maker/components/template-preview/TemplatePreview.mixin.d.ts +4 -1
- package/lib/src/brand-page-maker/components/template-preview/TemplatePreview.mixin.js +6 -6
- package/lib/src/brand-page-maker/components/upgrade-to-premium-button/UpgradeToPremiumButton.mixin.d.ts +3 -0
- package/lib/src/brand-page-maker/stores/brandpage-container/brand-page-container-store.d.ts +6 -1
- package/lib/src/brand-page-maker/stores/brandpage-container/brand-page-container-store.js +6 -0
- package/lib/src/brand-page-maker/stores/brandpage-maker/brandpage-maker-store.js +6 -0
- package/lib/src/clients/fabric-render-client.d.ts +1 -0
- package/lib/src/css/library.brand-page-brandCrowd.min.css +57 -57
- package/lib/src/css/library.brand-page-brandPage.min.css +57 -57
- package/lib/src/css/library.brand-page-designCom.min.css +57 -57
- package/lib/src/css/library.brand-page-preview.min.css +57 -57
- package/lib/src/index.mjs +1 -1
- package/lib/src/{lib-dewphkuW.js → lib-Bg2K2ze6.js} +225 -213
- package/lib/src/shared/background-settings/components/background-shapes/BackgroundShapeSettings.mixin.d.ts +1 -1
- package/lib/src/shared/background-settings/components/background-shapes/BackgroundShapeSettings.mixin.js +1 -1
- package/lib/src/shared/content-settings/components/content-settings/ContentSettings.mixin.d.ts +1 -1
- package/lib/src/shared/content-settings/components/content-settings/ContentSettings.mixin.js +1 -1
- package/lib/src/shared/content-settings/components/content-settings/ReplaceImageSettingsForContent.mixin.d.ts +1 -1
- package/lib/src/shared/content-settings/components/content-settings/ReplaceImageSettingsForContent.mixin.js +2 -2
- package/lib/src/shared/content-settings/components/content-settings-item/ContentSettingsItem.mixin.d.ts +1 -1
- package/lib/src/shared/content-settings/components/content-settings-item/ContentSettingsItem.mixin.js +2 -2
- package/lib/src/shared/content-settings/components/content-settings-item/ContentSettingsItemField.mixin.d.ts +1 -1
- package/lib/src/shared/content-settings/components/content-settings-item/ContentSettingsItemField.mixin.js +3 -3
- package/lib/src/shared/content-settings/components/draggable-item-list/DraggableItemList.mixin.d.ts +2 -2
- package/lib/src/shared/content-settings/components/draggable-item-list/DraggableItemList.mixin.js +1 -1
- package/lib/src/shared/content-settings/components/focused-content-item-settings/FocusedContentItemSettings.mixin.d.ts +1 -1
- package/lib/src/shared/content-settings/components/focused-content-item-settings/FocusedContentItemSettings.mixin.js +2 -2
- package/lib/src/shared/content-settings/components/images-field/ImagesField.mixin.d.ts +2 -2
- package/lib/src/shared/content-settings/components/images-field/ImagesField.mixin.js +1 -1
- package/lib/src/shared/content-settings/components/links-field/LinksField.mixin.d.ts +2 -2
- package/lib/src/shared/content-settings/components/links-field/LinksField.mixin.js +1 -1
- package/lib/src/shared/content-settings/components/payment-config-field/PaymentConfigField.mixin.d.ts +3 -0
- package/lib/src/shared/content-settings/components/shape-field/ShapeField.mixin.d.ts +2 -2
- package/lib/src/shared/content-settings/components/shape-field/ShapeField.mixin.js +1 -1
- package/lib/src/shared/content-settings/components/testimonial-items-field/TestimonialItemsField.mixin.d.ts +2 -2
- package/lib/src/shared/content-settings/components/testimonial-items-field/TestimonialItemsField.mixin.js +1 -1
- package/lib/src/shared/content-settings/components/text-items-field/TextItemsField.mixin.d.ts +2 -2
- package/lib/src/shared/content-settings/components/text-items-field/TextItemsField.mixin.js +1 -1
- package/lib/src/shared/content-settings/components/text-style-field/TextStyleField.mixin.d.ts +2 -2
- package/lib/src/shared/content-settings/components/text-style-field/TextStyleField.mixin.js +1 -1
- package/lib/src/shared/logo-settings/components/EditLogoSettings.mixin.d.ts +1 -0
- package/lib/src/shared/logo-settings/components/LogoSettings.mixin.d.ts +4 -0
- package/lib/src/shared/logo-settings/store/editable-logo-store.d.ts +2 -0
- package/lib/src/shared/logo-settings/store/editable-logo-store.js +20 -1
- package/lib/src/shared/my-uploads/MyUploads.mixin.d.ts +1 -1
- package/lib/src/shared/my-uploads/MyUploads.mixin.js +1 -1
- package/lib/src/shared/navigation-style-settings/components/navigation-style-settings/NavigationStyleSettings.mixin.d.ts +2 -2
- package/lib/src/shared/navigation-style-settings/components/navigation-style-settings/NavigationStyleSettings.mixin.js +1 -1
- package/lib/src/shared/page-settings/components/page-settings/PageSettings.mixin.d.ts +4 -1
- package/lib/src/shared/page-settings/components/page-settings/PageSettings.mixin.js +1 -1
- package/lib/src/shared/page-settings/components/page-settings-section-styles/PageSettingsSectionStyles.mixin.d.ts +6 -2
- package/lib/src/shared/page-settings/components/page-settings-section-styles/PageSettingsSectionStyles.mixin.js +1 -1
- package/lib/src/shared/publish-brand-page-with-state/PublishBrandPageModalWithState.mixin.d.ts +3 -0
- package/lib/src/shared/side-bar/components/SideBar.mixin.d.ts +4 -1
- package/lib/src/shared/side-bar/components/SideBar.mixin.js +3 -3
- package/lib/src/shared/style-settings/components/StyleSettings.mixin.d.ts +4 -1
- package/lib/src/shared/style-settings/components/StyleSettings.mixin.js +2 -2
- package/package.json +1 -1
- package/src/brand-page-maker/components/action-bar/ActionBar.mixin.ts +1 -1
- package/src/brand-page-maker/components/action-bar/ActionBar.vue +1 -1
- package/src/brand-page-maker/components/action-bar/ActionBarNavigation.vue +5 -5
- package/src/brand-page-maker/components/admin-background-settings/AdminBackgroundSettings.vue +1 -1
- package/src/brand-page-maker/components/brand-page-maker/BrandPageMaker.mixin.ts +1 -1
- package/src/brand-page-maker/components/brand-page-maker/BrandPageMaker.stories.ts +7 -7
- package/src/brand-page-maker/components/brand-page-maker/BrandPageMaker.vue +1 -1
- package/src/brand-page-maker/components/brand-page-maker/__fixtures__/store-fixture.ts +1 -1
- package/src/brand-page-maker/components/brandpage-maker-page/BrandPageMakerPage.mixin.ts +2 -2
- package/src/brand-page-maker/components/brandpage-settings/BrandPageSettings.vue +3 -3
- package/src/brand-page-maker/components/brandpage-settings/ReplaceImageSettingsForBrandPageSettings.mixin.ts +1 -1
- package/src/brand-page-maker/components/brandpage-settings/ReplaceImageSettingsForBrandPageSettings.vue +1 -1
- package/src/brand-page-maker/components/navigation/Navigation.mixin.ts +1 -1
- package/src/brand-page-maker/components/navigation/Navigation.vue +3 -3
- package/src/brand-page-maker/components/rich-text-editor/RichTextEditor.vue +11 -11
- package/src/brand-page-maker/components/save-contact/SaveContact.vue +2 -2
- package/src/brand-page-maker/components/shop/ReplaceImageSettingsForShop.vue +1 -1
- package/src/brand-page-maker/components/template-preview/TemplatePreview.mixin.ts +6 -6
- package/src/brand-page-maker/stores/brandpage-container/brand-page-container-store.initialise.test.ts +53 -0
- package/src/brand-page-maker/stores/brandpage-container/brand-page-container-store.ts +20 -1
- package/src/brand-page-maker/stores/brandpage-maker/brandpage-maker-store.ts +7 -0
- package/src/clients/fabric-render-client.ts +5 -0
- package/src/shared/background-settings/components/BackgroundSettings.vue +7 -7
- package/src/shared/background-settings/components/MultiBackgroundShapes.vue +5 -5
- package/src/shared/background-settings/components/ReplaceImageSettingsForBackgroundSettings.vue +2 -2
- package/src/shared/background-settings/components/SingleBackgroundShape.vue +3 -3
- package/src/shared/background-settings/components/background-color/BackgroundColorSettings.vue +4 -4
- package/src/shared/background-settings/components/background-shapes/BackgroundShapeSettings.mixin.ts +1 -1
- package/src/shared/background-settings/components/background-shapes/BackgroundShapeSettings.vue +1 -1
- package/src/shared/content-settings/components/button-configuration-field/ButtonConfigurationField.vue +2 -2
- package/src/shared/content-settings/components/color-field/ColorField.vue +6 -6
- package/src/shared/content-settings/components/color-replacements-field/ColorReplacementsField.vue +9 -7
- package/src/shared/content-settings/components/content-settings/ContentSettings.mixin.ts +1 -1
- package/src/shared/content-settings/components/content-settings/ReplaceImageSettingsForContent.mixin.ts +2 -2
- package/src/shared/content-settings/components/content-settings/ReplaceImageSettingsForContent.vue +1 -1
- package/src/shared/content-settings/components/content-settings-item/ContentSettingsItem.mixin.ts +2 -2
- package/src/shared/content-settings/components/content-settings-item/ContentSettingsItemField.mixin.ts +3 -3
- package/src/shared/content-settings/components/content-settings-item/ContentSettingsItemField.vue +1 -1
- package/src/shared/content-settings/components/draggable-item-list/DraggableItemList.mixin.ts +1 -1
- package/src/shared/content-settings/components/draggable-item-list/DraggableItemList.vue +1 -1
- package/src/shared/content-settings/components/focused-content-item-settings/FocusedContentItemSettings.mixin.ts +2 -2
- package/src/shared/content-settings/components/images-field/ImagesField.mixin.ts +1 -1
- package/src/shared/content-settings/components/images-field/ImagesField.vue +1 -1
- package/src/shared/content-settings/components/links-field/LinksField.mixin.ts +1 -1
- package/src/shared/content-settings/components/links-field/LinksField.vue +1 -1
- package/src/shared/content-settings/components/replace-image-base-settings/ReplaceImageBaseSettings.vue +2 -2
- package/src/shared/content-settings/components/shape-field/ShapeField.mixin.ts +1 -1
- package/src/shared/content-settings/components/shape-field/ShapeField.vue +1 -1
- package/src/shared/content-settings/components/testimonial-items-field/TestimonialItemsField.mixin.ts +1 -1
- package/src/shared/content-settings/components/testimonial-items-field/TestimonialItemsField.vue +5 -5
- package/src/shared/content-settings/components/text-image-field/TextImageField.vue +7 -7
- package/src/shared/content-settings/components/text-items-field/TextItemsField.mixin.test.ts +1 -1
- package/src/shared/content-settings/components/text-items-field/TextItemsField.mixin.ts +1 -1
- package/src/shared/content-settings/components/text-items-field/TextItemsField.vue +2 -2
- package/src/shared/content-settings/components/text-style-field/TextStyleField.mixin.ts +1 -1
- package/src/shared/content-settings/components/text-style-field/TextStyleField.vue +2 -2
- package/src/shared/logo-settings/store/editable-logo-store.test.ts +90 -0
- package/src/shared/logo-settings/store/editable-logo-store.ts +28 -1
- package/src/shared/my-uploads/MyUploads.mixin.ts +1 -1
- package/src/shared/my-uploads/MyUploads.vue +1 -1
- package/src/shared/navigation-style-settings/components/navigation-style-settings/NavigationStyleSettings.mixin.ts +1 -1
- package/src/shared/navigation-style-settings/components/navigation-style-settings/NavigationStyleSettings.vue +12 -9
- package/src/shared/page-settings/components/page-settings/PageSettings.mixin.ts +1 -1
- package/src/shared/page-settings/components/page-settings/PageSettings.vue +3 -3
- package/src/shared/page-settings/components/page-settings-section-styles/PageSettingsSectionStyles.mixin.ts +1 -1
- package/src/shared/page-settings/components/page-settings-section-styles/PageSettingsSectionStyles.vue +4 -4
- package/src/shared/shape-library/ShapeLibrary.vue +9 -9
- package/src/shared/side-bar/components/SideBar.mixin.ts +3 -3
- package/src/shared/style-settings/components/StyleSettings.mixin.ts +2 -2
- package/src/shared/style-settings/components/StyleSettings.vue +29 -23
- package/src/shared/style-settings/components/text-style-options-settings-with-state/TextStyleOptionsSettingsWithState.vue +2 -2
|
@@ -87,3 +87,56 @@ describe('brand-page-container-store initialise — admin maker mapping', () =>
|
|
|
87
87
|
expect(store.isAdminMaker).toBe(false);
|
|
88
88
|
});
|
|
89
89
|
});
|
|
90
|
+
|
|
91
|
+
describe('brand-page-container-store initialise — Brand Kit token (BP-5962)', () => {
|
|
92
|
+
beforeEach(() => {
|
|
93
|
+
setActivePinia(createPinia());
|
|
94
|
+
});
|
|
95
|
+
|
|
96
|
+
test('consumes the explicit prePurchaseBrandKitLogoDraftToken from the host', () => {
|
|
97
|
+
const store = useBrandPageContainerStore();
|
|
98
|
+
|
|
99
|
+
store.initialise(
|
|
100
|
+
createInitialisePayload({
|
|
101
|
+
prePurchaseBrandKitLogoDraftToken: 'brand-kit-copy-token',
|
|
102
|
+
}),
|
|
103
|
+
);
|
|
104
|
+
|
|
105
|
+
expect(store.prePurchaseBrandKitLogoDraftToken).toBe(
|
|
106
|
+
'brand-kit-copy-token',
|
|
107
|
+
);
|
|
108
|
+
});
|
|
109
|
+
|
|
110
|
+
test('leaves the token empty when the host omits it — even for a prepurchase logo draft (the old inference is gone)', () => {
|
|
111
|
+
const store = useBrandPageContainerStore();
|
|
112
|
+
|
|
113
|
+
// Pre-BP-5962 this derived the token from isPrePurchase && logoDraftToken, which
|
|
114
|
+
// wrongly fired on every reload of a normal saved prepurchase draft. It must now
|
|
115
|
+
// stay empty unless the host supplies the explicit field.
|
|
116
|
+
store.initialise(
|
|
117
|
+
createInitialisePayload({
|
|
118
|
+
isPrePurchase: true,
|
|
119
|
+
logoDraftToken: 'a-normal-prepurchase-logo-token',
|
|
120
|
+
}),
|
|
121
|
+
);
|
|
122
|
+
|
|
123
|
+
expect(store.prePurchaseBrandKitLogoDraftToken).toBe('');
|
|
124
|
+
});
|
|
125
|
+
|
|
126
|
+
test('clears a stale token from a previous mount when the next payload omits it', () => {
|
|
127
|
+
const store = useBrandPageContainerStore();
|
|
128
|
+
|
|
129
|
+
store.initialise(
|
|
130
|
+
createInitialisePayload({
|
|
131
|
+
prePurchaseBrandKitLogoDraftToken: 'brand-kit-copy-token',
|
|
132
|
+
}),
|
|
133
|
+
);
|
|
134
|
+
expect(store.prePurchaseBrandKitLogoDraftToken).toBe(
|
|
135
|
+
'brand-kit-copy-token',
|
|
136
|
+
);
|
|
137
|
+
|
|
138
|
+
store.initialise(createInitialisePayload());
|
|
139
|
+
|
|
140
|
+
expect(store.prePurchaseBrandKitLogoDraftToken).toBe('');
|
|
141
|
+
});
|
|
142
|
+
});
|
|
@@ -89,6 +89,12 @@ export interface BrandPageContainerState {
|
|
|
89
89
|
triggerSaveSuccessMessage: boolean;
|
|
90
90
|
isDesignCom: boolean;
|
|
91
91
|
isPrePurchase: boolean;
|
|
92
|
+
// BP-5962: the REAL server logo draft this PREPURCHASE editor mount was
|
|
93
|
+
// seeded with (the Brand Kit Edit flow - a frozen copy of the user's logo),
|
|
94
|
+
// or '' when the entry carries none. Rewritten on EVERY initialise -
|
|
95
|
+
// unlike uiStore.logoDraftToken, which is never cleared and can go stale
|
|
96
|
+
// across client-side editor-to-editor navigation.
|
|
97
|
+
prePurchaseBrandKitLogoDraftToken: string;
|
|
92
98
|
makerFonts: any[];
|
|
93
99
|
eventButtonLocation?: string;
|
|
94
100
|
websiteUpsellModalViewModel?: any;
|
|
@@ -119,9 +125,15 @@ export type GettyVideoEditorViewModelResponse = {
|
|
|
119
125
|
|
|
120
126
|
export type InitialisePayload = Omit<
|
|
121
127
|
BrandPageContainerState,
|
|
122
|
-
|
|
128
|
+
| 'customDomain'
|
|
129
|
+
| 'customDomainConfig'
|
|
130
|
+
| 'isAdminMaker'
|
|
131
|
+
| 'prePurchaseBrandKitLogoDraftToken'
|
|
123
132
|
> & {
|
|
124
133
|
logoDraftToken?: string;
|
|
134
|
+
// BP-5962: the Brand Kit logo copy's token, supplied EXPLICITLY by the host (set only for Brand Kit
|
|
135
|
+
// logos). Never derived. Absent for normal prepurchase/template logos.
|
|
136
|
+
prePurchaseBrandKitLogoDraftToken?: string;
|
|
125
137
|
isAdminMaker?: boolean;
|
|
126
138
|
brandPageCustomDomain?: CustomDomainModel;
|
|
127
139
|
isBrandPageCustomDomainEnabled: boolean;
|
|
@@ -181,6 +193,7 @@ export const useBrandPageContainerStore = defineStore('brandPageContainer', {
|
|
|
181
193
|
isSellDomainNameEnabled: false,
|
|
182
194
|
isDesignCom: false,
|
|
183
195
|
isPrePurchase: false,
|
|
196
|
+
prePurchaseBrandKitLogoDraftToken: '',
|
|
184
197
|
makerFonts: [],
|
|
185
198
|
eventButtonLocation: undefined,
|
|
186
199
|
websiteUpsellModalViewModel: undefined,
|
|
@@ -291,6 +304,12 @@ export const useBrandPageContainerStore = defineStore('brandPageContainer', {
|
|
|
291
304
|
uiStore.setLogoDraftToken({ logoDraftToken: payload.logoDraftToken });
|
|
292
305
|
}
|
|
293
306
|
|
|
307
|
+
// BP-5962: consume the host's explicit token verbatim (set unconditionally so a stale token from a
|
|
308
|
+
// previous editor mount never leaks in). The old derivation from isPrePurchase + logoDraftToken is
|
|
309
|
+
// gone — it fired on every reload of a normal saved draft and wrongly rendered it from the draft.
|
|
310
|
+
this.prePurchaseBrandKitLogoDraftToken =
|
|
311
|
+
payload.prePurchaseBrandKitLogoDraftToken || '';
|
|
312
|
+
|
|
294
313
|
payload?.gettyVideos?.forEach((video) =>
|
|
295
314
|
videoStore.setVideoUrlsWithToken(
|
|
296
315
|
video.token,
|
|
@@ -1435,6 +1435,13 @@ export const useBrandPageMakerStore = defineStore('brandPageMaker', {
|
|
|
1435
1435
|
logoTemplateMetadata: '',
|
|
1436
1436
|
isLogoDraftSaved: false,
|
|
1437
1437
|
logoDraftToken: uiStore.logoDraftToken || uuid.v4(),
|
|
1438
|
+
// Only the container's per-mount Brand Kit seed is a REAL server
|
|
1439
|
+
// draft (the editor was opened from one - Brand Kit Edit). The
|
|
1440
|
+
// uuid fallback above is a session-local identity, and
|
|
1441
|
+
// uiStore.logoDraftToken is never cleared between mounts -
|
|
1442
|
+
// neither must ever reach fabric-render as a render base.
|
|
1443
|
+
prePurchaseBrandKitLogoDraftToken:
|
|
1444
|
+
brandPageContainerStore.prePurchaseBrandKitLogoDraftToken,
|
|
1438
1445
|
logoEdits: {
|
|
1439
1446
|
backgroundObject: {
|
|
1440
1447
|
id: '',
|
|
@@ -32,6 +32,11 @@ export interface ModifyLogoDataRequest {
|
|
|
32
32
|
variation: string;
|
|
33
33
|
primaryText?: string;
|
|
34
34
|
generateS3Url?: boolean;
|
|
35
|
+
// BP-6010: opt out of fabric-render's default re-stack after a changeRequest.
|
|
36
|
+
// Sent only on Brand Kit prepurchase renders, where the render base is the
|
|
37
|
+
// user's seeded logo draft and its authored arrangement must be preserved.
|
|
38
|
+
// Absent/false keeps fabric-render's behaviour unchanged for everyone else.
|
|
39
|
+
disableAutoLayout?: boolean;
|
|
35
40
|
logo: {
|
|
36
41
|
template: {
|
|
37
42
|
token: string;
|
|
@@ -47,9 +47,9 @@
|
|
|
47
47
|
id="background-overlay-color"
|
|
48
48
|
name="overlayColor"
|
|
49
49
|
:value="overlayColorValue"
|
|
50
|
-
:is-admin="
|
|
50
|
+
:is-admin-maker="isAdminMaker"
|
|
51
51
|
:logo-theme="logoTheme"
|
|
52
|
-
:enable-color-match="
|
|
52
|
+
:enable-color-match="isAdminMaker"
|
|
53
53
|
disable-transparent
|
|
54
54
|
:label="backgroundSettingsTr('overlayColor')"
|
|
55
55
|
@update:model-value="onOverlayColorChange"
|
|
@@ -80,7 +80,7 @@
|
|
|
80
80
|
<!-- Shape section — admin always sees it; customers only when the
|
|
81
81
|
template has at least one shape (main or array). -->
|
|
82
82
|
<CollapsiblePanel
|
|
83
|
-
v-if="
|
|
83
|
+
v-if="isAdminMaker || hasSingleShape || hasMultipleShapes"
|
|
84
84
|
data-component="collapsible-panel"
|
|
85
85
|
:title="backgroundSettingsTr('shape')"
|
|
86
86
|
>
|
|
@@ -158,7 +158,7 @@ const recommendedLogoColors = computed(
|
|
|
158
158
|
const logoColors = computed(() => backgroundSettingsStore.logoColors);
|
|
159
159
|
const logoTheme = computed(() => uiStore.logoTheme);
|
|
160
160
|
const backgroundMode = computed(() => backgroundSettingsStore.backgroundMode);
|
|
161
|
-
const
|
|
161
|
+
const isAdminMaker = computed(() => containerStore.isAdminMaker);
|
|
162
162
|
const isPersonalisationEnabled = computed(
|
|
163
163
|
() => uiStore.isPersonalisationEnabled,
|
|
164
164
|
);
|
|
@@ -166,7 +166,7 @@ const isPersonalisationEnabled = computed(
|
|
|
166
166
|
defineEmits(['on-intent-image-replace']);
|
|
167
167
|
|
|
168
168
|
const showPersonalisationField = computed(() => {
|
|
169
|
-
return
|
|
169
|
+
return isAdminMaker.value && isPersonalisationEnabled.value;
|
|
170
170
|
});
|
|
171
171
|
|
|
172
172
|
const personalisationRole = computed(() => {
|
|
@@ -251,10 +251,10 @@ const hasMultipleShapes = computed(
|
|
|
251
251
|
|
|
252
252
|
const shapeTabs = computed(() => {
|
|
253
253
|
const tabs: string[] = [];
|
|
254
|
-
if (
|
|
254
|
+
if (isAdminMaker.value || hasSingleShape.value) {
|
|
255
255
|
tabs.push(backgroundSettingsTr('singleShape'));
|
|
256
256
|
}
|
|
257
|
-
if (
|
|
257
|
+
if (isAdminMaker.value || hasMultipleShapes.value) {
|
|
258
258
|
tabs.push(backgroundSettingsTr('multipleShapes'));
|
|
259
259
|
}
|
|
260
260
|
return tabs;
|
|
@@ -5,9 +5,9 @@
|
|
|
5
5
|
id="background-shapes"
|
|
6
6
|
name="shapeColor"
|
|
7
7
|
:value="shapeColorValue"
|
|
8
|
-
:is-admin="
|
|
8
|
+
:is-admin-maker="isAdminMaker"
|
|
9
9
|
:logo-theme="logoTheme"
|
|
10
|
-
:enable-color-match="
|
|
10
|
+
:enable-color-match="isAdminMaker"
|
|
11
11
|
:disable-transparent="true"
|
|
12
12
|
:custom-groups="customGroups"
|
|
13
13
|
:label="backgroundSettingsTr('shapeColor')"
|
|
@@ -72,7 +72,7 @@
|
|
|
72
72
|
|
|
73
73
|
<template v-if="backgroundShapes[option.index]">
|
|
74
74
|
<!-- Screen placement comes first (admin-only, template building) -->
|
|
75
|
-
<template v-if="
|
|
75
|
+
<template v-if="isAdminMaker">
|
|
76
76
|
<p
|
|
77
77
|
class="tw-mt-3 tw-font-sans tw-font-bold tw-text-secondary-800 tw-text-sm tw-mb-1"
|
|
78
78
|
>
|
|
@@ -143,7 +143,7 @@
|
|
|
143
143
|
|
|
144
144
|
<!-- Adding items is admin-only -->
|
|
145
145
|
<Button
|
|
146
|
-
v-if="
|
|
146
|
+
v-if="isAdminMaker"
|
|
147
147
|
variant="outline"
|
|
148
148
|
:label="shapeFieldTr('addItemLabel')"
|
|
149
149
|
size="small"
|
|
@@ -187,7 +187,7 @@ defineProps({
|
|
|
187
187
|
|
|
188
188
|
const store = useUiBackgroundSettingsStore();
|
|
189
189
|
const containerStore = useBrandPageContainerStore();
|
|
190
|
-
const
|
|
190
|
+
const isAdminMaker = computed(() => containerStore.isAdminMaker);
|
|
191
191
|
|
|
192
192
|
const {
|
|
193
193
|
backgroundShapes,
|
package/src/shared/background-settings/components/ReplaceImageSettingsForBackgroundSettings.vue
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
:section-title="sectionTitle"
|
|
5
5
|
:media-settings="mediaSettings"
|
|
6
6
|
:image-extension="mediaExtension"
|
|
7
|
-
:is-admin="
|
|
7
|
+
:is-admin-maker="isAdminMaker"
|
|
8
8
|
:mode="backgroundMode"
|
|
9
9
|
:active-tabs="activeTabs"
|
|
10
10
|
:media-type="mediaType"
|
|
@@ -58,7 +58,7 @@ const contentSettingsStore = useUiContentSettingsStore();
|
|
|
58
58
|
const bpEventTracker = useEventTracker();
|
|
59
59
|
|
|
60
60
|
const backgroundMode = computed(() => backgroundSettingsStore.backgroundMode);
|
|
61
|
-
const
|
|
61
|
+
const isAdminMaker = computed(() => containerStore.isAdminMaker);
|
|
62
62
|
|
|
63
63
|
const mediaSettings = computed((): ReplaceImageSettingsBase | undefined => {
|
|
64
64
|
return brandPageMakerStore.fieldSettings?.replaceImageSettings;
|
|
@@ -14,9 +14,9 @@
|
|
|
14
14
|
id="background-shape"
|
|
15
15
|
name="shapeColor"
|
|
16
16
|
:value="shapeColorValue"
|
|
17
|
-
:is-admin="
|
|
17
|
+
:is-admin-maker="isAdminMaker"
|
|
18
18
|
:logo-theme="logoTheme"
|
|
19
|
-
:enable-color-match="
|
|
19
|
+
:enable-color-match="isAdminMaker"
|
|
20
20
|
:disable-transparent="true"
|
|
21
21
|
:custom-groups="customGroups"
|
|
22
22
|
:label="backgroundSettingsTr('shapeColor')"
|
|
@@ -66,7 +66,7 @@ defineProps({
|
|
|
66
66
|
|
|
67
67
|
const store = useUiBackgroundSettingsStore();
|
|
68
68
|
const containerStore = useBrandPageContainerStore();
|
|
69
|
-
const
|
|
69
|
+
const isAdminMaker = computed(() => containerStore.isAdminMaker);
|
|
70
70
|
|
|
71
71
|
const {
|
|
72
72
|
shapeUrl,
|
package/src/shared/background-settings/components/background-color/BackgroundColorSettings.vue
CHANGED
|
@@ -4,16 +4,16 @@
|
|
|
4
4
|
id="background-color"
|
|
5
5
|
name="background"
|
|
6
6
|
:value="backgroundStyles.style.background || ''"
|
|
7
|
-
:is-admin="
|
|
7
|
+
:is-admin-maker="isAdminMaker"
|
|
8
8
|
:logo-theme="logoTheme"
|
|
9
|
-
:enable-color-match="
|
|
9
|
+
:enable-color-match="isAdminMaker"
|
|
10
10
|
show-gradients
|
|
11
11
|
disable-transparent
|
|
12
12
|
:label="backgroundSettingsTr(`backgroundColor`)"
|
|
13
13
|
@update:model-value="onBackgroundColorChange"
|
|
14
14
|
/>
|
|
15
15
|
<HelloBar
|
|
16
|
-
v-if="colorMatched &&
|
|
16
|
+
v-if="colorMatched && isAdminMaker"
|
|
17
17
|
label="Color Matched Logo"
|
|
18
18
|
description="The color of the background is matched to the customers logo. If you change the color of the background, it will not longer be matched to the customer's logo."
|
|
19
19
|
class="tw-mb-4 tw-mt-4"
|
|
@@ -47,7 +47,7 @@ const containerStore = useBrandPageContainerStore();
|
|
|
47
47
|
const backgroundSettingsStore = useUiBackgroundSettingsStore();
|
|
48
48
|
|
|
49
49
|
// Computed
|
|
50
|
-
const
|
|
50
|
+
const isAdminMaker = computed(() => containerStore.isAdminMaker);
|
|
51
51
|
const backgroundStyles = computed(
|
|
52
52
|
() => backgroundSettingsStore.backgroundStyles,
|
|
53
53
|
);
|
package/src/shared/background-settings/components/background-shapes/BackgroundShapeSettings.mixin.ts
CHANGED
|
@@ -34,7 +34,7 @@ export default defineComponent({
|
|
|
34
34
|
const backgroundSettingsStore = useUiBackgroundSettingsStore();
|
|
35
35
|
|
|
36
36
|
return {
|
|
37
|
-
|
|
37
|
+
isAdminMaker: computed(() => containerStore.isAdminMaker),
|
|
38
38
|
backgroundStyles: computed(
|
|
39
39
|
() => backgroundSettingsStore.backgroundStyles,
|
|
40
40
|
),
|
package/src/shared/background-settings/components/background-shapes/BackgroundShapeSettings.vue
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div>
|
|
3
3
|
<HelloBar
|
|
4
|
-
v-if="colorMatched &&
|
|
4
|
+
v-if="colorMatched && isAdminMaker"
|
|
5
5
|
label="Color Matched Logo"
|
|
6
6
|
description="The color of the shapes is matched to the customers logo. If you change the color of the shapes, it will not longer be matched to the customer's logo."
|
|
7
7
|
class="tw-mb-4"
|
|
@@ -130,13 +130,13 @@ interface Props {
|
|
|
130
130
|
pages?: Array<{ slug: string; title: string }>;
|
|
131
131
|
titleLength?: number;
|
|
132
132
|
descriptionLength?: number;
|
|
133
|
-
|
|
133
|
+
isAdminMaker?: boolean;
|
|
134
134
|
}
|
|
135
135
|
|
|
136
136
|
const props = withDefaults(defineProps<Props>(), {
|
|
137
137
|
titleLength: MAX_TITLE_LENGTH,
|
|
138
138
|
descriptionLength: MAX_DESCRIPTION_LENGTH,
|
|
139
|
-
|
|
139
|
+
isAdminMaker: false,
|
|
140
140
|
pages: undefined,
|
|
141
141
|
});
|
|
142
142
|
|
|
@@ -4,8 +4,8 @@
|
|
|
4
4
|
class="tw-flex"
|
|
5
5
|
:class="{
|
|
6
6
|
'tw-mt-4': !!label,
|
|
7
|
-
'tw-flex-col tw-gap-y-2 tw-w-full':
|
|
8
|
-
'tw-gap-2 tw-justify-between tw-items-center': !
|
|
7
|
+
'tw-flex-col tw-gap-y-2 tw-w-full': isAdminMaker,
|
|
8
|
+
'tw-gap-2 tw-justify-between tw-items-center': !isAdminMaker,
|
|
9
9
|
}"
|
|
10
10
|
>
|
|
11
11
|
<span
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
class="tw-flex tw-flex-row tw-gap-2 tw-items-center tw-justify-between"
|
|
19
19
|
>
|
|
20
20
|
<Toggle
|
|
21
|
-
v-if="
|
|
21
|
+
v-if="isAdminMaker && enableColorMatch"
|
|
22
22
|
:id="`${id}-${name}-color-matched${toggleIdSuffix}`"
|
|
23
23
|
:model-value="isOptionColorMatched"
|
|
24
24
|
color="info"
|
|
@@ -43,7 +43,7 @@
|
|
|
43
43
|
</div>
|
|
44
44
|
|
|
45
45
|
<!-- Start Admin Style Theme Key Select -->
|
|
46
|
-
<div v-if="
|
|
46
|
+
<div v-if="isAdminMaker && !isRichTextEditor && isOptionColorMatched">
|
|
47
47
|
<select
|
|
48
48
|
class="c-select c-button-style tw-border tw-appearance-none tw-border-none tw-h-10 tw-pl-2 tw-rounded tw-cursor-pointer tw-transition-all tw-duration-300 tw-bg-white"
|
|
49
49
|
@change.stop="
|
|
@@ -100,7 +100,7 @@ interface Props {
|
|
|
100
100
|
string | undefined
|
|
101
101
|
>;
|
|
102
102
|
label?: string;
|
|
103
|
-
|
|
103
|
+
isAdminMaker: boolean;
|
|
104
104
|
logoTheme: LogoTheme;
|
|
105
105
|
toggleUniqueId?: string;
|
|
106
106
|
enableColorMatch?: boolean;
|
|
@@ -333,7 +333,7 @@ watch(
|
|
|
333
333
|
return;
|
|
334
334
|
}
|
|
335
335
|
|
|
336
|
-
if (props.
|
|
336
|
+
if (props.isAdminMaker && !newVal) {
|
|
337
337
|
newColor.value = '';
|
|
338
338
|
changeColor();
|
|
339
339
|
return;
|
package/src/shared/content-settings/components/color-replacements-field/ColorReplacementsField.vue
CHANGED
|
@@ -3,8 +3,8 @@
|
|
|
3
3
|
data-component="color-replacements-field"
|
|
4
4
|
class="tw-flex"
|
|
5
5
|
:class="{
|
|
6
|
-
'tw-flex-col tw-gap-y-2 tw-w-full':
|
|
7
|
-
'tw-gap-2 tw-justify-between tw-items-center': !
|
|
6
|
+
'tw-flex-col tw-gap-y-2 tw-w-full': isAdminMaker,
|
|
7
|
+
'tw-gap-2 tw-justify-between tw-items-center': !isAdminMaker,
|
|
8
8
|
}"
|
|
9
9
|
>
|
|
10
10
|
<span
|
|
@@ -14,7 +14,9 @@
|
|
|
14
14
|
</span>
|
|
15
15
|
<Toggle
|
|
16
16
|
v-if="
|
|
17
|
-
|
|
17
|
+
isAdminMaker &&
|
|
18
|
+
data.colorReplacements &&
|
|
19
|
+
data.colorReplacements.length > 0
|
|
18
20
|
"
|
|
19
21
|
:id="`${id}-${name}-color-matched${toggleIdSuffix}`"
|
|
20
22
|
:model-value="isOptionColorMatched"
|
|
@@ -35,18 +37,18 @@
|
|
|
35
37
|
:key="`${colorReplacement.attribute}-${colorReplacement.originalColor}`"
|
|
36
38
|
>
|
|
37
39
|
<ColorField
|
|
38
|
-
v-if="!
|
|
40
|
+
v-if="!isAdminMaker || !isOptionColorMatched"
|
|
39
41
|
name="fill"
|
|
40
42
|
:disable-transparent="true"
|
|
41
43
|
:value="colorReplacement.replacementColor"
|
|
42
|
-
:is-admin="
|
|
44
|
+
:is-admin-maker="isAdminMaker"
|
|
43
45
|
:logo-theme="logoTheme"
|
|
44
46
|
@update:model-value="onColorPickerInput($event, index)"
|
|
45
47
|
/>
|
|
46
48
|
</div>
|
|
47
49
|
<div
|
|
48
50
|
v-if="
|
|
49
|
-
|
|
51
|
+
isAdminMaker &&
|
|
50
52
|
data.colorReplacements &&
|
|
51
53
|
data.colorReplacements.length > 0 &&
|
|
52
54
|
isOptionColorMatched
|
|
@@ -90,7 +92,7 @@ const props = defineProps<{
|
|
|
90
92
|
id: string;
|
|
91
93
|
name: string;
|
|
92
94
|
value: ColorReplacement[];
|
|
93
|
-
|
|
95
|
+
isAdminMaker: boolean;
|
|
94
96
|
label?: string;
|
|
95
97
|
toggleUniqueId?: string;
|
|
96
98
|
logoTheme: LogoTheme;
|
|
@@ -59,7 +59,7 @@ export default defineComponent({
|
|
|
59
59
|
contentSettingsSelectedItemId: computed(
|
|
60
60
|
() => contentSettingsStore.selectedItemId,
|
|
61
61
|
),
|
|
62
|
-
|
|
62
|
+
isAdminMaker: computed(() => containerStore.isAdminMaker),
|
|
63
63
|
canUseRichTextEditor: computed(
|
|
64
64
|
() => userStore.features.canUseRichTextEditor,
|
|
65
65
|
),
|
|
@@ -54,7 +54,7 @@ export default defineComponent({
|
|
|
54
54
|
() => contentSettingsStore.selectedItemTemplate?.type,
|
|
55
55
|
),
|
|
56
56
|
mode: computed(() => contentSettingsStore.mode),
|
|
57
|
-
|
|
57
|
+
isAdminMaker: computed(() => containerStore.isAdminMaker),
|
|
58
58
|
contentSettingsStore,
|
|
59
59
|
userStore,
|
|
60
60
|
pageSettingsStore,
|
|
@@ -66,7 +66,7 @@ export default defineComponent({
|
|
|
66
66
|
},
|
|
67
67
|
computed: {
|
|
68
68
|
isDeleteEnabled(): boolean {
|
|
69
|
-
return this.
|
|
69
|
+
return this.isAdminMaker;
|
|
70
70
|
},
|
|
71
71
|
selectedField(): ContentItemFieldSettings | undefined {
|
|
72
72
|
if (!this.selectedItemFieldName) {
|
package/src/shared/content-settings/components/content-settings-item/ContentSettingsItem.mixin.ts
CHANGED
|
@@ -72,7 +72,7 @@ export default defineComponent({
|
|
|
72
72
|
isPersonalisationEnabled: computed(
|
|
73
73
|
() => uiStore.isPersonalisationEnabled,
|
|
74
74
|
),
|
|
75
|
-
|
|
75
|
+
isAdminMaker: computed(() => containerStore.isAdminMaker),
|
|
76
76
|
contentSettingsStore,
|
|
77
77
|
sideBarStore,
|
|
78
78
|
eventTracker,
|
|
@@ -190,7 +190,7 @@ export default defineComponent({
|
|
|
190
190
|
},
|
|
191
191
|
|
|
192
192
|
showPersonalisationField(): boolean {
|
|
193
|
-
return this.
|
|
193
|
+
return this.isAdminMaker && this.isPersonalisationEnabled;
|
|
194
194
|
},
|
|
195
195
|
|
|
196
196
|
personalisationRole(): PersonalisationRole | undefined {
|
|
@@ -68,7 +68,7 @@ export default defineComponent({
|
|
|
68
68
|
getContent: computed(() => contentSettingsStore.getContent),
|
|
69
69
|
getValue: computed(() => contentSettingsStore.getValue),
|
|
70
70
|
brandPageData: computed(() => brandPageMakerStore.brandPageData),
|
|
71
|
-
|
|
71
|
+
isAdminMaker: computed(() => brandPageContainerStore.isAdminMaker),
|
|
72
72
|
isDesignCom: computed(() => brandPageContainerStore.isDesignCom),
|
|
73
73
|
canUseRichTextEditor: computed(
|
|
74
74
|
() => userStore.features.canUseRichTextEditor,
|
|
@@ -208,7 +208,7 @@ export default defineComponent({
|
|
|
208
208
|
},
|
|
209
209
|
showToggle(): boolean | undefined {
|
|
210
210
|
//TODO: convert showToggle to both boolean and a function
|
|
211
|
-
if (this.field.name === 'backgroundStyle' && this.
|
|
211
|
+
if (this.field.name === 'backgroundStyle' && this.isAdminMaker) {
|
|
212
212
|
return true;
|
|
213
213
|
}
|
|
214
214
|
|
|
@@ -294,7 +294,7 @@ export default defineComponent({
|
|
|
294
294
|
}
|
|
295
295
|
},
|
|
296
296
|
onFieldChangeLogo(): void {
|
|
297
|
-
if (this.
|
|
297
|
+
if (this.isAdminMaker) {
|
|
298
298
|
this.sideBarStore.setSelectedTabName({
|
|
299
299
|
tabName: SIDE_BAR_TAB_NAMES.ADMIN_LOGO_SETTINGS,
|
|
300
300
|
});
|
|
@@ -57,7 +57,7 @@ export default defineComponent({
|
|
|
57
57
|
isPersonalisationEnabled: computed(
|
|
58
58
|
() => uiStore.isPersonalisationEnabled,
|
|
59
59
|
),
|
|
60
|
-
|
|
60
|
+
isAdminMaker: computed(() => containerStore.isAdminMaker),
|
|
61
61
|
canUseRichTextEditor: computed(
|
|
62
62
|
() => userStore.features.canUseRichTextEditor,
|
|
63
63
|
),
|
|
@@ -223,7 +223,7 @@ export default defineComponent({
|
|
|
223
223
|
},
|
|
224
224
|
|
|
225
225
|
showPersonalisationField(): boolean {
|
|
226
|
-
return this.
|
|
226
|
+
return this.isAdminMaker && this.isPersonalisationEnabled;
|
|
227
227
|
},
|
|
228
228
|
|
|
229
229
|
personalisationRole(): PersonalisationRole | undefined {
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
value-prop-name="url"
|
|
11
11
|
field-type="url"
|
|
12
12
|
:settings="itemListSettings"
|
|
13
|
-
:is-admin="
|
|
13
|
+
:is-admin-maker="isAdminMaker"
|
|
14
14
|
:logo-theme="logoTheme"
|
|
15
15
|
@on-intent-image-replace="onItemListIntentImageReplace"
|
|
16
16
|
@on-color-replacements-change="onColorReplacementsChange"
|
|
@@ -128,7 +128,7 @@ const props = defineProps({
|
|
|
128
128
|
type: Object as PropType<BrandPageSettingsMode>,
|
|
129
129
|
required: true,
|
|
130
130
|
},
|
|
131
|
-
|
|
131
|
+
isAdminMaker: {
|
|
132
132
|
type: Boolean,
|
|
133
133
|
required: true,
|
|
134
134
|
default: false,
|
|
@@ -231,7 +231,7 @@ const tabs = ref<Tab[]>([
|
|
|
231
231
|
|
|
232
232
|
const enabledTabs = computed(() => {
|
|
233
233
|
return tabs.value
|
|
234
|
-
.filter((x) => x.id !== 'MY_DESIGNS' || !props.
|
|
234
|
+
.filter((x) => x.id !== 'MY_DESIGNS' || !props.isAdminMaker)
|
|
235
235
|
.filter(
|
|
236
236
|
(x) =>
|
|
237
237
|
props.activeTabs.some((y) => y === x.id) &&
|