diff --git a/frontend/app/package-lock.json b/frontend/app/package-lock.json index c6f7819..3cfb992 100644 --- a/frontend/app/package-lock.json +++ b/frontend/app/package-lock.json @@ -7438,6 +7438,11 @@ "merge-stream": "^1.0.1" } }, + "jquery": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz", + "integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==" + }, "js-base64": { "version": "2.4.9", "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.9.tgz", @@ -11514,6 +11519,11 @@ "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=", "dev": true }, + "propdoc": { + "version": "0.9.3", + "resolved": "https://registry.npmjs.org/propdoc/-/propdoc-0.9.3.tgz", + "integrity": "sha512-pt/2w96r2v6RXWJBUAoDAKCQGUtAGtOGUlzrLV0hleWHoMJ+vKQjWxSTVYXh3hKARv7+C9+fWPFrirgco80Hzw==" + }, "proto-list": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", @@ -14406,6 +14416,14 @@ "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.0.1.tgz", "integrity": "sha512-vLLoY452L+JBpALMP5UHum9+7nzR9PeIBCghU9ZtJ1eWm6ieUI8Zb/DI3MYxH32bxkjzYV1LRjNv4qr8d+uX/w==" }, + "vue-sidebar-menu": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/vue-sidebar-menu/-/vue-sidebar-menu-2.4.1.tgz", + "integrity": "sha512-VkciJFYTvoXH0rAtxXpahLFj1YcJbJymWZPjiuBwshWisRisfqr0lHoJlQ58GB6xEjU4xrI9lIm0LDOyMbLMAw==", + "requires": { + "vue": "^2.5.11" + } + }, "vue-style-loader": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-3.1.2.tgz", diff --git a/frontend/app/package.json b/frontend/app/package.json index 984b0c6..2fd210a 100644 --- a/frontend/app/package.json +++ b/frontend/app/package.json @@ -15,9 +15,13 @@ }, "dependencies": { "axios": "^0.18.0", + "bootstrap": "^4.1.3", "bootstrap-vue": "^2.0.0-rc.11", + "jquery": "^3.3.1", + "propdoc": "^0.9.3", "vue": "^2.5.2", "vue-router": "^3.0.1", + "vue-sidebar-menu": "^2.4.1", "vuex": "^3.0.1" }, "devDependencies": { diff --git a/frontend/app/src/App.vue b/frontend/app/src/App.vue index 0764015..cd89914 100644 --- a/frontend/app/src/App.vue +++ b/frontend/app/src/App.vue @@ -1,7 +1,12 @@ @@ -29,6 +34,3 @@ export default { // https://codepen.io/anon/pen/BGzVpK - diff --git a/frontend/app/src/components/BootstrapMenu.vue b/frontend/app/src/components/BootstrapMenu.vue deleted file mode 100644 index 445b16f..0000000 --- a/frontend/app/src/components/BootstrapMenu.vue +++ /dev/null @@ -1,17 +0,0 @@ - - diff --git a/frontend/app/src/components/MyMenu.vue b/frontend/app/src/components/MyMenu.vue new file mode 100644 index 0000000..8a65b4e --- /dev/null +++ b/frontend/app/src/components/MyMenu.vue @@ -0,0 +1,39 @@ + + + + diff --git a/frontend/app/src/components/SidenavMenu.vue b/frontend/app/src/components/SidenavMenu.vue deleted file mode 100644 index f84dbf8..0000000 --- a/frontend/app/src/components/SidenavMenu.vue +++ /dev/null @@ -1,165 +0,0 @@ - - - - - - - - - - diff --git a/frontend/app/src/main.js b/frontend/app/src/main.js index 6312448..9a743f2 100644 --- a/frontend/app/src/main.js +++ b/frontend/app/src/main.js @@ -2,22 +2,21 @@ // (runtime-only or standalone) has been set in webpack.base.conf with an alias. import Vue from 'vue' import App from './App' +import VueSidebarMenu from 'vue-sidebar-menu' import router from './router' -import { store } from './store/store' //importowanie central store; -import SidenavMenu from '@/components/SidenavMenu' -import TransitionElement from '@/components/TransitionElement' +import { store } from './store/store' //importowanie central store; import BootstrapVue from 'bootstrap-vue' -import BMenu from '@/components/BootstrapMenu' - -Vue.component('sidenav-menu', SidenavMenu) // globalnby import menu -Vue.component('transition-element', TransitionElement) // globalnby import menu -Vue.component('b-menu', BMenu) // globalnby import menu - - - -Vue.use(BootstrapVue); import 'bootstrap/dist/css/bootstrap.css' import 'bootstrap-vue/dist/bootstrap-vue.css' +import MyMenu from '@/components/MyMenu' +import jQuery from 'jquery' +global.jQuery = jQuery +let Bootstrap = require('bootstrap') + +Vue.component('my-menu', MyMenu) +Vue.use(VueSidebarMenu) + +Vue.use(BootstrapVue) Vue.config.productionTip = false