diff --git a/package-lock.json b/package-lock.json index 8c7d815..a6886bf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10968,6 +10968,36 @@ } }, "vue-loader-v16": { +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD + "version": "npm:vue-loader@16.0.0-beta.7", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.0.0-beta.7.tgz", + "integrity": "sha512-xQ8/GZmRPdQ3EinnE0IXwdVoDzh7Dowo0MowoyBuScEBXrRabw6At5/IdtD3waKklKW5PGokPsm8KRN6rvQ1cw==", + "dev": true, + "optional": true, + "requires": { + "@types/mini-css-extract-plugin": "^0.9.1", + "chalk": "^3.0.0", + "hash-sum": "^2.0.0", + "loader-utils": "^1.2.3", + "merge-source-map": "^1.1.0", + "source-map": "^0.6.1" + }, + "dependencies": { + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "optional": true, + "requires": { + "@types/color-name": "^1.1.1", +======= +>>>>>>> origin +======= +>>>>>>> origin "version": "npm:vue-loader@16.0.0-beta.8", "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.0.0-beta.8.tgz", "integrity": "sha512-oouKUQWWHbSihqSD7mhymGPX1OQ4hedzAHyvm8RdyHh6m3oIvoRF+NM45i/bhNOlo8jCnuJhaSUf/6oDjv978g==", @@ -10986,13 +11016,38 @@ "dev": true, "optional": true, "requires": { +<<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> origin +>>>>>>> origin +======= +>>>>>>> origin "color-convert": "^2.0.1" } }, "chalk": { +<<<<<<< HEAD +<<<<<<< HEAD "version": "4.1.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", +======= +<<<<<<< HEAD + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", +======= + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", +>>>>>>> origin +>>>>>>> origin +======= + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", +>>>>>>> origin "dev": true, "optional": true, "requires": { @@ -11024,6 +11079,20 @@ "dev": true, "optional": true }, +<<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "optional": true +======= +>>>>>>> origin +======= +>>>>>>> origin "loader-utils": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", @@ -11035,6 +11104,13 @@ "emojis-list": "^3.0.0", "json5": "^2.1.2" } +<<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> origin +>>>>>>> origin +======= +>>>>>>> origin }, "supports-color": { "version": "7.2.0", diff --git a/src/components/SearchResultsPage.vue b/src/components/SearchResultsPage.vue new file mode 100644 index 0000000..98550e2 --- /dev/null +++ b/src/components/SearchResultsPage.vue @@ -0,0 +1,82 @@ + + + + + \ No newline at end of file diff --git a/src/view/Home.vue b/src/view/Home.vue index 8794aef..d882edb 100644 --- a/src/view/Home.vue +++ b/src/view/Home.vue @@ -1,9 +1,9 @@ @@ -11,13 +11,14 @@