From 66f84b8f75a917e5966bea3b5edfab933807e033 Mon Sep 17 00:00:00 2001 From: Erin Date: Wed, 24 Jul 2019 18:54:29 -0500 Subject: [PATCH 01/15] fixing 351 severe vulns --- package-lock.json | 55 +++++++++++++++-------------------------------- 1 file changed, 17 insertions(+), 38 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3a57dd0..bbbdf4c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5764,9 +5764,9 @@ } }, "lodash": { - "version": "4.17.11", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", - "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==" + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" }, "lodash._reinterpolate": { "version": "3.0.0", @@ -6064,9 +6064,9 @@ } }, "mixin-deep": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", - "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", + "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", "requires": { "for-in": "^1.0.2", "is-extendable": "^1.0.1" @@ -8991,9 +8991,9 @@ "dev": true }, "set-value": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", - "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", + "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", "requires": { "extend-shallow": "^2.0.1", "is-extendable": "^0.1.1", @@ -9619,13 +9619,13 @@ "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==" }, "tar": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz", - "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz", + "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==", "dev": true, "requires": { "block-stream": "*", - "fstream": "^1.0.2", + "fstream": "^1.0.12", "inherits": "2" } }, @@ -9982,35 +9982,14 @@ "integrity": "sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw==" }, "union-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", - "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", + "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", "requires": { "arr-union": "^3.1.0", "get-value": "^2.0.6", "is-extendable": "^0.1.1", - "set-value": "^0.4.3" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "^0.1.0" - } - }, - "set-value": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", - "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", - "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.1", - "to-object-path": "^0.3.0" - } - } + "set-value": "^2.0.1" } }, "uniq": { From 5cf4d3f9653bb1054294e511842fbff09ee727fa Mon Sep 17 00:00:00 2001 From: Erin Date: Wed, 24 Jul 2019 21:04:10 -0500 Subject: [PATCH 02/15] Setting up Nuxt Store --- store/Sidebar.js | 11 +++++++++++ store/index.js | 7 +++++++ 2 files changed, 18 insertions(+) create mode 100644 store/Sidebar.js create mode 100644 store/index.js diff --git a/store/Sidebar.js b/store/Sidebar.js new file mode 100644 index 0000000..16bab35 --- /dev/null +++ b/store/Sidebar.js @@ -0,0 +1,11 @@ +export const state = () => ({ + cardsShown: true +}) + +export const mutations = { + toggleCardsShown (state) { + console.log(state.cardsShown) + if (process.browser) localStorage.setItem('cardsShown', !state.cardsShown) + state.cardsShown = !state.cardsShown + } +} \ No newline at end of file diff --git a/store/index.js b/store/index.js new file mode 100644 index 0000000..28de64e --- /dev/null +++ b/store/index.js @@ -0,0 +1,7 @@ +export const state = () => ({ + +}) + +export const mutations = { + +} \ No newline at end of file From 305d6c56744b65791a117fb227a328b4c34182f0 Mon Sep 17 00:00:00 2001 From: Erin Date: Wed, 24 Jul 2019 21:04:40 -0500 Subject: [PATCH 03/15] Early working version of table components --- components/TableHead.vue | 128 +++++++++++++++++++++++++++++++++++++ components/TableRow.vue | 133 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 261 insertions(+) create mode 100644 components/TableHead.vue create mode 100644 components/TableRow.vue diff --git a/components/TableHead.vue b/components/TableHead.vue new file mode 100644 index 0000000..aff3ed2 --- /dev/null +++ b/components/TableHead.vue @@ -0,0 +1,128 @@ + + + + + + diff --git a/components/TableRow.vue b/components/TableRow.vue new file mode 100644 index 0000000..a4264ba --- /dev/null +++ b/components/TableRow.vue @@ -0,0 +1,133 @@ + + + + + + From df95c8f29cc02a4dbbfd31616a6f6769edab7570 Mon Sep 17 00:00:00 2001 From: Erin Date: Wed, 24 Jul 2019 21:05:21 -0500 Subject: [PATCH 04/15] update to moving parts for site toggle ugly but works --- app.html | 4 ++-- components/Sidebar.vue | 18 +++++++++++++++--- pages/_category.vue | 16 +++++++++++++--- 3 files changed, 30 insertions(+), 8 deletions(-) diff --git a/app.html b/app.html index 400eaa2..2faaeb5 100644 --- a/app.html +++ b/app.html @@ -5,7 +5,7 @@ - --> {{ APP }} diff --git a/components/Sidebar.vue b/components/Sidebar.vue index aae7849..204a8e1 100644 --- a/components/Sidebar.vue +++ b/components/Sidebar.vue @@ -3,20 +3,32 @@ .sidebar template(v-for='category in categories') nuxt-link(:to='category.slug') {{ category.title }} + input(type='checkbox' :checked='cardsShown' @change="toggleCardsShown()") diff --git a/pages/_category.vue b/pages/_category.vue index 91efda5..1a79a0f 100644 --- a/pages/_category.vue +++ b/pages/_category.vue @@ -1,27 +1,37 @@ + \ No newline at end of file From d635d1e6076c83ae81048e96b452e5065c4e5f77 Mon Sep 17 00:00:00 2001 From: Erin Date: Thu, 25 Jul 2019 19:58:01 -0500 Subject: [PATCH 05/15] cleaning up formatting --- components/Sidebar.vue | 30 +++++++-------- components/TableHead.vue | 80 ++++++++++++++++++++-------------------- components/TableRow.vue | 80 ++++++++++++++++++++-------------------- pages/_category.vue | 29 ++++++++------- store/Sidebar.js | 10 ++--- 5 files changed, 116 insertions(+), 113 deletions(-) diff --git a/components/Sidebar.vue b/components/Sidebar.vue index 204a8e1..2526a72 100644 --- a/components/Sidebar.vue +++ b/components/Sidebar.vue @@ -7,29 +7,29 @@ From 9dbeaedb7f6e7ab9b465db7fda3a73247c466528 Mon Sep 17 00:00:00 2001 From: Erin Date: Sat, 27 Jul 2019 17:17:11 -0500 Subject: [PATCH 10/15] restoring tracking script to app.html --- app.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app.html b/app.html index 2faaeb5..400eaa2 100644 --- a/app.html +++ b/app.html @@ -5,7 +5,7 @@ - + {{ APP }} From d96db19dd5acfe6d1585c5fc3f3eaa948f2895f4 Mon Sep 17 00:00:00 2001 From: Erin Rivas Date: Mon, 12 Aug 2019 19:43:39 -0500 Subject: [PATCH 11/15] moving logic to _category to reduce duplication --- components/Card.vue | 58 ++++++++++++++++------------------------- components/TableRow.vue | 49 ++++++++++++---------------------- pages/_category.vue | 33 ++++++++++++++++++----- 3 files changed, 65 insertions(+), 75 deletions(-) diff --git a/components/Card.vue b/components/Card.vue index 94ae71e..122e16b 100644 --- a/components/Card.vue +++ b/components/Card.vue @@ -1,58 +1,48 @@ From 5d1e205a191cd94ed91a1bc4f09663c5470beb7f Mon Sep 17 00:00:00 2001 From: Erin Rivas Date: Tue, 13 Aug 2019 18:08:24 -0500 Subject: [PATCH 13/15] cleaning out old code from card.vue --- components/Card.vue | 6 ------ 1 file changed, 6 deletions(-) diff --git a/components/Card.vue b/components/Card.vue index 122e16b..e034494 100644 --- a/components/Card.vue +++ b/components/Card.vue @@ -28,12 +28,6 @@ export default { }, mounted() {}, watch: {}, - // category() { - // return this.categories.find( - // category => - // category.title.toLowerCase() === this.categoryRouteTitle.toLowerCase() - // ); - // } } From 0a8c7ebc2890e2a7e5c9614031fe114e7090597d Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 13 Aug 2019 20:15:05 -0500 Subject: [PATCH 14/15] createCopyUrl to _category.vue --- components/Card.vue | 21 ++------------------- components/TableRow.vue | 21 ++------------------- pages/_category.vue | 14 ++++++++++++-- 3 files changed, 16 insertions(+), 40 deletions(-) diff --git a/components/Card.vue b/components/Card.vue index e034494..7e24308 100644 --- a/components/Card.vue +++ b/components/Card.vue @@ -3,31 +3,14 @@ p.card--title {{resource.title}} p.card--description {{resource.desc}} .card--links - a.card--reference(@click='createCopyUrl') Copy + a.card--reference(@click='createCopyUrl(resource)') Copy br a.card--target(:href="resource.url" :target='resource.title' rel='noreferrer') Open diff --git a/components/TableRow.vue b/components/TableRow.vue index cb11505..1930717 100644 --- a/components/TableRow.vue +++ b/components/TableRow.vue @@ -5,31 +5,14 @@ td.tableRow--links tr td - a.tableRow--reference(@click='createCopyUrl') Copy + a.tableRow--reference(@click='createCopyUrl(resource)') Copy td a.tableRow--target(:href="resource.url" :target='resource.title' rel='noreferrer') Open diff --git a/pages/_category.vue b/pages/_category.vue index 81e315e..1982ff0 100644 --- a/pages/_category.vue +++ b/pages/_category.vue @@ -4,12 +4,12 @@ .cards(v-if="cardsShown") template div(v-for='resource in category.resources' :key='resource.title') - Card(:resource='resource' :isActive='activeCard === resource.title' v-on:toggle='onToggle(resource.title)') + Card(:resource='resource' :createCopyUrl="createCopyUrl" :isActive='activeCard === resource.title') table(v-if="!cardsShown") TableHead(:title="'Welcome'" :desc="'Description'" :url="'URL'") template div(v-for='resource in category.resources' :key='resource.title') - TableRow(:resource='resource' :isActive='activeCard === resource.title' v-on:toggle='onToggle(resource.title)') + TableRow(:resource='resource' :createCopyUrl="createCopyUrl" :isActive='activeCard === resource.title')