CERBERUS/outline-server
1
0
Fork 0
mirror of https://github.com/OutlineFoundation/outline-server.git synced 2026-08-04 14:37:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #963 from Jigsaw-Code/bemasc-free-tier

Browse source 
Add links to the GCP pricing explanation
This commit is contained in:
Benjamin M. Schwartz 2021-08-17 10:09:47 -04:00 • committed by GitHub
commit fcc5e3367c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 57 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/server_manager/messages/en.json
View file

@ -251,7 +251,8 @@
"setup-do-title": "Setting up Outline.",
"setup-firewall-instructions": "Firewall instructions",
"setup-gcp-easy": "Easy setup process",
"setup-gcp-cost": "Your first server is free for 90 days, then as low as US$3/month",
"setup-gcp-free-tier": "With {openLinkFreeTier}Free Tier{closeLink}, your first server starts at {openLinkIpPrice}US$3/month{closeLink}",
"setup-gcp-free-trial": "{openLinkFreeTrial}90 day free trial{closeLink} for new users",
"setup-gcp-create": "Create a new server with your Google account. Costs vary by location and usage.",
"setup-gcp-promo": "Try the new automatic Outline server creation process for Google Cloud",
"setup-recommended": "Recommended",

29
src/server_manager/messages/master_messages.json
View file

@ -1152,9 +1152,32 @@
"message": "Easy setup process",
"description": "This string appears in the server setup view as an item of a list describing Outline's features."
},
"setup_gcp_cost": {
"message": "Your first server is free for 90 days, then as low as US$3/month",
"description": "This string appears in the server setup view as an item of a list describing Outline's features."
"setup_gcp_free_tier": {
"message": "With $START_OF_LINK1$Free Tier$END_OF_LINK$, your first server starts at $START_OF_LINK2$US$3/month$END_OF_LINK$",
"description": "Describes the benefits of the GCP Free Tier program (https://cloud.google.com/free/docs/gcp-free-tier)",
"placeholders": {
"END_OF_LINK": {
"content": "{closeLink}"
},
"START_OF_LINK1": {
"content": "{openLinkFreeTier}"
},
"START_OF_LINK2": {
"content": "{openLinkIpPrice}"
}
}
},
"setup_gcp_free_trial": {
"message": "$START_OF_LINK$90 day free trial$END_OF_LINK$ for new users",
"description": "Describes the benefits of the GCP Free Trial program (https://cloud.google.com/free/docs/gcp-free-tier/#free-trial)",
"placeholders": {
"END_OF_LINK": {
"content": "{closeLink}"
},
"START_OF_LINK": {
"content": "{openLinkFreeTrial}"
}
}
},
"setup_gcp_create": {
"message": "Create a new server with your Google account. Costs vary by location and usage.",

32
src/server_manager/web_app/ui_components/outline-intro-step.js
View file

@ -93,12 +93,27 @@ const GCP_STYLES = html`
:host(:dir(rtl)) #gcp .description ul {
list-style-image: url("../images/check_blue_rtl.svg");
}
iron-icon {
width: 16px;
height: 16px;
margin-left: 4px;
vertical-align: middle;
}
</style>
`;
const GCP_EXPERIMENTAL_CARD_HTML = html`
${GCP_STYLES}
<div id="gcp" class="card" on-tap="setUpGcpTapped" hidden\$="[[!_showNewGcpFlow(gcpAccountName)]]">
<style>
/* This card contains hyperlinks so the whole thing can't be clickable. */
.card#gcp {
cursor: auto;
}
.card-footer {
cursor: pointer;
}
</style>
<div id="gcp" class="card" hidden\$="[[!_showNewGcpFlow(gcpAccountName)]]">
<div class="card-header">
<div class="tag">[[localize('experimental')]]</div>
<div class="email" hidden\$="[[!_computeIsAccountConnected(gcpAccountName)]]">[[gcpAccountName]]</div>
@ -109,7 +124,13 @@ const GCP_EXPERIMENTAL_CARD_HTML = html`
<div class="description">
<ul hidden\$="[[_computeIsAccountConnected(gcpAccountName)]]">
<li>[[localize('setup-gcp-easy')]]</li>
<li>[[localize('setup-gcp-cost')]]</li>
<li inner-h-t-m-l="[[localize('setup-gcp-free-tier',
'openLinkFreeTier', _openLinkFreeTier,
'openLinkIpPrice', _openLinkIpPrice,
'closeLink', _closeLink)]]"></li>
<li inner-h-t-m-l="[[localize('setup-gcp-free-trial',
'openLinkFreeTrial', _openLinkFreeTrial,
'closeLink', _closeLink)]]"></li>
<li>[[localize('setup-cancel')]]</li>
</ul>
<p hidden\$="[[!_computeIsAccountConnected(gcpAccountName)]]">
@ -117,7 +138,7 @@ const GCP_EXPERIMENTAL_CARD_HTML = html`
</p>
</div>
</div>
<div class="card-footer">
<div class="card-footer" on-tap="setUpGcpTapped">
<paper-button class="primary" hidden\$="[[_computeIsAccountConnected(gcpAccountName)]]">[[localize('setup-action')]]</paper-button>
<paper-button class="primary" hidden\$="[[!_computeIsAccountConnected(gcpAccountName)]]">[[localize('setup-create')]]</paper-button>
</div>
@ -348,6 +369,11 @@ Polymer({
},
},
_openLinkFreeTier: '<a href="https://cloud.google.com/free/docs/gcp-free-tier#compute">',
_openLinkIpPrice: '<a href="https://cloud.google.com/vpc/network-pricing#ipaddress">',
_openLinkFreeTrial: '<a href="https://cloud.google.com/free/docs/gcp-free-tier/#free-trial">',
_closeLink: '<iron-icon icon=open-in-new></iron-icon></a>',
_computeIsAccountConnected(accountName) {
return Boolean(accountName);
},