@hywax/cms 1.5.0 → 1.7.0

package/.nuxt/cms/config.ts

@@ -1,5 +1,8 @@
 const cmsConfig = {
-  "name": "cms"
+  "name": "cms",
+  "formats": {
+    "serverDateTime": "YYYY-MM-DD HH:mm:ss"
+  }
 } as const
 
 export const getCmsConfig = () => cmsConfig

package/dist/module.d.mts

@@ -29,7 +29,6 @@ interface CMSOptions {
     envPrefix?: string;
     /**
      * HTTP codes
-     * @defaultValue {}
      */
     httpCodes?: Record<string, string>;
     /**
@@ -37,6 +36,12 @@ interface CMSOptions {
      * @defaultValue {}
      */
     features?: Record<string, boolean>;
+    /**
+     * Formats
+     */
+    formats?: {
+        serverDateTime?: string;
+    };
 }
 
 declare module '@nuxt/schema' {

package/dist/module.json

@@ -1,6 +1,6 @@
 {
   "name": "@hywax/cms",
-  "version": "1.5.0",
+  "version": "1.7.0",
   "configKey": "cms",
   "builder": {
     "@nuxt/module-builder": "1.0.2",

package/dist/module.mjs

@@ -6,7 +6,7 @@ import { snakeCase, kebabCase } from 'scule';
 import { readFile, writeFile } from 'node:fs/promises';
 
 const name = "@hywax/cms";
-const version = "1.5.0";
+const version = "1.7.0";
 
 function createContext(options, nuxt) {
   const { resolve } = createResolver(import.meta.url);
@@ -42,7 +42,10 @@ const defaultModuleOptions = {
     badGateway: "502: \u041E\u0448\u0438\u0431\u043A\u0430 \u0448\u043B\u044E\u0437\u0430",
     serviceUnavailable: "503: \u0421\u0435\u0440\u0432\u0438\u0441 \u043D\u0435\u0434\u043E\u0441\u0442\u0443\u043F\u0435\u043D"
   },
-  features: {}
+  features: {},
+  formats: {
+    serverDateTime: "YYYY-MM-DD HH:mm:ss"
+  }
 };
 
 function transformHttpCodes(httpCodes) {
@@ -160,14 +163,31 @@ function prepareMergeConfigs({ nuxt, options }) {
   nuxt.options.runtimeConfig.nitro.envPrefix = options.envPrefix;
   nuxt.options.appConfig.ui = defu(nuxt.options.appConfig.ui || {}, {
     icons,
-    input: {
+    button: {
       slots: {
-        root: "w-full"
+        base: "cursor-pointer"
+      }
+    },
+    modal: {
+      slots: {
+        content: "divide-y-0",
+        body: "py-0! text-sm",
+        footer: "justify-end"
       }
     },
     form: {
       base: "flex flex-col gap-4"
     },
+    input: {
+      slots: {
+        root: "w-full"
+      }
+    },
+    inputNumber: {
+      slots: {
+        root: "w-full"
+      }
+    },
     select: {
       slots: {
         base: "overflow-hidden w-full"
@@ -452,10 +472,8 @@ export {}
     write: true,
     getContents: () => {
       const config = {
-        name: options.name
-        // Переменные есть в runtimeConfig
-        // uploraUrl: options.uploraUrl,
-        // fluxorUrl: options.fluxorUrl,
+        name: options.name,
+        formats: options.formats
       };
       return `const cmsConfig = ${JSON.stringify(config, null, 2)} as const
 
@@ -496,6 +514,7 @@ const module$1 = defineNuxtModule({
   moduleDependencies: {
     "@nuxt/ui": {},
     "@nuxtjs/mdc": {},
+    "@nuxtjs/seo": {},
     "@vueuse/nuxt": {},
     "nuxt-auth-utils": {}
   },

package/dist/runtime/components/Layout.d.vue.ts

@@ -2,6 +2,7 @@ import type { NavigationMenuItem } from '@nuxt/ui';
 import type { RouteLocationRaw } from 'vue-router';
 interface LayoutProps {
     navigation: NavigationMenuItem[];
+    links?: NavigationMenuItem[];
     version?: string;
     logotype?: string;
     logotypeIcon?: string;

package/dist/runtime/components/Layout.vue

@@ -3,7 +3,7 @@
     <UDashboardSidebar
       v-model:open="isSidebarOpen"
       v-model:collapsed="isSidebarCollapsed"
-      :ui="{ footer: 'lg:border-t lg:border-default' }"
+      :ui="{ root: 'bg-elevated/25', footer: 'lg:border-t lg:border-default' }"
       collapsible
     >
       <template #header="{ collapsed }">
@@ -57,8 +57,9 @@
 import { useAppConfig } from "#imports";
 import { computed } from "vue";
 import { useAdmin } from "../composables/useAdmin";
-defineProps({
+const props = defineProps({
   navigation: { type: Array, required: true },
+  links: { type: Array, required: false },
   version: { type: String, required: false },
   logotype: { type: String, required: false },
   logotypeIcon: { type: String, required: false },
@@ -69,6 +70,7 @@ defineSlots();
 const appConfig = useAppConfig();
 const { isSidebarOpen, isSidebarCollapsed } = useAdmin();
 const links = computed(() => [
+  ...props.links || [],
   {
     label: isSidebarCollapsed.value ? "\u0420\u0430\u0437\u0432\u0435\u0440\u043D\u0443\u0442\u044C \u043C\u0435\u043D\u044E" : "\u0421\u0432\u0435\u0440\u043D\u0443\u0442\u044C \u043C\u0435\u043D\u044E",
     icon: isSidebarCollapsed.value ? appConfig.ui.icons.panelClose : appConfig.ui.icons.panelOpen,

package/dist/runtime/components/Layout.vue.d.ts

@@ -2,6 +2,7 @@ import type { NavigationMenuItem } from '@nuxt/ui';
 import type { RouteLocationRaw } from 'vue-router';
 interface LayoutProps {
     navigation: NavigationMenuItem[];
+    links?: NavigationMenuItem[];
     version?: string;
     logotype?: string;
     logotypeIcon?: string;

package/dist/runtime/components/TableColumnSorting.vue

@@ -2,7 +2,7 @@
   <UPopover v-if="sortingColumns.length > 0" v-model:open="isOpen">
     <UChip :ui="{ base: 'z-1 size-3' }" :show="model.length > 0" size="xl">
       <UButton
-        variant="soft"
+        variant="subtle"
         color="neutral"
         label="Сортировка"
         :icon="appConfig.ui.icons.sort"

package/dist/runtime/components/TableColumnVisibility.vue

@@ -7,7 +7,7 @@
       size="xl"
     >
       <UButton
-        variant="soft"
+        variant="subtle"
         color="neutral"
         label="Колонки"
         :icon="appConfig.ui.icons.columns"

package/dist/runtime/components/TableFilters.vue

@@ -7,7 +7,7 @@
       size="xl"
     >
       <UButton
-        variant="soft"
+        variant="subtle"
         color="neutral"
         label="Фильтры"
         :icon="appConfig.ui.icons.filter"

package/dist/runtime/components/TablePanel.vue

@@ -100,7 +100,7 @@
             :model-value="itemsPerPage"
             :items="itemsPerPageItems"
             :ui="{ base: 'text-muted' }"
-            variant="soft"
+            variant="subtle"
             @update:model-value="emit('update:items-per-page', $event)"
           >
             <template #default="{ modelValue }">
@@ -115,7 +115,7 @@
           <UPagination
             v-bind="paginationProps"
             :ui="isTotalUnknown ? { first: 'hidden', last: 'hidden' } : void 0"
-            variant="soft"
+            variant="subtle"
             :sibling-count="isTotalUnknown ? 3 : 1"
             :show-edges="!isTotalUnknown"
             @update:page="emit('update:page', $event)"

package/dist/runtime/components/TableSearchInput.vue

@@ -2,6 +2,7 @@
   <UInput
     :class="ui.input({ class: props.ui?.input })"
     :leading-icon="appConfig.ui.icons.search"
+    variant="subtle"
     v-bind="{
   ...forward,
   'modelValue': inputValue,

package/dist/runtime/composables/useModal.d.ts

@@ -0,0 +1,7 @@
+import type { Component, MaybeRefOrGetter } from 'vue';
+import type { ComponentProps } from 'vue-component-type-helpers';
+export interface UseModalResult<T extends Component> {
+    open: (props?: ComponentProps<T>) => Promise<any>;
+    close: (value?: any) => void;
+}
+export declare function useModal<T extends Component>(component: T, defaultProps?: MaybeRefOrGetter<ComponentProps<T>>): UseModalResult<T>;

package/dist/runtime/composables/useModal.js

@@ -0,0 +1,10 @@
+import { useOverlay } from "@nuxt/ui/composables/useOverlay";
+import { toValue } from "vue";
+export function useModal(component, defaultProps) {
+  const { open: _open, close } = useOverlay().create(component);
+  const open = (props) => _open({
+    ...defaultProps ? toValue(defaultProps) : {},
+    ...props || {}
+  });
+  return { open, close };
+}

package/dist/runtime/composables/useTableColumns.d.ts

@@ -17,8 +17,9 @@ export type TableColumnCustom<T extends TableData, D = unknown> = TableColumn<T,
     format?: TableColumnFormat;
     to?: ((row: TableRow<T>) => RouteLocationRaw | string | undefined) | RouteLocationRaw | string | undefined;
     target?: ButtonProps['target'];
-    external?: boolean;
     emptyValue?: string;
+    image?: string;
+    description?: string;
 };
 export declare function useTableColumns<I extends Record<string, any>, T extends readonly TableColumnCustom<I>[] = readonly TableColumnCustom<I>[]>(columns: T): {
     columns: {

package/dist/runtime/composables/useTableColumns.js

@@ -1,4 +1,4 @@
-import { UButton } from "#components";
+import { UUser } from "#components";
 import { h } from "vue";
 import { formatDate, formatDateTime } from "../utils/date.js";
 import { formatNumber } from "../utils/formatters.js";
@@ -29,13 +29,17 @@ function transformColumn(column) {
         return void 0;
       }
       if (column.to) {
-        return h(UButton, {
+        return h(UUser, {
           to: typeof column.to === "function" ? column.to(row) : column.to,
-          external: column.external,
           target: column.target,
-          label: value.toString(),
-          variant: "link",
-          class: "px-0"
+          name: value.toString(),
+          class: "inline-flex",
+          ui: {
+            name: "text-primary",
+            avatar: "group-hover/user:scale-100"
+          },
+          avatar: column.image ? { src: column.image, size: "sm", alt: value.toString() } : void 0,
+          description: column.description
         });
       }
       return value;

package/dist/runtime/utils/date.js

@@ -1,3 +1,4 @@
+import { getCmsConfig } from "#imports";
 import { formatDate as format, normalizeDate } from "@vueuse/core";
 export function getPeriod(beforeDays, afterDays = 0, fixTime = true) {
   const start = /* @__PURE__ */ new Date();
@@ -24,5 +25,6 @@ export function formatTime(date) {
   return normalizeDate(date).toLocaleTimeString("ru-RU");
 }
 export function formatServerDateTime(date) {
-  return format(normalizeDate(date), "YYYY-MM-DD HH:mm:ss");
+  const { formats } = getCmsConfig();
+  return format(normalizeDate(date), formats.serverDateTime);
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hywax/cms",
   "type": "module",
-  "version": "1.5.0",
+  "version": "1.7.0",
   "description": "Hywax CMS. ⚠️ This package is intended for internal use only.",
   "repository": {
     "type": "git",
@@ -61,6 +61,7 @@
     "@nuxt/kit": "^4.2.2",
     "@nuxt/ui": "^4.3.0",
     "@nuxtjs/mdc": "^0.19.2",
+    "@nuxtjs/seo": "^3.3.0",
     "@sindresorhus/slugify": "^3.0.0",
     "@uplora/formats": "^0.1.0",
     "@uplora/serializer": "^0.1.3",
@@ -70,6 +71,7 @@
     "fast-copy": "^3.0.2",
     "fast-equals": "^5.4.0",
     "nuxt-auth-utils": "^0.5.26",
+    "object-to-formdata": "^4.5.1",
     "pathe": "^2.0.3",
     "scule": "^1.3.0",
     "sortablejs": "^1.15.6",