From 86bf404c31ba923b7487a8f3228399142e51071b Mon Sep 17 00:00:00 2001 From: Michael Evans Date: Thu, 24 Feb 2022 15:13:10 -0700 Subject: [PATCH 1/3] style changes --- src/components/promos/PromoLinks.vue | 264 +++++++++++++++++---------- 1 file changed, 169 insertions(+), 95 deletions(-) diff --git a/src/components/promos/PromoLinks.vue b/src/components/promos/PromoLinks.vue index 8f6cdfd8..24b7a6f2 100644 --- a/src/components/promos/PromoLinks.vue +++ b/src/components/promos/PromoLinks.vue @@ -9,7 +9,17 @@ New Promo Link - close + close

@@ -119,21 +129,32 @@

Period: February 2022

- Goal - Reward + Goal + Reward
- {{reward.name.split('Reward:')[0]}} - {{reward.name.split('Reward:')[1]}} + class="available-reward-table d-flex justify-start col-12" + > + {{ + reward.name.split('Reward:')[0] + }} + {{ + reward.name.split('Reward:')[1] + }}
- Please Select a Promo Length to view rewards + Please Select a Promo Length to view rewards
@@ -164,10 +185,26 @@ note_add
New Promo Link - + @@ -175,7 +212,7 @@ - + {{ pl.name }} @@ -183,22 +220,47 @@ calendar_today - {{ formatDate(pl.startTime) }} - {{ formatDate(pl.endTime) }} + {{ formatDate(pl.startTime) }} - + {{ formatDate(pl.endTime) }} {{ pl.email }} - + -

{{ progressToDisplay(pl.rewards).progression.earned }} PSV Earned

+

+ {{ progressToDisplay(pl.rewards).progression.earned }} PSV + Earned +

-

- Earned: {{ rewardToDisplay(pl.rewards).reward.name.split('Reward:')[1] }} +

+ Earned: + {{ + rewardToDisplay(pl.rewards).reward.name.split( + 'Reward:' + )[1] + }}

- Next: {{nextReward(pl.rewards).reward.name.split('Reward:')[1] }} + Next: + {{ + nextReward(pl.rewards).reward.name.split('Reward:')[1] + }}

- - Progress Data Unavailable - + Progress Data Unavailable

{{ pl.email }}

- + + + Claim Rewards + -

- Claim Rewards -

-

+ class="card-progress-bar" + > +

{{ progressText(pl, progressToDisplay(pl.rewards)) }}

- + Close - + + - {{selectedTemplate.name}} - close + {{ selectedTemplate.name }} + close Length - - {{window.name}} + + {{ window.name }} Rewards - - - {{reward.metadata.labels.en[marketKey].goal}} - {{reward.metadata.labels.en[marketKey].reward}} + + + {{ + reward.metadata.labels.en[marketKey].goal + }} + {{ + reward.metadata.labels.en[marketKey].reward + }} @@ -324,6 +427,7 @@ + @@ -624,19 +725,9 @@ p { } /* START fine tuning spacing aka: vuetify override */ - -.promo-link-modal .v-card__text { - padding: 0 10px; -} -.promo-link-modal .v-card__title { - padding: 10px 10px 0; -} -.promo-link-modal .v-card__actions { - padding: 5px 10px 10px; -} .promo-form-input.col.col-12 { padding-top: 0; - padding-bottom: 0; + padding-bottom: 0px; } .date-picker-input .col, .col-12 { @@ -688,24 +779,7 @@ p { font-weight: 600; } -.claim-reward-btn { - /* padding: 5px 110px; */ - padding: 6px 0; - height: 35px; - width: 318px; - cursor: pointer; - /* border: solid 1px rgba(255, 255, 255, 0); */ - background-color: rgba(255, 255, 255, 0.5); - border: rgba(0, 0, 0, 0.8) 1px solid; - border-radius: 4px; -} -.claim-reward-btn:hover { - /* background-color: rgba(255, 153, 0, 0.7); */ - background-color: rgba(255, 255, 255, 0.8); - border: rgba(0, 0, 0, 0.8) 1px solid; - border-radius: 4px; -} -.hidden{ +.hidden { visibility: hidden; } From d629636c4b9377393b266326ea97fc9f185156df Mon Sep 17 00:00:00 2001 From: Michael Evans Date: Fri, 25 Feb 2022 14:03:59 -0700 Subject: [PATCH 2/3] prog button --- src/components/promos/PromoLinks.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/components/promos/PromoLinks.vue b/src/components/promos/PromoLinks.vue index 0f229987..fc6d970f 100644 --- a/src/components/promos/PromoLinks.vue +++ b/src/components/promos/PromoLinks.vue @@ -350,7 +350,11 @@ Resend Link - + Visit Link @@ -650,6 +654,9 @@ export default { p { margin: 0; } +#visit-link-btn { + text-decoration: none; +} /* .thisone { text-align: center; From 6dbd5ff64ba42471dd2a625a46781b84a4c6dfa9 Mon Sep 17 00:00:00 2001 From: Michael Evans Date: Mon, 28 Feb 2022 16:04:08 -0700 Subject: [PATCH 3/3] small style changes to Sales History page --- src/views/Sales.vue | 318 +++++++++++++++++++++++++++++--------------- 1 file changed, 214 insertions(+), 104 deletions(-) diff --git a/src/views/Sales.vue b/src/views/Sales.vue index b3fd52cd..f87346f7 100644 --- a/src/views/Sales.vue +++ b/src/views/Sales.vue @@ -1,13 +1,17 @@