cc-core-cli 1.0.140 → 1.0.142

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cc-core-cli",
-  "version": "1.0.140",
+  "version": "1.0.142",
   "description": "Command Line Interface tool for generating project templates for the (Your Platform's Name) platform.",
   "main": "bin/index.js",
   "scripts": {

package/template/admin/pages/_app.js

@@ -10,7 +10,7 @@ import { CustomApp } from '@shopstack/cc-admin-lib'
 import { importCustomModules } from '@shopstack/cc-admin-lib';
 
 try {
-  const modules = require.context('../modules', true)
+  const modules = require.context('../modules', true, /.(js|json)/)
   importCustomModules(modules)
 } catch (e) { }
 

package/template/admin/public/static/styles/detail.css

@@ -315,6 +315,10 @@
 }
 
 /* Custom Button Styles */
+.ant-btn-secondary {
+    border-color: var(--border-color-base);
+}
+
 .ant-btn.ant-btn-secondary:focus,
 .ant-btn.ant-btn-secondary:hover {
     color: white;
@@ -412,10 +416,35 @@
     height: 32px;
 }
 
+
+.ant-input-number-group-addon {
+    padding: 0 11px;
+    background: transparent;
+    border: none;
+}
+
+.ant-input-number-group-wrapper {
+    width: 100%;
+}
+
 .ant-input-number-affix-wrapper:focus-within {
     box-shadow: 0 0 0 1px var(--primary-color) !important;
 }
 
+.ant-input-number-affix-wrapper .ant-input-number-suffix {
+    display: flex;
+    align-items: center;
+    gap: 4px;
+}
+
+.ant-input-number-affix-wrapper .ant-input-number-suffix .number-input-suffix {
+    margin-right: 4px;
+}
+
+.detail-number-input {
+    width: 100%;
+}
+
 .detail-number-input .tag,
 .detail-string-input .tag {
     display: none;
@@ -662,44 +691,6 @@
 }
 
 /* Custom Ant InputNumber */
-.input-number-container.ant-input-affix-wrapper {
-    padding: 0 0 0 0px;
-}
-
-.input-number-container.ant-input-affix-wrapper .ant-input-number,
-.input-number-container.ant-input-affix-wrapper .ant-input-number:focus,
-.input-number-container.ant-input-affix-wrapper .ant-input-number-focused {
-    border: none;
-    box-shadow: none;
-}
-
-.input-number-container.ant-input-affix-wrapper.ant-input-number-without-prefix {
-    background: #f5f5f5;
-}
-
-.input-number-container.ant-input-affix-wrapper .ant-input-number-input {
-    padding: 0px;
-}
-
-.input-number-container.ant-input-affix-wrapper.suffix .ant-input-number .ant-input-number-handler-up {
-    border-top-right-radius: 0px;
-    border-right: 1px solid #d9d9d9;
-}
-
-.input-number-container.ant-input-affix-wrapper.suffix .ant-input-number .ant-input-number-handler-down {
-    border-right: 1px solid #d9d9d9;
-    border-bottom-right-radius: 0px;
-}
-
-.input-number-container.ant-input-affix-wrapper.suffix .ant-input-suffix {
-    padding-right: 11px;
-}
-
-.input-number-container.ant-input-affix-wrapper:focus-within {
-    box-shadow: 0 0 0 2px rgba(var(--primary-color), 0.2);
-    border-color: var(--primary-color);
-}
-
 /* Custom upload container of image */
 .mutiple-upload-files-container,
 .mutiple-upload-images-container {
@@ -2618,11 +2609,11 @@
     padding: 0px !important;
 }
 
-.ant-select-selector,
+/* .ant-select-selector,
 .ant-input-number-outlined,
 .ant-input-outlined {
     background-color: white !important;
-}
+} */
 
 .ant-table-wrapper .ant-table-thead>tr>th {
     background-color: var(--table-header-bg) !important;
@@ -2642,4 +2633,8 @@
 
 .setting .ant-card-body {
     padding: 16px;
+}
+
+.ant-form-item-label>label {
+    color: rgba(0, 0, 0, .65) !important;
 }

package/template/admin/public/static/styles/entities.css

@@ -56,7 +56,7 @@
   border-radius: 5px;
   padding-right: 5px;
   margin-bottom: 15px;
-  background-color: var(--background-color);
+  background-color: var(--menu-dark-submenu-bg);
   border: 1px dashed var(--border-color-base);
   min-height: 46px !important;
 }
