From 5a0ebf078bddec9f8bcaaa17c9ab72bc6a464135 Mon Sep 17 00:00:00 2001 From: Alexis <35.alexis.pele@gmail.com> Date: Wed, 3 Jun 2020 19:27:43 +0200 Subject: [PATCH] - Fixed masonry setup, need to npm install --- client/package-lock.json | 111 ++++++++++++++++-- client/package.json | 5 +- client/public/index.html | 9 +- .../src/components/global/navbar/navbar.vue | 37 +++--- client/src/components/spells/spell-card.vue | 75 ++---------- client/src/components/spells/spells-list.vue | 14 ++- client/src/main.js | 15 ++- client/src/pages/spells-page.vue | 10 +- client/vue.config.js | 12 -- 9 files changed, 161 insertions(+), 127 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 5daa117..f3ce7c8 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -2399,6 +2399,11 @@ "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=", "dev": true }, + "bootstrap": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.5.0.tgz", + "integrity": "sha512-Z93QoXvodoVslA+PWNdk23Hze4RBYIkpb5h8I2HY2Tu2h7A0LpAgLcyrhrSUyo2/Oxm2l1fRZPs1e5hnxnliXA==" + }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -4031,6 +4036,11 @@ "minimalistic-assert": "^1.0.0" } }, + "desandro-matches-selector": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/desandro-matches-selector/-/desandro-matches-selector-2.0.2.tgz", + "integrity": "sha1-cXvu1NwT59jzdi9wem1YpndCGOE=" + }, "destroy": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", @@ -4796,6 +4806,11 @@ "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=", "dev": true }, + "ev-emitter": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ev-emitter/-/ev-emitter-1.1.1.tgz", + "integrity": "sha512-ipiDYhdQSCZ4hSbX4rMW+XzNKMD1prg/sTvoVmSLkuQ1MVlwjJQQA+sW8tMYR3BLUr9KjodFV4pvzunvRhd33Q==" + }, "event-pubsub": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/event-pubsub/-/event-pubsub-4.3.0.tgz", @@ -5231,6 +5246,14 @@ "locate-path": "^3.0.0" } }, + "fizzy-ui-utils": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/fizzy-ui-utils/-/fizzy-ui-utils-2.0.7.tgz", + "integrity": "sha512-CZXDVXQ1If3/r8s0T+v+qVeMshhfcuq0rqIFgJnrtd+Bu8GmDmqMjntjUePypVtjHXKJ6V4sw9zeyox34n9aCg==", + "requires": { + "desandro-matches-selector": "^2.0.0" + } + }, "flat-cache": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz", @@ -5402,7 +5425,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -5423,12 +5447,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -5443,17 +5469,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -5570,7 +5599,8 @@ "inherits": { "version": "2.0.4", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -5582,6 +5612,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -5596,6 +5627,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -5608,6 +5640,7 @@ "version": "2.9.0", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -5626,6 +5659,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "dependencies": { "minimist": { "version": "1.2.5", @@ -5719,7 +5753,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -5731,6 +5766,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -5817,7 +5853,8 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -5853,6 +5890,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -5872,6 +5910,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -5915,12 +5954,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, @@ -6022,6 +6063,11 @@ "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", "dev": true }, + "get-size": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/get-size/-/get-size-2.0.3.tgz", + "integrity": "sha512-lXNzT/h/dTjTxRbm9BXb+SGxxzkm97h/PCIKtlN/CBCxxmkkIVV21udumMS93MuVTDX583gqc94v3RjuHmI+2Q==" + }, "get-stdin": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", @@ -6591,6 +6637,14 @@ "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", "dev": true }, + "imagesloaded": { + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/imagesloaded/-/imagesloaded-4.1.4.tgz", + "integrity": "sha512-ltiBVcYpc/TYTF5nolkMNsnREHW+ICvfQ3Yla2Sgr71YFwQ86bDwV9hgpFhFtrGPuwEx5+LqOHIrdXBdoWwwsA==", + "requires": { + "ev-emitter": "^1.0.0" + } + }, "import-cwd": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz", @@ -7536,6 +7590,15 @@ "object-visit": "^1.0.0" } }, + "masonry-layout": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/masonry-layout/-/masonry-layout-4.2.2.tgz", + "integrity": "sha512-iGtAlrpHNyxaR19CvKC3npnEcAwszXoyJiI8ARV2ePi7fmYhIud25MHK8Zx4P0LCC4d3TNO9+rFa1KoK1OEOaA==", + "requires": { + "get-size": "^2.0.2", + "outlayer": "^2.1.0" + } + }, "md5.js": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", @@ -8519,6 +8582,16 @@ "os-tmpdir": "^1.0.0" } }, + "outlayer": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/outlayer/-/outlayer-2.1.1.tgz", + "integrity": "sha1-KYY7beEOpdrf/8rfoNcokHOH6aI=", + "requires": { + "ev-emitter": "^1.0.0", + "fizzy-ui-utils": "^2.0.0", + "get-size": "^2.0.2" + } + }, "p-finally": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", @@ -8751,7 +8824,8 @@ "version": "2.2.2", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==", - "dev": true + "dev": true, + "optional": true }, "pify": { "version": "4.0.1", @@ -8792,6 +8866,11 @@ "ts-pnp": "^1.1.6" } }, + "popper.js": { + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz", + "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==" + }, "portfinder": { "version": "1.0.26", "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.26.tgz", @@ -11963,6 +12042,16 @@ } } }, + "vue-masonry": { + "version": "0.11.8", + "resolved": "https://registry.npmjs.org/vue-masonry/-/vue-masonry-0.11.8.tgz", + "integrity": "sha512-O+T+3zUghbKpjc+5aubXr8Kg1h9P334+Or9euYyXsQYa3mtScUqZFI6A16BijR9v4hYdtKksuPzU0mQplUvhDA==", + "requires": { + "imagesloaded": "4.1.4", + "masonry-layout": "^4.2.2", + "vue": "^2.0.0" + } + }, "vue-router": { "version": "3.1.6", "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.1.6.tgz", diff --git a/client/package.json b/client/package.json index fad853c..0e77466 100644 --- a/client/package.json +++ b/client/package.json @@ -28,9 +28,12 @@ }, "dependencies": { "axios": "^0.19.2", + "bootstrap": "^4.5.0", "core-js": "^3.6.4", "jquery": "^3.5.1", - "vue": "^2.6.11" + "popper.js": "^1.16.1", + "vue": "^2.6.11", + "vue-masonry": "^0.11.8" }, "devDependencies": { "@vue/cli-plugin-babel": "~4.2.0", diff --git a/client/public/index.html b/client/public/index.html index 6486ef9..0d3707e 100644 --- a/client/public/index.html +++ b/client/public/index.html @@ -6,18 +6,15 @@ Spellsaurus - - - - + +
- - + diff --git a/client/src/components/global/navbar/navbar.vue b/client/src/components/global/navbar/navbar.vue index 89d1d86..8b8076d 100644 --- a/client/src/components/global/navbar/navbar.vue +++ b/client/src/components/global/navbar/navbar.vue @@ -1,26 +1,19 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/client/src/components/spells/spells-list.vue b/client/src/components/spells/spells-list.vue index f99de94..8c9c982 100644 --- a/client/src/components/spells/spells-list.vue +++ b/client/src/components/spells/spells-list.vue @@ -1,13 +1,13 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/client/src/main.js b/client/src/main.js index 541a913..e3a0572 100644 --- a/client/src/main.js +++ b/client/src/main.js @@ -1,13 +1,26 @@ +// Core import Vue from 'vue' import VueRouter from 'vue-router' import App from './app.vue' +import { VueMasonryPlugin } from 'vue-masonry'; + +// Router import routes from './routes' -window.$ = window.jQuery = require('jquery'); +// Jquery +import jquery from 'jquery' +window.$ = jquery +window.jquery = jquery + +// Bootstrap +import 'bootstrap/dist/css/bootstrap.css' +import 'bootstrap/dist/js/bootstrap.js' Vue.config.productionTip = false Vue.use(VueRouter) +Vue.use(VueMasonryPlugin) + var filter = function(text, length, clamp){ clamp = clamp || '...'; diff --git a/client/src/pages/spells-page.vue b/client/src/pages/spells-page.vue index f1393f2..c69eea2 100644 --- a/client/src/pages/spells-page.vue +++ b/client/src/pages/spells-page.vue @@ -6,17 +6,11 @@ diff --git a/client/vue.config.js b/client/vue.config.js index dcea90a..e180b24 100644 --- a/client/vue.config.js +++ b/client/vue.config.js @@ -1,14 +1,2 @@ module.exports = { - css: { - loaderOptions: { - sass: { - prependData: ` - @import "@/assets/scss/_global.scss"; - @import "@/assets/scss/_variables.scss"; - @import "@/assets/scss/_mixins.scss"; - @import "@/assets/scss/_fonts.scss"; - ` - } - } - } }; \ No newline at end of file