@tager/admin-administrators 0.2.7 → 1.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tager/admin-administrators",
-  "version": "0.2.7",
+  "version": "1.0.0",
   "license": "MIT",
   "main": "dist/index.umd.js",
   "module": "dist/index.esm.js",
@@ -10,65 +10,66 @@
     "typings",
     "src"
   ],
+  "exports": {
+    "./css": "./dist/style.css",
+    ".": "./dist/index.mjs"
+  },
   "scripts": {
+    "build:js": "vite build",
+    "build:package": "concurrently --success first \"yarn build:js\" \"yarn emit-declarations\"",
+    "emit-declarations": "vue-tsc --project tsconfig.json --emitDeclarationOnly",
     "start": "vue-cli-service serve",
-    "lint": "vue-cli-service lint",
-    "build": "rollup --config",
-    "prepare": "yarn build",
-    "tager:update": "node scripts/tager-update.js",
-    "yalc:clean": "yalc remove --all"
+    "prepare": "yarn build:package",
+    "tager:update": "yarn upgrade --latest --scope @tager"
   },
   "dependencies": {
+    "lodash.isequal": "^4.5.0",
+    "lodash.kebabcase": "^4.1.1",
+    "lodash.pick": "^4.4.0",
     "path-to-regexp": "^6.1.0"
   },
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^15.0.0",
-    "@rollup/plugin-node-resolve": "^9.0.0",
-    "@tager/admin-dynamic-field": "^0.1.14",
-    "@tager/admin-layout": "^0.4.13",
-    "@tager/admin-services": "^0.2.22",
-    "@tager/admin-ui": "^0.8.49",
-    "@types/node": "12.x",
-    "@typescript-eslint/eslint-plugin": "^2.26.0",
-    "@typescript-eslint/parser": "^2.26.0",
-    "@vue/cli-plugin-babel": "~4.5.6",
-    "@vue/cli-plugin-eslint": "~4.5.6",
-    "@vue/cli-plugin-router": "~4.5.6",
-    "@vue/cli-plugin-typescript": "~4.5.6",
-    "@vue/cli-service": "~4.5.6",
-    "@vue/composition-api": "^1.0.0-beta.14",
-    "@vue/eslint-config-prettier": "^6.0.0",
-    "@vue/eslint-config-typescript": "^5.1.0",
-    "babel-eslint": "^10.1.0",
-    "core-js": "^3.6.5",
-    "eslint": "^6.7.2",
-    "eslint-plugin-import": "^2.22.0",
-    "eslint-plugin-prettier": "^3.1.4",
-    "eslint-plugin-vue": "^6.2.2",
-    "prettier": "^2.1.2",
-    "rollup": "^2.27.1",
-    "rollup-plugin-typescript2": "^0.27.2",
-    "rollup-plugin-vue": "^5.1.9",
-    "sass-loader": "^10.0.2",
-    "typescript": "~3.9.6",
-    "vue": "2.6.x",
-    "vue-router": "^3.5.1",
-    "vue-template-compiler": "^2.6.11"
+    "@babel/core": "^7.17.9",
+    "@babel/eslint-parser": "^7.17.0",
+    "@rushstack/eslint-patch": "^1.1.2",
+    "@tager/admin-dynamic-field": "^1.0.0",
+    "@tager/admin-layout": "^1.0.0",
+    "@tager/admin-services": "^1.0.0",
+    "@tager/admin-ui": "^1.0.1",
+    "@types/lodash.isequal": "^4.5.6",
+    "@types/lodash.pick": "^4.4.7",
+    "@types/node": "16.x",
+    "@typescript-eslint/eslint-plugin": "^5.21.0",
+    "@typescript-eslint/parser": "^5.21.0",
+    "@vitejs/plugin-vue": "^2.3.1",
+    "@vue/cli-plugin-babel": "^5.0.4",
+    "@vue/cli-plugin-typescript": "^5.0.4",
+    "@vue/cli-service": "~5.0.0",
+    "@vue/eslint-config-prettier": "^7.0.0",
+    "@vue/eslint-config-typescript": "^10.0.0",
+    "concurrently": "^7.1.0",
+    "core-js": "^3.22.3",
+    "eslint": "^8.14.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-plugin-vue": "^8.7.1",
+    "sass": "^1.51.0",
+    "sass-loader": "^12.6.0",
+    "typescript": "^4.6.3",
+    "vite": "^2.9.6",
+    "vue": "^3.2.31",
+    "vue-router": "^4.0.14",
+    "vue-tsc": "^0.34.10"
   },
   "peerDependencies": {
-    "@tager/admin-dynamic-field": ">=0.1.3",
-    "@tager/admin-layout": ">=0.4.2",
-    "@tager/admin-services": ">=0.2.12",
-    "@tager/admin-ui": ">=0.7.5",
-    "@vue/composition-api": ">=1.0.0-beta.14",
-    "vue": "2.6.x"
-  },
-  "resolutions": {
-    "prettier": "2.x"
+    "@tager/admin-layout": "^1.0.0",
+    "@tager/admin-services": "^1.0.0",
+    "@tager/admin-ui": "^1.0.1",
+    "vue": "^3.2.31",
+    "vue-router": "^4.0.14"
   },
   "publishConfig": {
     "access": "public"
-  },
-  "repository": "https://m.malkovich:1230978b@github.com/ozitag/tager-admin-administrators.git",
-  "author": "m.malkovich <m.malkovich@ozitag.com>"
+  }
 }

