From ba522c350ae5e90ff3106cbded94ccccb078c8b5 Mon Sep 17 00:00:00 2001 From: KevinMidboe Date: Sun, 11 Oct 2020 23:31:20 +0200 Subject: [PATCH 01/17] Cleaned up some styling. --- src/ui/Wine.vue | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/ui/Wine.vue b/src/ui/Wine.vue index 955bdcd..db2ac3c 100644 --- a/src/ui/Wine.vue +++ b/src/ui/Wine.vue @@ -61,7 +61,6 @@ export default { \ No newline at end of file From cb368ee6a3b9c82e282ce47f7f8143fe3d5cca66 Mon Sep 17 00:00:00 2001 From: KevinMidboe Date: Sun, 11 Oct 2020 23:37:53 +0200 Subject: [PATCH 03/17] Wine gets named slots for bottom and top section. --- src/ui/Wine.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/ui/Wine.vue b/src/ui/Wine.vue index db2ac3c..d0c9850 100644 --- a/src/ui/Wine.vue +++ b/src/ui/Wine.vue @@ -1,5 +1,6 @@ @@ -78,6 +74,8 @@ export default { \ No newline at end of file From 87c309d09477ac9b1e1fb166c14c38cf3571d9c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kevin=20Midb=C3=B8e?= Date: Mon, 26 Oct 2020 12:55:20 +0100 Subject: [PATCH 08/17] Fix issue where backend didn't delete. Now pass correct id. --- src/api.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api.js b/src/api.js index 2e0a9e2..3c2baf1 100644 --- a/src/api.js +++ b/src/api.js @@ -122,7 +122,7 @@ const winners = () => { const deleteRequestedWine = wineToBeDeleted => { - const url = new URL("api/request/"+ wineToBeDeleted._id, BASE_URL); + const url = new URL("api/request/"+ wineToBeDeleted.id, BASE_URL); const options = { headers: { From 13a9c00b50e832255ae0cc3525f0a185d4e6eb09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kevin=20Midb=C3=B8e?= Date: Mon, 26 Oct 2020 12:55:44 +0100 Subject: [PATCH 09/17] Use the most unique id as key. --- src/components/AllRequestedWines.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/AllRequestedWines.vue b/src/components/AllRequestedWines.vue index ae0db86..cff50a0 100644 --- a/src/components/AllRequestedWines.vue +++ b/src/components/AllRequestedWines.vue @@ -5,7 +5,7 @@

Ingen har foreslått noe enda!

- +
From e13b4125be2d675df243aa179741c402766afd0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kevin=20Midb=C3=B8e?= Date: Mon, 26 Oct 2020 12:56:20 +0100 Subject: [PATCH 10/17] Small vin-button class for setting hight to content. --- src/styles/global.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/styles/global.scss b/src/styles/global.scss index 6811071..87d0a81 100644 --- a/src/styles/global.scss +++ b/src/styles/global.scss @@ -168,6 +168,10 @@ textarea { opacity: 0.25; cursor: not-allowed; } + + &.small { + height: min-content; + } } From 12d01379877a48a7ca9d30e0081d4cbd3b85f23a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kevin=20Midb=C3=B8e?= Date: Mon, 26 Oct 2020 12:57:21 +0100 Subject: [PATCH 11/17] New global width classes for 100/75/50/25. --- src/styles/global.scss | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/styles/global.scss b/src/styles/global.scss index 87d0a81..eabf453 100644 --- a/src/styles/global.scss +++ b/src/styles/global.scss @@ -245,6 +245,21 @@ textarea { } } +.width { + &-100 { + width: 100%; + } + &-75 { + width: 75%; + } + &-50 { + width: 50%; + } + &-25 { + width: 25%; + } +} + .cursor { &-pointer { cursor: pointer; From f01b58c1b6770d9c15a09da0973314bfb86f49a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kevin=20Midb=C3=B8e?= Date: Mon, 26 Oct 2020 13:10:01 +0100 Subject: [PATCH 12/17] Removed trailing whitespace. --- api/request.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/api/request.js b/api/request.js index f7ac11c..210c3e0 100644 --- a/api/request.js +++ b/api/request.js @@ -20,20 +20,20 @@ const deleteRequestedWineById = async (req, res) => { return res.json({ message: `Slettet vin med id: ${id}`, success: true - }); + }); } const getAllRequestedWines = async (req, res) => { const allWines = await RequestedWine.find({}).populate("wine"); - + return res.json(allWines); } const requestNewWine = async (req, res) => { const {wine} = req.body - + let thisWineIsLOKO = await Wine.findOne({id: wine.id}) - + if(thisWineIsLOKO == undefined){ thisWineIsLOKO = new Wine({ name: wine.name, @@ -45,9 +45,9 @@ const requestNewWine = async (req, res) => { }); await thisWineIsLOKO.save() } - + let requestedWine = await RequestedWine.findOne({ "wineId": wine.id}) - + if(requestedWine == undefined){ requestedWine = new RequestedWine({ count: 1, @@ -58,7 +58,7 @@ const requestNewWine = async (req, res) => { requestedWine.count += 1; } await requestedWine.save() - + return res.send(requestedWine); } From 554948d67c48bb93c33bfeff435f3640f4822dc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kevin=20Midb=C3=B8e?= Date: Mon, 26 Oct 2020 13:10:45 +0100 Subject: [PATCH 13/17] Use new hearth icon and smaller delete btn. --- src/ui/RequestedWineCard.vue | 47 ++++++++++++++++++++++++------------ 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/src/ui/RequestedWineCard.vue b/src/ui/RequestedWineCard.vue index dd9d6ce..bf13a34 100644 --- a/src/ui/RequestedWineCard.vue +++ b/src/ui/RequestedWineCard.vue @@ -4,22 +4,25 @@
{{ requestedElement.count }} - {{ locallyRequested ? "💜" : "🤍" }} +
@@ -77,26 +80,40 @@ export default { @import "./src/styles/variables"; .requested-count { - display: inline-block; + display: flex; + align-items: center; margin-top: -0.5rem; background-color: rgb(244,244,244); border-radius: 1.1rem; - font-size: 1.1rem; - padding-left: 1rem; - padding-right: 1rem; + padding: 0.25rem 1rem; + font-size: 1.25em; span { - padding: 0.6rem 0; - padding-right: 0.25rem; - display: inline-block; + padding-right: 0.5rem; + line-height: 1.25em; } - .icon { - font-style: unset; + .icon--heart{ + color: $link-color; } } .link .active { border-color: $link-color; } + + +.request { + display: flex; + align-items: center; + + &-icon { + font-size: 2rem; + color: $link-color; + } + + a { + margin-left: 0.75rem; + } +} \ No newline at end of file From 3aa989d2c11298f1cb1a40f436329508604b7900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kevin=20Midb=C3=B8e?= Date: Mon, 2 Nov 2020 15:14:13 +0100 Subject: [PATCH 14/17] Before requested hearth is grey, clicking sets colors to pink. --- src/ui/RequestedWineCard.vue | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/src/ui/RequestedWineCard.vue b/src/ui/RequestedWineCard.vue index bf13a34..addabe5 100644 --- a/src/ui/RequestedWineCard.vue +++ b/src/ui/RequestedWineCard.vue @@ -4,7 +4,7 @@
{{ requestedElement.count }} - +
@@ -17,10 +17,10 @@ @@ -94,26 +94,31 @@ export default { } .icon--heart{ - color: $link-color; + color: grey; } } -.link .active { - border-color: $link-color; -} +.active { + &.link { + border-color: $link-color + } + &.icon--heart { + color: $link-color; + } +} .request { display: flex; align-items: center; &-icon { - font-size: 2rem; - color: $link-color; + font-size: 1.5rem; + color: grey; } a { - margin-left: 0.75rem; + margin-left: 0.5rem; } } \ No newline at end of file From 003f0d1c4d9639f04b99a7034361dfbec8217ea4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kevin=20Midb=C3=B8e?= Date: Mon, 2 Nov 2020 15:16:39 +0100 Subject: [PATCH 15/17] Requested wines header looks the same as other headers. --- src/components/AllRequestedWines.vue | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/components/AllRequestedWines.vue b/src/components/AllRequestedWines.vue index cff50a0..44c3ce3 100644 --- a/src/components/AllRequestedWines.vue +++ b/src/components/AllRequestedWines.vue @@ -40,6 +40,21 @@ export default {