@evershop/evershop 1.0.0 → 1.2.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

@@ -1,3 +1,5 @@
+process.env.ALLOW_CONFIG_MUTATIONS = true;
+const config = require('config');
 const { existsSync, rmSync, mkdirSync } = require('fs');
 const path = require('path');
 const { CONSTANTS } = require('@evershop/evershop/src/lib/helpers');
@@ -10,9 +12,15 @@ 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 { lockHooks } = require('@evershop/evershop/src/lib/util/hookable');
+const { lockRegistry } = require('@evershop/evershop/src/lib/util/registry');
+const {
+  validateConfiguration
+} = require('@evershop/evershop/src/lib/util/validateConfiguration');
 const { compile } = require('./complie');
 const { getEnabledExtensions } = require('../extension');
+const { loadBootstrapScript } = require('../lib/bootstrap/bootstrap');
 require('dotenv').config();
 /* Loading modules and initilize routes, components */
 const modules = [...getCoreModules(), ...getEnabledExtensions()];
@@ -38,6 +46,22 @@ if (existsSync(path.resolve(CONSTANTS.BUILDPATH))) {
 }
 
 (async () => {
+  /** Loading bootstrap script from modules */
+  try {
+    // eslint-disable-next-line no-restricted-syntax
+    for (const module of modules) {
+      await loadBootstrapScript(module);
+    }
+    lockHooks();
+    lockRegistry();
+    // Get the configuration (nodeconfig)
+    validateConfiguration(config);
+  } catch (e) {
+    error(e);
+    process.exit(0);
+  }
+  process.env.ALLOW_CONFIG_MUTATIONS = false;
+
   const routes = getRoutes();
   await buildEntry(routes.filter((r) => isBuildRequired(r)));
 

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,9 +3,9 @@ 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 = [];
+let extensions;
 
 function loadExtensions() {
   const coreModules = getCoreModules();
@@ -42,7 +42,7 @@ function loadExtensions() {
 }
 
 module.exports.getEnabledExtensions = function getEnabledExtensions() {
-  if (extensions.length === 0) {
+  if (extensions === undefined) {
     extensions = loadExtensions();
   }
   return 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
@@ -78,10 +78,10 @@ exports.addDefaultMiddlewareFuncs = function addDefaultMiddlewareFuncs(
           }),
     secret: cookieSecret,
     cookie: {
-      maxAge: 24 * 60 * 60 * 1000
+      maxAge: getConfig('system.session.maxAge', 24 * 60 * 60 * 1000)
     },
     resave: getConfig('system.session.resave', false),
-    saveUninitialized: true
+    saveUninitialized: getConfig('system.session.saveUninitialized', true)
   };
 
   if (isProductionMode()) {
@@ -261,6 +261,11 @@ exports.addDefaultMiddlewareFuncs = function addDefaultMiddlewareFuncs(
         } else {
           middlewareFunc = route.webpackMiddleware;
         }
+        middlewareFunc.waitUntilValid(() => {
+          const { stats } = middlewareFunc.context;
+          const jsonWebpackStats = stats.toJson();
+          response.locals.jsonWebpackStats = jsonWebpackStats;
+        });
         // We need to run build for notFound route
         const notFoundRoute = routes.find((r) => r.id === 'notFound');
         const notFoundWebpackCompiler = notFoundRoute.webpackCompiler;

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,10 @@ 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');
+const {
+  getEnabledWidgets
+} = require('@evershop/evershop/src/lib/util/getEnabledWidgets');
 /**
  * Only pass the page routes, not api routes
  */
@@ -21,6 +24,7 @@ module.exports.buildEntry = async function buildEntry(
   routes,
   clientOnly = false
 ) {
+  const widgets = getEnabledWidgets();
   await Promise.all(
     routes.map(async (route) => {
       const subPath = getRouteBuildPath(route);
@@ -70,6 +74,16 @@ module.exports.buildEntry = async function buildEntry(
         route.isAdmin ? 'HydrateAdmin' : 'HydrateFrontStore'
       }';
       `;
+      areas['*'] = areas['*'] || {};
+      widgets.forEach((widget) => {
+        areas['*'][widget.type] = {
+          id: widget.type,
+          sortOrder: widget.sortOrder || 0,
+          component: route.isAdmin
+            ? `---require('${widget.setting_component}')---`
+            : `---require('${widget.component}')---`
+        };
+      });
       contentClient += '\r\n';
       contentClient += `Area.defaultProps.components = ${inspect(areas, {
         depth: 5
@@ -93,6 +107,7 @@ module.exports.buildEntry = async function buildEntry(
         /** Build query */
         const query = `${JSON.stringify(parseGraphql(components))}`;
 
+        // Loop through the widgets config and add the query to the widgets
         let contentServer = `import React from 'react'; `;
         contentServer += '\r\n';
         contentServer += `import ReactDOM from 'react-dom'; `;

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 { green } = require('kleur');
 const normalizePort = require('./normalizePort');
 
 const port = normalizePort();
@@ -7,13 +7,16 @@ const port = normalizePort();
  * Event listener for HTTP server "listening" event.
  */
 module.exports = function onListening() {
-  success(
-    boxen(`Your website is running at "http://localhost:${port}"`, {
+  const message = boxen(
+    `Your website is running at "http://localhost:${port}"`,
+    {
       title: 'EverShop',
       titleAlignment: 'center',
       padding: 1,
       margin: 1,
       borderColor: 'green'
-    })
+    }
   );
+  // eslint-disable-next-line no-console
+  console.log(green(message));
 };

package/bin/lib/startUp.js

@@ -1,11 +1,15 @@
 const http = require('http');
+const config = require('config');
 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');
+const {
+  validateConfiguration
+} = require('@evershop/evershop/src/lib/util/validateConfiguration');
 const { createApp } = require('./app');
 const normalizePort = require('./normalizePort');
 const onListening = require('./onListening');
@@ -22,14 +26,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
@@ -38,11 +34,22 @@ module.exports.start = async function start(cb) {
     }
     lockHooks();
     lockRegistry();
+    // Get the configuration (nodeconfig)
+    validateConfiguration(config);
   } catch (e) {
     error(e);
     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.2.0",
   "description": "The React Ecommerce platform. Built with React and Postgres. Open-source and free. Fast and customizable.",
   "files": [
     "bin",
@@ -40,7 +40,13 @@
     "@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",
+    "@editorjs/editorjs": "^2.30.2",
+    "@editorjs/header": "^2.8.7",
+    "@editorjs/list": "^1.10.0",
+    "@editorjs/quote": "^2.6.0",
+    "@editorjs/raw": "^2.5.0",
+    "@evershop/editorjs-image": "^1.0.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",
@@ -50,6 +56,7 @@
     "@shopify/draggable": "^1.0.0-beta.8",
     "@stripe/react-stripe-js": "^1.5.0",
     "@stripe/stripe-js": "^1.18.0",
+    "@tailwindcss/typography": "^0.5.13",
     "ajv": "^8.12.0",
     "ajv-errors": "^3.0.0",
     "ajv-formats": "^2.1.1",
@@ -82,6 +89,7 @@
     "html-webpack-plugin": "^5.5.0",
     "immer": "^9.0.3",
     "is-object": "^1.0.2",
+    "is-resolvable": "^1.1.0",
     "jsesc": "^3.0.2",
     "json5": "^2.2.1",
     "kleur": "3.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
   });
@@ -32,16 +32,11 @@ function CategoryItem({ category, selectedCategory, setSelectedCategory }) {
   const { data, fetching, error } = result;
 
   if (error) {
-    return (
-      <p>
-        Oh no...
-        {error.message}
-      </p>
-    );
+    return <p className="text-critical">{error.message}</p>;
   }
   return (
     <li>
-      <div className="flex justify-start gap-1 items-center">
+      <div className="flex justify-start gap-4 items-center">
         {!category.children && (
           <a
             href="#"

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

@@ -25,28 +25,35 @@ 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;
 
   if (fetching) {
-    return <Spinner width={30} height={30} />;
+    return (
+      <div className="category-tree-container absolute top-full left-0 right-0 border rounded">
+        <Spinner width={30} height={30} />
+      </div>
+    );
   }
   if (error) {
     return (
-      <p>
-        Oh no...
-        {error.message}
-      </p>
+      <div className="category-tree-container absolute top-full left-0 right-0 border rounded">
+        <p className="text-critical">{error.message}</p>
+      </div>
     );
   }
   if (data.categories.items.length === 0) {
-    return <div>There is no category</div>;
+    return (
+      <div className="category-tree-container absolute top-full left-0 right-0 border rounded">
+        <div>There is no category</div>
+      </div>
+    );
   }
 
   return (
-    <div>
+    <div className="category-tree-container absolute top-full left-0 right-0 border rounded">
       <ul className="category-tree">
         {data.categories.items.map((category) => (
           <CategoryItem

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

@@ -2,4 +2,14 @@
   ul {
     margin-left: 20px;
   }
+}
+.category-tree-container {
+  background-color: #fff;
+  z-index: 100;
+  border-color: #c9cccf;
+  padding:10px;
+  box-sizing: border-box;
+  max-height: 250px;
+  overflow-y: auto;
+  overflow-x: hidden;
 }

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

@@ -20,7 +20,7 @@ export function CreateVariant({
 
   return (
     <div>
-      <div className="mt-2">
+      <div className="mt-8">
         <Button
           title="Add Variant"
           onAction={() => {
@@ -46,7 +46,7 @@ export function CreateVariant({
                   </Card.Session>
                   <Card.Session>
                     <div className="flex justify-end">
-                      <div className="grid grid-cols-2 gap-1">
+                      <div className="grid grid-cols-2 gap-4">
                         <SubmitButton
                           productId={productId}
                           attributes={variantGroup.attributes}

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 (
@@ -119,7 +114,7 @@ export function CreateVariantGroup({ createVariantGroupApi, setGroup }) {
                 }}
               />
             ))}
-            <div className="mt-2">
+            <div className="mt-8">
               <a
                 className="text-interactive hover:underline"
                 href="#"

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

@@ -45,7 +45,7 @@ export function EditVariant({
             </Card.Session>
             <Card.Session>
               <div className="flex justify-end">
-                <div className="grid grid-cols-2 gap-1">
+                <div className="grid grid-cols-2 gap-4">
                   <Button
                     title="Save"
                     variant="primary"