diff --git a/Client/package.json b/Client/package.json index 45a26235..3a3cf13d 100644 --- a/Client/package.json +++ b/Client/package.json @@ -1,6 +1,6 @@ { "name": "sunengine-client", - "version": "2.2.5", + "version": "2.2.6", "description": "SunEngine - web engine with support of blog, forum and articles functionality", "productName": "SunEngine", "author": "Dimitrij Polianin", diff --git a/Client/quasar.conf.js b/Client/quasar.conf.js index 0db71af6..510741aa 100644 --- a/Client/quasar.conf.js +++ b/Client/quasar.conf.js @@ -22,7 +22,8 @@ module.exports = function (ctx) { 'iconPicker', 'components', 'throttle', - 'vueDevTools' + 'vueDevTools', + 'getBreadcrumbs' ], css: [ 'app.scss', diff --git a/Client/quasar.extensions.json b/Client/quasar.extensions.json index 86209407..91fbdfb1 100644 --- a/Client/quasar.extensions.json +++ b/Client/quasar.extensions.json @@ -2,7 +2,7 @@ "ide-helper": { "addToGitIgnore": true, "__internal": { - "lastQuasarVersion": "1.7.3", + "lastQuasarVersion": "1.7.4", "lastIdeHelperVersion": "1.0.0-alpha.3" } }, diff --git a/Client/src/admin/AdminInformation.vue b/Client/src/admin/AdminInformation.vue index 2ff7e3b5..cbda3971 100644 --- a/Client/src/admin/AdminInformation.vue +++ b/Client/src/admin/AdminInformation.vue @@ -122,7 +122,7 @@ export default { }, computed: { breadcrumbsCategory() { - return this.$store.getters.breadcrumbsAdmin; + return this.$getBreadcrumbs("Admin"); }, additionalData() { const { diff --git a/Client/src/admin/ConfigurationAdmin.vue b/Client/src/admin/ConfigurationAdmin.vue index 2d30b0db..e2e623fc 100644 --- a/Client/src/admin/ConfigurationAdmin.vue +++ b/Client/src/admin/ConfigurationAdmin.vue @@ -151,7 +151,7 @@ export default { }, computed: { breadcrumbsCategory() { - return this.$store.getters.breadcrumbsAdmin; + return this.$getBreadcrumbs("Admin"); }, filterLowerCase() { return this.filter.toLowerCase(); diff --git a/Client/src/admin/CypherSecrets.vue b/Client/src/admin/CypherSecrets.vue index ca2dd917..9898579f 100644 --- a/Client/src/admin/CypherSecrets.vue +++ b/Client/src/admin/CypherSecrets.vue @@ -36,7 +36,7 @@ export default { name: "CypherSecrets", computed: { breadcrumbsCategory() { - return this.$store.getters.breadcrumbsAdmin; + return this.$getBreadcrumbs("Admin"); } }, methods: { diff --git a/Client/src/admin/DeletedElements.vue b/Client/src/admin/DeletedElements.vue index e38aa67b..b02711a7 100644 --- a/Client/src/admin/DeletedElements.vue +++ b/Client/src/admin/DeletedElements.vue @@ -41,7 +41,7 @@ export default { }, computed: { breadcrumbsCategory() { - return this.$store.getters.breadcrumbsAdmin; + return this.$getBreadcrumbs("Admin"); } }, beforeCreate() { diff --git a/Client/src/admin/ImagesCleaner.vue b/Client/src/admin/ImagesCleaner.vue index c8db721e..c9db80a9 100644 --- a/Client/src/admin/ImagesCleaner.vue +++ b/Client/src/admin/ImagesCleaner.vue @@ -64,7 +64,7 @@ export default { }, computed: { breadcrumbsCategory() { - return this.$store.getters.breadcrumbsAdmin; + return this.$getBreadcrumbs("Admin"); } }, methods: { diff --git a/Client/src/admin/categories/CategoriesAdmin.vue b/Client/src/admin/categories/CategoriesAdmin.vue index a482cc3d..29264049 100644 --- a/Client/src/admin/categories/CategoriesAdmin.vue +++ b/Client/src/admin/categories/CategoriesAdmin.vue @@ -41,9 +41,9 @@ export default { }; }, computed: { - breadcrumbsCategory() { - return this.$store.getters.breadcrumbsAdmin; - } + breadcrumbsCategory() { + return this.$getBreadcrumbs("Admin"); + } }, methods: { up(category) { diff --git a/Client/src/admin/categories/CreateCategory.vue b/Client/src/admin/categories/CreateCategory.vue index 084a9f82..7b391365 100644 --- a/Client/src/admin/categories/CreateCategory.vue +++ b/Client/src/admin/categories/CreateCategory.vue @@ -66,7 +66,7 @@ export default { }, computed: { breadcrumbsCategory() { - return this.$store.getters.breadcrumbsCategoriesAdmin; + return this.$getBreadcrumbs("CategoriesAdmin"); } }, methods: { diff --git a/Client/src/admin/categories/EditCategory.vue b/Client/src/admin/categories/EditCategory.vue index f7180e97..0701784e 100644 --- a/Client/src/admin/categories/EditCategory.vue +++ b/Client/src/admin/categories/EditCategory.vue @@ -59,8 +59,8 @@ export default { }; }, computed: { - breadcrumbsCategory() { - return this.$store.getters.breadcrumbsCategoriesAdmin; + breadcrumbsCategory() { + return this.$getBreadcrumbs("CategoriesAdmin"); } }, methods: { diff --git a/Client/src/admin/components/ComponentsAdmin.vue b/Client/src/admin/components/ComponentsAdmin.vue index e88ca58a..a20bdc67 100644 --- a/Client/src/admin/components/ComponentsAdmin.vue +++ b/Client/src/admin/components/ComponentsAdmin.vue @@ -57,7 +57,7 @@ export default { }, computed: { breadcrumbsCategory() { - return this.$store.getters.breadcrumbsAdmin; + return this.$getBreadcrumbs("Admin"); } }, methods: { @@ -85,4 +85,4 @@ export default { font-size: 1.15em; } } - + \ No newline at end of file diff --git a/Client/src/admin/components/CreateComponent.vue b/Client/src/admin/components/CreateComponent.vue index 3abf8dd2..1f66fbb3 100644 --- a/Client/src/admin/components/CreateComponent.vue +++ b/Client/src/admin/components/CreateComponent.vue @@ -48,9 +48,9 @@ export default { }; }, computed: { - breadcrumbsCategory() { - return this.$store.getters.breadcrumbsComponentsAdmin; - } + breadcrumbsCategory() { + return this.$getBreadcrumbs("ComponentsAdmin"); + } }, methods: { save() { diff --git a/Client/src/admin/components/EditComponent.vue b/Client/src/admin/components/EditComponent.vue index 657db844..61901075 100644 --- a/Client/src/admin/components/EditComponent.vue +++ b/Client/src/admin/components/EditComponent.vue @@ -57,7 +57,7 @@ export default { }, computed: { breadcrumbsCategory() { - return this.$store.getters.breadcrumbsComponentsAdmin; + return this.$getBreadcrumbs("ComponentsAdmin"); } }, data() { diff --git a/Client/src/admin/menuItems/CreateMenuItem.vue b/Client/src/admin/menuItems/CreateMenuItem.vue index bb6c7fba..0db049d7 100644 --- a/Client/src/admin/menuItems/CreateMenuItem.vue +++ b/Client/src/admin/menuItems/CreateMenuItem.vue @@ -41,7 +41,7 @@ export default { }, computed: { breadcrumbsCategory() { - return this.$store.getters.breadcrumbsMenuAdmin; + return this.$getBreadcrumbs("MenuItemsAdmin"); } }, data() { @@ -104,4 +104,4 @@ export default { margin-top: $flex-gutter-md; } } - + \ No newline at end of file diff --git a/Client/src/admin/menuItems/EditMenuItem.vue b/Client/src/admin/menuItems/EditMenuItem.vue index d9eaaa4a..11eb75f5 100644 --- a/Client/src/admin/menuItems/EditMenuItem.vue +++ b/Client/src/admin/menuItems/EditMenuItem.vue @@ -59,7 +59,7 @@ export default { }, computed: { breadcrumbsCategory() { - return this.$store.getters.breadcrumbsMenuAdmin; + return this.$getBreadcrumbs("MenuItemsAdmin"); } }, methods: { diff --git a/Client/src/admin/menuItems/MenuItemsAdmin.vue b/Client/src/admin/menuItems/MenuItemsAdmin.vue index 34652e35..2a1a3636 100644 --- a/Client/src/admin/menuItems/MenuItemsAdmin.vue +++ b/Client/src/admin/menuItems/MenuItemsAdmin.vue @@ -46,7 +46,7 @@ export default { return this.menuItems.length - 1; }, breadcrumbsCategory() { - return this.$store.getters.breadcrumbsAdmin; + return this.$getBreadcrumbs("Admin"); } }, methods: { diff --git a/Client/src/admin/roles/RolesPage.vue b/Client/src/admin/roles/RolesPage.vue index 10ac728f..bbbdc03b 100644 --- a/Client/src/admin/roles/RolesPage.vue +++ b/Client/src/admin/roles/RolesPage.vue @@ -47,7 +47,7 @@ export default { }, computed: { breadcrumbsCategory() { - return this.$store.getters.breadcrumbsAdmin; + return this.$getBreadcrumbs("Admin"); } }, diff --git a/Client/src/admin/roles/RolesPermissions.vue b/Client/src/admin/roles/RolesPermissions.vue index fb4c5499..4518e3a4 100644 --- a/Client/src/admin/roles/RolesPermissions.vue +++ b/Client/src/admin/roles/RolesPermissions.vue @@ -67,7 +67,7 @@ export default { }, computed: { breadcrumbsCategory() { - return this.$store.getters.breadcrumbsAdmin; + return this.$getBreadcrumbs("Admin"); } }, methods: { diff --git a/Client/src/admin/skins/SkinsAdmin.vue b/Client/src/admin/skins/SkinsAdmin.vue index 10b431e9..27d7de12 100644 --- a/Client/src/admin/skins/SkinsAdmin.vue +++ b/Client/src/admin/skins/SkinsAdmin.vue @@ -45,7 +45,7 @@ export default { }, computed: { breadcrumbsCategory() { - return this.$store.getters.breadcrumbsAdmin; + return this.$getBreadcrumbs("Admin"); } }, beforeCreate() { diff --git a/Client/src/boot/getBreadcrumbs.js b/Client/src/boot/getBreadcrumbs.js new file mode 100644 index 00000000..93bf25ed --- /dev/null +++ b/Client/src/boot/getBreadcrumbs.js @@ -0,0 +1,5 @@ +import { getBreadcrumbs } from "sun"; + +export default ({ Vue }) => { + Vue.prototype.$getBreadcrumbs = getBreadcrumbs; +}; diff --git a/Client/src/components/Breadcrumbs.vue b/Client/src/components/Breadcrumbs.vue index f4b12303..e23d2ccb 100644 --- a/Client/src/components/Breadcrumbs.vue +++ b/Client/src/components/Breadcrumbs.vue @@ -10,6 +10,7 @@ - +