@evershop/evershop 2.0.1 → 2.1.1

package/dist/modules/cms/graphql/types/PageInfo/PageInfo.resolvers.d.ts

@@ -1,17 +1,21 @@
-declare namespace _default {
-    namespace Query {
-        function pageInfo(root: any, args: any, context: any): {
+import { OgInfo } from '../../../../../types/pageMeta.js';
+declare const _default: {
+    Query: {
+        pageInfo: (root: any, args: any, context: any) => Promise<{
             url: any;
             title: any;
             description: any;
             keywords: any;
-        };
-    }
-    namespace PageInfo {
-        function breadcrumbs(root: any, args: any, context: any): Promise<{
+            canonicalUrl: any;
+            favicon: () => Promise<string | null>;
+        }>;
+    };
+    PageInfo: {
+        breadcrumbs: (root: any, args: any, context: any) => Promise<{
             title: any;
             url: any;
         }[]>;
-    }
-}
+        ogInfo: (root: any, args: any, context: any) => Promise<OgInfo>;
+    };
+};
 export default _default;

package/dist/modules/cms/graphql/types/PageInfo/PageInfo.resolvers.js

@@ -1,13 +1,31 @@
+import { access } from 'fs/promises';
+import path from 'path';
 import { select } from '@evershop/postgres-query-builder';
+import { CONSTANTS } from '../../../../../lib/helpers.js';
 import { translate } from '../../../../../lib/locale/translate/translate.js';
 import { get } from '../../../../../lib/util/get.js';
+import { getBaseUrl } from '../../../../../lib/util/getBaseUrl.js';
+import { getConfig } from '../../../../../lib/util/getConfig.js';
+import { getValueSync } from '../../../../../lib/util/registry.js';
+import { getSetting } from '../../../../setting/services/setting.js';
 export default {
     Query: {
-        pageInfo: (root, args, context) => ({
+        pageInfo: async (root, args, context) => ({
             url: get(context, 'currentUrl'),
-            title: get(context, 'pageInfo.title', ''),
+            title: get(context, 'pageInfo.title', await getSetting('storeName', 'Evershop')),
             description: get(context, 'pageInfo.description', ''),
-            keywords: get(context, 'pageInfo.keywords', '')
+            keywords: get(context, 'pageInfo.keywords', []),
+            canonicalUrl: get(context, 'pageInfo.canonicalUrl', get(context, 'currentUrl')),
+            favicon: async () => {
+                // Check if a file named favicon.ico exists in the public folder
+                try {
+                    await access(path.resolve(CONSTANTS.PUBLICPATH, 'favicon.ico'));
+                    return getBaseUrl() + '/assets/favicon.ico';
+                }
+                catch (error) {
+                    return null;
+                }
+            }
         })
     },
     PageInfo: {
@@ -77,6 +95,30 @@ export default {
                 });
                 return breadcrumbs;
             }
+        },
+        ogInfo: async (root, args, context) => {
+            let logo = getConfig('themeConfig.logo.src');
+            const baseUrl = getBaseUrl();
+            // Check if logo is a full URL
+            // If logo is not set, use default /images/logo.png
+            if (logo && !logo.startsWith('http')) {
+                // If logo is a relative path, convert to absolute URL
+                logo = `${baseUrl}${logo}`;
+            }
+            const image = get(context, 'pageInfo.ogInfo.image', logo ? `${baseUrl}/images?src=${logo}&w=1200&q=80&h=675&f=png` : '');
+            return getValueSync('ogInfo', {
+                title: get(context, 'pageInfo.ogTitle', root.title),
+                description: get(context, 'pageInfo.ogInfo.description', root.description),
+                image: get(context, 'pageInfo.ogInfo.image', image ? image : root.image),
+                url: get(context, 'pageInfo.ogInfo.url', root.url),
+                siteName: get(context, 'pageInfo.ogInfo.siteName', root.siteName),
+                type: get(context, 'pageInfo.ogInfo.type', 'website'),
+                locale: get(context, 'pageInfo.ogInfo.locale', root.locale),
+                twitterCard: get(context, 'pageInfo.ogInfo.twitterCard', 'summary'),
+                twitterSite: get(context, 'pageInfo.ogInfo.twitterSite', await getSetting('storeName', 'Evershop')),
+                twitterCreator: get(context, 'pageInfo.ogInfo.twitterCreator', await getSetting('storeName', 'Evershop')),
+                twitterImage: get(context, 'pageInfo.ogInfo.twitterImage', image)
+            }, context);
         }
     }
 };

package/dist/modules/cms/graphql/types/PageInfo/PageInfo.resolvers.js.map

