diff --git a/webapp/package.json b/webapp/package.json index 218955f..39f8465 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -8,8 +8,11 @@ "lint": "vue-cli-service lint" }, "dependencies": { + "@popperjs/core": "^2.11.5", + "bootstrap": "^5.1.3", "core-js": "^3.8.3", - "vue": "^3.2.13" + "vue": "^3.2.13", + "vue-router": "^4.0.14" }, "devDependencies": { "@babel/core": "^7.12.16", diff --git a/webapp/src/App.vue b/webapp/src/App.vue index 591a031..1e37818 100644 --- a/webapp/src/App.vue +++ b/webapp/src/App.vue @@ -1,26 +1,25 @@ diff --git a/webapp/src/components/AboutView.vue b/webapp/src/components/AboutView.vue new file mode 100644 index 0000000..2d03659 --- /dev/null +++ b/webapp/src/components/AboutView.vue @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/webapp/src/components/HelloWorld.vue b/webapp/src/components/HelloWorld.vue deleted file mode 100644 index 879051a..0000000 --- a/webapp/src/components/HelloWorld.vue +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - diff --git a/webapp/src/components/HomeView.vue b/webapp/src/components/HomeView.vue new file mode 100644 index 0000000..c4a8821 --- /dev/null +++ b/webapp/src/components/HomeView.vue @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/webapp/src/components/NavBar.vue b/webapp/src/components/NavBar.vue new file mode 100644 index 0000000..5914291 --- /dev/null +++ b/webapp/src/components/NavBar.vue @@ -0,0 +1,30 @@ + + + + + \ No newline at end of file diff --git a/webapp/src/main.js b/webapp/src/main.js index 01433bc..15569ba 100644 --- a/webapp/src/main.js +++ b/webapp/src/main.js @@ -1,4 +1,8 @@ import { createApp } from 'vue' import App from './App.vue' +import router from './router' -createApp(App).mount('#app') +import "bootstrap/dist/css/bootstrap.min.css" +import "bootstrap/dist/js/bootstrap.js" + +createApp(App).use(router).mount('#app') diff --git a/webapp/src/router/index.js b/webapp/src/router/index.js new file mode 100644 index 0000000..95daf14 --- /dev/null +++ b/webapp/src/router/index.js @@ -0,0 +1,24 @@ +import { createWebHistory, createRouter } from 'vue-router'; +import HomeView from '@/components/HomeView' +import AboutView from '@/components/AboutView' + +const routes = [ + { + path: '/', + name: 'Home', + component: HomeView + }, + { + path: '/about', + name: 'About', + component: AboutView + } +]; + +const router = createRouter({ + history: createWebHistory(), + routes, + linkActiveClass: "active", +}); + +export default router; \ No newline at end of file diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 4b89093..19d1ce0 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -1068,6 +1068,11 @@ resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1" integrity sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g== +"@popperjs/core@^2.11.5": + version "2.11.5" + resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.5.tgz#db5a11bf66bdab39569719555b0f76e138d7bd64" + integrity sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw== + "@sideway/address@^4.1.3": version "4.1.4" resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.4.tgz#03dccebc6ea47fdc226f7d3d1ad512955d4783f0" @@ -1568,6 +1573,11 @@ optionalDependencies: prettier "^1.18.2 || ^2.0.0" +"@vue/devtools-api@^6.0.0": + version "6.1.4" + resolved "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-6.1.4.tgz#b4aec2f4b4599e11ba774a50c67fa378c9824e53" + integrity sha512-IiA0SvDrJEgXvVxjNkHPFfDx6SXw0b/TUkqMcDZWNg9fnCAHbTpoo59YfJ9QLFkwa3raau5vSlRVzMSLDnfdtQ== + "@vue/reactivity-transform@3.2.31": version "3.2.31" resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.2.31.tgz#0f5b25c24e70edab2b613d5305c465b50fc00911" @@ -2067,6 +2077,11 @@ boolbase@^1.0.0: resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24= +bootstrap@^5.1.3: + version "5.1.3" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.1.3.tgz#ba081b0c130f810fa70900acbc1c6d3c28fa8f34" + integrity sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q== + brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" @@ -5897,6 +5912,13 @@ vue-loader@^17.0.0: hash-sum "^2.0.0" loader-utils "^2.0.0" +vue-router@^4.0.14: + version "4.0.14" + resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-4.0.14.tgz#ce2028c1c5c33e30c7287950c973f397fce1bd65" + integrity sha512-wAO6zF9zxA3u+7AkMPqw9LjoUCjSxfFvINQj3E/DceTt6uEz1XZLraDhdg2EYmvVwTBSGlLYsUw8bDmx0754Mw== + dependencies: + "@vue/devtools-api" "^6.0.0" + vue-style-loader@^4.1.0, vue-style-loader@^4.1.3: version "4.1.3" resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-4.1.3.tgz#6d55863a51fa757ab24e89d9371465072aa7bc35"