From 7e8dee218c32070331029c135310cb2a29f009e4 Mon Sep 17 00:00:00 2001 From: ian Date: Thu, 14 Sep 2023 10:46:42 +0100 Subject: [PATCH 1/7] new plans --- src/components/modal/ModalPro.vue | 71 ++++++++++++++++++++++++++----- 1 file changed, 61 insertions(+), 10 deletions(-) diff --git a/src/components/modal/ModalPro.vue b/src/components/modal/ModalPro.vue index 6641ed4d..6e43f217 100644 --- a/src/components/modal/ModalPro.vue +++ b/src/components/modal/ModalPro.vue @@ -12,20 +12,38 @@

Pro Account

- {{proButtonText}} + {{proButtonText}}

Visionary Account

- {{visionaryButtonText}} + {{visionaryButtonText}} +
+
+

Pioneer Account

+ + {{pioneerButtonText}} +
+
+

Trailblazer Account

+ + {{trailblazerButtonText}}
@@ -54,8 +72,10 @@ module.exports = { return { unit:"GiB", space:"", - proMb: 50*1024, - visionaryMb: 500*1024, + proMb: 100*1000, + visionaryMb: 500*1000, + pioneerMb: 2000*1000, + trailblazerMb: 4000*1000, gettingCard: false, paymentUrl:null, showCard:false, @@ -85,10 +105,31 @@ module.exports = { return this.quotaBytes/(1024*1024) > this.paymentProperties.freeMb() && this.paymentProperties.desiredMb() == this.visionaryMb; }, - prorataText() { - if (!this.isPro) - return ""; - return " (pro rata for this month)"; + isPioneer() { + return this.quotaBytes/(1024*1024) > this.paymentProperties.freeMb() && this.paymentProperties.desiredMb() == this.pioneerMb; + }, + + isTrailBlazer() { + return this.quotaBytes/(1024*1024) > this.paymentProperties.freeMb() && this.paymentProperties.desiredMb() == this.trailblazerMb; + }, + + prorataTextVisionary() { + if (this.isPro()) + return " (pro rata for this month)"; + else + return "" + }, + prorataTextPioneer() { + if (this.isPro() || this.isVisionary()) + return " (pro rata for this month)"; + else + return "" + }, + prorataTextTrailBlazer() { + if (this.isPro() || this.isVisionary() || this.isPioneer()) + return " (pro rata for this month)"; + else + return "" }, upgradeTitle(){ return (this.isPaid) @@ -104,6 +145,16 @@ module.exports = { return (this.isVisionary) ? 'Your Current Plan' : 'Select Visionary (opens new tab)' + }, + pioneerButtonText(){ + return (this.isPioneer) + ? 'Your Current Plan' + : 'Select Pioneer (opens new tab)' + }, + trailblazerButtonText(){ + return (this.isTrailBlazer) + ? 'Your Current Plan' + : 'Select Trailblazer (opens new tab)' } }, From 94813886a1efd4a2c36d7e40afbf17819f3233a7 Mon Sep 17 00:00:00 2001 From: ian Date: Wed, 1 Nov 2023 16:18:26 +0000 Subject: [PATCH 2/7] switch to decimal storage sizes --- src/components/drive/DriveTable.vue | 12 ++++++------ src/components/modal/ModalPro.vue | 12 ++++++------ src/mixins/storage/index.js | 14 +++++++------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/components/drive/DriveTable.vue b/src/components/drive/DriveTable.vue index b3475cdb..31899e11 100644 --- a/src/components/drive/DriveTable.vue +++ b/src/components/drive/DriveTable.vue @@ -99,13 +99,13 @@ module.exports = { return formatted; }, convertBytesToHumanReadable:function(bytes) { - if (bytes < 1024) + if (bytes < 1000) return bytes + " Bytes"; - if (bytes < 1024 * 1024) - return this.roundToDisplay(bytes / 1024) + " KiB"; - if (bytes < 1024 * 1024 * 1024) - return this.roundToDisplay(bytes / 1024 / 1024) + " MiB"; - return this.roundToDisplay(bytes / 1024 / 1024 / 1024) + " GiB"; + if (bytes < 1000 * 1000) + return this.roundToDisplay(bytes / 1000) + " KB"; + if (bytes < 1000 * 1000 * 1000) + return this.roundToDisplay(bytes / 1000 / 1000) + " MB"; + return this.roundToDisplay(bytes / 1000 / 1000 / 1000) + " GB"; }, roundToDisplay:function(x) { return Math.round(x * 100) / 100; diff --git a/src/components/modal/ModalPro.vue b/src/components/modal/ModalPro.vue index 6e43f217..b9c61a91 100644 --- a/src/components/modal/ModalPro.vue +++ b/src/components/modal/ModalPro.vue @@ -95,22 +95,22 @@ module.exports = { ]), isPaid() { - return this.quotaBytes/(1024*1024) > this.paymentProperties.freeMb() && this.paymentProperties.desiredMb() > 0; + return this.quotaBytes/(1000*1000) > this.paymentProperties.freeMb() && this.paymentProperties.desiredMb() > 0; }, isPro() { - return this.quotaBytes/(1024*1024) > this.paymentProperties.freeMb() && this.paymentProperties.desiredMb() == this.proMb; + return this.quotaBytes/(1000*1000) > this.paymentProperties.freeMb() && this.paymentProperties.desiredMb() == this.proMb; }, isVisionary() { - return this.quotaBytes/(1024*1024) > this.paymentProperties.freeMb() && this.paymentProperties.desiredMb() == this.visionaryMb; + return this.quotaBytes/(1000*1000) > this.paymentProperties.freeMb() && this.paymentProperties.desiredMb() == this.visionaryMb; }, isPioneer() { - return this.quotaBytes/(1024*1024) > this.paymentProperties.freeMb() && this.paymentProperties.desiredMb() == this.pioneerMb; + return this.quotaBytes/(1000*1000) > this.paymentProperties.freeMb() && this.paymentProperties.desiredMb() == this.pioneerMb; }, isTrailBlazer() { - return this.quotaBytes/(1024*1024) > this.paymentProperties.freeMb() && this.paymentProperties.desiredMb() == this.trailblazerMb; + return this.quotaBytes/(1000*1000) > this.paymentProperties.freeMb() && this.paymentProperties.desiredMb() == this.trailblazerMb; }, prorataTextVisionary() { @@ -210,7 +210,7 @@ module.exports = { }, updateCardDetails() { - this.updateCard(this.paymentProperties.desiredMb()*1024*1024) + this.updateCard(this.paymentProperties.desiredMb()*1000*1000) }, updateCard(desired) { diff --git a/src/mixins/storage/index.js b/src/mixins/storage/index.js index 00f6d8e2..a558fdf2 100644 --- a/src/mixins/storage/index.js +++ b/src/mixins/storage/index.js @@ -6,12 +6,12 @@ module.exports = { convertBytesToHumanReadable:function(bytesAsString) { let bytes = Number(bytesAsString); - if (bytes < 1024) + if (bytes < 1000) return bytes + " Bytes"; - if (bytes < 1024 * 1024) - return this.roundToDisplay(bytes / 1024) + " KiB"; - if (bytes < 1024 * 1024 * 1024) - return this.roundToDisplay(bytes / 1024 / 1024) + " MiB"; - return this.roundToDisplay(bytes / 1024 / 1024 / 1024) + " GiB"; + if (bytes < 1000 * 100) + return this.roundToDisplay(bytes / 1000) + " KB"; + if (bytes < 1000 * 1000 * 1000) + return this.roundToDisplay(bytes / 1000 / 1000) + " MB"; + return this.roundToDisplay(bytes / 1000 / 1000 / 1000) + " GB"; }, -} \ No newline at end of file +} From e80caf85d7f7a1f6bf62a6e01657c4dd4210349d Mon Sep 17 00:00:00 2001 From: ian Date: Fri, 3 Nov 2023 10:49:14 +0000 Subject: [PATCH 3/7] change more 1024s to 1000 in space units --- src/components/modal/ModalSpace.vue | 14 +++++++------- src/mixins/mixins.js | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/components/modal/ModalSpace.vue b/src/components/modal/ModalSpace.vue index 99c9ef58..bc7314a9 100644 --- a/src/components/modal/ModalSpace.vue +++ b/src/components/modal/ModalSpace.vue @@ -16,8 +16,8 @@ placeholder="New total space amount" > @@ -40,7 +40,7 @@ module.exports = { }, data() { return { - unit:"GiB", + unit:"GB", space:"", }; }, @@ -56,9 +56,9 @@ module.exports = { methods: { getRequestedBytes() { - if (this.unit == "GiB") - return this.space*1024*1024*1024; - return this.space*1024*1024; + if (this.unit == "GB") + return this.space*1000*1000*1000; + return this.space*1000*1000; }, validateSpace() { @@ -101,4 +101,4 @@ module.exports = { } - \ No newline at end of file + diff --git a/src/mixins/mixins.js b/src/mixins/mixins.js index 439e452e..39f3ebb5 100644 --- a/src/mixins/mixins.js +++ b/src/mixins/mixins.js @@ -10,14 +10,14 @@ module.exports = { convertBytesToHumanReadable(bytesAsString) { let bytes = Number(bytesAsString); - if (bytes < 1024) + if (bytes < 1000) return bytes + " Bytes"; - if (bytes < 1024 * 1024) - return this.roundToDisplay(bytes / 1024) + " KiB"; - if (bytes < 1024 * 1024 * 1024) - return this.roundToDisplay(bytes / 1024 / 1024) + " MiB"; - return this.roundToDisplay(bytes / 1024 / 1024 / 1024) + " GiB"; + if (bytes < 1000 * 1000) + return this.roundToDisplay(bytes / 1000) + " KB"; + if (bytes < 1000 * 1000 * 1000) + return this.roundToDisplay(bytes / 1000 / 1000) + " MB"; + return this.roundToDisplay(bytes / 1000 / 1000 / 1000) + " GB"; }, } -} \ No newline at end of file +} From b34a61f988fbeb5ce50037c66aefed7d2575eb03 Mon Sep 17 00:00:00 2001 From: ian Date: Fri, 3 Nov 2023 11:03:01 +0000 Subject: [PATCH 4/7] update paid signup page --- src/components/Signup.vue | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/src/components/Signup.vue b/src/components/Signup.vue index ab7cc1bd..8f2a43ea 100644 --- a/src/components/Signup.vue +++ b/src/components/Signup.vue @@ -50,20 +50,38 @@

Pro Account

    -
  • 50 GB of hyper secure storage
    • +
  • 100 GB of hyper secure storage
  • All our bundled private applications
  • £5 / month
- Select Pro + Select Pro

Visionary Account

  • 500 GB of hyper secure storage
  • All our bundled private applications
    • +
  • £10 / month
    • +
+ Select Visionary +
+
+

Pioneer Account

+
    +
  • 2000 GB of hyper secure storage
    • +
  • All our bundled private applications
  • £25 / month
- Select Visionary + Select Visionary +
+
+

Trailblazer Account

+
    +
  • 4000 GB of hyper secure storage
    • +
  • All our bundled private applications
    • +
  • £40 / month
    • +
+ Select Visionary

Want to try it first?

From 2d6406de770edc6bd858818b5a78e1a584a0f294 Mon Sep 17 00:00:00 2001 From: ian Date: Sat, 4 Nov 2023 20:56:38 +0000 Subject: [PATCH 5/7] fix account plans page --- src/components/modal/ModalPro.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/modal/ModalPro.vue b/src/components/modal/ModalPro.vue index b9c61a91..dd8768f5 100644 --- a/src/components/modal/ModalPro.vue +++ b/src/components/modal/ModalPro.vue @@ -43,7 +43,7 @@
  • All our bundled private applications
  • £40 / month {{ prorataTextTrailblazer }}
    • - {{trailblazerButtonText}} + {{trailblazerButtonText}}
    @@ -114,19 +114,19 @@ module.exports = { }, prorataTextVisionary() { - if (this.isPro()) + if (this.isPro) return " (pro rata for this month)"; else return "" }, prorataTextPioneer() { - if (this.isPro() || this.isVisionary()) + if (this.isPro || this.isVisionary) return " (pro rata for this month)"; else return "" }, prorataTextTrailBlazer() { - if (this.isPro() || this.isVisionary() || this.isPioneer()) + if (this.isPro || this.isVisionary || this.isPioneer) return " (pro rata for this month)"; else return "" From 20b2ce9eef230775290baa2755ccd0e45be3f98d Mon Sep 17 00:00:00 2001 From: ian Date: Sat, 4 Nov 2023 20:57:50 +0000 Subject: [PATCH 6/7] fix prorata text for trailblazer --- src/components/modal/ModalPro.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/modal/ModalPro.vue b/src/components/modal/ModalPro.vue index dd8768f5..d5bb0fbb 100644 --- a/src/components/modal/ModalPro.vue +++ b/src/components/modal/ModalPro.vue @@ -41,7 +41,7 @@
    • 4000 GB of hyper secure storage
    • All our bundled private applications
      • -
    • £40 / month {{ prorataTextTrailblazer }}
      • +
    • £40 / month {{ prorataTextTrailBlazer }}
    {{trailblazerButtonText}} From 1170729cc7896bd2902974b9d9e1bc639d9cf96d Mon Sep 17 00:00:00 2001 From: ian Date: Sat, 4 Nov 2023 23:40:31 +0000 Subject: [PATCH 7/7] Fix Account modal that was off screen and unscrollable --- src/components/modal/AppModal.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/modal/AppModal.vue b/src/components/modal/AppModal.vue index 65893c47..5c0b6a05 100644 --- a/src/components/modal/AppModal.vue +++ b/src/components/modal/AppModal.vue @@ -82,6 +82,7 @@ module.exports = { .app-modal__container.modal--right{ position: absolute; + top:0; right:0; width:50%; min-height:100vh; @@ -153,4 +154,4 @@ module.exports = { } } - \ No newline at end of file +