@@ -324,7 +324,7 @@
 .page-entities .compute-field-container .compute-field,
 .page-entities .compute-field-container .widget-component {
   cursor: pointer;
-  background-color: var(--background-color);
+  background-color: var(--menu-dark-submenu-bg);
   margin-bottom: 5px;
   border-radius: 5px;
   padding: 5px 15px;
@@ -551,7 +551,7 @@
 .render-tabs-component .ant-tabs-tab {
   border: 1px solid var(--list-layouts-border) !important;
   border-bottom: unset !important;
-  background-color: var(--background-color) !important;
+  /* background-color: var(--primary-color) !important; */
 }
 
 .render-tabs-component .ant-tabs-tab.ant-tabs-tab-active {

package/template/admin/public/static/styles/input.css

@@ -75,3 +75,23 @@
   text-align: center;
   margin-top: 10px;
 }
+
+.detail-related-one2one-input {
+  position: relative;
+}
+
+.detail-related-one2one-input .tag {
+  display: none;
+  position: absolute;
+  right: 70px;
+  top: 50%;
+  transform: translateY(-50%);
+}
+
+.detail-related-one2one-input .tag.force-show {
+  display: inline-block;
+}
+
+.detail-related-one2one-input:hover .tag {
+  display: inline-block;
+}

package/template/admin/public/static/styles/json-diff-viewer.css

@@ -0,0 +1,144 @@
+.json-diff-viewer {
+  width: 100%;
+  border-collapse: collapse;
+  border-spacing: 0;
+  table-layout: fixed;
+}
+.json-diff-viewer tr {
+  vertical-align: top;
+}
+.json-diff-viewer tr .line-add {
+  background: #a5d6a7;
+}
+.json-diff-viewer tr .line-remove {
+  background: #ef9a9a;
+}
+.json-diff-viewer tr .line-modify {
+  background: #ffe082;
+}
+.json-diff-viewer tr:hover td {
+  position: relative;
+}
+.json-diff-viewer tr:hover td:before {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.05);
+  content: '';
+  pointer-events: none;
+}
+.json-diff-viewer tr.message-line {
+  border-top: 1px solid;
+  border-bottom: 1px solid;
+  text-align: center;
+}
+.json-diff-viewer tr.message-line td {
+  padding: 4px 0;
+  font-size: 12px;
+}
+.json-diff-viewer tr.expand-line {
+  text-align: center;
+}
+.json-diff-viewer tr.expand-line td {
+  padding: 4px 0;
+}
+.json-diff-viewer tr.expand-line:hover td:before {
+  background: transparent;
+}
+.json-diff-viewer tr.expand-line .has-lines-before {
+  border-bottom: 1px solid;
+}
+.json-diff-viewer tr.expand-line .has-lines-after {
+  border-top: 1px solid;
+}
+.json-diff-viewer tr.expand-line button {
+  padding: 0;
+  border: none;
+  margin: 0 0.5em;
+  background: transparent;
+  color: #2196f3;
+  cursor: pointer;
+  font-size: 12px;
+  user-select: none;
+}
+.json-diff-viewer tr.expand-line button:hover {
+  text-decoration: underline;
+}
+.json-diff-viewer td {
+  padding: 1px;
+  font-size: 0;
+}
+.json-diff-viewer td.line-number {
+  box-sizing: content-box;
+  padding: 0 8px;
+  border-right: 1px solid;
+  font-family: monospace;
+  font-size: 14px;
+  text-align: right;
+  user-select: none;
+}
+.json-diff-viewer pre {
+  overflow: hidden;
+  margin: 0;
+  font-size: 12px;
+  line-height: 16px;
+  white-space: pre-wrap;
+  word-break: break-all;
+}
+.json-diff-viewer pre .inline-diff-add {
+  background: rgba(0, 0, 0, 0.08);
+  text-decoration: underline;
+  word-break: break-all;
+}
+.json-diff-viewer pre .inline-diff-remove {
+  background: rgba(0, 0, 0, 0.08);
+  text-decoration: line-through;
+  word-break: break-all;
+}
+.json-diff-viewer-virtual pre {
+  overflow-x: auto;
+  white-space: pre;
+}
+.json-diff-viewer-virtual pre::-webkit-scrollbar {
+  display: none;
+}
+
+.json-diff-viewer.json-diff-viewer-theme-monokai {
+  background: #272822;
+  color: #f8f8f2;
+}
+.json-diff-viewer.json-diff-viewer-theme-monokai .line-number {
+  color: #999;
+}
+.json-diff-viewer.json-diff-viewer-theme-monokai tr:hover {
+  background: #3e3d32;
+}
+.json-diff-viewer.json-diff-viewer-theme-monokai tr .line-add {
+  background: #040;
+}
+.json-diff-viewer.json-diff-viewer-theme-monokai tr .line-remove {
+  background: #400;
+}
+.json-diff-viewer.json-diff-viewer-theme-monokai tr .line-modify {
+  background: #440;
+}
+.json-diff-viewer.json-diff-viewer-theme-monokai tr.expand-line button {
+  color: #f8f8f2;
+}
+.json-diff-viewer.json-diff-viewer-theme-monokai .string {
+  color: #e6db74;
+}
+.json-diff-viewer.json-diff-viewer-theme-monokai .number,
+.json-diff-viewer.json-diff-viewer-theme-monokai .boolean,
+.json-diff-viewer.json-diff-viewer-theme-monokai .null {
+  color: #ae81ff;
+}
+.json-diff-viewer.json-diff-viewer-theme-monokai .key {
+  color: #f92672;
+}
+.json-diff-viewer.json-diff-viewer-theme-monokai .invalid {
+  background: #960050;
+  color: #fff;
+}

