npm - @zeedhi/teknisa-cli - Versions diffs - 1.35.0 → 1.41.0 - Mend

@zeedhi/teknisa-cli 1.35.0 → 1.41.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (22) hide show

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@zeedhi/teknisa-cli",
-  "version": "1.35.0",
+  "version": "1.41.0",
   "description": "Teknisa CLI",
   "author": "Zeedhi <zeedhi@teknisa.com>",
   "license": "ISC",
@@ -34,5 +34,5 @@
     "/src",
     "/bin"
   ],
-  "gitHead": "9a83974f8b6a8f11b1aa35b10068c87822c3aec3"
+  "gitHead": "bce3adcbc8986e99a5467d491971d8d26a1a84fd"
 }

package/src/util/project/editCliVersion.js ADDED Viewed

@@ -0,0 +1,18 @@
+const path = require('path')
+const fs = require('fs-extra')
+function getCliVersionJsonContent(filePath) {
+  const pkg = require(filePath)
+  pkg.version = require('../../../package').version
+  return pkg
+}
+editCliVersion = (config) => {
+  const filePath = path.resolve(config.targetDir, 'cliVersion.json')
+  const content = getCliVersionJsonContent(filePath)
+  fs.writeJsonSync(filePath, content, { spaces: 2 })
+}
+module.exports = (config) => {
+  editCliVersion(config)
+}

package/src/util/project/module/.eslintrc.js CHANGED Viewed

@@ -5,9 +5,11 @@ module.exports = {
     es6: true,
     node: true
   },
