cc-core-cli 1.0.120 → 1.0.122

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cc-core-cli",
-  "version": "1.0.120",
+  "version": "1.0.122",
   "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/register.js

@@ -0,0 +1,13 @@
+import React from 'react'
+import RegisterForm from '../components/Register'
+
+class Register extends React.Component {
+
+    render() {
+        return (
+            <RegisterForm {...this.props} />
+        )
+    }
+}
+
+export default Register

package/template/admin/public/static/styles/login.less

@@ -25,17 +25,36 @@
     .logo-layout {
         padding: 0rem 1rem;
         width: 100%;
+        height: 100vh;
     }
+
+    .logo-layout-v3 {
+        padding: 0rem 1rem;
+        width: 100%;
+        height: 100vh;
+    }
+}
+
+@media only screen and (max-width: 768px) {
+    .logo-layout {
+        padding: 0rem 1rem;
+        width: 100%;
+        height: 100vh;
+    }
+
     .logo-layout-v3 {
         padding: 0rem 1rem;
         width: 100%;
+        height: 100vh;
     }
 }
+
 @media only screen and (min-width: 768px) and (max-width: 992px) {
     .logo-layout {
         padding: 0rem 4rem;
         width: 100%;
     }
+
     .logo-layout-v3 {
         padding: 0rem 4rem;
         width: 100%;
@@ -58,6 +77,7 @@
     overflow-y: hidden;
     padding: 1.5rem;
     border-radius: @border-radius-base;
+    width: 100%;
 
     .form-login-authentication {
         margin-bottom: 15px;
@@ -87,6 +107,8 @@
     .ant-btn-social {
         display: flex;
         justify-content: center;
+        align-items: center;
+        height: 44px;
 
         img {
             height: 20px;
@@ -216,26 +238,26 @@
 }
 
 .forgot-password-title {
-  margin-top : 0;
-  padding-top: 0;
-  text-align : center;
+    margin-top: 0;
+    padding-top: 0;
+    text-align: center;
 }
 
 .login-input {
-  .ant-input {
-    height: 44px;
-    font-size: 16px;
-  }  
+    .ant-input {
+        height: 44px;
+        font-size: 16px;
+    }
 }
 
 .login-input-password {
-  .ant-input-password {
-    height: 44px;
-    font-size: 16px;
-  }
+    .ant-input-password {
+        height: 44px;
+        font-size: 16px;
+    }
 }
 
 .button_login {
-  height:  44px;
-  font-size: 16px;
-}
+    height: 44px;
+    font-size: 16px;
+}

package/template/core/src/core/core.controller.ts

@@ -154,20 +154,26 @@ export class CoreController {
     @Param() params: any,
     @Query() query: any
   ): Promise<any> {
+    const { keywords, filters, page, page_size, sort, grouping } = query;
+    const searchKey = `${keywords || ""}${
+      _.isEmpty(filters) ? "" : JSON.stringify(filters)
+    }${page || ""}${page_size || ""}${sort || ""}${grouping || ""}`;
     if (
       !["mail_setting"].includes(params.entity) &&
       params.entity.indexOf("_setting") !== -1
     ) {
       return this.serviceSetting.getSetting(params.entity, params.key);
     } else {
-      if (/^(?=[a-f\d]{24}$)(\d+[a-f]|[a-f]+\d)/i.test(params.key)) {
+      if (
+        /^(?=[a-f\d]{24}$)(\d+[a-f]|[a-f]+\d)/i.test(params.key) ||
+        _.isEmpty(searchKey)
+      ) {
         return this.service.findOne(
           params.entity,
           params.key,
           this._convertFields(query.fields)
         );
       }
-      const { keywords, filters, page, page_size, sort, grouping } = query;
       return this.service.searchWithLayout(
         params.entity,
         params.key,

package/template/core/src/main.ts

@@ -255,7 +255,6 @@ async function bootstrap() {
 
   // Serve specific file for "/"
   fastify.get("/", (request, reply) => {
-    console.log("Serving / from custom route");
     reply
       .type("text/html")
       .sendFile("index.html", path.join(process.cwd(), "storage/documents"));