package/template/admin/public/static/styles/style.css

@@ -35,6 +35,8 @@
 @import url("./editTable.css");
 @import url("./menu.css");
 @import url("@xyflow/react/dist/style.css");
+@import url("./json-diff-viewer.css");
+
 
 /*----- Custom table ------*/
 .ant-table-column-sorters {

package/template/core/src/app.module.ts

@@ -41,6 +41,7 @@ import {
   PipelineModule,
   RewriteUrlModule,
   SearchTextModule,
+  ExternalProviderModule,
 } from "@shopstack/cc-core-lib/core";
 
 import { CoreModule } from "./core/core.module";
@@ -156,7 +157,7 @@ if (+process.env.MONGODB_MAX_POOL_SIZE) {
     LayoutModule,
     RewriteUrlModule,
     SearchTextModule,
-
+    ExternalProviderModule,
     // ...RUN_CUSTOM_MODULES,
 
     CoreModule,

package/template/core/src/modules/modules.ts

@@ -6,6 +6,16 @@
  * { module: ProductsModule, services: [ProductService] },
  * { module: OrdersModule, services: [ChannelService, OrderService, OrderItemService] }
  * ];
+ * 
+ * const EXTERNAL_CUSTOM_MODULES = [
+ * { external: true, module_code: "external_module_code", domain: "external_module_domain" },
+ * ];
+ * example:
+ * {
+ *     external: true,
+ *     module_code: "module_code_from_module.json",
+ *     domain: "http://localhost:3001"
+ * }
 
 export { CUSTOM_MODULES };
 
@@ -13,4 +23,6 @@ export { CUSTOM_MODULES };
 
 const CUSTOM_MODULES = [];
 
-export { CUSTOM_MODULES };
+const EXTERNAL_CUSTOM_MODULES = [];
+
+export { CUSTOM_MODULES, EXTERNAL_CUSTOM_MODULES };

package/template/core_v3/src/app.module.ts

@@ -41,7 +41,8 @@ import {
   CustomFunctionModule,
   CacheModule,
   PipelineModule,
-  RewriteUrlModule
+  RewriteUrlModule,
+  ExternalProviderModule
 } from '@shopstack/cc-core-lib/core'
 
 import { CoreModule } from './core/core.module'
@@ -163,7 +164,7 @@ if (+process.env.MONGODB_MAX_POOL_SIZE) {
     PipelineModule,
     LayoutModule,
     RewriteUrlModule,
-
+    ExternalProviderModule,
     // ...RUN_CUSTOM_MODULES,
 
     CoreModule

package/template/core_v3/src/modules/modules.ts

@@ -6,6 +6,16 @@
  * { module: ProductsModule, services: [ProductService] },
  * { module: OrdersModule, services: [ChannelService, OrderService, OrderItemService] }
  * ];
+ * 
+ * const EXTERNAL_CUSTOM_MODULES = [
+ * { external: true, module_code: "external_module_code", domain: "external_module_domain" },
+ * ];
+ * example:
+ * {
+ *     external: true,
+ *     module_code: "module_code_from_module.json",
+ *     domain: "http://localhost:3001"
+ * }
 
 export { CUSTOM_MODULES };
 
@@ -13,4 +23,6 @@ export { CUSTOM_MODULES };
 
 const CUSTOM_MODULES = [];
 
-export { CUSTOM_MODULES };
+const EXTERNAL_CUSTOM_MODULES = [];
+
+export { CUSTOM_MODULES, EXTERNAL_CUSTOM_MODULES };