Skip to content

Commit

Permalink
Revert "fresh updates"
Browse files Browse the repository at this point in the history
This reverts commit 3a770bb.
  • Loading branch information
glenn-sorrentino committed Oct 2, 2024
1 parent 3a770bb commit b01edf7
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 86 deletions.
63 changes: 1 addition & 62 deletions hushline/static/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -395,10 +395,6 @@
.plan {
border: var(--border);
}

#invoice-wrapper {
border: var(--border);
}
}

/* Dark Mode */
Expand Down Expand Up @@ -731,10 +727,6 @@
.icon.chevron {
background-image: url("../img/app/icon-chevron-dm.png");
}

#invoice-wrapper {
border: var(--border-dark);
}
}

body {
Expand Down Expand Up @@ -819,10 +811,6 @@ h4 {
margin-top: 0;
}

.centered-heading {
text-align: center;
}

p {
word-break: break-word;
margin: 0.5rem 0;
Expand Down Expand Up @@ -2197,8 +2185,7 @@ p.bio + .extra-fields {
}

.plan .badge {
margin-bottom: 1.5rem;
margin-top: 0.625rem;
margin-bottom: 1.25rem;
}

.plan .plan-status {
Expand Down Expand Up @@ -2350,51 +2337,3 @@ p.bio + .extra-fields {
.drill-in .checkbox-group {
margin-bottom: 0;
}

#invoice-wrapper {
margin-top: 1rem;
padding: 1.5rem;
border-radius: 0.25rem;
}

#invoice-wrapper table {
text-align: left;
padding: 0;
margin: 0;
width: 100%;
}

#invoice-wrapper table tr {
width: 100%;
}

#invoice-wrapper table th,
#invoice-wrapper table td {
padding-top: 0.325rem;
padding-bottom: 0.325rem;
}

.adv-form {
display: flex;
margin-bottom: 2rem;
flex-direction: column;
}

#enable-autorenew-form,
#cancel-form {
margin-bottom: 0;
margin-top: 0;
}

#enable-autorenew-form button,
#cancel-form button {
margin-bottom: 0;
}

#enable-autorenew-form {
margin-top: 1rem;
}

.plan .sub-info {
margin-top: 1.25rem;
}
8 changes: 3 additions & 5 deletions hushline/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,6 @@ <h1>{{ host_org.brand_app_name }}</h1>
<div class="navGroup">
<a class="mobileNav btnIcon" aria-label="Navigation menu">Menu</a>
<ul>
<li>
{% if is_premium_enabled and user.is_free_tier() %}
<a href="{{ url_for('premium.index') }}">⭐️ Upgrade</a>
{% endif %}
</li>
{% if is_personal_server %}
<li><a href="{{ url_for('personal_server_info') }}">Info</a></li>
{% endif %}
Expand Down Expand Up @@ -151,6 +146,9 @@ <h1>{{ host_org.brand_app_name }}</h1>
<li><a href="{{ url_for('logout') }}">Logout</a></li>
</ul>
</div>
{% if is_premium_enabled and user.is_free_tier() %}
<a class="btn" href="{{ url_for('premium.index') }}">Upgrade</a>
{% endif %}
</li>
{% else %}
<li><a href="{{ url_for('login') }}">Login</a></li>
Expand Down
9 changes: 4 additions & 5 deletions hushline/templates/premium-select-tier.html
Original file line number Diff line number Diff line change
@@ -1,29 +1,28 @@
{% extends "base.html" %}
{% block title %}Select a Tier{% endblock %}
{% block content %}
<h2 class="centered-heading">Choose a Hush Line Plan</h2>
<h2>Choose a Hush Line Plan</h2>

