Skip to content

Commit

Permalink
Merge pull request #610 from Peergos/feat/new-pricing
Browse files Browse the repository at this point in the history 
new pricing
  • Loading branch information
@ianopolous
ianopolous committed Sep 5, 2024
2 parents 70d0854 + 9732801 commit c44baf7
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 65 deletions.
9 changes: 3 additions & 6 deletions assets/pro.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,12 @@ <h3>Space</h3>
<table>
<tr><th>Plan</th><th>Space</th></tr>
<tr><td>
Pro</td><td>100GB</td>
Pro</td><td>200GB</td>
</tr>
<tr>
<td>Visionary</td><td>500GB</td>
<td>Visionary</td><td>1000GB</td>
</tr>
<tr>
<td>Pioneer</td><td>2000GB</td>
</tr>
<tr>
<td>Trailblazer</td><td>4000GB</td>
<td>Pioneer</td><td>3000GB</td>
</tr>
</table>
26 changes: 7 additions & 19 deletions src/components/Signup.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,38 +55,29 @@
<div class="card__meta options">
<h3>Pro Account</h3>
<ul>
<li>100 GB {{ translate("SIGNUP.HYPER") }}</li>
<li>200 GB {{ translate("SIGNUP.HYPER") }}</li>
<li>{{ translate("SIGNUP.BUNDLED") }}</li>
<li>&#x00A3;{{ price1() }}</li>
</ul>
<AppButton @click.native="setPlan(100000000000)" type="primary" block accent>Select Pro</AppButton>
<AppButton @click.native="setPlan(200000000000)" type="primary" block accent>Select Pro</AppButton>
</div>
<div class="card__meta options">
<h3>Visionary Account</h3>
<ul>
<li>500 GB {{ translate("SIGNUP.HYPER") }}</li>
<li>1000 GB {{ translate("SIGNUP.HYPER") }}</li>
<li>{{ translate("SIGNUP.BUNDLED") }}</li>
<li>&#x00A3;{{ price2() }}</li>
</ul>
<AppButton @click.native="setPlan(500000000000)" type="primary" block accent>Select Visionary</AppButton>
<AppButton @click.native="setPlan(1000000000000)" type="primary" block accent>Select Visionary</AppButton>
</div>
<div class="card__meta options">
<h3>Pioneer Account</h3>
<ul>
<li>2000 GB {{ translate("SIGNUP.HYPER") }}</li>
<li>3000 GB {{ translate("SIGNUP.HYPER") }}</li>
<li>{{ translate("SIGNUP.BUNDLED") }}</li>
<li>&#x00A3;{{ price3() }}</li>
</ul>
<AppButton @click.native="setPlan(2000000000000)" type="primary" block accent>Select Pioneer</AppButton>
</div>
<div class="card__meta options">
<h3>Trailblazer Account</h3>
<ul>
<li>4000 GB {{ translate("SIGNUP.HYPER") }}</li>
<li>{{ translate("SIGNUP.BUNDLED") }}</li>
<li>&#x00A3;{{ price4() }}</li>
</ul>
<AppButton @click.native="setPlan(4000000000000)" type="primary" block accent>Select Trailblazer</AppButton>
<AppButton @click.native="setPlan(3000000000000)" type="primary" block accent>Select Pioneer</AppButton>
</div>
<div class="card__meta options">
<h3>{{ translate("SIGNUP.TRYTITLE") }}</h3>
Expand Down Expand Up @@ -204,17 +195,14 @@ module.exports = {
this.annual = true;
},
price1() {
return (this.annual ? 4 : 5) + " / " + this.translate("SIGNUP.MONTH");
return (this.annual ? 3 : 4) + " / " + this.translate("SIGNUP.MONTH");
},
price2() {
return (this.annual ? 8 : 10) + " / " + this.translate("SIGNUP.MONTH");
},
price3() {
return (this.annual ? 20 : 25) + " / " + this.translate("SIGNUP.MONTH");
},
price4() {
return (this.annual ? 35 : 40) + " / " + this.translate("SIGNUP.MONTH");
},
showPaidPlans() {
return this.token.length == 0 && this.acceptingPaidSignups && this.desiredQuota == 0;
},
Expand Down
48 changes: 10 additions & 38 deletions src/components/modal/ModalPro.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,38 +20,29 @@
<div class="card__meta options">
<h3>Pro {{ translate("PAID.ACCOUNT") }}</h3>
<ul>
<li>100 GB {{ translate("PAID.STORAGE") }}</li>
<li>200 GB {{ translate("PAID.STORAGE") }}</li>
<li>{{ translate("PAID.APPS") }}</li>
<li>&#x00A3;{{ price1() }}</li>
</ul>
<AppButton @click.native="updateCard(100000000000)" :disabled="disablePro" type="primary" block accent>{{proButtonText}}</AppButton>
<AppButton @click.native="updateCard(200000000000)" :disabled="disablePro" type="primary" block accent>{{proButtonText}}</AppButton>
</div>
<div class="card__meta options">
<h3>Visionary {{ translate("PAID.ACCOUNT") }}</h3>
<ul>
<li>500 GB {{ translate("PAID.STORAGE") }}</li>
<li>1000 GB {{ translate("PAID.STORAGE") }}</li>
<li>{{ translate("PAID.APPS") }}</li>
<li>&#x00A3;{{ price2() }} {{ prorataTextVisionary }}</li>
</ul>
<AppButton @click.native="updateCard(500000000000)" :disabled="disableVisionary" type="primary" block accent>{{visionaryButtonText}}</AppButton>
<AppButton @click.native="updateCard(1000000000000)" :disabled="disableVisionary" type="primary" block accent>{{visionaryButtonText}}</AppButton>
</div>
<div class="card__meta options">
<h3>Pioneer {{ translate("PAID.ACCOUNT") }}</h3>
<ul>
<li>2000 GB {{ translate("PAID.STORAGE") }}</li>
<li>3000 GB {{ translate("PAID.STORAGE") }}</li>
<li>{{ translate("PAID.APPS") }}</li>
<li>&#x00A3;{{ price3() }} {{ prorataTextPioneer }}</li>
</ul>
<AppButton @click.native="updateCard(2000000000000)" :disabled="disablePioneer" type="primary" block accent>{{pioneerButtonText}}</AppButton>
</div>
<div class="card__meta options">
<h3>Trailblazer {{ translate("PAID.ACCOUNT") }}</h3>
<ul>
<li>4000 GB {{ translate("PAID.STORAGE") }}</li>
<li>{{ translate("PAID.APPS") }}</li>
<li>&#x00A3;{{ price4() }} {{ prorataTextTrailBlazer }}</li>
</ul>
<AppButton @click.native="updateCard(4000000000000)" :disabled="isTrailBlazer" type="primary" block accent>{{trailblazerButtonText}}</AppButton>
<AppButton @click.native="updateCard(3000000000000)" :disabled="disablePioneer" type="primary" block accent>{{pioneerButtonText}}</AppButton>
</div>
</div>

