@designcrowd/library.brand-page 5.11.5 → 5.11.6

package/lib/src/shared/content-settings/components/payment-config-field/PaymentConfigField.mixin.d.ts

@@ -192,7 +192,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             isPurchasedDomain: any;
         }): Promise<boolean | undefined>;
         checkWebsiteSlugAsync(slug: string): Promise<import("../../../../brand-page-maker/models/api.model").WebsiteSlugCheckResponse | null>;
-        redirectToLogoEditPage(logoEditUrl: string): Promise<void>;
+        redirectToLogoEditPage(logoEditUrl: string, locale: string): Promise<void>;
         redirectToCreateNewDesignPage(): Promise<void>;
         redirectToStripeOnboarding(): Promise<void>;
         exportDesignAsync(): Promise<any>;

package/lib/src/shared/logo-settings/components/LogoSettings.mixin.d.ts

@@ -357,7 +357,7 @@ declare const _default: import("vue").DefineComponent<{}, {
             isPurchasedDomain: any;
         }): Promise<boolean | undefined>;
         checkWebsiteSlugAsync(slug: string): Promise<import("../../../brand-page-maker/models/api.model").WebsiteSlugCheckResponse | null>;
-        redirectToLogoEditPage(logoEditUrl: string): Promise<void>;
+        redirectToLogoEditPage(logoEditUrl: string, locale: string): Promise<void>;
         redirectToCreateNewDesignPage(): Promise<void>;
         redirectToStripeOnboarding(): Promise<void>;
         exportDesignAsync(): Promise<any>;

package/lib/src/shared/page-settings/components/page-settings/PageSettings.mixin.d.ts

@@ -4614,7 +4614,7 @@ declare const _default: import("vue").DefineComponent<{}, {
             isPurchasedDomain: any;
         }): Promise<boolean | undefined>;
         checkWebsiteSlugAsync(slug: string): Promise<import("../../../../brand-page-maker/models/api.model").WebsiteSlugCheckResponse | null>;
-        redirectToLogoEditPage(logoEditUrl: string): Promise<void>;
+        redirectToLogoEditPage(logoEditUrl: string, locale: string): Promise<void>;
         redirectToCreateNewDesignPage(): Promise<void>;
         redirectToStripeOnboarding(): Promise<void>;
         exportDesignAsync(): Promise<any>;

package/lib/src/shared/page-settings/components/page-settings-section-styles/PageSettingsSectionStyles.mixin.d.ts

@@ -4045,7 +4045,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             isPurchasedDomain: any;
         }): Promise<boolean | undefined>;
         checkWebsiteSlugAsync(slug: string): Promise<import("../../../../brand-page-maker/models/api.model").WebsiteSlugCheckResponse | null>;
-        redirectToLogoEditPage(logoEditUrl: string): Promise<void>;
+        redirectToLogoEditPage(logoEditUrl: string, locale: string): Promise<void>;
         redirectToCreateNewDesignPage(): Promise<void>;
         redirectToStripeOnboarding(): Promise<void>;
         exportDesignAsync(): Promise<any>;

package/lib/src/shared/publish-brand-page-with-state/PublishBrandPageModalWithState.mixin.d.ts

@@ -349,7 +349,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             isPurchasedDomain: any;
         }): Promise<boolean | undefined>;
         checkWebsiteSlugAsync(slug: string): Promise<import("../../brand-page-maker/models/api.model").WebsiteSlugCheckResponse | null>;
-        redirectToLogoEditPage(logoEditUrl: string): Promise<void>;
+        redirectToLogoEditPage(logoEditUrl: string, locale: string): Promise<void>;
         redirectToCreateNewDesignPage(): Promise<void>;
         redirectToStripeOnboarding(): Promise<void>;
         exportDesignAsync(): Promise<any>;

package/lib/src/shared/side-bar/components/SideBar.mixin.d.ts

@@ -185,7 +185,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             isPurchasedDomain: any;
         }): Promise<boolean | undefined>;
         checkWebsiteSlugAsync(slug: string): Promise<import("../../../brand-page-maker/models/api.model").WebsiteSlugCheckResponse | null>;