package/src/constants/routes.ts

@@ -1,4 +1,4 @@
-import { CustomRouteConfig } from '@tager/admin-layout';
+import type { RouteRecordRaw } from "vue-router";
 
 import AdminList from '../views/AdminList';
 import AdminForm from '../views/AdminForm';
@@ -7,64 +7,64 @@ import RoleForm from '../views/RoleForm';
 
 import { ADMINISTRATOR_ROUTE_PATHS } from './paths';
 
-export const ADMIN_LIST_ROUTE: CustomRouteConfig = {
+export const ADMIN_LIST_ROUTE: RouteRecordRaw = {
   path: ADMINISTRATOR_ROUTE_PATHS.ADMIN_LIST,
   component: AdminList,
   name: 'AdminList',
   meta: {
-    getBreadcrumbs: (route, t) => [
-      { url: '/', text: t('administrators:home') },
+    getBreadcrumbs: (route, i18n) => [
+      { url: '/', text: i18n.t('administrators:home') },
       {
         url: ADMINISTRATOR_ROUTE_PATHS.ADMIN_LIST,
-        text: t('administrators:adminList'),
+        text: i18n.t('administrators:adminList'),
       },
     ],
   },
 };
 
-export const ADMIN_FORM_ROUTE: CustomRouteConfig = {
+export const ADMIN_FORM_ROUTE: RouteRecordRaw = {
   path: ADMINISTRATOR_ROUTE_PATHS.ADMIN_FORM,
   component: AdminForm,
   name: 'AdminForm',
   meta: {
-    getBreadcrumbs: (route, t) => [
-      { url: '/', text: t('administrators:home') },
+    getBreadcrumbs: (route, i18n) => [
+      { url: '/', text: i18n.t('administrators:home') },
       {
         url: ADMINISTRATOR_ROUTE_PATHS.ADMIN_LIST,
-        text: t('administrators:adminList'),
+        text: i18n.t('administrators:adminList'),
       },
-      { url: route.path, text: t('administrators:adminForm') },
+      { url: route.path, text: i18n.t('administrators:adminForm') },
     ],
   },
 };
 
-export const ROLE_LIST_ROUTE: CustomRouteConfig = {
+export const ROLE_LIST_ROUTE: RouteRecordRaw = {
   path: ADMINISTRATOR_ROUTE_PATHS.ROLE_LIST,
   component: RoleList,
   name: 'RoleList',
   meta: {
-    getBreadcrumbs: (route, t) => [
-      { url: '/', text: t('administrators:home') },
+    getBreadcrumbs: (route, i18n) => [
+      { url: '/', text: i18n.t('administrators:home') },
       {
         url: ADMINISTRATOR_ROUTE_PATHS.ROLE_LIST,
-        text: t('administrators:roleList'),
+        text: i18n.t('administrators:roleList'),
       },
     ],
   },
 };
 
-export const ROLE_FORM_ROUTE: CustomRouteConfig = {
+export const ROLE_FORM_ROUTE: RouteRecordRaw = {
   path: ADMINISTRATOR_ROUTE_PATHS.ROLE_FORM,
   component: RoleForm,
   name: 'RoleForm',
   meta: {
-    getBreadcrumbs: (route, t) => [
-      { url: '/', text: t('administrators:home') },
+    getBreadcrumbs: (route, i18n) => [
+      { url: '/', text: i18n.t('administrators:home') },
       {
         url: ADMINISTRATOR_ROUTE_PATHS.ROLE_LIST,
-        text: t('administrators:roleList'),
+        text: i18n.t('administrators:roleList'),
       },
-      { url: route.path, text: t('administrators:roleForm') },
+      { url: route.path, text: i18n.t('administrators:roleForm') },
     ],
   },
 };

package/src/dev/App.vue

@@ -0,0 +1,57 @@
+<template>
+  <PageLayout :sidebar-menu-list="sidebarMenuList">
+    <router-view/>
+  </PageLayout>
+</template>
+
+<script lang="ts">
+import {defineComponent} from 'vue';
+
+import {MenuItemType, PageLayout} from "@tager/admin-layout";
+
+import {ViewListIcon} from "@tager/admin-ui";
+
+import {
+  getAdminFormUrl,
+  getAdminListUrl,
+  getRoleFormUrl,
+  getRoleListUrl,
+} from '../utils/paths';
+import {useI18n} from "@tager/admin-services";
+
+export default defineComponent({
+  name: 'App',
+  components: {
+    PageLayout,
+  },
+  setup() {
+    const i18n = useI18n();
+
+    const sidebarMenuList: Array<MenuItemType> = [
+      {
+        id: 'admins',
+        text: i18n.t('administrators:administrators'),
+        icon: ViewListIcon,
+        children: [
+          {url: getRoleListUrl(), text: i18n.t('administrators:roles')},
+          {
+            url: getRoleFormUrl({roleId: 'create'}),
+            text: i18n.t('administrators:createRole'),
+          },
+          {url: getAdminListUrl(), text: i18n.t('administrators:admins')},
+          {
+            url: getAdminFormUrl({adminId: 'create'}),
+            text: i18n.t('administrators:createAdmin'),
+          },
+        ],
+      },
+    ];
+
+    return {
+      sidebarMenuList,
+    };
+  },
+});
+</script>
+
+<style scoped lang="scss"></style>

package/src/dev/config.ts

@@ -0,0 +1,23 @@
+import type {AppConfigType} from "@tager/admin-services";
+
+export const OZITAG_CONFIG: AppConfigType = {
+    APP_NAME: "OZiTAG_ADMIN",
+    TITLE_TEMPLATE: "OZiTAG Admin - {{title}}",
+    LANGUAGE: "EN",
+    BRAND: {
+        small: {
+            logo: "logo-small.svg",
+        },
+        large: {
+            logo: "logo.svg",
+            label: "OZiTAG",
+            "label-color": "#DD6900",
+        },
+        subtitle: ''
+    },
+    SPLASH_SCREEN: {
+        enabled: true,
+        logo: "logo-white.svg",
+        background: "#1e1e1e",
+    },
+};

package/src/dev/env.ts

@@ -0,0 +1,17 @@
+import { initializeEnvironment } from "@tager/admin-services";
+
+export function populateEnvironment() {
+  initializeEnvironment({
+    publicPath: process.env.VUE_APP_PUBLIC_PATH,
+    appEnv: process.env.VUE_APP_ENV,
+    apiUrl: process.env.VUE_APP_API_URL,
+    accessToken: process.env.VUE_APP_ACCESS_TOKEN,
+    websiteUrl: process.env.VUE_APP_WEBSITE_URL,
+    websiteButtonUrl: process.env.VUE_APP_WEBSITE_BUTTON_URL,
+    sentryDsn: process.env.VUE_APP_SENTRY_DSN,
+    sentryEnv: process.env.VUE_APP_SENTRY_ENVIRONMENT,
+    baseUrl: process.env.BASE_URL,
+    nodeEnv: process.env.NODE_ENV,
+    version: process.env.VUE_APP_VERSION,
+  });
+}

package/src/dev/main.ts

@@ -0,0 +1,46 @@
+import { createApp } from "vue";
+
+import { configStore, i18n, i18nPlugin } from "@tager/admin-services";
+import { createRouter } from "@tager/admin-layout";
+import "@tager/admin-ui/css";
+import "@tager/admin-layout/css";
+import "@tager/admin-dynamic-field/css";
+
+import { applyTranslations } from "../locales/apply";
+import {
+    ADMIN_FORM_ROUTE,
+    ADMIN_LIST_ROUTE,
+    ROLE_FORM_ROUTE,
+    ROLE_LIST_ROUTE
+} from "../constants/routes";
+
+import { OZITAG_CONFIG } from "./config";
+import App from "./App.vue";
+import { populateEnvironment } from "./env";
+
+populateEnvironment();
+
+configStore.setConfig(OZITAG_CONFIG);
+
+const router = createRouter(
+  {
+    routes: [
+        ADMIN_LIST_ROUTE,
+        ADMIN_FORM_ROUTE,
+        ROLE_LIST_ROUTE,
+        ROLE_FORM_ROUTE,
+    ],
+  },
+  { useTitleSync: false }
+);
+
+const app = createApp(App);
+
+app.use(router);
+app.use(i18nPlugin);
+
+applyTranslations();
+
+i18n.init({ debug: true, lng: "ru" }).then(() => {
+  app.mount("#app");
+});

package/src/locales/apply.ts

@@ -0,0 +1,9 @@
+import { i18n } from "@tager/admin-services";
+
+import { EN } from "./en";
+import { RU } from "./ru";
+
+export function applyTranslations() {
+  i18n.addTranslations("en", "administrators", EN);
+  i18n.addTranslations("ru", "administrators", RU);
+}

package/src/locales/en.ts

@@ -1,4 +1,4 @@
-const EN = {
+export const EN = {
   home: 'Home',
   administrators: 'Administrators',
   role: 'Role',
@@ -38,5 +38,3 @@ const EN = {
   roleForm: 'Role form',
   andMorePrivilege: 'and more {{count}} privilege...',
 };
-
-export default EN;

package/src/locales/ru.ts

@@ -1,44 +1,42 @@
-import EN from './en';
+import {EN} from './en';
 
-const RU: typeof EN = {
-  home: 'Главная',
-  administrators: 'Администраторы',
-  role: 'Роль',
-  roles: 'Роли',
-  admin: 'Админ',
-  admins: 'Админы',
-  createRole: 'Создать роль',
-  createAdmin: 'Создать админа',
-  createAdministrator: 'Создать администратора',
-  edit: 'Редактировать',
-  delete: 'Удалить',
-  email: 'Электронная почта',
-  actions: 'Действия',
-  updateRole: 'Обновить роль',
-  updateAdmin: 'Обновить администратора',
-  password: 'Пароль',
-  newPassword: 'Новый пароль',
-  name: 'Имя',
-  success: 'Успех',
-  adminSuccessfullyCreated: 'Админ успешно создан',
-  adminSuccessfullyUpdated: 'Админ успешно обновлен',
-  error: 'Ошибка',
-  adminCreationError: 'Ошибка создания администратора',
-  adminUpdateError: 'Ошибка обновления администратора',
-  listOfRoles: 'Список ролей',
-  addRole: 'Добавить роль',
-  noPrivileges: 'Без привилегий',
-  privileges: 'Привилегии',
-  all: 'Все',
-  roleSuccessfullyCreated: 'Роль успешно создана',
-  roleSuccessfullyUpdate: 'Роль успешно обновлена',
-  roleCreationError: 'Ошибка создания роли',
-  roleUpdateError: 'Ошибка обновления роли',
-  adminList: 'Список администраторов',
-  adminForm: 'Форма администратора',
-  roleList: 'Список ролей',
-  roleForm: 'Форма роли',
-  andMorePrivilege: 'и еще {{count}} привилегий...',
+export const RU: typeof EN = {
+    home: 'Главная',
+    administrators: 'Администраторы',
+    role: 'Роль',
+    roles: 'Роли',
+    admin: 'Админ',
+    admins: 'Админы',
+    createRole: 'Создать роль',
+    createAdmin: 'Создать админа',
+    createAdministrator: 'Создать администратора',
+    edit: 'Редактировать',
+    delete: 'Удалить',
+    email: 'Электронная почта',
+    actions: 'Действия',
+    updateRole: 'Обновить роль',
+    updateAdmin: 'Обновить администратора',
+    password: 'Пароль',
+    newPassword: 'Новый пароль',
+    name: 'Имя',
+    success: 'Успех',
+    adminSuccessfullyCreated: 'Админ успешно создан',
+    adminSuccessfullyUpdated: 'Админ успешно обновлен',
+    error: 'Ошибка',
+    adminCreationError: 'Ошибка создания администратора',
+    adminUpdateError: 'Ошибка обновления администратора',
+    listOfRoles: 'Список ролей',
+    addRole: 'Добавить роль',
+    noPrivileges: 'Без привилегий',
+    privileges: 'Привилегии',
+    all: 'Все',
+    roleSuccessfullyCreated: 'Роль успешно создана',
+    roleSuccessfullyUpdate: 'Роль успешно обновлена',
+    roleCreationError: 'Ошибка создания роли',
+    roleUpdateError: 'Ошибка обновления роли',
+    adminList: 'Список администраторов',
+    adminForm: 'Форма администратора',
+    roleList: 'Список ролей',
+    roleForm: 'Форма роли',
+    andMorePrivilege: 'и еще {{count}} привилегий...',
 };
-
-export default RU;

package/src/main.ts

@@ -1,11 +1,7 @@
-import { i18n } from '@tager/admin-services';
+import {applyTranslations} from "./locales/apply";
 
-import EN from './locales/en';
-import RU from './locales/ru';
+applyTranslations();
 
-i18n.addTranslations('en', 'administrators', EN);
-i18n.addTranslations('ru', 'administrators', RU);
-
-export * from './constants/routes';
-export * from './services/requests';
-export * from './utils/paths';
+export * from "./constants/routes";
+export * from "./utils/paths";
+export * from "./services/requests";