<div id="plan-wrapper">
<div class="plan">
<p class="plan-status badge">👍 Great for Individuals</p>
{% include "premium/free-features.html" %}
<form
id="free-form"
action="{{ url_for('premium.select_free') }}"
method="post"
>
<button class="btn">Use Free Plan</button>
<button>Use Free Plan</button>
</form>
</div>
<div class="plan plan-recommended">
<p class="plan-status badge">⭐️ Recommended for Businesses</p>
<p class="plan-status badge">⭐️ Recommended</p>
{% include "premium/business-features.html" %}
<form
id="upgrade-form"
action="{{ url_for('premium.upgrade') }}"
method="post"
>
<button class="btn">Upgrade to Super User</button>
<button>Use Business Plan</button>
</form>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion hushline/templates/premium-waiting.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

{% block content %}
<h2>Subscribing</h2>
<p>Processing payment, please wait...</p>
<p>Processing payment, please wait...</p>
{% endblock %}

{% block scripts %}
Expand Down
14 changes: 7 additions & 7 deletions hushline/templates/premium.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,24 @@
{% block title %}Premium{% endblock %}

{% block content %}
<h2 class="centered-heading">Choose a Hush Line Plan</h2>
<h2>Choose a Hush Line Plan</h2>

<div id="plan-wrapper">
<div class="plan">
{% if user.is_free_tier() %}
<p class="plan-status badge">📍 Current Plan</p>
{% endif %}
{% if user.is_business_tier() %}
<p class="plan-status badge">👇 Fewer Features</p>
<p class="plan-status">Fewer Features</p>
{% endif %}
{% include "premium/free-features.html" %}
</div>
<div class="plan plan-recommended">
{% if user.is_free_tier() %}
<p class="plan-status badge">⭐️ Recommended for Businesses</p>
<p class="plan-status badge">⭐️ Recommended</p>
{% endif %}
{% if user.is_business_tier() %}
<p class="plan-status badge">📍 Current Plan</p>
<p class="plan-status">Current Plan</p>
{% endif %}
{% include "premium/business-features.html" %}
{% if user.is_free_tier() %}
Expand All @@ -34,7 +34,7 @@ <h2 class="centered-heading">Choose a Hush Line Plan</h2>
{% endif %}
{% if user.is_business_tier() %}
{% if user.stripe_subscription_cancel_at_period_end %}
<p class="meta sub-info">⚠️ Your subscription will expire on {{ user.stripe_subscription_current_period_end.strftime('%B %d, %Y') }}.</p>
<p>Your subscription will expire on {{ user.stripe_subscription_current_period_end.strftime('%B %d, %Y') }}.</p>
<form
id="enable-autorenew-form"
action="{{ url_for('premium.disable_autorenew') }}"
Expand All @@ -47,15 +47,15 @@ <h2 class="centered-heading">Choose a Hush Line Plan</h2>
action="{{ url_for('premium.disable_autorenew') }}"
method="post"
>
<button id="cancel" class="btn">Cancel Now</button>
<button id="cancel">Cancel Now</button>
</form>
{% else %}
<form
id="disable-autorenew-form"
action="{{ url_for('premium.disable_autorenew') }}"
method="post"
>
<button class="btn" id="disable-autorenew">Don't Renew</button>
<button id="disable-autorenew">Don't Renew</button>
</form>
{% endif %}
{% endif %}
Expand Down
8 changes: 3 additions & 5 deletions hushline/templates/settings/advanced.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,9 @@
hidden
>
{% if is_premium_enabled %}
<div class="adv-form">
<h3>Paid Features</h3>
<div>
<a href="{{ url_for('premium.index') }}">Manage my plan</a>
</div>
<h3>Manage Plan</h3>
<div>
<a href="{{ url_for('premium.index') }}" class="btn">Manage Premium Plans</a>
</div>
{% endif %}

Expand Down
2 changes: 1 addition & 1 deletion hushline/templates/settings/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ <h2>Settings</h2>
('aliases', 'Aliases', False),
('auth', 'Authentication', False),
('email', 'Email & Encryption', False),
('branding', 'Branding', True),
('advanced', 'Advanced', False),
('branding', 'Branding', True),
('admin', 'Admin', True)
] %}
{% for (id, display, requires_admin) in buttons %}
Expand Down

0 comments on commit b01edf7

Please sign in to comment.