From d7a432527bfe18d8d73009cab62964a1123b14b4 Mon Sep 17 00:00:00 2001 From: Alexis Date: Thu, 12 Mar 2020 19:03:28 +0100 Subject: [PATCH] + Added app router and index/spell pages --- package-lock.json | 12 +++-- package.json | 1 + public/index.html | 2 +- src/app.vue | 26 +++------ src/assets/scss/_global.scss | 2 +- src/assets/scss/_variables.scss | 16 ++++-- src/components/global/navbar.vue | 32 ----------- src/components/global/navbar/navbar.vue | 72 +++++++++++++++++++++++++ src/components/spells/spell-card.vue | 30 +++++++---- src/main.js | 20 +++++-- src/pages/index.vue | 15 ++++++ src/pages/spells.vue | 31 +++++++++++ src/routes.js | 18 +++++++ 13 files changed, 205 insertions(+), 72 deletions(-) delete mode 100644 src/components/global/navbar.vue create mode 100644 src/components/global/navbar/navbar.vue create mode 100644 src/pages/index.vue create mode 100644 src/pages/spells.vue create mode 100644 src/routes.js diff --git a/package-lock.json b/package-lock.json index 016fe7e..48354ad 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1746,9 +1746,9 @@ } }, "acorn": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.0.tgz", - "integrity": "sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz", + "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==", "dev": true }, "acorn-jsx": { @@ -11859,6 +11859,12 @@ } } }, + "vue-router": { + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.1.6.tgz", + "integrity": "sha512-GYhn2ynaZlysZMkFE5oCHRUTqE8BWs/a9YbKpNLi0i7xD6KG1EzDqpHQmv1F5gXjr8kL5iIVS8EOtRaVUEXTqA==", + "dev": true + }, "vue-style-loader": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz", diff --git a/package.json b/package.json index d2a077f..eee8938 100644 --- a/package.json +++ b/package.json @@ -39,6 +39,7 @@ "eslint-plugin-vue": "^6.1.2", "node-sass": "^4.13.1", "sass-loader": "^8.0.2", + "vue-router": "^3.1.6", "vue-template-compiler": "^2.6.11" }, "eslintConfig": { diff --git a/public/index.html b/public/index.html index a0a38d3..56563bd 100644 --- a/public/index.html +++ b/public/index.html @@ -11,7 +11,7 @@ -
+
diff --git a/src/app.vue b/src/app.vue index 6504c34..2952010 100644 --- a/src/app.vue +++ b/src/app.vue @@ -1,38 +1,28 @@ \ No newline at end of file diff --git a/src/components/global/navbar/navbar.vue b/src/components/global/navbar/navbar.vue new file mode 100644 index 0000000..2f28578 --- /dev/null +++ b/src/components/global/navbar/navbar.vue @@ -0,0 +1,72 @@ + + + + + diff --git a/src/components/spells/spell-card.vue b/src/components/spells/spell-card.vue index 0c5f48d..b74c429 100644 --- a/src/components/spells/spell-card.vue +++ b/src/components/spells/spell-card.vue @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/src/pages/spells.vue b/src/pages/spells.vue new file mode 100644 index 0000000..6e2d545 --- /dev/null +++ b/src/pages/spells.vue @@ -0,0 +1,31 @@ + + + + + \ No newline at end of file diff --git a/src/routes.js b/src/routes.js new file mode 100644 index 0000000..eb9bc0f --- /dev/null +++ b/src/routes.js @@ -0,0 +1,18 @@ +// App router + + +// Pages +import index from "./pages/index"; +import spells from "./pages/spells"; + +// Routes +const routes = [ + { + path: '/', component: index, + }, + { + path: '/spells', component: spells, + } +]; + +export default routes; \ No newline at end of file