@evershop/evershop 1.0.0 → 1.1.0

package/bin/build/client/index.js

@@ -2,7 +2,7 @@ const webpack = require('webpack');
 const {
   createConfigClient
 } = require('@evershop/evershop/src/lib/webpack/prod/createConfigClient');
-const { error } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
 
 module.exports.buildClient = async function buildClient(routes) {
   const config = createConfigClient(routes);

package/bin/build/complie.js

@@ -5,7 +5,7 @@ const {
 const {
   createConfigServer
 } = require('@evershop/evershop/src/lib/webpack/prod/createConfigServer');
-const { error } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
 
 module.exports.compile = async function compile(routes) {
   const config = [createConfigClient(routes), createConfigServer(routes)];

package/bin/build/index.js

@@ -10,7 +10,7 @@ const {
 } = require('@evershop/evershop/src/lib/webpack/isBuildRequired');
 const { buildEntry } = require('@evershop/evershop/bin/lib/buildEntry');
 const { getCoreModules } = require('@evershop/evershop/bin/lib/loadModules');
-const { error } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
 const { compile } = require('./complie');
 const { getEnabledExtensions } = require('../extension');
 require('dotenv').config();

package/bin/build/server/index.js

@@ -2,7 +2,7 @@ const webpack = require('webpack');
 const {
   createConfigServer
 } = require('@evershop/evershop/src/lib/webpack/prod/createConfigServer');
-const { error } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
 
 module.exports.buildServer = async function buildServer(routes) {
   const config = createConfigServer(routes);

package/bin/build/server/useDDL.js

@@ -11,7 +11,7 @@ const {
   getComponentsByRoute
 } = require('@evershop/evershop/src/lib/componee/getComponentByRoute');
 const webpack = require('webpack');
-const { info } = require('@evershop/evershop/src/lib/log/debuger');
+const { info } = require('@evershop/evershop/src/lib/log/logger');
 
 const modules = loadModules(path.resolve(__dirname, '../../../src', 'modules'));
 

package/bin/dev/index.js

@@ -2,7 +2,8 @@
 process.env.ALLOW_CONFIG_MUTATIONS = true;
 require('dotenv').config();
 const { start } = require('@evershop/evershop/bin/lib/startUp');
+const { watchComponents } = require('../lib/watch/watchComponents');
 
 (async () => {
-  await start();
+  await start(watchComponents);
 })();

package/bin/evershop

@@ -2,16 +2,9 @@
 /* eslint-disable global-require */
 const yargs = require('yargs/yargs');
 const { hideBin } = require('yargs/helpers');
-const { error } = require('../src/lib/log/debuger');
 
 const { argv } = yargs(hideBin(process.argv));
 const command = argv._[0];
-process.on('uncaughtException', function (exception) {
-  error(exception);
-});
-process.on('unhandledRejection', (reason, p) => {
-  error(`Unhandled Rejection: ${reason} at: ${p}`);
-});
 
 try {
   if (command === 'build') {
@@ -33,5 +26,13 @@ try {
     throw new Error('Invalid command');
   }
 } catch (e) {
+  const { error } = require('../src/lib/log/logger');
   error(e);
 }
+const { error } = require('../src/lib/log/logger');
+process.on('uncaughtException', function (exception) {
+  error(exception);
+});
+process.on('unhandledRejection', (reason, p) => {
+  error(`Unhandled Rejection: ${reason} at: ${p}`);
+});

package/bin/extension/index.js

@@ -3,7 +3,7 @@ const { resolve } = require('path');
 const { CONSTANTS } = require('@evershop/evershop/src/lib/helpers');
 const { getConfig } = require('@evershop/evershop/src/lib/util/getConfig');
 const { getCoreModules } = require('@evershop/evershop/bin/lib/loadModules');
-const { warning } = require('@evershop/evershop/src/lib/log/debuger');
+const { warning } = require('@evershop/evershop/src/lib/log/logger');
 
 let extensions = [];
 

package/bin/install/index.js

@@ -14,7 +14,7 @@ const {
 } = require('@evershop/postgres-query-builder');
 const { prompt } = require('enquirer');
 const { CONSTANTS } = require('@evershop/evershop/src/lib/helpers');
-const { error, success } = require('@evershop/evershop/src/lib/log/debuger');
+const { error, success } = require('@evershop/evershop/src/lib/log/logger');
 const {
   hashPassword
 } = require('@evershop/evershop/src/lib/util/passwordHelper');

package/bin/lib/addDefaultMiddlewareFuncs.js

@@ -4,7 +4,7 @@ const session = require('express-session');
 const sessionStorage = require('connect-pg-simple');
 const pathToRegexp = require('path-to-regexp');
 const webpack = require('webpack');
-const { debug } = require('@evershop/evershop/src/lib/log/debuger');
+const { debug } = require('@evershop/evershop/src/lib/log/logger');
 const middleware = require('webpack-dev-middleware');
 const {
   createConfigClient
@@ -59,7 +59,7 @@ exports.addDefaultMiddlewareFuncs = function addDefaultMiddlewareFuncs(
       ) {
         return;
       }
-      debug('info', message);
+      debug(message);
     });
   });
   // Add public static middleware

package/bin/lib/app.js

@@ -10,7 +10,7 @@ const {
   loadModuleRoutes
 } = require('@evershop/evershop/src/lib/router/loadModuleRoutes');
 const { Handler } = require('@evershop/evershop/src/lib/middleware/Handler');
-const { error } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
 const { getCoreModules } = require('./loadModules');
 const { addDefaultMiddlewareFuncs } = require('./addDefaultMiddlewareFuncs');
 const { getEnabledExtensions } = require('../extension');

package/bin/lib/bootstrap/migrate.js

@@ -12,7 +12,7 @@ const {
   pool
 } = require('@evershop/evershop/src/lib/postgres/connection');
 const { existsSync, readdirSync } = require('fs');
-const { error } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
 const { createMigrationTable } = require('../../install/createMigrationTable');
 
 async function getCurrentInstalledVersion(module) {

package/bin/lib/buildEntry.js

@@ -13,7 +13,7 @@ const {
   parseGraphql
 } = require('@evershop/evershop/src/lib/webpack/util/parseGraphql');
 const JSON5 = require('json5');
-const { error } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
 /**
  * Only pass the page routes, not api routes
  */

package/bin/lib/onError.js

@@ -1,4 +1,4 @@
-const { error } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
 const normalizePort = require('./normalizePort');
 
 const port = normalizePort();

package/bin/lib/onListening.js

@@ -1,5 +1,5 @@
 const boxen = require('boxen');
-const { success } = require('@evershop/evershop/src/lib/log/debuger');
+const { success } = require('@evershop/evershop/src/lib/log/logger');
 const normalizePort = require('./normalizePort');
 
 const port = normalizePort();

package/bin/lib/startUp.js

@@ -2,7 +2,7 @@ const http = require('http');
 const { Handler } = require('@evershop/evershop/src/lib/middleware/Handler');
 const spawn = require('cross-spawn');
 const path = require('path');
-const { error } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
 const isDevelopmentMode = require('@evershop/evershop/src/lib/util/isDevelopmentMode');
 const { lockHooks } = require('@evershop/evershop/src/lib/util/hookable');
 const { lockRegistry } = require('@evershop/evershop/src/lib/util/registry');
@@ -22,14 +22,6 @@ const server = http.createServer(app);
 module.exports.start = async function start(cb) {
   const modules = [...getCoreModules(), ...getEnabledExtensions()];
 
-  /** Migration */
-  try {
-    await migrate(modules);
-  } catch (e) {
-    error(e);
-    process.exit(0);
-  }
-
   /** Loading bootstrap script from modules */
   try {
     // eslint-disable-next-line no-restricted-syntax
@@ -43,6 +35,15 @@ module.exports.start = async function start(cb) {
     process.exit(0);
   }
   process.env.ALLOW_CONFIG_MUTATIONS = false;
+
+  /** Migration */
+  try {
+    await migrate(modules);
+  } catch (e) {
+    error(e);
+    process.exit(0);
+  }
+
   /**
    * Get port from environment and store in Express.
    */

package/bin/lib/watch/watchComponents.js

@@ -1,34 +1,24 @@
 const chokidar = require('chokidar');
-const { resolve, sep, normalize } = require('path');
+const touch = require('touch');
+const { resolve } = require('path');
 const { CONSTANTS } = require('@evershop/evershop/src/lib/helpers');
-const { Componee } = require('@evershop/evershop/src/lib/componee/Componee');
-const {
-  createComponents
-} = require('@evershop/evershop/bin/lib/createComponents');
-const { getRoutes } = require('@evershop/evershop/src/lib/router/Router');
-const {
-  isBuildRequired
-} = require('@evershop/evershop/src/lib/webpack/isBuildRequired');
 
 function watchComponents() {
   chokidar
-    .watch('**/**/pages/*.js', {
-      ignored: /node_modules[\\/]/,
-      ignoreInitial: true,
-      persistent: true
-    })
-    .on('all', (event, path) => {
-      const modulePath = resolve(CONSTANTS.ROOTPATH, path).split(
-        normalize('/views/')
-      )[0];
-      Componee.updateModuleComponents({
-        name: modulePath.split(sep).reverse()[0],
-        path: modulePath
-      });
-      const routes = getRoutes();
-      createComponents(
-        routes.filter((r) => isBuildRequired(r)),
-        true
+    .watch(
+      ['./packages/**/*.jsx', './extensions/**/*.jsx', './themes/**/*.jsx'],
+      {
+        ignored: /node_modules[\\/]/,
+        ignoreInitial: true,
+        persistent: true
+      }
+    )
+    .on('add', () => {
+      touch(
+        resolve(
+          CONSTANTS.MOLDULESPATH,
+          '../components/common/react/client/Index.jsx'
+        )
       );
     });
 }

package/bin/lib/watch/watchMF.js

@@ -1,6 +1,6 @@
 const { normalize, basename } = require('path');
 const { Handler } = require('@evershop/evershop/src/lib/middleware/Handler');
-const { error } = require('@evershop/evershop/src/lib/log/debuger');
+const { error } = require('@evershop/evershop/src/lib/log/logger');
 const { broadcash } = require('./broadcash');
 
 module.exports.watchMF = function (event, path) {

package/bin/lib/watch/watchMR.js

@@ -3,7 +3,7 @@ const { existsSync } = require('fs');
 const { resolve } = require('path');
 const { CONSTANTS } = require('@evershop/evershop/src/lib/helpers');
 const { Handler } = require('@evershop/evershop/src/lib/middleware/Handler');
-const { info, error } = require('@evershop/evershop/src/lib/log/debuger');
+const { info, error } = require('@evershop/evershop/src/lib/log/logger');
 const { updateApp } = require('../startUp');
 const { broadcash } = require('./broadcash');
 

package/bin/lib/watch/watchSchema.js

@@ -1,6 +1,6 @@
 const { normalize, resolve } = require('path');
 const { CONSTANTS } = require('@evershop/evershop/src/lib/helpers');
-const { info } = require('@evershop/evershop/src/lib/log/debuger');
+const { info } = require('@evershop/evershop/src/lib/log/logger');
 const { broadcash } = require('./broadcash');
 
 module.exports.watchSchema = function (event, path) {

package/bin/user/changePassword.js

@@ -1,5 +1,5 @@
 require('dotenv').config();
-const { error, success } = require('@evershop/evershop/src/lib/log/debuger');
+const { error, success } = require('@evershop/evershop/src/lib/log/logger');
 const { pool } = require('@evershop/evershop/src/lib/postgres/connection');
 const {
   hashPassword

package/bin/user/create.js

@@ -1,5 +1,5 @@
 require('dotenv').config();
-const { error, success } = require('@evershop/evershop/src/lib/log/debuger');
+const { error, success } = require('@evershop/evershop/src/lib/log/logger');
 const { pool } = require('@evershop/evershop/src/lib/postgres/connection');
 const {
   hashPassword

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evershop/evershop",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "The React Ecommerce platform. Built with React and Postgres. Open-source and free. Fast and customizable.",
   "files": [
     "bin",
@@ -40,7 +40,7 @@
     "@babel/preset-react": "^7.16.0",
     "@ckeditor/ckeditor5-build-classic": "^36.0.1",
     "@ckeditor/ckeditor5-react": "^5.1.0",
-    "@evershop/postgres-query-builder": "^1.1.0",
+    "@evershop/postgres-query-builder": "^1.2.0",
     "@graphql-tools/load-files": "^6.6.1",
     "@graphql-tools/merge": "^8.3.5",
     "@graphql-tools/schema": "^9.0.3",

package/src/components/admin/catalog/productEdit/category/CategoryItem.jsx

@@ -24,7 +24,7 @@ function CategoryItem({ category, selectedCategory, setSelectedCategory }) {
   const [result] = useQuery({
     query: childrenQuery,
     variables: {
-      filters: [{ key: 'parent', operation: '=', value: category.categoryId }]
+      filters: [{ key: 'parent', operation: 'eq', value: category.categoryId }]
     },
     pause: !expanded
   });

package/src/components/admin/catalog/productEdit/category/CategoryTree.jsx

@@ -25,7 +25,7 @@ function CategoryTree({ selectedCategory, setSelectedCategory }) {
   const [result] = useQuery({
     query: categoriesQuery,
     variables: {
-      filters: [{ key: 'parent', operation: '=', value: null }]
+      filters: [{ key: 'parent', operation: 'eq', value: null }]
     }
   });
   const { data, fetching, error } = result;

package/src/components/admin/catalog/productEdit/variants/CreateVariantGroup.jsx

@@ -70,8 +70,8 @@ export function CreateVariantGroup({ createVariantGroupApi, setGroup }) {
     query: AttributesQuery,
     variables: {
       filters: [
-        { key: 'type', operation: '=', value: 'select' },
-        { key: 'group', operation: '=', value: groupField?.value }
+        { key: 'type', operation: 'eq', value: 'select' },
+        { key: 'group', operation: 'eq', value: groupField?.value }
       ]
     },
     pause: shouldPause
@@ -87,12 +87,7 @@ export function CreateVariantGroup({ createVariantGroupApi, setGroup }) {
   }
 
   if (error) {
-    return (
-      <p>
-        Oh no...
-        {error.message}
-      </p>
-    );
+    return <p className="text-critical">{error.message}</p>;
   }
 
   return (

package/src/components/admin/catalog/productEdit/variants/Variant.jsx

@@ -22,7 +22,7 @@ export function Variant({
       </td>
       {variant.attributes.map((a) => (
         <td key={a.attributeId}>
-          <label>{a.optionText}</label>
+          <label>{a.optionText || '--'}</label>
         </td>
       ))}
       <td>

package/src/components/admin/catalog/productEdit/variants/VariantModal.jsx

@@ -2,20 +2,65 @@
 /* eslint-disable jsx-a11y/anchor-is-valid */
 import React from 'react';
 import PropTypes from 'prop-types';
+import { useQuery } from 'urql';
 import ProductMediaManager from '@components/admin/catalog/productEdit/media/ProductMediaManager';
 import { Field } from '@components/common/form/Field';
+import { useFormContext } from '@components/common/form/Form';
+import Spinner from '@components/common/Spinner';
+
+const AttributesQuery = `
+  query Query($filters: [FilterInput]) {
+    attributes(filters: $filters) {
+      items {
+        attributeId
+        attributeCode
+        attributeName
+        options {
+          value: attributeOptionId
+          text: optionText
+        }
+      }
+    }
+  }
+`;
 
 export function VariantModal({
   variant,
   variantAttributes,
   productImageUploadUrl
 }) {
+  const formContext = useFormContext();
   const image = variant?.product?.image;
   let gallery = variant?.product?.gallery || [];
 
   if (image) {
     gallery = [image].concat(gallery);
   }
+  const [result] = useQuery({
+    query: AttributesQuery,
+    variables: {
+      filters: [
+        {
+          key: 'code',
+          operation: 'in',
+          value: variantAttributes.map((a) => a.attributeCode).join(',')
+        }
+      ]
+    }
+  });
+
+  const { data, fetching, error } = result;
+  if (fetching) {
+    return (
+      <div className="p-3 flex justify-center items-center border rounded border-divider">
+        <Spinner width={30} height={30} />
+      </div>
+    );
+  }
+
+  if (error) {
+    return <p className="text-critical">{error.message}</p>;
+  }
   return (
     <div className="variant-item pb-15 border-b border-solid border-divider mb-15 last:border-b-0 last:pb-0">
       <div className="grid grid-cols-2 gap-x-1">
@@ -28,23 +73,34 @@ export function VariantModal({
         </div>
         <div className="col-span-1">
           <div className="grid grid-cols-2 gap-x-1 border-b border-divider pb-15 mb-15">
-            {variantAttributes.map((a) => (
+            {data?.attributes?.items.map((a, index) => (
               <div key={a.attributeId} className="mt-1 col">
                 <div>
                   <label>{a.attributeName}</label>
                 </div>
-                <Field
+                <input
+                  type="hidden"
+                  name={`attributes[${index}][attribute_code]`}
+                  value={a.attributeCode}
+                />
+                <input
+                  type="hidden"
                   name={a.attributeCode}
+                  value={
+                    formContext.fields.find(
+                      (f) => f.name === `attributes[${index}][value]`
+                    )?.value
+                  }
+                />
+                <Field
+                  name={`attributes[${index}][value]`}
                   validationRules={['notEmpty']}
                   value={
                     variant?.attributes.find(
                       (v) => v.attributeCode === a.attributeCode
                     )?.optionId
                   }
-                  options={a.options.map((o) => ({
-                    value: o.optionId,
-                    text: o.optionText
-                  }))}
+                  options={a.options}
                   type="select"
                 />
               </div>

package/src/components/admin/catalog/productEdit/variants/Variants.jsx

@@ -4,7 +4,7 @@ import { useQuery } from 'urql';
 import { Card } from '@components/admin/cms/Card';
 import { CreateVariant } from '@components/admin/catalog/productEdit/variants/CreateVariant';
 import Spinner from '@components/common/Spinner';
-import { Variant } from './Variant';
+import { Variant } from '@components/admin/catalog/productEdit/variants/Variant';
 
 export const VariantQuery = `
 query Query($productId: ID!) {

package/src/components/admin/checkout/shippingSetting/Method.jsx

@@ -0,0 +1,130 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { toast } from 'react-toastify';
+import CogIcon from '@heroicons/react/outline/CogIcon';
+import { useModal } from '@components/common/modal/useModal';
+import MethodForm from '@components/admin/checkout/shippingSetting/MethodForm';
+
+function Method({ method, getZones }) {
+  const modal = useModal();
+  return (
+    <>
+      <>
+        <td className="border-none py-1">{method.name}</td>
+        <td className="border-none py-1">
+          {method.isEnabled ? 'Enabled' : 'Disabled'}
+        </td>
+        <td className="border-none py-1">
+          {method.cost?.text || (
+            <a
+              href="#"
+              className="text-interactive"
+              onClick={(e) => {
+                e.preventDefault();
+                modal.openModal();
+              }}
+            >
+              <CogIcon width={22} height={22} />
+            </a>
+          )}
+        </td>
+        <td className="border-none py-1">
+          {method.conditionType
+            ? `${method.min || 0} <= ${method.conditionType} <= ${
+                method.max || '∞'
+              }`
+            : 'None'}
+        </td>
+        <td className="border-none py-1">
+          <a
+            href="#"
+            className="text-interactive"
+            onClick={(e) => {
+              e.preventDefault();
+              modal.openModal();
+            }}
+          >
+            Edit
+          </a>
+          <a
+            href="#"
+            className="text-critical ml-2"
+            onClick={async (e) => {
+              e.preventDefault();
+              try {
+                const response = await fetch(method.deleteApi, {
+                  method: 'DELETE',
+                  headers: {
+                    'Content-Type': 'application/json'
+                  },
+                  credentials: 'include'
+                });
+                if (response.ok) {
+                  await getZones();
+                  // Toast success
+                  toast.success('Method removed successfully');
+                } else {
+                  // Toast error
+                  toast.error('Failed to remove method');
+                }
+              } catch (error) {
+                // Toast error
+                toast.error('Failed to remove method');
+              }
+            }}
+          >
+            Delete
+          </a>
+        </td>
+      </>
+      {modal.state.showing && (
+        <div className={modal.className} onAnimationEnd={modal.onAnimationEnd}>
+          <div
+            className="modal-wrapper flex self-center justify-center items-center"
+            tabIndex={-1}
+            role="dialog"
+          >
+            <div className="modal">
+              <MethodForm
+                saveMethodApi={method.updateApi}
+                closeModal={() => modal.closeModal()}
+                getZones={getZones}
+                method={method}
+              />
+            </div>
+          </div>
+        </div>
+      )}
+    </>
+  );
+}
+
+Method.propTypes = {
+  method: PropTypes.shape({
+    name: PropTypes.string.isRequired,
+    isEnabled: PropTypes.bool.isRequired,
+    cost: PropTypes.shape({
+      text: PropTypes.string.isRequired
+    }),
+    priceBasedCost: PropTypes.arrayOf(
+      PropTypes.shape({
+        minPrice: PropTypes.number.isRequired,
+        cost: PropTypes.number.isRequired
+      })
+    ),
+    weightBasedCost: PropTypes.arrayOf(
+      PropTypes.shape({
+        minWeight: PropTypes.number.isRequired,
+        cost: PropTypes.number.isRequired
+      })
+    ),
+    conditionType: PropTypes.string.isRequired,
+    min: PropTypes.number.isRequired,
+    max: PropTypes.number.isRequired,
+    updateApi: PropTypes.string.isRequired,
+    deleteApi: PropTypes.string.isRequired
+  }).isRequired,
+  getZones: PropTypes.func.isRequired
+};
+
+export default Method;