-        redirectToLogoEditPage(logoEditUrl: string): Promise<void>;
+        redirectToLogoEditPage(logoEditUrl: string, locale: string): Promise<void>;
         redirectToCreateNewDesignPage(): Promise<void>;
         redirectToStripeOnboarding(): Promise<void>;
         exportDesignAsync(): Promise<any>;

package/lib/src/shared/style-settings/components/StyleSettings.mixin.d.ts

@@ -762,7 +762,7 @@ declare const _default: import("vue").DefineComponent<{}, {
             isPurchasedDomain: any;
         }): Promise<boolean | undefined>;
         checkWebsiteSlugAsync(slug: string): Promise<import("../../../brand-page-maker/models/api.model").WebsiteSlugCheckResponse | null>;
-        redirectToLogoEditPage(logoEditUrl: string): Promise<void>;
+        redirectToLogoEditPage(logoEditUrl: string, locale: string): Promise<void>;
         redirectToCreateNewDesignPage(): Promise<void>;
         redirectToStripeOnboarding(): Promise<void>;
         exportDesignAsync(): Promise<any>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@designcrowd/library.brand-page",
   "description": "A collection of Maker/Designer applications",
-  "version": "5.11.5",
+  "version": "5.11.6",
   "author": "Design.com Eng",
   "license": "UNLICENSED",
   "type": "module",

package/src/brand-page-maker/components/brand-page-maker/BrandPageMaker.vue

@@ -4,7 +4,7 @@
       :is-admin="isAdmin"
       :is-published="isPublished"
       :is-saving="isSaving"
-      :brand-crowd-url="viewModel.brandCrowdUrl"
+      :brand-crowd-url="brandCrowdUrl"
       :back-url="backUrl"
       :back-button-label="backButtonLabel"
       :is-design-com="isDesignCom"
@@ -97,6 +97,7 @@
   </div>
 </template>
 <script>
+import { computed } from 'vue';
 import { HelloBar } from '@designcrowd/fe-shared-lib';
 import ActionBar from '../action-bar/ActionBar.vue';
 import BrandPageBackgroundSettings from '../brandpage-background-settings/BrandPageBackgroundSettings.vue';
@@ -119,6 +120,7 @@ import ProductConfigModal from '../../../brand-page-maker/components/shop/Produc
 import { SIDE_BAR_TAB_NAMES } from '../../constants';
 import { VIEWPORTS, BRAND_PAGE_TYPES } from '../../../brand-page';
 import { UI_DEVICE_MODES, UI_SCREENSIZE_MODES } from '../../../shared/models';
