diff --git a/package-lock.json b/package-lock.json index d2a0892..fc2823c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,8 +7,8 @@ "": { "version": "0.1.0", "dependencies": { - "bootstrap": "^5.0.1", - "bootstrap-vue": "^2.21.2", + "bootstrap": "^4.5.2", + "bootstrap-vue": "^2.16.0", "core-js": "^3.6.5", "vue": "^2.6.11", "vue-router": "^3.2.0", @@ -1777,16 +1777,6 @@ "node": ">=8" } }, - "node_modules/@popperjs/core": { - "version": "2.9.2", - "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.2.tgz", - "integrity": "sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q==", - "peer": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/popperjs" - } - }, "node_modules/@soda/friendly-errors-webpack-plugin": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.8.0.tgz", @@ -3865,15 +3855,16 @@ "dev": true }, "node_modules/bootstrap": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.0.1.tgz", - "integrity": "sha512-Fl79+wsLOZKoiU345KeEaWD0ik8WKRI5zm0YSPj2oF1Qr+BO7z0fco6GbUtqjoG1h4VI89PeKJnMsMMVQdKKTw==", + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.0.tgz", + "integrity": "sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw==", "funding": { "type": "opencollective", "url": "https://opencollective.com/bootstrap" }, "peerDependencies": { - "@popperjs/core": "^2.9.2" + "jquery": "1.9.1 - 3", + "popper.js": "^1.16.1" } }, "node_modules/bootstrap-vue": { @@ -3889,19 +3880,6 @@ "vue-functional-data-merge": "^3.1.0" } }, - "node_modules/bootstrap-vue/node_modules/bootstrap": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.0.tgz", - "integrity": "sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw==", - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/bootstrap" - }, - "peerDependencies": { - "jquery": "1.9.1 - 3", - "popper.js": "^1.16.1" - } - }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -17085,12 +17063,6 @@ } } }, - "@popperjs/core": { - "version": "2.9.2", - "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.2.tgz", - "integrity": "sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q==", - "peer": true - }, "@soda/friendly-errors-webpack-plugin": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.8.0.tgz", @@ -18827,9 +18799,9 @@ "dev": true }, "bootstrap": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.0.1.tgz", - "integrity": "sha512-Fl79+wsLOZKoiU345KeEaWD0ik8WKRI5zm0YSPj2oF1Qr+BO7z0fco6GbUtqjoG1h4VI89PeKJnMsMMVQdKKTw==", + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.0.tgz", + "integrity": "sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw==", "requires": {} }, "bootstrap-vue": { @@ -18842,14 +18814,6 @@ "popper.js": "^1.16.1", "portal-vue": "^2.1.7", "vue-functional-data-merge": "^3.1.0" - }, - "dependencies": { - "bootstrap": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.0.tgz", - "integrity": "sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw==", - "requires": {} - } } }, "brace-expansion": { diff --git a/package.json b/package.json index d56cb10..7729742 100644 --- a/package.json +++ b/package.json @@ -8,8 +8,8 @@ "lint": "vue-cli-service lint" }, "dependencies": { - "bootstrap": "^5.0.1", - "bootstrap-vue": "^2.21.2", + "bootstrap": "^4.5.2", + "bootstrap-vue": "^2.16.0", "core-js": "^3.6.5", "vue": "^2.6.11", "vue-router": "^3.2.0", diff --git a/public/favicon.ico b/public/favicon.ico index df36fcf..4dc4777 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/src/App.vue b/src/App.vue index 6c26aa6..05f40bd 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,32 +1,50 @@ + + diff --git a/src/assets/logo.png b/src/assets/logo.png index f3d2503..d567fd4 100644 Binary files a/src/assets/logo.png and b/src/assets/logo.png differ diff --git a/src/components/FooterContent.vue b/src/components/FooterContent.vue new file mode 100644 index 0000000..5e5e269 --- /dev/null +++ b/src/components/FooterContent.vue @@ -0,0 +1,23 @@ + + + \ No newline at end of file diff --git a/src/components/HelloWorld.vue b/src/components/HelloWorld.vue deleted file mode 100644 index 1c544cb..0000000 --- a/src/components/HelloWorld.vue +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - diff --git a/src/components/Navbar.vue b/src/components/Navbar.vue new file mode 100644 index 0000000..8216f3b --- /dev/null +++ b/src/components/Navbar.vue @@ -0,0 +1,33 @@ + + + + + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index d36779e..5a9e666 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,6 +1,7 @@ import Vue from 'vue' import VueRouter from 'vue-router' import Home from '../views/Home.vue' +import Devices from '../views/Devices.vue' Vue.use(VueRouter) @@ -10,6 +11,11 @@ const routes = [ name: 'Home', component: Home }, + { + path: '/devices', + name: 'Devices', + component: Devices + }, { path: '/about', name: 'About', diff --git a/src/views/Devices.vue b/src/views/Devices.vue new file mode 100644 index 0000000..d802f80 --- /dev/null +++ b/src/views/Devices.vue @@ -0,0 +1,14 @@ + + + + + \ No newline at end of file diff --git a/src/views/Home.vue b/src/views/Home.vue index 8bd6c57..a93d1b1 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -1,18 +1,10 @@ diff --git a/vue.config.js b/vue.config.js new file mode 100644 index 0000000..cc80e97 --- /dev/null +++ b/vue.config.js @@ -0,0 +1,30 @@ +module.exports = { + publicPath: "/", + chainWebpack: config => { + config.module + .rule('vue') + .use('vue-loader') + .loader('vue-loader') + .tap(options => { + options.transformAssetUrls = { + img: 'src', + image: 'xlink:href', + 'b-avatar': 'src', + 'b-img': 'src', + 'b-img-lazy': ['src', 'blank-src'], + 'b-card': 'img-src', + 'b-card-img': 'src', + 'b-card-img-lazy': ['src', 'blank-src'], + 'b-carousel-slide': 'img-src', + 'b-embed': 'src' + } + + return options + }), + config.plugin('html') + .tap(args => { + args[0].title = "BirbController" + return args + }) + } +} \ No newline at end of file