Expand Down Expand Up @@ -82,10 +73,9 @@ module.exports = {
return {
unit:"GiB",
space:"",
proMb: 100*1000,
visionaryMb: 500*1000,
pioneerMb: 2000*1000,
trailblazerMb: 4000*1000,
proMb: 200*1000,
visionaryMb: 1000*1000,
pioneerMb: 3000*1000,
gettingCard: false,
paymentUrl:null,
showCard:false,
Expand Down Expand Up @@ -130,10 +120,6 @@ module.exports = {
return this.quotaBytes/(1000*1000) > this.paymentProperties.freeMb() && this.paymentProperties.desiredMb() == this.pioneerMb && this.annual == this.currentAnnual;
},
isTrailBlazer() {
return this.quotaBytes/(1000*1000) > this.paymentProperties.freeMb() && this.paymentProperties.desiredMb() == this.trailblazerMb && this.annual == this.currentAnnual;
},
prorataTextVisionary() {
if (this.isPro)
return " ("+this.translate("PAID.PRORATA")+")";
Expand All @@ -146,12 +132,6 @@ module.exports = {
else
return ""
},
prorataTextTrailBlazer() {
if (this.isPro || this.isVisionary || this.isPioneer)
return " ("+this.translate("PAID.PRORATA")+")";
else
return ""
},
upgradeTitle(){
return (this.isPaid)
? this.translate("PAID.SETTINGS")
Expand All @@ -171,11 +151,6 @@ module.exports = {
return (this.isPioneer)
? this.translate("PAID.CURRENT")
: this.translate("PAID.PIONEER")
},
trailblazerButtonText(){
return (this.isTrailBlazer)
? this.translate("PAID.CURRENT")
: this.translate("PAID.TRAILBLAZER")
}
},
Expand All @@ -197,17 +172,14 @@ module.exports = {
this.annual = true;
},
price1() {
return (this.annual ? 4 : 5) + " / " + this.translate("SIGNUP.MONTH");
return (this.annual ? 3 : 4) + " / " + this.translate("SIGNUP.MONTH");
},
price2() {
return (this.annual ? 8 : 10) + " / " + this.translate("SIGNUP.MONTH");
},
price3() {
return (this.annual ? 20 : 25) + " / " + this.translate("SIGNUP.MONTH");
},
price4() {
return (this.annual ? 35 : 40) + " / " + this.translate("SIGNUP.MONTH");
},
startAddCardListener: function(desired) {
var that = this;
this.currentFocusFunction = function(event) {
Expand Down
1 change: 0 additions & 1 deletion src/i18n/en-GB.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,6 @@ module.exports = {
"PAID.PRO":"Select Pro (opens new tab)",
"PAID.VISIONARY":"Select Visionary (opens new tab)",
"PAID.PIONEER":"Select Pioneer (opens new tab)",
"PAID.TRAILBLAZER":"Select Trailblazer (opens new tab)",
"PAID.SORRY":"Sorry to see you go. You have until the end of the billing month to download your data, after which it will be deleted.",
"PAID.THANKYOU":"Thank you for signing up to a paid Peergos account!",
"PAID.CARD.NEEDED":"Card details required. Add a payment card to complete your upgrade.",
Expand Down
1 change: 0 additions & 1 deletion src/i18n/zh-CN.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,6 @@ module.exports = {
"PAID.PRO":"选择 Pro 计划（将打开新选项卡）",
"PAID.VISIONARY":"选择 Visionary 计划（将打开新选项卡）",
"PAID.PIONEER":"选择 Pioneer 计划（将打开新选项卡）",
"PAID.TRAILBLAZER":"选择 Trailblazer 计划（将打开新选项卡）",
"PAID.SORRY":"很遗憾看到你离开。我们很想知道有什么可以做得更好。请确保删除足够的数据，使其不超出基本配额。您将在计费月结束时恢复基本配额。",
"PAID.THANKYOU":"感谢您注册付费 Peergos 账户！",
"PAID.CARD.NEEDED":"需要卡的详细信息。添加支付卡以完成升级。",
Expand Down

0 comments on commit c44baf7

Please sign in to comment.