@evershop/evershop 1.1.0 → 1.2.0

package/src/modules/cms/services/tailwind.admin.config.js

@@ -1,111 +1,26 @@
 module.exports = {
-  corePlugins: {
-    // ...
-    lineHeight: false,
-    placeholder: false,
-    placeholderOpacity: false,
-    textOpacity: false,
-    backgroundOpacity: false,
-    backgroundPosition: false,
-    backgroundImage: false,
-    gradientColorStops: false,
-    borderOpacity: false,
-    divideColor: false,
-    divideOpacity: false,
-    ringOpacity: false,
-    ringOffsetColor: false,
-    mixBlendMode: false,
-    backgroundBlendMode: false,
-    brightness: false,
-    contrast: false,
-    dropShadow: false,
-    hueRotate: false,
-    invert: false,
-    saturate: false,
-    sepia: false,
-    backdropFilter: false,
-    backdropBlur: false,
-    backdropBrightness: false,
-    backdropContrast: false,
-    backdropGrayscale: false,
-    backdropHueRotate: false,
-    backdropInvert: false,
-    backdropOpacity: false,
-    backdropSaturate: false,
-    backdropSepia: false,
-    transitionDelay: false,
-    transform: false,
-    transformOrigin: false,
-    scale: false,
-    rotate: false,
-    translate: false,
-    skew: false
-  },
   theme: {
-    fontSize: {
-      sm: '0.8rem',
-      xs: '.75rem',
-      base: '.875rem',
-      lg: '1.125rem',
-      xl: '1.25rem',
-      '2xl': '1.5rem'
-    },
-    colors: {
-      primary: '#008060',
-      secondary: '#111213',
-      surface: '#111213',
-      onSurface: '#111213',
-      interactive: '#2c6ecb',
-      critical: '#d72c0d',
-      warning: '#FFC453',
-      highlight: '#5BCDDA',
-      success: '#008060',
-      decorative: '#FFC96B',
-      border: '#8c9196',
-      background: '#f6f6f7fc',
-      icon: '#5c5f62',
-      divider: '#e1e3e5',
-      textSubdued: '#6d7175'
-    },
-    spacing: {
-      0: '0px',
-      '025': '.25rem',
-      '05': '.5rem',
-      '075': '.75rem',
-      1: '1rem',
-      125: '1.25rem',
-      15: '1.5rem',
-      2: '2rem',
-      225: '2.25rem',
-      25: '2.5rem',
-      275: '2.75rem',
-      3: '3rem'
-    },
-    margin: {
-      0: '0px',
-      '025': '.25rem',
-      '05': '.5rem',
-      '075': '.75rem',
-      1: '1rem',
-      125: '1.25rem',
-      15: '1.5rem',
-      2: '2rem',
-      225: '2.25rem',
-      25: '2.5rem',
-      275: '2.75rem',
-      3: '3rem'
-    },
-    borderRadius: {
-      DEFAULT: '0.25rem',
-      100: '100%'
-    },
-    borderWidth: {
-      0: '0px',
-      DEFAULT: '1px'
-    },
-    opacity: {},
-    boxShadow: {
-      DEFAULT: '0 0 0 1px rgba(63,63,68,.05),0 1px 3px 0 rgba(63,63,68,.15)'
+    extend: {
+      colors: {
+        primary: '#008060',
+        secondary: '#111213',
+        surface: '#111213',
+        onSurface: '#111213',
+        interactive: '#2c6ecb',
+        critical: '#d72c0d',
+        warning: '#FFC453',
+        highlight: '#5BCDDA',
+        success: '#008060',
+        decorative: '#FFC96B',
+        border: '#8c9196',
+        background: '#f6f6f7fc',
+        icon: '#5c5f62',
+        divider: '#e1e3e5',
+        textSubdued: '#6d7175'
+      },
+      boxShadow: {
+        DEFAULT: '0 0 0 1px rgba(63,63,68,.05),0 1px 3px 0 rgba(63,63,68,.15)'
+      }
     }
   },
   variants: {
@@ -115,5 +30,5 @@ module.exports = {
       padding: ['first', 'last']
     }
   },
-  plugins: []
+  plugins: [require('@tailwindcss/typography')]
 };

package/src/modules/cms/services/tailwind.frontStore.config.js

@@ -1,112 +1,27 @@
 module.exports = {
-  corePlugins: {
-    // ...
-    lineHeight: false,
-    placeholder: false,
-    placeholderOpacity: false,
-    textOpacity: false,
-    backgroundOpacity: false,
-    backgroundPosition: false,
-    backgroundImage: false,
-    gradientColorStops: false,
-    borderOpacity: false,
-    divideColor: false,
-    divideOpacity: false,
-    ringOpacity: false,
-    ringOffsetColor: false,
-    mixBlendMode: false,
-    backgroundBlendMode: false,
-    brightness: false,
-    contrast: false,
-    dropShadow: false,
-    hueRotate: false,
-    invert: false,
-    saturate: false,
-    sepia: false,
-    backdropFilter: false,
-    backdropBlur: false,
-    backdropBrightness: false,
-    backdropContrast: false,
-    backdropGrayscale: false,
-    backdropHueRotate: false,
-    backdropInvert: false,
-    backdropOpacity: false,
-    backdropSaturate: false,
-    backdropSepia: false,
-    transitionDelay: false,
-    transform: false,
-    transformOrigin: false,
-    scale: false,
-    rotate: false,
-    translate: false,
-    skew: false
-  },
   theme: {
-    fontFamily: {
-      sans: 'Helvetica,Helvetica Neue,Arial,Lucida Grande,sans-serif'
-    },
-    fontSize: {
-      base: '.875rem'
-    },
-    colors: {
-      white: '#ffffff',
-      primary: '#3a3a3a',
-      secondary: '#111213',
-      surface: '#111213',
-      onSurface: '#111213',
-      interactive: '#2c6ecb',
-      critical: '#fa4545',
-      warning: '#FFC453',
-      highlight: '#5BCDDA',
-      success: '#008060',
-      decorative: '#FFC96B',
-      border: '#8c9196',
-      icon: '#5c5f62',
-      divider: '#e1e3e5',
-      textSubdued: '#737373',
-      button: '#3a3a3a'
-    },
-    spacing: {
-      0: '0px',
-      '025': '.25rem',
-      '05': '.5rem',
-      '075': '.75rem',
-      1: '1rem',
-      125: '1.25rem',
-      15: '1.5rem',
-      2: '2rem',
-      225: '2.25rem',
-      25: '2.5rem',
-      275: '2.75rem',
-      3: '3rem',
-      4: '4rem'
-    },
-    margin: {
-      0: '0px',
-      '025': '.25rem',
-      '05': '.5rem',
-      '075': '.75rem',
-      1: '1rem',
-      125: '1.25rem',
-      15: '1.5rem',
-      2: '2rem',
-      225: '2.25rem',
-      25: '2.5rem',
-      275: '2.75rem',
-      3: '3rem',
-      4: '4rem'
-    },
-    borderRadius: {
-      DEFAULT: '0.25rem',
-      100: '100%'
-    },
-    borderWidth: {
-      0: '0px',
-      DEFAULT: '1px'
-    },
-    opacity: {},
-    boxShadow: {
-      DEFAULT: '0 0 0 1px rgba(63,63,68,.05),0 1px 3px 0 rgba(63,63,68,.15)'
+    extend: {
+      colors: {
+        white: '#ffffff',
+        primary: '#3a3a3a',
+        secondary: '#111213',
+        surface: '#111213',
+        onSurface: '#111213',
+        interactive: '#2c6ecb',
+        critical: '#fa4545',
+        warning: '#FFC453',
+        highlight: '#5BCDDA',
+        success: '#008060',
+        decorative: '#FFC96B',
+        border: '#8c9196',
+        icon: '#5c5f62',
+        divider: '#e1e3e5',
+        textSubdued: '#737373',
+        button: '#3a3a3a'
+      },
+      boxShadow: {
+        DEFAULT: '0 0 0 1px rgba(63,63,68,.05),0 1px 3px 0 rgba(63,63,68,.15)'
+      }
     }
   },
   variants: {
@@ -116,5 +31,5 @@ module.exports = {
       padding: ['first', 'last']
     }
   },
-  plugins: []
+  plugins: [require('@tailwindcss/typography')]
 };

package/src/modules/cms/services/widget/createWidget.js

@@ -0,0 +1,73 @@
+const { hookable } = require('@evershop/evershop/src/lib/util/hookable');
+const {
+  getValueSync,
+  getValue
+} = require('@evershop/evershop/src/lib/util/registry');
+const {
+  startTransaction,
+  commit,
+  rollback,
+  insert
+} = require('@evershop/postgres-query-builder');
+const {
+  getConnection
+} = require('@evershop/evershop/src/lib/postgres/connection');
+const { getAjv } = require('../../../base/services/getAjv');
+const widgetDataSchema = require('./widgetDataSchema.json');
+
+function validateWidgetDataBeforeInsert(data) {
+  const ajv = getAjv();
+  widgetDataSchema.required = ['status', 'name', 'sort_order'];
+  const jsonSchema = getValueSync(
+    'createWidgetDataJsonSchema',
+    widgetDataSchema
+  );
+  const validate = ajv.compile(jsonSchema);
+  const valid = validate(data);
+  if (valid) {
+    return data;
+  } else {
+    throw new Error(validate.errors[0].message);
+  }
+}
+
+async function insertWidgetData(data, connection) {
+  const widget = await insert('widget').given(data).execute(connection);
+  return widget;
+}
+
+/**
+ * Create widget service. This service will create a widget with all related data
+ * @param {Object} data
+ * @param {Object} context
+ */
+async function createWidget(data, context) {
+  const connection = await getConnection();
+  await startTransaction(connection);
+  try {
+    const widgetData = await getValue('widgetDataBeforeCreate', data);
+    // Validate widget data
+    validateWidgetDataBeforeInsert(widgetData);
+
+    // Insert widget data
+    const widget = await hookable(insertWidgetData, { ...context, connection })(
+      widgetData,
+      connection
+    );
+
+    await commit(connection);
+    return widget;
+  } catch (e) {
+    await rollback(connection);
+    throw e;
+  }
+}
+
+module.exports = async (data, context) => {
+  // Make sure the context is either not provided or is an object
+  if (context && typeof context !== 'object') {
+    throw new Error('Context must be an object');
+  }
+  const widget = await hookable(createWidget, context)(data, context);
+  return widget;
+};

package/src/modules/cms/services/widget/deleteWidget.js

@@ -0,0 +1,49 @@
+const { hookable } = require('@evershop/evershop/src/lib/util/hookable');
+const {
+  startTransaction,
+  commit,
+  rollback,
+  select,
+  del
+} = require('@evershop/postgres-query-builder');
+const {
+  getConnection
+} = require('@evershop/evershop/src/lib/postgres/connection');
+
+async function deleteWidgetData(uuid, connection) {
+  await del('widget').where('uuid', '=', uuid).execute(connection);
+}
+/**
+ * Delete widget service. This service will delete a widget with all related data
+ * @param {String} uuid
+ * @param {Object} context
+ */
+async function deleteWidget(uuid, context) {
+  const connection = await getConnection();
+  await startTransaction(connection);
+  try {
+    const query = select().from('widget');
+    const widget = await query.where('uuid', '=', uuid).load(connection);
+    if (!widget) {
+      throw new Error('Invalid widget id');
+    }
+    await hookable(deleteWidgetData, { ...context, widget, connection })(
+      uuid,
+      connection
+    );
+    await commit(connection);
+    return widget;
+  } catch (e) {
+    await rollback(connection);
+    throw e;
+  }
+}
+
+module.exports = async (uuid, context) => {
+  // Make sure the context is either not provided or is an object
+  if (context && typeof context !== 'object') {
+    throw new Error('Context must be an object');
+  }
+  const widget = await hookable(deleteWidget, context)(uuid, context);
+  return widget;
+};

package/src/modules/cms/services/widget/loadWidgetInstances.js

@@ -0,0 +1,54 @@
+const { pool } = require('@evershop/evershop/src/lib/postgres/connection');
+const { v4: uuidv4 } = require('uuid');
+const {
+  getEnabledWidgets
+} = require('@evershop/evershop/src/lib/util/getEnabledWidgets');
+const { select } = require('@evershop/postgres-query-builder');
+
+module.exports = exports = {};
+
+const newUUID = uuidv4();
+exports.loadWidgetInstances = async function loadWidgetInstances(request) {
+  const route = request.currentRoute;
+  if (route.isAdmin && !['widgetEdit', 'widgetNew'].includes(route.id)) {
+    return [];
+  }
+  const enabledWidgets = getEnabledWidgets();
+  const query = select().from('widget');
+  if (!route.isAdmin) {
+    query.where('status', '=', 't');
+  } else if (route.id === 'widgetEdit') {
+    const uuid = request.params.id;
+    query.where('uuid', '=', uuid);
+  } else {
+    const { type } = request.params;
+    return enabledWidgets
+      .map((widget) => ({
+        type: widget.type,
+        areaId: 'widget_setting_form',
+        uuid: newUUID,
+        sortOrder: 0,
+        settings: widget.default_settings || {}
+      }))
+      .filter((widget) => widget.type === type);
+  }
+
+  const node = query.andWhere(
+    'type',
+    'in',
+    enabledWidgets.map((widget) => widget.type)
+  );
+
+  if (!route.isAdmin) {
+    node.addRaw('AND', `(route @> '["all"]' OR route @> '["${route.id}"]')`);
+  }
+  query.orderBy('sort_order', 'asc');
+  const widgetInstances = await query.execute(pool);
+  return widgetInstances.map((widgetInstance) => ({
+    type: widgetInstance.type,
+    uuid: widgetInstance.uuid,
+    areaId: widgetInstance.area,
+    settings: widgetInstance.settings,
+    sortOrder: widgetInstance.sort_order
+  }));
+};

package/src/modules/cms/services/widget/updateWidget.js

@@ -0,0 +1,86 @@
+const { hookable } = require('@evershop/evershop/src/lib/util/hookable');
+const {
+  getValueSync,
+  getValue
+} = require('@evershop/evershop/src/lib/util/registry');
+const {
+  startTransaction,
+  commit,
+  rollback,
+  update,
+  select
+} = require('@evershop/postgres-query-builder');
+const {
+  getConnection
+} = require('@evershop/evershop/src/lib/postgres/connection');
+const { getAjv } = require('../../../base/services/getAjv');
+const widgetDataSchema = require('./widgetDataSchema.json');
+
+function validateWidgetDataBeforeInsert(data) {
+  const ajv = getAjv();
+  widgetDataSchema.required = ['status'];
+  const jsonSchema = getValueSync(
+    'updateWidgetDataJsonSchema',
+    widgetDataSchema
+  );
+  const validate = ajv.compile(jsonSchema);
+  const valid = validate(data);
+  if (valid) {
+    return data;
+  } else {
+    throw new Error(validate.errors[0].message);
+  }
+}
+
+async function updateWidgetData(uuid, data, connection) {
+  const query = select().from('widget');
+  const widget = await query.where('uuid', '=', uuid).load(connection);
+
+  if (!widget) {
+    throw new Error('Requested widget not found');
+  }
+  const newWidget = await update('widget')
+    .given(data)
+    .where('uuid', '=', uuid)
+    .execute(connection);
+
+  return newWidget;
+}
+
+/**
+ * Update widget service. This service will update a widget with all related data
+ * @param {String} uuid
+ * @param {Object} data
+ * @param {Object} context
+ */
+async function updateWidget(uuid, data, context) {
+  const connection = await getConnection();
+  await startTransaction(connection);
+  try {
+    const widgetData = await getValue('widgetDataBeforeUpdate', data);
+    // Validate widget data
+    validateWidgetDataBeforeInsert(widgetData);
+
+    // Insert widget data
+    const widget = await hookable(updateWidgetData, { ...context, connection })(
+      uuid,
+      widgetData,
+      connection
+    );
+
+    await commit(connection);
+    return widget;
+  } catch (e) {
+    await rollback(connection);
+    throw e;
+  }
+}
+
+module.exports = async (uuid, data, context) => {
+  // Make sure the context is either not provided or is an object
+  if (context && typeof context !== 'object') {
+    throw new Error('Context must be an object');
+  }
+  const widget = await hookable(updateWidget, context)(uuid, data, context);
+  return widget;
+};

package/src/modules/cms/services/widget/widgetDataSchema.json

@@ -0,0 +1,29 @@
+{
+  "type": "object",
+  "properties": {
+    "name": {
+      "type": "string"
+    },
+    "status": {
+      "type": ["string", "integer"],
+      "enum": ["0", "1", 0, 1]
+    },
+    "area": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "route": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "settings": {
+      "type": "object",
+      "additionalProperties": true
+    }
+  },
+  "additionalProperties": true
+}

package/src/modules/cod/pages/admin/paymentSetting/CODSetting.jsx

@@ -10,7 +10,7 @@ export default function CODPayment({
   return (
     <Card title="Cash On Delivery Payment">
       <Card.Session>
-        <div className="grid grid-cols-3 gap-2">
+        <div className="grid grid-cols-3 gap-8">
           <div className="col-span-1 items-center flex">
             <h4>Enable?</h4>
           </div>
@@ -20,7 +20,7 @@ export default function CODPayment({
         </div>
       </Card.Session>
       <Card.Session>
-        <div className="grid grid-cols-3 gap-2">
+        <div className="grid grid-cols-3 gap-8">
           <div className="col-span-1 items-center flex">
             <h4>Dislay Name</h4>
           </div>

package/src/modules/cod/pages/frontStore/checkout/CashOnDelivery.jsx

@@ -39,7 +39,7 @@ export default function CashOnDeliveryMethod() {
 
   return (
     <div>
-      <div className="flex justify-start items-center gap-1">
+      <div className="flex justify-start items-center gap-4">
         {(!selectedPaymentMethod || selectedPaymentMethod.code !== 'cod') && (
           <a
             href="#"

package/src/modules/customer/bootstrap.js

@@ -2,6 +2,7 @@ const { request } = require('express');
 const config = require('config');
 const { pool } = require('@evershop/evershop/src/lib/postgres/connection');
 const { select } = require('@evershop/postgres-query-builder');
+const { merge } = require('@evershop/evershop/src/lib/util/merge');
 const { comparePassword } = require('../../lib/util/passwordHelper');
 const { translate } = require('../../lib/locale/translate/translate');
 const { addProcessor } = require('../../lib/util/registry');
@@ -98,7 +99,6 @@ module.exports = () => {
   request.logoutCustomer = function logoutCustomer(callback) {
     this.session.customerID = undefined;
     this.locals.customer = undefined;
-
     this.session.save(callback);
   };
 
@@ -110,8 +110,25 @@ module.exports = () => {
     return this.locals?.customer;
   };
 
-  // Customer configuration
-  const customerConfig = {
+  addProcessor('configuratonSchema', (schema) => {
+    merge(schema, {
+      properties: {
+        customer: {
+          type: 'object',
+          properties: {
+            addressSchema: {
+              type: 'object',
+              additionalProperties: true
+            }
+          }
+        }
+      }
+    });
+    return schema;
+  });
+
+  // Default customer configuration
+  const defaultCustomerConfig = {
     addressSchema: {
       type: 'object',
       properties: {
@@ -159,7 +176,7 @@ module.exports = () => {
       additionalProperties: true
     }
   };
-  config.util.setModuleDefaults('customer', customerConfig);
+  config.util.setModuleDefaults('customer', defaultCustomerConfig);
 
   // Reigtering the default filters for customer collection
   addProcessor(

package/src/modules/customer/pages/admin/customerEdit/CustomerEditForm.jsx

@@ -3,11 +3,11 @@ import Area from '@components/common/Area';
 
 export default function CustomerEditForm() {
   return (
-    <div className="grid grid-cols-3 gap-x-2 grid-flow-row ">
-      <div className="col-span-2 grid grid-cols-1 gap-2 auto-rows-max">
+    <div className="grid grid-cols-3 gap-x-8 grid-flow-row ">
+      <div className="col-span-2 grid grid-cols-1 gap-8 auto-rows-max">
         <Area id="leftSide" noOuter />
       </div>
-      <div className="col-span-1 grid grid-cols-1 gap-2 auto-rows-max">
+      <div className="col-span-1 grid grid-cols-1 gap-8 auto-rows-max">
         <Area id="rightSide" noOuter />
       </div>
     </div>

package/src/modules/customer/pages/admin/customerEdit+customerNew/OrderHistory.jsx

@@ -14,7 +14,7 @@ export default function OrderHistory({ customer: { orders = [] } }) {
         <>
           {orders.map((order) => (
             <Card.Session>
-              <div className="flex justify-between items-center gap-1">
+              <div className="flex justify-between items-center gap-4">
                 <div>
                   <a
                     className="font-semibold text-interactive"