@@ -1 +1 @@
-{"version":3,"file":"PageInfo.resolvers.js","sourceRoot":"","sources":["../../../../../../src/modules/cms/graphql/types/PageInfo/PageInfo.resolvers.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"PageInfo.resolvers.js","sourceRoot":"","sources":["../../../../../../src/modules/cms/graphql/types/PageInfo/PageInfo.resolvers.ts"],"names":[],"mappings":"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"}

package/dist/modules/cms/graphql/types/ThemeConfig/ThemeConfig.resolvers.d.ts

@@ -1,6 +1,20 @@
 declare namespace _default {
     namespace Query {
-        function themeConfig(): any;
+        function themeConfig(): {
+            logo: {
+                alt: string | undefined;
+                src: string | undefined;
+                width: number | undefined;
+                height: number | undefined;
+            };
+            headTags: {
+                links: any[];
+                metas: any[];
+                scripts: any[];
+                bases: any[];
+            };
+            copyRight: string;
+        };
     }
 }
 export default _default;

package/dist/modules/cms/graphql/types/Widget/Widget.graphql

@@ -76,16 +76,82 @@ type Menu {
 Return a menu Widget
 """
 type BasicMenuWidget {
-  menus: [Menu],
+  menus: [Menu]
   isMain: Boolean
   className: String
 }
 
+"""
+Return a banner Widget
+"""
+type BasicBannerWidget {
+  src: String
+  alignment: String
+  width: Float
+  height: Float
+  alt: String
+}
+
+"""
+Input for a slide in a slideshow
+"""
+input SlideInput {
+  id: String!
+  image: String!
+  headline: String
+  subText: String
+  buttonText: String
+  buttonLink: String
+  buttonColor: String
+  width: Float
+  height: Float
+}
+
+"""
+A slide in a slideshow
+"""
+type Slide {
+  id: String!
+  image: String!
+  headline: String
+  subText: String
+  buttonText: String
+  buttonLink: String
+  buttonColor: String
+  width: Float
+  height: Float
+}
+
+"""
+Return a slideshow Widget
+"""
+type SlideshowWidget {
+  slides: [Slide!]
+  autoplay: Boolean
+  autoplaySpeed: Int
+  arrows: Boolean
+  dots: Boolean
+}
+
 extend type Query {
   widget(id: Int): Widget
   widgets(filters: [FilterInput]): WidgetCollection
   widgetTypes: [WidgetType]
   widgetType(code: String!): WidgetType
   textWidget(text: String, className: String): TextBlockWidget
-  basicMenuWidget(settings: JSON ): BasicMenuWidget
+  basicMenuWidget(settings: JSON): BasicMenuWidget
+  bannerWidget(
+    src: String
+    alignment: String
+    width: String
+    height: String
+    alt: String
+  ): BasicBannerWidget
+  slideshowWidget(
+    slides: [SlideInput]
+    autoplay: Boolean
+    autoplaySpeed: Int
+    arrows: Boolean
+    dots: Boolean
+  ): SlideshowWidget
 }

package/dist/modules/cms/graphql/types/Widget/Widget.resolvers.d.ts

@@ -37,6 +37,40 @@ declare namespace _default {
             text: any;
             className: any;
         };
+        function bannerWidget(_: any, { src, alignment, width, height, alt }: {
+            src: any;
+            alignment: any;
+            width: any;
+            height: any;
+            alt: any;
+        }): {
+            src: any;
+            alignment: any;
+            width: any;
+            height: any;
+            alt: any;
+        };
+        function slideshowWidget(_: any, { slides, autoplay, autoplaySpeed, arrows, dots, fullWidth, widthValue, heightValue, heightType }: {
+            slides: any;
+            autoplay: any;
+            autoplaySpeed: any;
+            arrows: any;
+            dots: any;
+            fullWidth: any;
+            widthValue: any;
+            heightValue: any;
+            heightType: any;
+        }): {
+            slides: any;
+            autoplay: any;
+            autoplaySpeed: any;
+            arrows: any;
+            dots: any;
+            fullWidth: any;
+            widthValue: any;
+            heightValue: any;
+            heightType: any;
+        };
         function basicMenuWidget(_: any, { settings }: {
             settings: any;
         }, { pool }: {

package/dist/modules/cms/graphql/types/Widget/Widget.resolvers.js

@@ -1,5 +1,7 @@
 import { select } from '@evershop/postgres-query-builder';
+import sanitizeHtml from 'sanitize-html';
 import uniqid from 'uniqid';
+import { error } from '../../../../../lib/log/logger.js';
 import { buildUrl } from '../../../../../lib/router/buildUrl.js';
 import { camelCase } from '../../../../../lib/util/camelCase.js';
 import { getEnabledWidgets } from '../../../../../lib/widget/widgetManager.js';
@@ -48,14 +50,53 @@ export default {
                 : null;
         },
         textWidget(_, { text, className }) {
-            const replacements = {
-                '&lt;': '<',
-                '&gt;': '>'
+            try {
+                if (!text) {
+                    return { text: [], className };
+                }
+                const json = JSON.parse(text);
+                // Loop through each row and find the columns with raw block type. Use dompurify to sanitize the HTML content.
+                json.forEach((row) => {
+                    row.columns.forEach((column) => {
+                        column.data.blocks.forEach((block) => {
+                            if (block.type === 'raw' && block.data.html) {
+                                const replacements = {
+                                    '&lt;': '<',
+                                    '&gt;': '>'
+                                };
+                                const jsonText = block.data.html
+                                    ? block.data.html.replace(/&lt;|&gt;/g, (match) => replacements[match])
+                                    : '';
+                                block.data.html = sanitizeHtml(jsonText);
+                            }
+                        });
+                    });
+                });
+                return {
+                    text: json,
+                    className
+                };
+            }
+            catch (e) {
+                error(e);
+                return { text: [], className };
+            }
+        },
+        bannerWidget(_, { src, alignment, width, height, alt }) {
+            return { src, alignment, width, height, alt };
+        },
+        slideshowWidget(_, { slides, autoplay, autoplaySpeed, arrows, dots, fullWidth, widthValue, heightValue, heightType }) {
+            return {
+                slides: slides || [],
+                autoplay: autoplay !== undefined ? autoplay : true,
+                autoplaySpeed: autoplaySpeed || 3000,
+                arrows: arrows !== undefined ? arrows : true,
+                dots: dots !== undefined ? dots : true,
+                fullWidth: fullWidth !== undefined ? fullWidth : true,
+                widthValue: widthValue || 1920,
+                heightValue: heightValue || 800,
+                heightType: heightType || 'auto'
             };
-            const jsonText = text
-                ? text.replace(/&lt;|&gt;/g, (match) => replacements[match])
-                : '[]';
-            return { text: JSON.parse(jsonText), className };
         },
         basicMenuWidget: async (_, { settings }, { pool }) => {
             const categories = [];

package/dist/modules/cms/graphql/types/Widget/Widget.resolvers.js.map

@@ -1 +1 @@
-{"version":3,"file":"Widget.resolvers.js","sourceRoot":"","sources":["../../../../../../src/modules/cms/graphql/types/Widget/Widget.resolvers.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAC1D,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAE,MAAM,uCAAuC,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAC/E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAC/E,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AAEzE,eAAe;IACb,KAAK,EAAE;QACL,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;YACvC,MAAM,KAAK,GAAG,mBAAmB,EAAE,CAAC;YACpC,KAAK,CAAC,KAAK,CAAC,WAAW,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;YAClC,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACtC,OAAO,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAC3C,CAAC;QACD,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,OAAO,GAAG,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;YAC/C,MAAM,KAAK,GAAG,mBAAmB,EAAE,CAAC;YACpC,MAAM,IAAI,GAAG,IAAI,gBAAgB,CAAC,KAAK,CAAC,CAAC;YACzC,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;YACjC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,WAAW,EAAE,GAAG,EAAE;YAChB,MAAM,KAAK,GAAG,iBAAiB,EAAE,CAAC;YAClC,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;gBACzB,IAAI,EAAE,GAAG,CAAC,IAAI;gBACd,IAAI,EAAE,GAAG,CAAC,IAAI;gBACd,WAAW,EAAE,GAAG,CAAC,WAAW;gBAC5B,gBAAgB,EAAE,GAAG,CAAC,gBAAgB;gBACtC,SAAS,EAAE,GAAG,CAAC,SAAS;gBACxB,eAAe,EAAE,GAAG,CAAC,eAAe;gBACpC,eAAe,EAAE,QAAQ,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC;aAC3D,CAAC,CAAC,CAAC;QACN,CAAC;QACD,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;YAC1B,MAAM,KAAK,GAAG,iBAAiB,EAAE,CAAC;YAClC,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;YACpD,OAAO,IAAI;gBACT,CAAC,CAAC;oBACE,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,WAAW,EAAE,IAAI,CAAC,WAAW;oBAC7B,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;oBACvC,SAAS,EAAE,IAAI,CAAC,SAAS;oBACzB,eAAe,EAAE,IAAI,CAAC,eAAe;oBACrC,eAAe,EAAE,QAAQ,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;iBAC5D;gBACH,CAAC,CAAC,IAAI,CAAC;QACX,CAAC;QACD,UAAU,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;YAC/B,MAAM,YAAY,GAAG;gBACnB,MAAM,EAAE,GAAG;gBACX,MAAM,EAAE,GAAG;aACZ,CAAC;YACF,MAAM,QAAQ,GAAG,IAAI;gBACnB,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;gBAC5D,CAAC,CAAC,IAAI,CAAC;YACT,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,SAAS,EAAE,CAAC;QACnD,CAAC;QACD,eAAe,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;YACnD,MAAM,UAAU,GAAG,EAAE,CAAC;YACtB,MAAM,KAAK,GAAG,EAAE,CAAC;YACjB,MAAM,KAAK,GAAG,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,KAAK,KAAI,SAAS,CAAC;YAC3C,MAAM,MAAM,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,QAAQ,CAAC,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,CAAC,IAAI,KAAK,CAAC;YAC1E,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;YACvB,CAAC;YAED,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACzB,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;oBAC7B,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC7B,CAAC;gBACD,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;oBACzB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACxB,CAAC;gBACD,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;oBAC9B,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;wBAC9B,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBAC9B,CAAC;oBACD,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;wBAC1B,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBACzB,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC;YACD,IAAI,IAAI,GAAG,EAAE,CAAC;YACd,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC1B,MAAM,QAAQ,GAAG,MAAM,MAAM,EAAE;qBAC5B,IAAI,CAAC,aAAa,CAAC;qBACnB,KAAK,CAAC,aAAa,EAAE,IAAI,EAAE,UAAU,CAAC;qBACtC,OAAO,CAAC,IAAI,CAAC,CAAC;gBACjB,IAAI,GAAG,IAAI,CAAC,MAAM,CAChB,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;oBACnB,IAAI,EAAE,CAAC,CAAC,WAAW;oBACnB,GAAG,EAAE,CAAC,CAAC,YAAY;iBACpB,CAAC,CAAC,CACJ,CAAC;YACJ,CAAC;YACD,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACrB,MAAM,KAAK,GAAG,oBAAoB,EAAE,CAAC;gBACrC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;gBACjC,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBAC3C,IAAI,GAAG,IAAI,CAAC,MAAM,CAChB,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;oBACnB,IAAI,EAAE,CAAC,CAAC,IAAI;oBACZ,GAAG,EAAE,QAAQ,CAAC,aAAa,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;iBACrD,CAAC,CAAC,CACJ,CAAC;YACJ,CAAC;YACD,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBAC/B,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,CAAC;gBACnD,OAAO;oBACL,GAAG,IAAI;oBACP,EAAE,EAAE,MAAM,EAAE;oBAEZ,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI;oBAC7D,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;wBACpC,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,CAAC,CAAC;wBACpD,OAAO;4BACL,GAAG,KAAK;4BACR,EAAE,EAAE,MAAM,EAAE;4BAEZ,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI;yBAChE,CAAC;oBACJ,CAAC,CAAC;iBACH,CAAC;YACJ,CAAC,CAAC,CAAC;YACH,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,SAAS,EAAE,CAAC;QAClE,CAAC;KACF;IACD,MAAM,EAAE;QACN,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,QAAQ,CAAC,YAAY,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;QAC3D,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,QAAQ,CAAC,cAAc,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;QACpE,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,QAAQ,CAAC,cAAc,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;KACrE;CACF,CAAC"}
+{"version":3,"file":"Widget.resolvers.js","sourceRoot":"","sources":["../../../../../../src/modules/cms/graphql/types/Widget/Widget.resolvers.js"],"names":[],"mappings":"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"}

package/dist/modules/cms/migration/Version-1.1.1.js

@@ -2,91 +2,5 @@ import { execute } from '@evershop/postgres-query-builder';
 export default async (connection) => {
     // Drop the layout column in the cms_page table
     await execute(connection, `ALTER TABLE cms_page DROP COLUMN layout`);
-    const query = `
-    INSERT INTO widget (name, type, route, area, sort_order, settings, status)
-    VALUES ($1, $2, $3, $4, $5, $6, $7)
-  `;
-    const mainMenu = [
-        'Main menu',
-        'basic_menu',
-        '["all"]',
-        '["header"]',
-        1,
-        JSON.stringify({
-            menus: [
-                {
-                    id: 'hanhk3km0m8nt2b',
-                    url: 'javascript:void(0)',
-                    name: 'Shop ❤️',
-                    type: 'custom',
-                    uuid: 'javascript:void(0)',
-                    children: [
-                        {
-                            id: 'hanhk3km0m8nt2c',
-                            url: '/men',
-                            name: 'Men',
-                            type: 'custom',
-                            uuid: '/men'
-                        },
-                        {
-                            id: 'hanhk3km0m8nt2d',
-                            url: '/women',
-                            name: 'Women',
-                            type: 'custom',
-                            uuid: '/women'
-                        }
-                    ]
-                },
-                {
-                    id: 'hanhk3km0m8nt2e',
-                    url: '/page/about-us',
-                    name: 'About us',
-                    type: 'custom',
-                    uuid: '/page/about-us',
-                    children: []
-                }
-            ],
-            isMain: '1',
-            className: ''
-        }),
-        true
-    ];
-    await connection.query(query, mainMenu);
-    const featuredCategories = [
-        'Featured categories',
-        'text_block',
-        '["homepage"]',
-        '["content"]',
-        10,
-        JSON.stringify({
-            text: '[{"id":"r__c13ffd49-f39e-40d7-8d67-d345c0a018c1","size":3,"columns":[{"id":"c__6dffc7a4-4378-4247-8ffd-07d956ce4939","size":1,"data":{"time":1725357550597,"blocks":[{"id":"PjJh9eW0O7","type":"header","data":{"text":"Kids shoes collection","level":3}},{"id":"CHsT6VaRCw","type":"paragraph","data":{"text":"Constructed from luxury nylons, leathers, and custom hardware, featuring sport details such as hidden breathing vents, waterproof + antimicrobial linings, and more."}},{"id":"-0lRctONo9","type":"raw","data":{"html":"<a href=\\"/kids\\" class=\\"button primary\\"><span>Shop kids</span></a>"}}],"version":"2.30.2"}},{"id":"c__ca76b2e3-65e3-4eb3-83cb-7ffdfba41208","size":1,"data":{"time":1725357550599,"blocks":[{"id":"2K_v3fp7Dd","type":"header","data":{"text":"Women shoes collection","level":3}},{"id":"XiPHWtWbZm","type":"paragraph","data":{"text":"Constructed from luxury nylons, leathers, and custom hardware, featuring sport details such as hidden breathing vents, waterproof + antimicrobial linings, and more."}},{"id":"f9KXlEkYmu","type":"raw","data":{"html":"<a href=\\"/women\\" class=\\"button primary\\"><span>Shop women</span></a>"}}],"version":"2.30.2"}},{"id":"c__2872ebd9-7f79-442b-bade-6c19d74220ef","size":1,"data":{"time":1725357550612,"blocks":[{"id":"mxTqYRjSTw","type":"header","data":{"text":"Men shoes collection","level":3}},{"id":"p-frIk8CU-","type":"paragraph","data":{"text":"Constructed from luxury nylons, leathers, and custom hardware, featuring sport details such as hidden breathing vents, waterproof + antimicrobial linings, and more."}},{"id":"AoCaoHwyWd","type":"raw","data":{"html":"<a href=\\"/men\\" class=\\"button primary\\"><span>Shop men</span></a>"}}],"version":"2.30.2"}}]}]',
-            className: 'page-width'
-        }),
-        true
-    ];
-    await connection.query(query, featuredCategories);
-    const featuredProducts = [
-        'Featured Products',
-        'collection_products',
-        '["homepage"]',
-        '["content"]',
-        20,
-        JSON.stringify({ count: 4, collection: 'homepage' }),
-        true
-    ];
-    await connection.query(query, featuredProducts);
-    const mainBanner = [
-        'Main banner',
-        'text_block',
-        '["homepage"]',
-        '["content"]',
-        5,
-        JSON.stringify({
-            text: '[{"id":"r__63dcb2ab-c2a4-40fc-a995-105bf1484b06","size":1,"columns":[{"id":"c__354832f1-6fe1-4845-8cbb-7e094082810e","size":1,"data":{"time":1725374404621,"blocks":[{"id":"KRtRWBBVvm","type":"raw","data":{"html":"&lt;div style=\\"height: 500px; margin-top: -3rem; background: linear-gradient(135deg, #aad3ff, #0056b3); display: flex; align-items: center; justify-content: center;\\"&gt;\\n  &lt;div style=\\"display: flex; align-items: center; max-width: 1200px; width: 100%; padding: 0 20px;\\"&gt;\\n    &lt;div style=\\"flex: 1; text-align: center;\\"&gt;\\n      &lt;svg width=\\"300\\" height=\\"300\\" viewBox=\\"0 0 128 146\\" fill=\\"none\\" xmlns=\\"http://www.w3.org/2000/svg\\" style=\\"fill: #0056b3; color: #0056b3;\\"&gt;\\n        &lt;path d=\\"M32.388 18.0772L1.15175 36.1544L1.05206 72.5081L0.985596 108.895L32.4213 127.039C49.7009 137.008 63.9567 145.182 64.1228 145.182C64.289 145.182 72.8956 140.264 83.2966 134.283C93.6644 128.268 107.82 120.127 114.732 116.139L127.26 108.895V101.119V93.3102L126.529 93.7089C126.097 93.9415 111.941 102.083 95.06 111.853C78.1459 121.622 64.156 129.531 63.9567 129.498C63.724 129.431 52.5587 123.051 39.1005 115.275L14.6099 101.152V72.5746V43.9967L25.6756 37.6165C31.7234 34.1274 42.8223 27.7472 50.2991 23.4273C57.7426 19.1073 63.9899 15.585 64.1228 15.585C64.2557 15.585 72.9288 20.5362 83.3963 26.5841L113.902 43.9967L118.713 41.1657L127.26 36.1544L113.902 28.5447C103.334 22.2974 64.3554 -0.033191 64.0231 3.90721e-05C63.8237 3.90721e-05 49.568 8.14142 32.388 18.0772Z\\" fill=\\"#0056b3\\"&gt;&lt;/path&gt;\\n        &lt;path d=\\"M96.0237 54.1983C78.9434 64.0677 64.721 72.2423 64.4219 72.3088C64.0896 72.4084 55.7488 67.7562 44.8826 61.509L25.9082 50.543V58.4186L25.9414 66.2609L44.3841 76.8945C54.5193 82.743 63.1591 87.6611 63.5911 87.8272C64.2557 88.0598 68.9079 85.5011 95.5585 70.1156C112.705 60.1798 126.861 51.9719 127.027 51.839C127.16 51.7061 127.227 48.1505 127.194 43.9302L127.094 36.2541L96.0237 54.1983Z\\" fill=\\"#0056b3\\"&gt;&lt;/path&gt;\\n        &lt;path d=\\"M123.771 66.7261C121.943 67.7562 107.854 75.8976 92.4349 84.8033C77.0161 93.7089 64.289 100.986 64.1228 100.986C63.9567 100.986 55.3501 96.0683 44.9491 90.0869L26.0744 79.1874L25.9747 86.8303C25.9082 92.6788 26.0079 94.5729 26.307 94.872C26.9383 95.4369 63.7241 116.604 64.1228 116.604C64.4551 116.604 126.496 80.8821 127.027 80.4169C127.16 80.284 127.227 76.7284 127.194 72.4749L127.094 64.7987L123.771 66.7261Z\\" fill=\\"#0056b3\\"&gt;&lt;/path&gt;\\n      &lt;/svg&gt;\\n    &lt;/div&gt;\\n    \\n    &lt;div style=\\"flex: 1; text-align: left; padding: 20px;\\"&gt;\\n      <h1 style=\\"font-size: 3.5rem; color: #fff;\\">Your Heading Here</h1>\\n      &lt;p style=\\"font-size: 1.5rem; color: #fff; margin: 20px 0;\\"&gt;Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent ultricies sodales mi, at ornare elit semper ac.&lt;/p&gt;\\n      &lt;a href=\\"#\\" style=\\"display: inline-block; padding: 10px 20px; background-color: #fff; color: #0056b3; text-decoration: none; border-radius: 5px; font-weight: bold;\\"&gt;SHOP NOW&lt;/a&gt;\\n    &lt;/div&gt;\\n  &lt;/div&gt;\\n&lt;/div&gt;\\n"}}],"version":"2.30.2"}}]}]',
-            className: ''
-        }),
-        true
-    ];
-    await connection.query(query, mainBanner);
 };
 //# sourceMappingURL=Version-1.1.1.js.map

package/dist/modules/cms/migration/Version-1.1.1.js.map

@@ -1 +1 @@
-{"version":3,"file":"Version-1.1.1.js","sourceRoot":"","sources":["../../../../src/modules/cms/migration/Version-1.1.1.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AAE3D,eAAe,KAAK,EAAE,UAAU,EAAE,EAAE;IAClC,+CAA+C;IAC/C,MAAM,OAAO,CAAC,UAAU,EAAE,yCAAyC,CAAC,CAAC;IAErE,MAAM,KAAK,GAAG;;;GAGb,CAAC;IACF,MAAM,QAAQ,GAAG;QACf,WAAW;QACX,YAAY;QACZ,SAAS;QACT,YAAY;QACZ,CAAC;QACD,IAAI,CAAC,SAAS,CAAC;YACb,KAAK,EAAE;gBACL;oBACE,EAAE,EAAE,iBAAiB;oBAErB,GAAG,EAAE,oBAAoB;oBACzB,IAAI,EAAE,SAAS;oBACf,IAAI,EAAE,QAAQ;oBAEd,IAAI,EAAE,oBAAoB;oBAC1B,QAAQ,EAAE;wBACR;4BACE,EAAE,EAAE,iBAAiB;4BACrB,GAAG,EAAE,MAAM;4BACX,IAAI,EAAE,KAAK;4BACX,IAAI,EAAE,QAAQ;4BACd,IAAI,EAAE,MAAM;yBACb;wBACD;4BACE,EAAE,EAAE,iBAAiB;4BACrB,GAAG,EAAE,QAAQ;4BACb,IAAI,EAAE,OAAO;4BACb,IAAI,EAAE,QAAQ;4BACd,IAAI,EAAE,QAAQ;yBACf;qBACF;iBACF;gBACD;oBACE,EAAE,EAAE,iBAAiB;oBACrB,GAAG,EAAE,gBAAgB;oBACrB,IAAI,EAAE,UAAU;oBAChB,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,gBAAgB;oBACtB,QAAQ,EAAE,EAAE;iBACb;aACF;YACD,MAAM,EAAE,GAAG;YACX,SAAS,EAAE,EAAE;SACd,CAAC;QACF,IAAI;KACL,CAAC;IAEF,MAAM,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAExC,MAAM,kBAAkB,GAAG;QACzB,qBAAqB;QACrB,YAAY;QACZ,cAAc;QACd,aAAa;QACb,EAAE;QACF,IAAI,CAAC,SAAS,CAAC;YACb,IAAI,EAAE,swDAAswD;YAC5wD,SAAS,EAAE,YAAY;SACxB,CAAC;QACF,IAAI;KACL,CAAC;IAEF,MAAM,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;IAElD,MAAM,gBAAgB,GAAG;QACvB,mBAAmB;QACnB,qBAAqB;QACrB,cAAc;QACd,aAAa;QACb,EAAE;QACF,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC;QACpD,IAAI;KACL,CAAC;IAEF,MAAM,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;IAEhD,MAAM,UAAU,GAAG;QACjB,aAAa;QACb,YAAY;QACZ,cAAc;QACd,aAAa;QACb,CAAC;QACD,IAAI,CAAC,SAAS,CAAC;YACb,IAAI,EAAE,6mGAA6mG;YACnnG,SAAS,EAAE,EAAE;SACd,CAAC;QACF,IAAI;KACL,CAAC;IAEF,MAAM,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;AAC5C,CAAC,CAAC"}
+{"version":3,"file":"Version-1.1.1.js","sourceRoot":"","sources":["../../../../src/modules/cms/migration/Version-1.1.1.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AAE3D,eAAe,KAAK,EAAE,UAAU,EAAE,EAAE;IAClC,+CAA+C;IAC/C,MAAM,OAAO,CAAC,UAAU,EAAE,yCAAyC,CAAC,CAAC;AACvE,CAAC,CAAC"}

package/dist/modules/cms/pages/admin/adminNotFound/Meta.d.ts

@@ -1,6 +1,6 @@
-export default function SeoMeta(): React.JSX.Element;
-export namespace layout {
-    let areaId: string;
-    let sortOrder: number;
-}
 import React from 'react';
+export default function SeoMeta(): React.JSX.Element;
+export declare const layout: {
+    areaId: string;
+    sortOrder: number;
+};

package/dist/modules/cms/pages/admin/adminNotFound/Meta.js

@@ -1,5 +1,5 @@
-import Meta from '@components/common/Meta';
-import Title from '@components/common/Title';
+import { Meta } from '@components/common/Meta.js';
+import { Title } from '@components/common/Title.js';
 import React from 'react';
 export default function SeoMeta() {
     return (React.createElement(React.Fragment, null,

package/dist/modules/cms/pages/admin/adminNotFound/Meta.js.map

@@ -1 +1 @@
-{"version":3,"file":"Meta.js","sourceRoot":"","sources":["../../../../../../src/modules/cms/pages/admin/adminNotFound/Meta.jsx"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,yBAAyB,CAAC;AAC3C,OAAO,KAAK,MAAM,0BAA0B,CAAC;AAC7C,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,CAAC,OAAO,UAAU,OAAO;IAC7B,OAAO,CACL;QACE,oBAAC,KAAK,IAAC,KAAK,EAAC,gBAAgB,GAAG;QAChC,oBAAC,IAAI,IAAC,IAAI,EAAC,aAAa,EAAC,OAAO,EAAC,gBAAgB,GAAG,CACnD,CACJ,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,MAAM;IACd,SAAS,EAAE,CAAC;CACb,CAAC"}
+{"version":3,"file":"Meta.js","sourceRoot":"","sources":["../../../../../../src/modules/cms/pages/admin/adminNotFound/Meta.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAClD,OAAO,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACpD,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,CAAC,OAAO,UAAU,OAAO;IAC7B,OAAO,CACL;QACE,oBAAC,KAAK,IAAC,KAAK,EAAC,gBAAgB,GAAG;QAChC,oBAAC,IAAI,IAAC,IAAI,EAAC,aAAa,EAAC,OAAO,EAAC,gBAAgB,GAAG,CACnD,CACJ,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,MAAM;IACd,SAAS,EAAE,CAAC;CACb,CAAC"}

package/dist/modules/cms/pages/admin/adminNotFound/NotFound.d.ts

@@ -1,15 +1,11 @@
-declare function NotFound({ dashboardUrl }: {
-    dashboardUrl: any;
-}): React.JSX.Element;
-declare namespace NotFound {
-    namespace propTypes {
-        let dashboardUrl: any;
-    }
-}
-export default NotFound;
-export namespace layout {
-    let areaId: string;
-    let sortOrder: number;
-}
-export const query: "\n  query Query {\n    dashboardUrl: url(routeId: \"dashboard\")\n  }\n";
 import React from 'react';
+interface ContentProps {
+    dashboardUrl: string;
+}
+export default function NotFound({ dashboardUrl }: ContentProps): React.JSX.Element;
+export declare const layout: {
+    areaId: string;
+    sortOrder: number;
+};
+export declare const query = "\n  query Query {\n    dashboardUrl: url(routeId: \"dashboard\")\n  }\n";
+export {};

package/dist/modules/cms/pages/admin/adminNotFound/NotFound.js

@@ -1,22 +1,18 @@
-import Area from '@components/common/Area';
-import Button from '@components/common/form/Button';
-import PropTypes from 'prop-types';
+import Area from '@components/common/Area.js';
+import { Button } from '@components/common/ui/Button.js';
 import React from 'react';
 function Name() {
-    return (React.createElement("h1", { className: "page-name text-center mt-10 mb-6" }, "404 Page Not Found"));
+    return (React.createElement("h1", { className: "page-name text-center mt-6 mb-4" }, "404 Page Not Found"));
 }
 function Content({ dashboardUrl }) {
     return (React.createElement("div", { className: "page-content" },
         React.createElement("div", { className: "text-center" }, "The page you requested does not exist."),
-        React.createElement("div", { className: "mt-8 text-center" },
-            React.createElement(Button, { title: "Back To Dashboard", url: dashboardUrl, outline: true }))));
+        React.createElement("div", { className: "mt-5 text-center" },
+            React.createElement(Button, { title: "Back To Dashboard", onClick: () => (window.location.href = dashboardUrl), variant: 'default' }, "Back To Dashboard"))));
 }
-Content.propTypes = {
-    dashboardUrl: PropTypes.string.isRequired
-};
 export default function NotFound({ dashboardUrl }) {
-    return (React.createElement("div", { className: "page-width mt-10" },
-        React.createElement("div", { className: "pt-6" },
+    return (React.createElement("div", { className: "page-width mt-6" },
+        React.createElement("div", { className: "pt-4" },
             React.createElement(Area, { id: "notfound-page", coreComponents: [
                     {
                         component: { default: Name },
@@ -32,9 +28,6 @@ export default function NotFound({ dashboardUrl }) {
                     }
                 ] }))));
 }
-NotFound.propTypes = {
-    dashboardUrl: PropTypes.string.isRequired
-};
 export const layout = {
     areaId: 'content',
     sortOrder: 10

package/dist/modules/cms/pages/admin/adminNotFound/NotFound.js.map

@@ -1 +1 @@
-{"version":3,"file":"NotFound.js","sourceRoot":"","sources":["../../../../../../src/modules/cms/pages/admin/adminNotFound/NotFound.jsx"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,yBAAyB,CAAC;AAC3C,OAAO,MAAM,MAAM,gCAAgC,CAAC;AACpD,OAAO,SAAS,MAAM,YAAY,CAAC;AACnC,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,SAAS,IAAI;IACX,OAAO,CACL,4BAAI,SAAS,EAAC,kCAAkC,yBAAwB,CACzE,CAAC;AACJ,CAAC;AAED,SAAS,OAAO,CAAC,EAAE,YAAY,EAAE;IAC/B,OAAO,CACL,6BAAK,SAAS,EAAC,cAAc;QAC3B,6BAAK,SAAS,EAAC,aAAa,6CAA6C;QACzE,6BAAK,SAAS,EAAC,kBAAkB;YAC/B,oBAAC,MAAM,IAAC,KAAK,EAAC,mBAAmB,EAAC,GAAG,EAAE,YAAY,EAAE,OAAO,SAAG,CAC3D,CACF,CACP,CAAC;AACJ,CAAC;AAED,OAAO,CAAC,SAAS,GAAG;IAClB,YAAY,EAAE,SAAS,CAAC,MAAM,CAAC,UAAU;CAC1C,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,QAAQ,CAAC,EAAE,YAAY,EAAE;IAC/C,OAAO,CACL,6BAAK,SAAS,EAAC,kBAAkB;QAC/B,6BAAK,SAAS,EAAC,MAAM;YACnB,oBAAC,IAAI,IACH,EAAE,EAAC,eAAe,EAClB,cAAc,EAAE;oBACd;wBACE,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;wBAC5B,KAAK,EAAE,EAAE;wBACT,SAAS,EAAE,EAAE;wBACb,EAAE,EAAE,qBAAqB;qBAC1B;oBACD;wBACE,SAAS,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE;wBAC/B,KAAK,EAAE,EAAE,YAAY,EAAE;wBACvB,SAAS,EAAE,EAAE;wBACb,EAAE,EAAE,uBAAuB;qBAC5B;iBACF,GACD,CACE,CACF,CACP,CAAC;AACJ,CAAC;AAED,QAAQ,CAAC,SAAS,GAAG;IACnB,YAAY,EAAE,SAAS,CAAC,MAAM,CAAC,UAAU;CAC1C,CAAC;AAEF,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,SAAS;IACjB,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;CAIpB,CAAC"}
+{"version":3,"file":"NotFound.js","sourceRoot":"","sources":["../../../../../../src/modules/cms/pages/admin/adminNotFound/NotFound.tsx"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,4BAA4B,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,iCAAiC,CAAC;AACzD,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,SAAS,IAAI;IACX,OAAO,CACL,4BAAI,SAAS,EAAC,iCAAiC,yBAAwB,CACxE,CAAC;AACJ,CAAC;AAKD,SAAS,OAAO,CAAC,EAAE,YAAY,EAAgB;IAC7C,OAAO,CACL,6BAAK,SAAS,EAAC,cAAc;QAC3B,6BAAK,SAAS,EAAC,aAAa,6CAA6C;QACzE,6BAAK,SAAS,EAAC,kBAAkB;YAC/B,oBAAC,MAAM,IACL,KAAK,EAAC,mBAAmB,EACzB,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,YAAY,CAAC,EACpD,OAAO,EAAE,SAAS,wBAGX,CACL,CACF,CACP,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,OAAO,UAAU,QAAQ,CAAC,EAAE,YAAY,EAAgB;IAC7D,OAAO,CACL,6BAAK,SAAS,EAAC,iBAAiB;QAC9B,6BAAK,SAAS,EAAC,MAAM;YACnB,oBAAC,IAAI,IACH,EAAE,EAAC,eAAe,EAClB,cAAc,EAAE;oBACd;wBACE,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;wBAC5B,KAAK,EAAE,EAAE;wBACT,SAAS,EAAE,EAAE;wBACb,EAAE,EAAE,qBAAqB;qBAC1B;oBACD;wBACE,SAAS,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE;wBAC/B,KAAK,EAAE,EAAE,YAAY,EAAE;wBACvB,SAAS,EAAE,EAAE;wBACb,EAAE,EAAE,uBAAuB;qBAC5B;iBACF,GACD,CACE,CACF,CACP,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,SAAS;IACjB,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;CAIpB,CAAC"}

package/dist/modules/cms/pages/admin/adminStaticAsset/staticAssets.d.ts

@@ -1,2 +1,2 @@
-declare function _default(request: any, response: any, next: any): void;
+declare const _default: (request: any, response: any, next: any) => Promise<void>;
 export default _default;

package/dist/modules/cms/pages/admin/adminStaticAsset/staticAssets.js

@@ -1,5 +1,5 @@
 import staticMiddleware from '../../../../../lib/middlewares/static.js';
-export default (request, response, next) => {
-    staticMiddleware(request, response, next);
+export default async (request, response, next) => {
+    await staticMiddleware(request, response, next);
 };
 //# sourceMappingURL=staticAssets.js.map

package/dist/modules/cms/pages/admin/adminStaticAsset/staticAssets.js.map

@@ -1 +1 @@
-{"version":3,"file":"staticAssets.js","sourceRoot":"","sources":["../../../../../../src/modules/cms/pages/admin/adminStaticAsset/staticAssets.js"],"names":[],"mappings":"AAAA,OAAO,gBAAgB,MAAM,0CAA0C,CAAC;AAExE,eAAe,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;IACzC,gBAAgB,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;AAC5C,CAAC,CAAC"}
+{"version":3,"file":"staticAssets.js","sourceRoot":"","sources":["../../../../../../src/modules/cms/pages/admin/adminStaticAsset/staticAssets.ts"],"names":[],"mappings":"AAAA,OAAO,gBAAgB,MAAM,0CAA0C,CAAC;AAExE,eAAe,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;IAC/C,MAAM,gBAAgB,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;AAClD,CAAC,CAAC"}

package/dist/modules/cms/pages/admin/all/CmsMenuGroup.js

@@ -1,17 +1,16 @@
-import { NavigationItemGroup } from '@components/admin/cms/NavigationItemGroup';
-import PageIcon from '@heroicons/react/solid/esm/DocumentIcon';
-import WidgetIcon from '@heroicons/react/solid/esm/PuzzleIcon';
+import { NavigationItemGroup } from '@components/admin/NavigationItemGroup';
+import { Book, Puzzle } from 'lucide-react';
 import PropTypes from 'prop-types';
 import React from 'react';
 export default function CmsMenuGroup({ cmsPageGrid, widgetGrid }) {
     return (React.createElement(NavigationItemGroup, { id: "cmsMenuGroup", name: "CMS", items: [
             {
-                Icon: PageIcon,
+                Icon: Book,
                 url: cmsPageGrid,
                 title: 'Pages'
             },
             {
-                Icon: WidgetIcon,
+                Icon: Puzzle,
                 url: widgetGrid,
                 title: 'Widgets'
             }

package/dist/modules/cms/pages/admin/all/CmsMenuGroup.js.map

@@ -1 +1 @@
-{"version":3,"file":"CmsMenuGroup.js","sourceRoot":"","sources":["../../../../../../src/modules/cms/pages/admin/all/CmsMenuGroup.jsx"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AAChF,OAAO,QAAQ,MAAM,yCAAyC,CAAC;AAC/D,OAAO,UAAU,MAAM,uCAAuC,CAAC;AAC/D,OAAO,SAAS,MAAM,YAAY,CAAC;AACnC,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE;IAC9D,OAAO,CACL,oBAAC,mBAAmB,IAClB,EAAE,EAAC,cAAc,EACjB,IAAI,EAAC,KAAK,EACV,KAAK,EAAE;YACL;gBACE,IAAI,EAAE,QAAQ;gBACd,GAAG,EAAE,WAAW;gBAChB,KAAK,EAAE,OAAO;aACf;YACD;gBACE,IAAI,EAAE,UAAU;gBAChB,GAAG,EAAE,UAAU;gBACf,KAAK,EAAE,SAAS;aACjB;SACF,GACD,CACH,CAAC;AACJ,CAAC;AAED,YAAY,CAAC,SAAS,GAAG;IACvB,WAAW,EAAE,SAAS,CAAC,MAAM,CAAC,UAAU;IACxC,UAAU,EAAE,SAAS,CAAC,MAAM,CAAC,UAAU;CACxC,CAAC;AAEF,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,WAAW;IACnB,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;;CAKpB,CAAC"}
+{"version":3,"file":"CmsMenuGroup.js","sourceRoot":"","sources":["../../../../../../src/modules/cms/pages/admin/all/CmsMenuGroup.jsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAC5E,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,SAAS,MAAM,YAAY,CAAC;AACnC,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE;IAC9D,OAAO,CACL,oBAAC,mBAAmB,IAClB,EAAE,EAAC,cAAc,EACjB,IAAI,EAAC,KAAK,EACV,KAAK,EAAE;YACL;gBACE,IAAI,EAAE,IAAI;gBACV,GAAG,EAAE,WAAW;gBAChB,KAAK,EAAE,OAAO;aACf;YACD;gBACE,IAAI,EAAE,MAAM;gBACZ,GAAG,EAAE,UAAU;gBACf,KAAK,EAAE,SAAS;aACjB;SACF,GACD,CACH,CAAC;AACJ,CAAC;AAED,YAAY,CAAC,SAAS,GAAG;IACvB,WAAW,EAAE,SAAS,CAAC,MAAM,CAAC,UAAU;IACxC,UAAU,EAAE,SAAS,CAAC,MAAM,CAAC,UAAU;CACxC,CAAC;AAEF,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,WAAW;IACnB,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;;CAKpB,CAAC"}