+import { useLocalisedRouteStore } from '../../stores/route/localised-route-store';
 
 export default {
   components: {
@@ -143,7 +145,12 @@ export default {
   },
   mixins: [BrandPageMakerMixin],
   setup(props, context) {
-    return BrandPageMakerMixin.setup(props, context);
+    const localisedRouteStore = useLocalisedRouteStore();
+
+    return {
+      ...BrandPageMakerMixin.setup(props, context),
+      brandCrowdUrl: computed(() => localisedRouteStore.localisedBaseUrl),
+    };
   },
   data() {
     return {

package/src/brand-page-maker/components/brandpage-settings/BrandPageSettings.vue

@@ -223,10 +223,12 @@ const onSlugChangeButtonClicked = async () => {
 const onUpdateSettings = async (payload: {
   description: string;
   title: string;
+  shouldRefresh: boolean;
 }) => {
   brandPageMakerStore.updateBrandPageSettings({
     description: payload.description,
     title: payload.title,
+    shouldRefresh: payload.shouldRefresh,
   });
 };
 
@@ -258,6 +260,7 @@ const onSocialShareChange = (mediaType: string) => {
 const onChangeSensitiveSettings = (value) => {
   brandPageMakerStore.updateSensitiveContentSettings({
     sensitiveContent: value,
+    shouldRefresh: false,
   });
 };
 </script>

package/src/brand-page-maker/components/sensitive-content/SensitiveContent.vue

@@ -19,47 +19,41 @@
       >
         {{ sensitiveSettingTr('sensitiveContentInfo') }}
       </p>
-      <form
-        ref="editSensitiveContentForm"
-        :action="editSensitiveContentActionPath"
-        method="post"
+      <div
+        class="tw-mt-4 tw-items-center tw-grid tw-grid-cols-2 tw-gap-4"
+        :class="{ 'tw-grid-cols-5': !isMaker }"
       >
         <div
-          class="tw-mt-4 tw-items-center tw-grid tw-grid-cols-2 tw-gap-4"
-          :class="{ 'tw-grid-cols-5': !isMaker }"
+          v-for="opt in data.sensitiveSettings"
+          :key="opt.value"
+          class="tw-flex tw-items-center"
+          :class="{
+            'tw-col-span-2':
+              !isMaker &&
+              opt.value === SENSITIVE_CONTENT_TYPES.sensitiveContent,
+          }"
+          @click="onSensitiveSettingsClick(opt.value)"
         >
-          <div
-            v-for="opt in data.sensitiveSettings"
-            :key="opt.value"
-            class="tw-flex tw-items-center"
-            :class="{
-              'tw-col-span-2':
-                !isMaker &&
-                opt.value === SENSITIVE_CONTENT_TYPES.sensitiveContent,
-            }"
-            @click="onSensitiveSettingsClick(opt.value)"
+          <input
+            type="radio"
+            class="tw-w-5 tw-h-5 tw-cursor-pointer tw-mb-0 tw-accent-primary-500 tw-mr-2"
+            name="sensitiveContent"
+            :checked="data.selectedSensitiveSettings === opt.value"
+            :value="opt.value"
+          />
+          <input
+            hidden
+            name="sensitiveContentType"
+            :value="data.selectedSensitiveSettings"
+          />
+          <label
+            for="radio1"
+            class="tw-font-sans tw-text-sm tw-cursor-pointer tw-h-fit tw-text-grayscale-600"
           >
-            <input
-              type="radio"
-              class="tw-w-5 tw-h-5 tw-cursor-pointer tw-mb-0 tw-accent-primary-500 tw-mr-2"
-              name="sensitiveContent"
-              :checked="data.selectedSensitiveSettings === opt.value"
-              :value="opt.value"
-            />
-            <input
-              hidden
-              name="sensitiveContentType"
-              :value="data.selectedSensitiveSettings"
-            />
-            <label
-              for="radio1"
-              class="tw-font-sans tw-text-sm tw-cursor-pointer tw-h-fit tw-text-grayscale-600"
-            >
-              {{ opt.label }}
-            </label>
-          </div>
+            {{ opt.label }}
+          </label>
         </div>
-      </form>
+      </div>
     </div>
     <div
       v-if="isMaker"
@@ -73,6 +67,7 @@
         class="tw-uppercase"
         :label="commonTr('updateSettings')"
         variant="primary"
+        type="submit"
         :disabled="isNoChange"
         @click="onSensitiveContentUpdate"
       />
@@ -98,7 +93,10 @@
 <script setup lang="ts">
 import { Button } from '@designcrowd/fe-shared-lib';
 import { computed, reactive, nextTick, useTemplateRef } from 'vue';
-import { SENSITIVE_CONTENT_TYPES } from '../../../brand-page/models/brand-page-context.model';
+import {
+  SENSITIVE_CONTENT_TYPES,
+  type SensitiveContent,
+} from '../../../brand-page/models/brand-page-context.model';
 import { useBrandPageMakerStore } from '../../stores';
 import {
   sensitiveSettingTr,
@@ -149,7 +147,6 @@ const emit = defineEmits([
   'change-sensitive-settings',
   'pre-submit-edit-sensitive-content',
 ]);
-const updateFormRef = useTemplateRef('editSensitiveContentForm');
 
 const onSensitiveSettingsClick = (value) => {
   data.selectedSensitiveSettings = value;
@@ -163,17 +160,10 @@ const onSubmitEditSensitiveContent = () => {
   emit('pre-submit-edit-sensitive-content', data.selectedSensitiveSettings);
 
   nextTick(() => {
-    updateFormRef.value?.submit();
+    brandPageMakerStore.updateSensitiveContentSettings({
+      sensitiveContent: data.selectedSensitiveSettings as SensitiveContent,
+      shouldRefresh: true,
+    });
   });
 };
-
-const editSensitiveContentActionPath = computed(() => {
-  if (isBrandPage.value) {
-    return `/maker/brand-page/manage/${props.designDraftToken}/updateSensitiveContent`;
-  } else if (isBrandContact.value) {
-    return `/maker/brand-contact/manage/${props.designDraftToken}/updateSensitiveContent`;
-  } else {
-    return `/maker/brand-site/manage/${props.designDraftToken}/updateSensitiveContent`;
-  }
-});
 </script>

package/src/brand-page-maker/components/seo-settings/SeoPageSettings.mixin.ts

@@ -79,24 +79,6 @@ export default defineComponent({
     this.internalTitle = this.brandPageContainerStore.brandPageTitle;
   },
   computed: {
-    editMetaActionPath() {
-      if (this.isBrandPage) {
-        return `/maker/brand-page/manage/${this.designDraftToken}/meta`;
-      } else if (this.isBrandContact) {
-        return `/maker/brand-contact/manage/${this.designDraftToken}/meta`;
-      } else {
-        return `/maker/brand-site/manage/${this.designDraftToken}/meta`;
-      }
-    },
-    duplicateActionPath() {
-      if (this.isBrandPage) {
-        return `/maker/brand-page/manage/${this.designDraftToken}/duplicate`;
-      } else if (this.isBrandContact) {
-        return `/maker/brand-contact/manage/${this.designDraftToken}/meta`;
-      } else {
-        return `/maker/brand-site/manage/${this.designDraftToken}/duplicate`;
-      }
-    },
     hasSlug() {
       return Boolean(this.brandPageContainerStore.brandPageSlug);
     },
@@ -181,13 +163,15 @@ export default defineComponent({
       this.$emit('update-settings', {
         description: this.internalDescription,
         title: this.internalTitle,
+        shouldRefresh: false,
       });
     },
-    onSubmitEditMeta() {
-      this.$emit('pre-submit-edit-meta');
 
-      this.$nextTick(() => {
-        (this.$refs.editMetaForm as HTMLFormElement)?.submit();
+    onUpdateSettingsFromManagePage() {
+      this.brandPageMakerStore.updateBrandPageSettings({
+        description: this.myPageDescription,
+        title: this.myPageTitle,
+        shouldRefresh: true,
       });
     },
   },

package/src/brand-page-maker/components/seo-settings/SeoPageSettings.vue

@@ -14,7 +14,7 @@
     </div>
     <!-- BC form -->
     <div v-if="!isMaker">
-      <form ref="editMetaForm" :action="editMetaActionPath" method="post">
+      <form ref="editMetaForm">
         <div class="tw-p-4">
           <div class="tw-m-0 tw-pb-2">
             <TextInput
@@ -54,9 +54,10 @@
           class="tw-uppercase"
           :label="commonTr('updateSettings')"
           variant="primary"
+          type="submit"
           :disabled="!isUpdateButtonEnabled"
           :attrs="{ 'data-test-btn-update-seo-settings': '' }"
-          @on-click.stop="onSubmitEditMeta"
+          @on-click.stop="onUpdateSettingsFromManagePage"
         />
       </div>
     </div>

package/src/brand-page-maker/stores/brandpage-container/brand-page-container-store.ts

@@ -673,10 +673,10 @@ export const useBrandPageContainerStore = defineStore('brandPageContainer', {
       }
     },
 
-    async redirectToLogoEditPage(logoEditUrl: string) {
+    async redirectToLogoEditPage(logoEditUrl: string, locale: string) {
       await this.saveBrandPage().then(() => {
         if (window) {
-          window.location.href = logoEditUrl;
+          window.location.href = `${logoEditUrl}?locale=${locale}`;
         }
       });
     },

package/src/brand-page-maker/stores/brandpage-maker/brandpage-maker-store.ts

@@ -154,10 +154,12 @@ export interface BrandPageMakerState {
 export interface UpdateBrandPageSettingsPayload {
   description: string;
   title: string;
+  shouldRefresh: boolean;
 }
 
 export interface UpdateSensitiveContentPayload {
   sensitiveContent: SensitiveContent;
+  shouldRefresh: boolean;
 }
 
 export interface SetIsModifiedPayload {
@@ -1045,6 +1047,12 @@ export const useBrandPageMakerStore = defineStore('brandPageMaker', {
       const brandPageContainerStore = useBrandPageContainerStore();
 
       await brandPageContainerStore.updateBrandPageSettings(payload);
+
+      if (payload.shouldRefresh) {
+        if (typeof window !== 'undefined') {
+          window.location.reload();
+        }
+      }
     },
 
     async updateSensitiveContentSettings(
@@ -1053,6 +1061,12 @@ export const useBrandPageMakerStore = defineStore('brandPageMaker', {
       const brandPageContainerStore = useBrandPageContainerStore();
 
       await brandPageContainerStore.updateSensitiveContent(payload);
+
+      if (payload.shouldRefresh) {
+        if (typeof window !== 'undefined') {
+          window.location.reload();
+        }
+      }
     },
 
     async updateAndSaveMeasurementID(payload: {

package/src/brand-page-maker/stores/route/localised-route-store.ts

@@ -19,6 +19,7 @@ export interface LocalisedRouteState {
   brandSiteEditorUrlPath: string;
   brandContactEditorUrlPath: string;
   logoEditUrlPath: string;
+  localisedBaseUrl: string;
 }
 
 export const useLocalisedRouteStore = defineStore('localisedRoute', {
@@ -38,6 +39,7 @@ export const useLocalisedRouteStore = defineStore('localisedRoute', {
     brandSiteEditorUrlPath: '',
     brandContactEditorUrlPath: '',
     logoEditUrlPath: '',
+    localisedBaseUrl: '',
   }),
   actions: {
     initialise(payload: any) {
@@ -57,6 +59,7 @@ export const useLocalisedRouteStore = defineStore('localisedRoute', {
       this.brandSiteEditorUrlPath = payload.brandSiteEditorUrlPath;
       this.brandContactEditorUrlPath = payload.brandContactEditorUrlPath;
       this.logoEditUrlPath = payload.logoEditUrlPath;
+      this.localisedBaseUrl = payload.localisedBaseUrl;
     },
   },
   getters: {
@@ -114,5 +117,11 @@ export const useLocalisedRouteStore = defineStore('localisedRoute', {
           ? `https://www.design.com${slug}`
           : `https://www.brandcrowd.com${slug}`;
       },
+
+    getWebsiteBaseUrl: () => (isDesignCom: boolean) => {
+      return isDesignCom
+        ? `https://www.design.com`
+        : `https://www.brandcrowd.com`;
+    },
   },
 });

package/src/bundles/bundled-translations.fr-FR.json

@@ -695,7 +695,7 @@
   },
   "deletePageModal": {
     "deletePageTitle": "Supprimez « {{PAGE_TITLE}} ».",
-    "deletePageConfirmation": "Voulez-vous vraiment supprimer cette page ? Cette opération ne peut pas être annulée.",
+    "deletePageConfirmation": "Voulez-vous vraiment supprimer cette page? Cette opération ne peut pas être annulée.",
     "cancel": "Annuler",
     "delete": "Supprimer"
   },

package/src/composables/useTranslate.ts

@@ -97,6 +97,7 @@ const tr = (
 
   return translated;
 };
+
 const modelsTr = (key) => tr(`model.${key}`);
 const commonTr = (key) => tr(`common.${key}`);
 const actionBarTr = (key) => tr(`actionBar.${key}`);

package/src/shared/content-settings/components/logo-selection-field/LogoSelection.vue

@@ -140,6 +140,7 @@ import { type LogoVariation, type LogoViewModel } from '../../../../brand-page';
 import {
   logoSelectionTr,
   commonTr,
+  getCurrentLocale,
 } from '../../../../composables/useTranslate';
 
 interface Tab {
@@ -371,7 +372,8 @@ const onEditLogoButtonClicked = () => {
     return;
   }
   if (data.logoEditUrl) {
-    containerStore.redirectToLogoEditPage(data.logoEditUrl);
+    const locale = getCurrentLocale();
+    containerStore.redirectToLogoEditPage(data.logoEditUrl, locale);
   }
 };
 </script>

package/src/shared/page-settings/components/delete-page-modal/i18n/delete-page-modal.fr-FR.json

@@ -1,7 +1,7 @@
 {
   "deletePageModal" : {
     "deletePageTitle" : "Supprimez « {{PAGE_TITLE}} ».",
-    "deletePageConfirmation" : "Voulez-vous vraiment supprimer cette page ? Cette opération ne peut pas être annulée.",
+    "deletePageConfirmation" : "Voulez-vous vraiment supprimer cette page? Cette opération ne peut pas être annulée.",
     "cancel" : "Annuler",
     "delete" : "Supprimer"
   }