From 861947620e402abce14a2f66c2a221d29e520f60 Mon Sep 17 00:00:00 2001 From: Oliver-Akins Date: Sat, 22 Aug 2020 00:03:17 -0600 Subject: [PATCH 01/12] Update the icon to use the properly cased prop --- src/components/Icon.vue | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/components/Icon.vue b/src/components/Icon.vue index 58f3720..03bc253 100644 --- a/src/components/Icon.vue +++ b/src/components/Icon.vue @@ -2,15 +2,15 @@
Date: Sat, 22 Aug 2020 00:03:50 -0600 Subject: [PATCH 02/12] Add share icon --- src/components/Icon.vue | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/components/Icon.vue b/src/components/Icon.vue index 03bc253..872a905 100644 --- a/src/components/Icon.vue +++ b/src/components/Icon.vue @@ -88,6 +88,29 @@ /> + + + + + +
From cadb8e7358263fd742efda739194b6a6ed743f23 Mon Sep 17 00:00:00 2001 From: Oliver-Akins Date: Sat, 22 Aug 2020 00:04:26 -0600 Subject: [PATCH 03/12] Adds some CSS variables for the bottom bar of the cards --- src/css/theme/dark.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/css/theme/dark.css b/src/css/theme/dark.css index b9e12b8..4e89d4c 100644 --- a/src/css/theme/dark.css +++ b/src/css/theme/dark.css @@ -60,4 +60,9 @@ --scrollbar-background: #0f0f0f; --scrollbar-handle: #4d4d4d; --scrollbar-handle-hover: #5e5e5e; + + --card-bottom-row-text-colour: var(--accent2); + --card-bottom-row-background: var(--on-card-colour); + --card-bottom-row-divider-colour: #000000; + --card-bottom-row-icon-colour: var(--card-bottom-row-text-colour); } \ No newline at end of file From 0e757cabf555944a4a3fa7b81139980f9d3673b3 Mon Sep 17 00:00:00 2001 From: Oliver-Akins Date: Sat, 22 Aug 2020 00:05:03 -0600 Subject: [PATCH 04/12] Change colour of on-card-text --- src/css/theme/dark.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/css/theme/dark.css b/src/css/theme/dark.css index 4e89d4c..cc75c13 100644 --- a/src/css/theme/dark.css +++ b/src/css/theme/dark.css @@ -23,7 +23,7 @@ --card-text: #ffffff80; --on-card-colour: #4c4c4c; - --on-card-text: var(--spotify-green); + --on-card-text: var(--accent2); --modal-container-background: #0e0f10eb; --modal-background: var(--card-colour); From d7d780c188ef2fb20f02c33476dcb9e743ee1955 Mon Sep 17 00:00:00 2001 From: Oliver-Akins Date: Sat, 22 Aug 2020 00:05:43 -0600 Subject: [PATCH 05/12] Add the bottom bar with the icons. Adds styling for the bottom of the card. --- src/components/cards/Track.vue | 99 ++++++++++++++++++++++++---------- 1 file changed, 71 insertions(+), 28 deletions(-) diff --git a/src/components/cards/Track.vue b/src/components/cards/Track.vue index 9bb4f5d..68b796f 100644 --- a/src/components/cards/Track.vue +++ b/src/components/cards/Track.vue @@ -21,18 +21,29 @@ {{ item.artists.map(x => x.name).join(`, `) }} -
- {{ item.popularity }} -
-
- {{ duration }} +
+
+ {{ item.popularity }} +
+ +
+ +
+
+ {{ duration }} +
// Import Components +import Icon from "../Icon"; import PopularityModal from "../modals/PopularityInfo.vue"; import DetailedTrackModal from "../modals/DetailedTrack.vue"; @@ -56,6 +68,7 @@ export default { components: { PopularityModal: PopularityModal, TrackInfo: DetailedTrackModal, + icon: Icon, }, props: { item: { @@ -100,7 +113,6 @@ export default { .card { border-radius: var(--corner-rounding); background-color: var(--card-colour); - padding: 10px 10px 1.75em; color: var(--card-text); flex-direction: column; align-items: center; @@ -108,6 +120,7 @@ export default { position: relative; margin: 5px auto; display: flex; + padding: 10px; width: 90%; } @@ -118,6 +131,14 @@ img { height: var(--size); } +.track-info { + justify-content: center; + flex-direction: column; + margin-bottom: 1.25em; + display: flex; + height: 100%; +} + .title { text-align: center; font-size: larger; @@ -128,27 +149,49 @@ img { font-size: smaller; } -.corner { - background-color: var(--on-card-colour); - color: var(--on-card-text); +.bottom-bar { + border-radius: 0 0 var(--corner-rounding) var(--corner-rounding); + background-color: var(--card-bottom-row-background); + color: var(--card-bottom-row-text-colour); + justify-content: space-between; position: absolute; - padding: 1px 6px; + padding-right: 5%; + padding-left: 5%; + display: flex; + width: 90%; + bottom: 0; } -.popularity { - border-radius: 0 var(--corner-rounding) 0 var(--corner-rounding); - bottom: 0; - left: 0; +/* Setting the growth and alignments of the bottom bar buttons */ +.bottom-bar > div { + border-color: var(--card-bottom-row-divider-colour); + padding-bottom: 2px; + padding-top: 2px; } -.popularity:hover { - cursor: pointer; +.bottom-bar > :nth-child(1) { + border-right-style: solid; + border-width: 2px; + flex-grow: 1; +} +.bottom-bar > :nth-child(2) { + border-right-style: solid; + text-align: center; + border-width: 1px; + flex-grow: 2; +} +.bottom-bar > :nth-child(3) { + border-left-style: solid; + text-align: center; + border-width: 1px; + flex-grow: 2; +} +.bottom-bar > :nth-child(4) { + border-left-style: solid; + text-align: right; + border-width: 2px; + flex-grow: 1; } -.duration { - border-radius: var(--corner-rounding) 0 var(--corner-rounding) 0; - bottom: 0; - right: 0; -} @media only screen and (min-width: 768px) { .card { From f70d8fb2adc9b0edf3a0971f5f6ceb8272e54de8 Mon Sep 17 00:00:00 2001 From: Oliver-Akins Date: Sun, 23 Aug 2020 01:12:54 -0600 Subject: [PATCH 06/12] Add sharing modal --- src/components/cards/Track.vue | 12 +++- src/components/modals/ShareTrack.vue | 99 ++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+), 2 deletions(-) create mode 100644 src/components/modals/ShareTrack.vue diff --git a/src/components/cards/Track.vue b/src/components/cards/Track.vue index 68b796f..13befb9 100644 --- a/src/components/cards/Track.vue +++ b/src/components/cards/Track.vue @@ -54,20 +54,27 @@ :track="item" @close="show_track_info = false" /> +
+ + \ No newline at end of file From 33cf7db1887260465742286a8832288ce45d675b Mon Sep 17 00:00:00 2001 From: Oliver-Akins Date: Sun, 23 Aug 2020 01:13:25 -0600 Subject: [PATCH 07/12] Finish track V2 --- src/components/cards/Track.vue | 77 +++++++++++++++++++++++++--------- 1 file changed, 57 insertions(+), 20 deletions(-) diff --git a/src/components/cards/Track.vue b/src/components/cards/Track.vue index 13befb9..5c9c958 100644 --- a/src/components/cards/Track.vue +++ b/src/components/cards/Track.vue @@ -1,5 +1,5 @@