diff --git a/assets/bulma.scss b/assets/bulma.scss index 03988d2..3fb2bd4 100644 --- a/assets/bulma.scss +++ b/assets/bulma.scss @@ -47,6 +47,10 @@ p.footer-link > a:hover { border-bottom: 2px solid $primary; } +.card { + border-radius: .6rem; + overflow: hidden; +} ul { @extend .list; diff --git a/components/BlogCardList.vue b/components/BlogCardList.vue index 2a80925..7a6a358 100644 --- a/components/BlogCardList.vue +++ b/components/BlogCardList.vue @@ -1,55 +1,57 @@ diff --git a/components/ProductCardList.vue b/components/ProductCardList.vue index db24801..a0d4ade 100644 --- a/components/ProductCardList.vue +++ b/components/ProductCardList.vue @@ -1,42 +1,36 @@ @@ -57,5 +51,7 @@ export default { diff --git a/components/TheFooter.vue b/components/TheFooter.vue index 99eee7f..4751ef8 100644 --- a/components/TheFooter.vue +++ b/components/TheFooter.vue @@ -3,10 +3,8 @@
-

- Bulma by Jeremy Thomas. The source code is licensed - MIT - . The website content is licensed CC BY NC SA 4.0. +

@@ -15,13 +13,6 @@ -

diff --git a/layouts/default.vue b/layouts/default.vue index 34b589e..f9b902d 100644 --- a/layouts/default.vue +++ b/layouts/default.vue @@ -17,13 +17,6 @@ export default { components: { TheFooter, TheNavbar - }, - asyncData ({ $shopify }) { - return $shopify.collection.fetchAllWithProducts().then((collections) => { - return { - collections - } - }) } } diff --git a/layouts/noContainer.vue b/layouts/noContainer.vue new file mode 100644 index 0000000..32f6b02 --- /dev/null +++ b/layouts/noContainer.vue @@ -0,0 +1,28 @@ + + + + + + diff --git a/nuxt.config.js b/nuxt.config.js index 7bb9687..5cb5af1 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -26,7 +26,10 @@ export default { /* ** Plugins to load before mounting the App */ - plugins: [{ src: '~/plugins/localStorage.js', ssr: false }], + plugins: [ + { src: '~/plugins/localStorage.js', ssr: false }, + { src: '~/plugins/moment', ssr: false } + ], /* ** Nuxt.js dev-modules */ diff --git a/package-lock.json b/package-lock.json index abef1d4..a742522 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8167,6 +8167,11 @@ } } }, + "moment": { + "version": "2.24.0", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz", + "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==" + }, "move-concurrently": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz", @@ -12475,8 +12480,7 @@ }, "ansi-regex": { "version": "2.1.1", - "bundled": true, - "optional": true + "bundled": true }, "aproba": { "version": "1.2.0", @@ -12494,13 +12498,11 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true, - "optional": true + "bundled": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -12513,18 +12515,15 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true, - "optional": true + "bundled": true }, "concat-map": { "version": "0.0.1", - "bundled": true, - "optional": true + "bundled": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true, - "optional": true + "bundled": true }, "core-util-is": { "version": "1.0.2", @@ -12627,8 +12626,7 @@ }, "inherits": { "version": "2.0.4", - "bundled": true, - "optional": true + "bundled": true }, "ini": { "version": "1.3.5", @@ -12638,7 +12636,6 @@ "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -12651,20 +12648,17 @@ "minimatch": { "version": "3.0.4", "bundled": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.8", - "bundled": true, - "optional": true + "bundled": true }, "minipass": { "version": "2.9.0", "bundled": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -12681,7 +12675,6 @@ "mkdirp": { "version": "0.5.1", "bundled": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -12762,8 +12755,7 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true, - "optional": true + "bundled": true }, "object-assign": { "version": "4.1.1", @@ -12773,7 +12765,6 @@ "once": { "version": "1.4.0", "bundled": true, - "optional": true, "requires": { "wrappy": "1" } @@ -12849,8 +12840,7 @@ }, "safe-buffer": { "version": "5.1.2", - "bundled": true, - "optional": true + "bundled": true }, "safer-buffer": { "version": "2.1.2", @@ -12880,7 +12870,6 @@ "string-width": { "version": "1.0.2", "bundled": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -12898,7 +12887,6 @@ "strip-ansi": { "version": "3.0.1", "bundled": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -12937,13 +12925,11 @@ }, "wrappy": { "version": "1.0.2", - "bundled": true, - "optional": true + "bundled": true }, "yallist": { "version": "3.1.1", - "bundled": true, - "optional": true + "bundled": true } } }, diff --git a/package.json b/package.json index 7ba3617..fde3834 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "dependencies": { "@nuxtjs/axios": "^5.9.5", "dotenv": "^8.2.0", + "moment": "^2.24.0", "node-sass": "^4.13.1", "nuxt": "^2.11.0", "nuxt-buefy": "^0.3.23", diff --git a/pages/basket/index.vue b/pages/basket/index.vue index 343a6e4..518cbaf 100644 --- a/pages/basket/index.vue +++ b/pages/basket/index.vue @@ -1,5 +1,5 @@