diff --git a/zero.Backoffice.UI/app/app.vue b/zero.Backoffice.UI/app/app.vue
index 0e99f4bb..79a68986 100644
--- a/zero.Backoffice.UI/app/app.vue
+++ b/zero.Backoffice.UI/app/app.vue
@@ -6,6 +6,7 @@
+
@@ -15,6 +16,7 @@
import './styles/styles';
import AppLogin from './account/login.vue';
import AppNavigation from './ui/app-navigation.vue';
+ import AppNotifications from './ui/app-notifications.vue';
import { useAccountStore } from './account/store';
import { useUiStore } from './ui/store';
import { useTranslationStore } from './stores/translations';
@@ -24,7 +26,7 @@
export default defineComponent({
name: 'app',
- components: { AppLogin, AppNavigation },
+ components: { AppLogin, AppNavigation, AppNotifications },
data: () => ({
initialized: false,
diff --git a/zero.Backoffice.UI/app/components/index.ts b/zero.Backoffice.UI/app/components/index.ts
index 8d8712b4..8d7429cd 100644
--- a/zero.Backoffice.UI/app/components/index.ts
+++ b/zero.Backoffice.UI/app/components/index.ts
@@ -19,6 +19,7 @@ import uiDropdownButton from './ui-dropdown-button.vue';
import uiDropdown from './ui-dropdown.vue';
import uiHeaderBar from './ui-header-bar.vue';
import uiCalendar from './ui-calendar.vue';
+import uiTree from './ui-tree.vue';
export {
uiIcon,
@@ -41,5 +42,6 @@ export {
uiDropdownButton,
uiDropdown,
uiHeaderBar,
- uiCalendar
+ uiCalendar,
+ uiTree
};
\ No newline at end of file
diff --git a/zero.Backoffice.UI/old_app/components/tree/tree-item.vue b/zero.Backoffice.UI/app/components/ui-tree-item.vue
similarity index 97%
rename from zero.Backoffice.UI/old_app/components/tree/tree-item.vue
rename to zero.Backoffice.UI/app/components/ui-tree-item.vue
index e7a9faf2..7e5f6db8 100644
--- a/zero.Backoffice.UI/old_app/components/tree/tree-item.vue
+++ b/zero.Backoffice.UI/app/components/ui-tree-item.vue
@@ -22,10 +22,10 @@
-
diff --git a/zero.Backoffice.UI/old_app/components/tree/tree.vue b/zero.Backoffice.UI/app/components/ui-tree.vue
similarity index 97%
rename from zero.Backoffice.UI/old_app/components/tree/tree.vue
rename to zero.Backoffice.UI/app/components/ui-tree.vue
index 6992c862..405df7e3 100644
--- a/zero.Backoffice.UI/old_app/components/tree/tree.vue
+++ b/zero.Backoffice.UI/app/components/ui-tree.vue
@@ -23,12 +23,15 @@
-
diff --git a/zero.Backoffice.UI/app/core/types/zeroPluginOptions.ts b/zero.Backoffice.UI/app/core/types/zeroPluginOptions.ts
index bba696e8..d85b1f71 100644
--- a/zero.Backoffice.UI/app/core/types/zeroPluginOptions.ts
+++ b/zero.Backoffice.UI/app/core/types/zeroPluginOptions.ts
@@ -1,7 +1,7 @@
import { RouteRecordRaw } from 'vue-router';
import { App } from 'vue';
-import { ZeroSchemaProp } from 'zero/schemas';
+import { ZeroSchemaProp } from '../zero';
export interface ZeroPluginOptions
{
diff --git a/zero.Backoffice.UI/app/core/zero.d.ts b/zero.Backoffice.UI/app/core/zero.d.ts
index 17dfc361..123a872f 100644
--- a/zero.Backoffice.UI/app/core/zero.d.ts
+++ b/zero.Backoffice.UI/app/core/zero.d.ts
@@ -1,3 +1,4 @@
+import { ZeroSchema } from "zero/schemas";
import { Zero } from "./types/zero";
declare module '@vue/runtime-core'
@@ -9,4 +10,7 @@ declare module '@vue/runtime-core'
*/
zero: Zero
}
-}
\ No newline at end of file
+}
+
+declare type Lazy = () => Promise;
+declare type ZeroSchemaProp = ZeroSchema | Lazy;
\ No newline at end of file
diff --git a/zero.Backoffice.UI/app/core/zeroRuntime.ts b/zero.Backoffice.UI/app/core/zeroRuntime.ts
index 846daa48..f381e346 100644
--- a/zero.Backoffice.UI/app/core/zeroRuntime.ts
+++ b/zero.Backoffice.UI/app/core/zeroRuntime.ts
@@ -9,7 +9,8 @@ import registerComponents from '../components/register';
import registerFormComponents from '../forms/register';
import { getRouterConfig, appendRouterGuards } from './router/routerConfig';
import { countryPlugin, applicationPlugin, settingsPlugin } from '../modules';
-import { ZeroSchema, ZeroSchemaProp } from 'zero/schemas';
+import { ZeroSchema } from 'zero/schemas';
+import { ZeroSchemaProp } from './zero';
export class ZeroRuntime implements Zero
{
@@ -90,7 +91,7 @@ export class ZeroRuntime implements Zero
**/
async getSchema(alias: string): Promise
{
- const schema = this._schemas[alias];
+ const schema: ZeroSchemaProp = this._schemas[alias];
if (!schema)
{
diff --git a/zero.Backoffice.UI/app/modules/countries/countries.vue b/zero.Backoffice.UI/app/modules/countries/countries.vue
index 3c42e6c9..57b63ee8 100644
--- a/zero.Backoffice.UI/app/modules/countries/countries.vue
+++ b/zero.Backoffice.UI/app/modules/countries/countries.vue
@@ -3,7 +3,7 @@
-
+
@@ -14,6 +14,7 @@
+
+
+
\ No newline at end of file