-
+
diff --git a/example.env b/example.env
index baed77d7..bbc7e1c4 100644
--- a/example.env
+++ b/example.env
@@ -135,6 +135,9 @@ FACEBOOK_CLIENT_SECRET=to_fill
# The landing page
# LANDING_PAGE_URL=https://simplelogin.io
+# The status page
+# STATUS_PAGE_URL=https://status.simplelogin.io
+
# Used when querying info on Apple API
# APPLE_API_SECRET=secret
# MACAPP_APPLE_API_SECRET=secret
diff --git a/server.py b/server.py
index 4c4e49bf..2942e24c 100644
--- a/server.py
+++ b/server.py
@@ -42,6 +42,14 @@ from app.config import (
FIRST_ALIAS_DOMAIN,
SESSION_COOKIE_NAME,
ADMIN_EMAIL,
+ PLAUSIBLE_HOST,
+ PLAUSIBLE_DOMAIN,
+ GITHUB_CLIENT_ID,
+ GOOGLE_CLIENT_ID,
+ FACEBOOK_CLIENT_ID,
+ LANDING_PAGE_URL,
+ STATUS_PAGE_URL,
+ SUPPORT_EMAIL,
)
from app.dashboard.base import dashboard_bp
from app.developer.base import developer_bp
@@ -452,6 +460,14 @@ def jinja2_filter(app):
SENTRY_DSN=SENTRY_FRONT_END_DSN,
VERSION=SHA1,
FIRST_ALIAS_DOMAIN=FIRST_ALIAS_DOMAIN,
+ PLAUSIBLE_HOST=PLAUSIBLE_HOST,
+ PLAUSIBLE_DOMAIN=PLAUSIBLE_DOMAIN,
+ GITHUB_CLIENT_ID=GITHUB_CLIENT_ID,
+ GOOGLE_CLIENT_ID=GOOGLE_CLIENT_ID,
+ FACEBOOK_CLIENT_ID=FACEBOOK_CLIENT_ID,
+ LANDING_PAGE_URL=LANDING_PAGE_URL,
+ STATUS_PAGE_URL=STATUS_PAGE_URL,
+ SUPPORT_EMAIL=SUPPORT_EMAIL,
)
diff --git a/static/logo.png b/static/logo.png
new file mode 100644
index 00000000..7c6114c1
Binary files /dev/null and b/static/logo.png differ
diff --git a/templates/emails/base.html b/templates/emails/base.html
index 49105e3e..9ca8391d 100644
--- a/templates/emails/base.html
+++ b/templates/emails/base.html
@@ -448,8 +448,8 @@
-
-
+
+
|
diff --git a/templates/emails/com/newsletter/mailbox.html b/templates/emails/com/newsletter/mailbox.html
index 3f494768..416e6683 100644
--- a/templates/emails/com/newsletter/mailbox.html
+++ b/templates/emails/com/newsletter/mailbox.html
@@ -31,5 +31,5 @@ maybe for different uses: a Gmail account for social networks & forums, a Pronto
{% block footer %}
This email is sent to {{ user.email }}. Unsubscribe on
- Settings
+ Settings
{% endblock %}
diff --git a/templates/emails/com/newsletter/mailbox.txt b/templates/emails/com/newsletter/mailbox.txt
index b8c86e8f..be4b28e9 100644
--- a/templates/emails/com/newsletter/mailbox.txt
+++ b/templates/emails/com/newsletter/mailbox.txt
@@ -1,5 +1,5 @@
This email is sent to {{ user.email }}.
-Unsubscribe from our emails on https://app.simplelogin.io/dashboard/setting#notification
+Unsubscribe from our emails on {{URL}}/dashboard/setting#notification
----------------
Hi {{user.name}}
diff --git a/templates/emails/com/newsletter/mobile-darkmode.html b/templates/emails/com/newsletter/mobile-darkmode.html
index c970293d..1dd6ac9f 100644
--- a/templates/emails/com/newsletter/mobile-darkmode.html
+++ b/templates/emails/com/newsletter/mobile-darkmode.html
@@ -20,7 +20,7 @@
Download the Android app on
Play Store and the iOS app on
- App Store.
+ App Store.
With the release of the mobile apps, SimpleLogin now covers most major platforms:
@@ -72,7 +72,7 @@
Again, another big tech enjoying its monopoly.
If you happen to use one of these social login options, please create a password for your account on the
- Setting page
+ Setting page
You can still sign in using these social login until 2020-05-31. After this date, they will be removed.
{% endcall %}
@@ -110,5 +110,5 @@
{% block footer %}
This email is sent to {{ user.email }}. Unsubscribe on
- Settings
+ Settings
{% endblock %}
diff --git a/templates/emails/com/newsletter/mobile-darkmode.txt b/templates/emails/com/newsletter/mobile-darkmode.txt
index 694e1545..b00c302c 100644
--- a/templates/emails/com/newsletter/mobile-darkmode.txt
+++ b/templates/emails/com/newsletter/mobile-darkmode.txt
@@ -1,5 +1,5 @@
This email is sent to {{ user.email }}.
-Unsubscribe from our emails on https://app.simplelogin.io/dashboard/setting#notification
+Unsubscribe from our emails on {{URL}}/dashboard/setting#notification
----------------
Hi {{user.name}}
@@ -14,7 +14,7 @@ Here are some of our latest news:
Now you can quickly create aliases on-the-go with SimpleLogin Android and iOS app, thanks to our mobile guy Thanh-Nhon!
Download:
- the Android app on Play Store https://play.google.com/store/apps/details?id=io.simplelogin.android
-- the iOS app on App Store https://apps.apple.com/us/app/simplelogin-anti-spam/id1494359858
+- the iOS app on App Store https://apps.apple.com/app/id1494359858
With the release of the mobile apps, SimpleLogin now covers most major platforms:
@@ -53,7 +53,7 @@ We have decided to deprecate those social login options because of several reaso
that isn't broadly available for Android users. Again, another big tech enjoying its monopoly.
If you happen to use one of these social login options, please create a password for your account on the Setting page
-https://app.simplelogin.io/dashboard/setting
+{{URL}}/dashboard/setting
You can still sign in using these social login until 2020-05-31. After this date, they will be removed.
diff --git a/templates/emails/com/newsletter/pgp.html b/templates/emails/com/newsletter/pgp.html
index f838e4db..7e09e58c 100644
--- a/templates/emails/com/newsletter/pgp.html
+++ b/templates/emails/com/newsletter/pgp.html
@@ -21,7 +21,7 @@
{{ render_text("You can create and manage your PGP keys when adding or editing your mailboxes. Check it out on your mailbox dashboard.") }}
- {{ render_button("Add your PGP key", "https://app.simplelogin.io/dashboard/mailbox") }}
+ {{ render_button("Add your PGP key", URL ~ "/dashboard/mailbox") }}
{{ render_text("Our next important feature is the coming of an iOS app. If you use iPhone or iPad want to help us testing out the app, please reply to this email so we can add you into the TestFlight program.
") }}
@@ -36,5 +36,5 @@
{% block footer %}
This email is sent to {{ user.email }}. Unsubscribe on
- Settings
+ Settings
{% endblock %}
diff --git a/templates/emails/com/newsletter/pgp.txt b/templates/emails/com/newsletter/pgp.txt
index 3e5d1438..a617e7b7 100644
--- a/templates/emails/com/newsletter/pgp.txt
+++ b/templates/emails/com/newsletter/pgp.txt
@@ -1,5 +1,5 @@
This email is sent to {{ user.email }}.
-Unsubscribe from our emails on https://app.simplelogin.io/dashboard/setting#notification
+Unsubscribe from our emails on {{URL}}/dashboard/setting#notification
----------------
Hi {{user.name}}
@@ -20,7 +20,7 @@ https://simplelogin.io/blog/with-pgp.png
You can find more info on our announcement post on https://simplelogin.io/blog/introducing-pgp/
-You can create and manage your PGP keys when adding or editing your mailboxes. Check it out on your mailbox dashboard at https://app.simplelogin.io/dashboard/mailbox
+You can create and manage your PGP keys when adding or editing your mailboxes. Check it out on your mailbox dashboard at {{URL}}/dashboard/mailbox
Our next important feature is the coming of an iOS app. If you use iPhone or iPad want to help us testing out the app, please reply to this email so we can add you into the TestFlight program.
diff --git a/templates/emails/com/onboarding/browser-extension.html b/templates/emails/com/onboarding/browser-extension.html
index 7bc912e6..55d5831e 100644
--- a/templates/emails/com/onboarding/browser-extension.html
+++ b/templates/emails/com/onboarding/browser-extension.html
@@ -5,17 +5,17 @@
{% call text() %}
If you want to quickly create aliases without going to SimpleLogin website, you can do that with SimpleLogin
- Chrome
+ Chrome
(or other Chromium-based browsers like Brave or Vivaldi),
- Firefox and
- Firefox and
+ Safari extension.
{% endcall %}
{% call text() %}
You can also manage your aliases using SimpleLogin
Android App
- or iOS app.
+ or iOS app.
{% endcall %}
{{ render_text('Thanks,
SimpleLogin Team.') }}
@@ -26,5 +26,5 @@
{% block footer %}
This email is sent to {{ user.email }} and is part of our onboarding series. Unsubscribe on
- Settings
+ Settings
{% endblock %}
diff --git a/templates/emails/com/onboarding/browser-extension.txt b/templates/emails/com/onboarding/browser-extension.txt
index 32082267..5a5f342e 100644
--- a/templates/emails/com/onboarding/browser-extension.txt
+++ b/templates/emails/com/onboarding/browser-extension.txt
@@ -1,5 +1,5 @@
This email is sent to {{ user.email }} and is part of our onboarding series.
-Unsubscribe from our emails on https://app.simplelogin.io/dashboard/setting#notification
+Unsubscribe from our emails on {{URL}}/dashboard/setting#notification
----------------
Hi {{user.name}}
@@ -7,15 +7,15 @@ Hi {{user.name}}
If you want to quickly create aliases without going to SimpleLogin website, you can do that with
SimpleLogin Chrome (or other Chromium-based browsers like Brave or Vivaldi), Firefox and Safari extension.
-Chrome: https://chrome.google.com/webstore/detail/simplelogin-your-anti-spa/dphilobhebphkdjbpfohgikllaljmgbn
+Chrome: https://chrome.google.com/webstore/detail/dphilobhebphkdjbpfohgikllaljmgbn
-Firefox: https://addons.mozilla.org/en-GB/firefox/addon/simplelogin/
+Firefox: https://addons.mozilla.org/firefox/addon/simplelogin/
-Safari: https://apps.apple.com/us/app/simplelogin/id1494051017?mt=12&fbclid=IwAR0M0nnEKgoieMkmx91TSXrtcScj7GouqRxGgXeJz2un_5ydhIKlbAI79Io
+Safari: https://apps.apple.com/app/id1494051017
You can also manage your aliases using SimpleLogin mobile apps, available at
- Play Store https://play.google.com/store/apps/details?id=io.simplelogin.android
-- App Store https://apps.apple.com/us/app/simplelogin-anti-spam/id1494359858
+- App Store https://apps.apple.com/app/id1494359858
As usual, let us know if you have any question by replying to this email.
diff --git a/templates/emails/com/onboarding/mailbox.html b/templates/emails/com/onboarding/mailbox.html
index 073e054a..cac040e3 100644
--- a/templates/emails/com/onboarding/mailbox.html
+++ b/templates/emails/com/onboarding/mailbox.html
@@ -19,16 +19,16 @@
{{ render_text('The mailbox doesn\'t have to be your personal email: you can also create aliases for your friend by adding his/her email as a mailbox.') }}
- {{ render_button("Create mailbox", "https://app.simplelogin.io/dashboard/mailbox") }}
+ {{ render_button("Create mailbox", URL ~ "/dashboard/mailbox") }}
{{ render_text('Thanks,
SimpleLogin Team.') }}
{{ render_text('P.S. Need immediate help getting started? Just reply to this email, the SimpleLogin support team is always ready to help!.') }}
- {{ raw_url("https://app.simplelogin.io/dashboard/mailbox") }}
+ {{ raw_url(URL ~ "/dashboard/mailbox") }}
{% endblock %}
{% block footer %}
This email is sent to {{ user.email }} and is part of our onboarding series. Unsubscribe on
- Settings
+ Settings
{% endblock %}
diff --git a/templates/emails/com/onboarding/mailbox.txt b/templates/emails/com/onboarding/mailbox.txt
index 88589294..47476652 100644
--- a/templates/emails/com/onboarding/mailbox.txt
+++ b/templates/emails/com/onboarding/mailbox.txt
@@ -1,5 +1,5 @@
This email is sent to {{ user.email }} and is part of our onboarding series.
-Unsubscribe from our emails on https://app.simplelogin.io/dashboard/setting#notification
+Unsubscribe from our emails on {{URL}}/dashboard/setting#notification
----------------
Hi {{user.name}}
@@ -18,7 +18,7 @@ You can also change the owning mailbox for an existing alias.
The mailbox doesn't have to be your personal email: you can also create aliases for your friend by adding his/her email as a mailbox.
-Start create you mailbox on https://app.simplelogin.io/dashboard/mailbox
+Start create you mailbox on {{URL}}/dashboard/mailbox
As usual, let us know if you have any question by replying to this email.
diff --git a/templates/emails/com/onboarding/pgp.html b/templates/emails/com/onboarding/pgp.html
index 7694dc19..5b38787e 100644
--- a/templates/emails/com/onboarding/pgp.html
+++ b/templates/emails/com/onboarding/pgp.html
@@ -21,7 +21,7 @@
{{ render_text("You can create and manage your PGP keys when adding or editing your mailboxes. Check it out on your mailbox dashboard.") }}
- {{ render_button("Add your PGP key", "https://app.simplelogin.io/dashboard/mailbox") }}
+ {{ render_button("Add your PGP key", URL ~ "/dashboard/mailbox") }}
{{ render_text('Thanks,
SimpleLogin Team.') }}
{{ render_text('P.S. Need immediate help getting started? Just reply to this email, the SimpleLogin support team is always ready to help!.') }}
@@ -30,5 +30,5 @@
{% block footer %}
This email is sent to {{ user.email }} and is part of our onboarding series. Unsubscribe on
- Settings
+ Settings
{% endblock %}
diff --git a/templates/emails/com/onboarding/pgp.txt b/templates/emails/com/onboarding/pgp.txt
index 7fda4243..a1e3f027 100644
--- a/templates/emails/com/onboarding/pgp.txt
+++ b/templates/emails/com/onboarding/pgp.txt
@@ -1,5 +1,5 @@
This email is sent to {{ user.email }} and is part of our onboarding series.
-Unsubscribe from our emails on https://app.simplelogin.io/dashboard/setting#notification
+Unsubscribe from our emails on {{URL}}/dashboard/setting#notification
----------------
Hi {{user.name}}
@@ -20,7 +20,7 @@ https://simplelogin.io/blog/with-pgp.png
You can find more info on our announcement post on https://simplelogin.io/blog/introducing-pgp/
-You can create and manage your PGP keys when adding or editing your mailboxes. Check it out on your mailbox dashboard at https://app.simplelogin.io/dashboard/mailbox
+You can create and manage your PGP keys when adding or editing your mailboxes. Check it out on your mailbox dashboard at {{URL}}/dashboard/mailbox
As usual, let us know if you have any question by replying to this email.
diff --git a/templates/emails/com/onboarding/send-from-alias.html b/templates/emails/com/onboarding/send-from-alias.html
index 56d3fb54..a7beeaf9 100644
--- a/templates/emails/com/onboarding/send-from-alias.html
+++ b/templates/emails/com/onboarding/send-from-alias.html
@@ -28,5 +28,5 @@
{% block footer %}
This email is sent to {{ user.email }} and is part of our onboarding series. Unsubscribe on
- Settings
+ Settings
{% endblock %}
diff --git a/templates/emails/com/onboarding/send-from-alias.txt b/templates/emails/com/onboarding/send-from-alias.txt
index c19e4db9..86efca78 100644
--- a/templates/emails/com/onboarding/send-from-alias.txt
+++ b/templates/emails/com/onboarding/send-from-alias.txt
@@ -1,5 +1,5 @@
This email is sent to {{ user.email }} and is part of our onboarding series.
-Unsubscribe from our emails on https://app.simplelogin.io/dashboard/setting#notification
+Unsubscribe from our emails on {{URL}}/dashboard/setting#notification
----------------
Hi {{user.name}}
diff --git a/templates/emails/com/safari-extension.html b/templates/emails/com/safari-extension.html
index 8f91efe0..0acdf068 100644
--- a/templates/emails/com/safari-extension.html
+++ b/templates/emails/com/safari-extension.html
@@ -7,14 +7,14 @@
color: #000000;
font-family: sans-serif;" class="paragraph">
This email is sent to {{ user.email }}.
- Unsubscribe on Settings
+ Unsubscribe on Settings
{{ render_text("Hi " + user.name) }}
{{ render_text("If you use Safari on a MacBook or iMac, you should check out our new Safari extension.") }}
- {{ render_text('It can be installed on AppStore. Its code is available on GitHub.') }}
+ {{ render_text('It can be installed on App Store. Its code is available on GitHub.') }}
{{ render_text('
') }}
diff --git a/templates/emails/com/safari-extension.txt b/templates/emails/com/safari-extension.txt
index 2999e6bb..99b2b5db 100644
--- a/templates/emails/com/safari-extension.txt
+++ b/templates/emails/com/safari-extension.txt
@@ -1,5 +1,5 @@
This email is sent to {{ user.email }}.
-Unsubscribe from our emails on https://app.simplelogin.io/dashboard/setting#notification
+Unsubscribe from our emails on {{URL}}/dashboard/setting#notification
----------------
Hi {{user.name}}
@@ -8,7 +8,7 @@ If you use Safari on a MacBook or iMac, you should check out our new Safari exte
It can be installed on:
-https://apps.apple.com/us/app/simplelogin/id1494051017?mt=12&fbclid=IwAR0M0nnEKgoieMkmx91TSXrtcScj7GouqRxGgXeJz2un_5ydhIKlbAI79Io
+https://apps.apple.com/app/id1494051017
As usual, let me know if you have any question by replying to this email.
diff --git a/templates/emails/com/welcome.html b/templates/emails/com/welcome.html
index f28dd4a8..1dad4f25 100644
--- a/templates/emails/com/welcome.html
+++ b/templates/emails/com/welcome.html
@@ -13,7 +13,7 @@
{% block content %}
{{ render_text("My name is Son. I’m the founder of SimpleLogin and I wanted to be the first to welcome you on board.") }}
- {{ render_text('To better secure your account, I recommend enabling Multi-Factor Authentication (MFA) on your Setting page.') }}
+ {{ render_text('To better secure your account, I recommend enabling Multi-Factor Authentication (MFA) on your Setting page.') }}
{{ render_text('If you have any feedback or improvement ideas please let me know by simply replying to this email. Yes, this email is not sent from a no-reply address.
') }}
@@ -25,7 +25,7 @@
{{ render_text('You can use all premium features like custom domain or alias directory during the trial period. Your trial will end ' + user.trial_end.humanize() + ". All aliases you create during the trial will continue to work normally when the trial ends.") }}
{% endif %}
- {{ render_text('In the next coming days, you are going to receive some onboarding emails to quickly present some SimpleLogin features. If you don\'t want to receive these emails, you can disable them in your notification settings.') }}
+ {{ render_text('In the next coming days, you are going to receive some onboarding emails to quickly present some SimpleLogin features. If you don\'t want to receive these emails, you can disable them in your notification settings.') }}
{{ render_text('Thanks,
SimpleLogin Team.') }}
diff --git a/templates/emails/com/welcome.txt b/templates/emails/com/welcome.txt
index 7e3efef5..d92848f6 100644
--- a/templates/emails/com/welcome.txt
+++ b/templates/emails/com/welcome.txt
@@ -3,7 +3,7 @@ Hi {{name}}
My name is Son. I’m the founder of SimpleLogin and I wanted to be the first to welcome you on board.
To better secure your account, I recommend enabling Multi-Factor Authentication (MFA) on your setting page at
-https://app.simplelogin.io/dashboard/setting
+{{URL}}/dashboard/setting
If you have any feedback or improvement ideas please let me know by simply replying to this email. Yes, this email is not sent from a no-reply address.
@@ -15,7 +15,7 @@ Your trial will end {{ user.trial_end.humanize() }}.
All aliases you create during the trial will continue to work normally when the trial ends.
{% endif %}
-In the next coming days, you are going to receive some onboarding emails to quickly present some SimpleLogin features. If you don't want to receive these emails, you can disable them in your notification settings on https://app.simplelogin.io/dashboard/setting#notification.
+In the next coming days, you are going to receive some onboarding emails to quickly present some SimpleLogin features. If you don't want to receive these emails, you can disable them in your notification settings on {{URL}}/dashboard/setting#notification.
diff --git a/templates/emails/transactional/send-from-alias-from-unknown-sender.html b/templates/emails/transactional/send-from-alias-from-unknown-sender.html
index 5200c8e9..e33a26b8 100644
--- a/templates/emails/transactional/send-from-alias-from-unknown-sender.html
+++ b/templates/emails/transactional/send-from-alias-from-unknown-sender.html
@@ -9,7 +9,7 @@
{{ render_text('This user has been also informed of this incident.') }}
- {{ render_text('If you have any question, you can contact us by replying to this email or consult our website at https://simplelogin.io.') }}
+ {{ render_text('If you have any question, you can contact us by replying to this email or consult our website at ' ~ LANDING_PAGE_URL ~ '.') }}
{{ render_text('Regards,
SimpleLogin Team.') }}
{% endblock %}
diff --git a/templates/emails/transactional/send-from-alias-from-unknown-sender.txt b/templates/emails/transactional/send-from-alias-from-unknown-sender.txt
index b2d06437..93181064 100644
--- a/templates/emails/transactional/send-from-alias-from-unknown-sender.txt
+++ b/templates/emails/transactional/send-from-alias-from-unknown-sender.txt
@@ -7,7 +7,7 @@ We have recorded an attempt to send an email from your email ({{sender}}) to {{r
{{reply_email}} is a special email address that only receives emails from its authorized user.
This user has been also informed of this incident.
-If you have any question, you can contact us by replying to this email or consult our website at https://simplelogin.io.
+If you have any question, you can contact us by replying to this email or consult our website at {{LANDING_PAGE_URL}}.
Regards,
SimpleLogin team.
diff --git a/templates/emails/transactional/subscription-end.html b/templates/emails/transactional/subscription-end.html
index dcb4536f..4f307839 100644
--- a/templates/emails/transactional/subscription-end.html
+++ b/templates/emails/transactional/subscription-end.html
@@ -26,13 +26,13 @@
{{ render_text('You can upgrade today to continue using all these Premium features (and much more coming).') }}
- {{ render_button("Upgrade your account", "https://app.simplelogin.io/dashboard/pricing") }}
+ {{ render_button("Upgrade your account", URL ~ "/dashboard/pricing") }}
{{ render_text('Regardless of your choice, we want to say thank you for trying SimpleLogin. We know the product
requires an investment of your time, and we appreciate you giving us a chance.') }}
{{ render_text('Thanks,
SimpleLogin Team.') }}
{{ render_text('P.S. If you have any questions or need any help, please don\'t hesitate to reach out. You can simply reply to this email or reach us via Twitter/Github.') }}
- {{ raw_url("https://app.simplelogin.io/dashboard/pricing") }}
+ {{ raw_url(URL ~ "/dashboard/pricing") }}
{% endblock %}
diff --git a/templates/emails/transactional/trial-end.html b/templates/emails/transactional/trial-end.html
index 63cd300c..5660d2a3 100644
--- a/templates/emails/transactional/trial-end.html
+++ b/templates/emails/transactional/trial-end.html
@@ -28,7 +28,7 @@
{{ render_text('You can upgrade today to continue using all these Premium features (and much more coming).') }}
- {{ render_button("Upgrade your account", "https://app.simplelogin.io/dashboard/pricing") }}
+ {{ render_button("Upgrade your account", URL ~ "/dashboard/pricing") }}
{{ render_text("If you're not ready to upgrade to a paying account, you have a few other options available to you:") }}
@@ -47,7 +47,7 @@
requires an investment of your time, and we appreciate you giving us a chance.') }}
{{ render_text('Thanks,
SimpleLogin Team.') }}
{{ render_text('P.S. If you have any questions or need any help, please don\'t hesitate to reach out. You can simply reply to this email or reach us via Twitter/Github.') }}
- {{ raw_url("https://app.simplelogin.io/dashboard/pricing") }}
+ {{ raw_url(URL ~ "/dashboard/pricing") }}
{% endblock %}
diff --git a/templates/footer.html b/templates/footer.html
index a3c260e2..703cec45 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -5,7 +5,7 @@