-  ignorePatterns: ["node_modules/", "**/coverage/*", "**/dist/*", "**/types/*", "**/__mocks__/*", "**/*.vue", "**/*.d.ts", "**/*.js"],
-  parser: "@typescript-eslint/parser",
+  ignorePatterns: ["node_modules/", "**/coverage/*", "**/dist/*", "**/types/*", "**/__mocks__/*", "**/*.d.ts", "**/*.js"],
+  parser: "vue-eslint-parser",
   parserOptions: {
+    parser: "@typescript-eslint/parser",
+    extraFileExtensions: [".vue"],
     project: "./tsconfig.json"
   },
   plugins: [

package/src/util/project/module/cliVersion.json ADDED Viewed

	@@ -0,0 +1 @@
1	+ {}

package/src/util/project/module/package.json CHANGED Viewed

@@ -4,10 +4,10 @@
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
-    "lint": "vue-cli-service lint"
+    "lint": "vue-cli-service lint --ext .ts,.vue ./src"
   },
   "dependencies": {
-    "@mdi/font": "^5.8.55",
+    "@mdi/font": "^6.5.95",
     "@types/execa": "^2.0.0",
     "@types/jest": "^26.0.19",
     "@types/lodash.merge": "^4.6.6",

package/src/util/project/module/public/index.html CHANGED Viewed

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="pt-br">
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">

package/src/util/project/module/src/App.vue CHANGED Viewed

@@ -1,6 +1,18 @@
 <template>
   <v-app>
     <zd-page id="main-page" :key="mainPage.path" v-bind="mainPage" />
+    <!-- Modal -->
+    <zd-modal v-bind="{ name: 'appModal ' }" />
+    <!-- Alert -->
+    <zd-alert v-bind="{ name: 'appAlert ' }" />
+    <!-- Dialog -->
+    <zd-dialog v-bind="{ name: 'appDialog ' }" />
+    <!-- Loading -->
+    <zd-loading v-bind="{ name: 'appLoading' }" />
   </v-app>
 </template>
@@ -8,7 +20,7 @@
 import Vue from 'vue';
 import Component from 'vue-class-component';
 import { ZdPage } from '@zeedhi/vue';
-import { LibAuth } from '@zeedhi/tek-lib';
+import { TekLibAuth } from '@zeedhi/tek-lib';
 @Component({
   components: { ZdPage },
@@ -74,7 +86,7 @@ export default class App extends Vue {
   }
   public mounted() {
-    LibAuth.getInstance().startLib();
+    TekLibAuth.startLib();
     const colorTheme = localStorage.getItem('MODULES_THEME_COLOR') || '#2d68c3';
     this.$vuetify.theme.themes.light.primary = colorTheme;
     this.$vuetify.theme.themes.light.anchor = colorTheme;

package/src/util/project/product/.eslintrc.js CHANGED Viewed

@@ -5,9 +5,11 @@ module.exports = {
     es6: true,
     node: true
   },
-  ignorePatterns: ["node_modules/", "**/coverage/*", "**/dist/*", "**/types/*", "**/__mocks__/*", "**/*.vue", "**/*.d.ts", "**/*.js"],
-  parser: "@typescript-eslint/parser",
+  ignorePatterns: ["node_modules/", "**/coverage/*", "**/dist/*", "**/types/*", "**/__mocks__/*", "**/*.d.ts", "**/*.js"],
+  parser: "vue-eslint-parser",
   parserOptions: {
+    parser: "@typescript-eslint/parser",
+    extraFileExtensions: [".vue"],
     project: "./tsconfig.json"
   },
   plugins: [

package/src/util/project/product/cliVersion.json ADDED Viewed

	@@ -0,0 +1 @@
1	+ {}

package/src/util/project/product/package.json CHANGED Viewed

@@ -7,7 +7,7 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "@mdi/font": "^5.8.55",
+    "@mdi/font": "^6.5.95",
     "@types/execa": "^2.0.0",
     "@types/jest": "^26.0.19",
     "@types/lodash.merge": "^4.6.6",

package/src/util/project/product/public/index.html CHANGED Viewed

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="pt-br">
   <head>
     <meta http-equiv="<%= VUE_APP_META_CONTENT_SECURITY_POLICY %>" content="<%= VUE_APP_UPGRADE_INSECURE_REQUESTS %>">
     <meta charset="utf-8">

package/src/util/project/product/public/metadata/login.json ADDED Viewed

@@ -0,0 +1,7 @@
+{
+  "name": "loginPage",
+  "component": "TekLogin",
+  "backgroundStyle": "{{LoginController.backgroundImgUrl}}",
+  "logo": "{{LoginController.logo}}",
+  "endPoint": "{{LoginController.endPoint}}"
+}

package/src/util/project/product/src/App.vue CHANGED Viewed

@@ -1,12 +1,12 @@
 <template>
   <v-app id="app">
     <component
-      v-if="!isCleanLayout"
+      v-if="!isRouteLogin"
       :is="menu.component"
       v-bind="{ ...menu }"
     ></component>
     <component
-      v-if="!isCleanLayout"
+      v-if="!isRouteLogin"
       :is="header.component"
       v-bind="header"
     ></component>
@@ -37,7 +37,7 @@ import Component from 'vue-class-component';
 import { IMenu, IHeader, Menu } from '@zeedhi/common';
 import { Metadata } from '@zeedhi/core';
 import { Config } from '@zeedhi/core';
-import { LibAuth, LibLocalStorage } from '@zeedhi/tek-lib';
+import { TekLibAuth, TekLibLocalStorage } from '@zeedhi/tek-lib';
 @Component
 export default class App extends Vue {
@@ -46,8 +46,8 @@ export default class App extends Vue {
   public header!: IHeader;
   public created() {
-    LibAuth.getInstance().startLib();
-    window.addEventListener('message', this.handleMessageEvent);
+    TekLibAuth.startLib();
+    window.addEventListener('afterLogin', this.handleMessageEvent);
     this.menu = {
       component: 'ZdMenu',
@@ -105,7 +105,7 @@ export default class App extends Vue {
           iconName: 'mdi-logout',
           events: {
             click: () => {
-              LibAuth.getInstance().logoutConfirm();
+              TekLibAuth.logoutConfirm();
             },
           },
         },
@@ -114,26 +114,28 @@ export default class App extends Vue {
   }
   public mounted() {
-    this.setMenu();
+    if (!this.isRouteLogin) {
+      this.setMenu();
+    }
   }
-  private async afterLogin(userData: any) {
-    await LibAuth.getInstance().startSession(userData);
-    this.setMenu();
+  private handleMessageEvent(event: any) {
+    this.afterLogin(event.detail.userData);
   }
-  private handleMessageEvent(event: any) {
-    if (event.data.type === 'afterLogin') {
-      this.afterLogin(event.data.userData);
-    }
+  private async afterLogin(userData: any) {
+    await TekLibAuth.startSession(userData);
+    this.setMenu();
   }
   private setMenu() {
-    const menu = Metadata.getInstance<Menu>('main-menu');
-    menu.items = JSON.parse(<string>localStorage.getItem('MENU')) || [];
+    if (TekLibLocalStorage.getItem('IS_NEXT')) {
+      const menu = Metadata.getInstance<Menu>('main-menu');
+      menu.items = JSON.parse(<string>localStorage.getItem('MENU')) || [];
+    }
   }
-  get isCleanLayout() {
+  get isRouteLogin() {
     return this.$route.path === Config.env.loginRoutePath;
   }
 }

package/src/util/project/product/src/config/devEnvironment.json CHANGED Viewed

@@ -13,7 +13,7 @@
   "modules": {
     "login": {
       "baseUrl": "http://localhost:8282",
-      "routePath": "/modules/login/autenticacao",
+      "routePath": "/auth/login",
       "backgroundImgUrl": "http://localhost:8080/assets/img/teknisa-login-background.jpg",
       "endPoint": "http://localhost:81/<nome do produto>/modules/login/backend/service/index.php"
     }

package/src/util/project/product/src/controllers/AppController.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import { IEventParam, Metadata, Singleton } from '@zeedhi/core';
 import { Menu, MenuButton } from '@zeedhi/common';
-import { LibAuth } from '@zeedhi/tek-lib';
+import { TekLibAuth } from '@zeedhi/tek-lib';
 @Singleton
 export class AppController {
@@ -9,7 +9,7 @@ export class AppController {
   public toggleMenu({ component }: IEventParam<MenuButton>) {
     const menu = Metadata.getInstance<Menu>(component.menuName);
     menu.toggleMenu();
-    if (menu.drawer && !menu.miniState) {
+    if (menu.opened && !menu.miniState) {
       if (menu.showSearch) {
         setTimeout(() => {
           const searchInput = document.querySelector('.zd-menu-search-input input');
@@ -27,6 +27,6 @@ export class AppController {
   }
   public showMessageExpiredMenu() {
-    LibAuth.getInstance().showMessageExpiredMenu();
+    TekLibAuth.showMessageExpiredMenu();
   }
 }

package/src/util/project/product/src/controllers/LoginController.ts ADDED Viewed

@@ -0,0 +1,17 @@
+import { Config, Singleton } from '@zeedhi/core';
+@Singleton
+export class LoginController {
+  get logo() {
+    return Config.env.product.logoUrl;
+  }
+  get backgroundImgUrl() {
+    const url = Config.env.loginBackgroundImgUrl;
+    return `url(${url})`;
+  }
+  get endPoint() {
+    return Config.env.loginEndPoint;
+  }
+}

package/src/util/project/product/src/controllers/index.ts CHANGED Viewed

@@ -1,5 +1,7 @@
 import { AppController } from './AppController';
+import { LoginController } from './LoginController';
 export default {
   AppController,
+  LoginController,
 };

package/src/util/project/product/src/plugins/zeedhi.ts CHANGED Viewed

@@ -2,6 +2,7 @@ import Vue from 'vue';
 import Zeedhi from '@zeedhi/vue';
 import ZeedhiComponents from '@zeedhi/vuetify';
 import TeknisaComponents from '@zeedhi/teknisa-components-vuetify';
+import TekLibComponents from '@zeedhi/tek-lib';
 import { Icons } from '@zeedhi/common';
 import { Messages } from '@zeedhi/core';
 import router from '../router';
@@ -22,6 +23,7 @@ Vue.use(Zeedhi, {
 });
 Vue.use(ZeedhiComponents);
 Vue.use(TeknisaComponents);
+Vue.use(TekLibComponents);
 vuetify.framework.icons.values = Icons.getIcons() as any;

package/src/util/project/product/src/{router.ts → router/index.ts} RENAMED Viewed

@@ -1,40 +1,17 @@
 import Vue from 'vue';
 import Router from 'vue-router';
 import { Config, Http } from '@zeedhi/core';
-import { ZdPage } from '@zeedhi/vue';
-import { LibLocalStorage } from '@zeedhi/tek-lib';
+import { TekLibLocalStorage } from '@zeedhi/tek-lib';
 import { LoadingService } from '@zeedhi/common';
-import Store from './store';
+import routes from './routes';
+import Store from '../store';
 Vue.use(Router);
 const router = new Router({
   mode: 'history',
-  base: process.env.BASE_URL,
-  routes: [
-    {
-      path: '/',
-      name: 'home',
-      component: ZdPage,
-      props: () => ({
-        path: 'home',
-        local: true,
-      }),
-    },
-    {
-      path: '/modules/:module/:page',
-      name: 'microservice',
-      component: () => import('./views/Microservice.vue'),
-    },
-    {
-      path: '*',
-      component: ZdPage,
-      props: {
-        path: 'notfound',
-        local: true,
-      },
-    },
-  ],
+  base: Config.env.BASE_URL,
+  routes,
 });
 const isOpeningNewModule = function isOpeningNewModule(to: any, from: any) {
@@ -66,7 +43,7 @@ router.beforeEach(async (to, from, next) => {
     }
   }
-  LibLocalStorage.setItem('IS_NEXT', true);
+  TekLibLocalStorage.setItem('IS_NEXT', true);
   if (to.path !== Config.env.loginRoutePath && !localStorage.getItem('LOGIN_TOKEN')) {
     next(Config.env.loginRoutePath);

package/src/util/project/product/src/router/routes.ts ADDED Viewed

@@ -0,0 +1,37 @@
+import { ZdPage } from '@zeedhi/vue';
+const routes = [
+  {
+    path: '/auth/login',
+    name: 'login',
+    component: ZdPage,
+    props: {
+      path: 'login',
+      local: true,
+    },
+  },
+  {
+    path: '/',
+    name: 'home',
+    component: ZdPage,
+    props: () => ({
+      path: 'home',
+      local: true,
+    }),
+  },
+  {
+    path: '/modules/:module/:page',
+    name: 'microservice',
+    component: () => import('../views/Microservice.vue'),
+  },
+  {
+    path: '*',
+    component: ZdPage,
+    props: {
+      path: 'notfound',
+      local: true,
+    },
+  },
+];
+export default routes;

package/src/util/project/product/src/views/Microservice.ts CHANGED Viewed

@@ -2,7 +2,7 @@ import store from '@/store';
 import Vue from 'vue';
 import { Component } from 'vue-property-decorator';
 import { Config } from '@zeedhi/core';
-import { LibLocalStorage } from '@zeedhi/tek-lib';
+import { TekLibLocalStorage } from '@zeedhi/tek-lib';
 /**
  * Microservice
@@ -29,7 +29,7 @@ export default class Mircroservice extends Vue {
     });
     const productInfo = JSON.stringify({
-      PRODUCT_ID: PRODUCT_ID: LibLocalStorage.getItem('IS_NEXT') ? Config.env.product.id : LibLocalStorage.getItem('PRODUCT_ID'),
+      PRODUCT_ID: TekLibLocalStorage.getItem('IS_NEXT') ? Config.env.product.id : TekLibLocalStorage.getItem('PRODUCT_ID'),
       PRODUCT_URL: Config.env.product.url,
       PRODUCT_LOGO_URL: Config.env.product.logoUrl,
       PRODUCT_BACKGROUND_IMG_PATH: Config.env.loginBackgroundImgUrl,
@@ -43,7 +43,7 @@ export default class Mircroservice extends Vue {
   }
   private setProductInfoLocalStorage() {
-    if (LibLocalStorage.getItem('IS_NEXT')) {
+    if (TekLibLocalStorage.getItem('IS_NEXT')) {
       localStorage.setItem('PRODUCT_ID', Config.env.product.id);
     }
     localStorage.setItem('PRODUCT_URL', Config.env.product.url);

package/src/util/project/run.js CHANGED Viewed

@@ -1,10 +1,12 @@
 const editPackageJson = require('./editPackageJson')
 const renameGitIgnore = require('./renameGitIgnore')
+const editCliVersion = require('./editCliVersion')
 function run(config) {
   try {
     editPackageJson(config)
     renameGitIgnore(config)
+    editCliVersion(config)
   } catch (e) {
     console.error(e)
     process.exit(1)