Read about our features, pricing and roadmap.
+ + +2. ## Create an account + {% if not current_user.is_authenticated %} +Create an account for free and add your first Notify service. When you add a new service it will start in trial mode.
+ {% else %} +Create an account for free and add your first Notify service. When you add a new service, it will start in trial mode.
+ {% endif %} + +3. ## Write some messages + {% if True %} +Add message templates with examples of the content you plan to send. You can use our guidance to help you.
+ {% endif %} + +4. ## Set up your service + {% if not current_user.is_authenticated or not current_service %} +Review your settings to add message branding and sender information.
+Add team members and check their permissions.
+ {% else %} +Review your settings to add message branding and sender information.
+Add team members and check their permissions.
+ {% endif %} + + +5. ## Start sending messages + {% if not current_user.is_authenticated or not current_service %} +When you’re ready to send messages to people outside your team, go to the Settings page and select Request to go live. We’ll approve your request within one working day.
+ {% else %} +You should request to go live when you’re ready to send messages to people outside your team. We’ll approve your request within one working day.
+ {% endif %} + + + + diff --git a/app/formatters.py b/app/formatters.py index 2442e70d0..86c187f55 100644 --- a/app/formatters.py +++ b/app/formatters.py @@ -1,3 +1,4 @@ +import os import re import unicodedata import urllib @@ -9,8 +10,11 @@ from numbers import Number import ago import dateutil import humanize +import markdown import pytz -from flask import Markup, url_for +from bs4 import BeautifulSoup +from flask import Markup, render_template_string, url_for +from flask.helpers import get_root_path from notifications_utils.field import Field from notifications_utils.formatters import make_quotes_smart from notifications_utils.formatters import nl2br as utils_nl2br @@ -21,6 +25,41 @@ from app.utils.csv import get_user_preferred_timezone from app.utils.time import parse_naive_dt +def apply_html_class(tags, html_file): + new_html = html_file + + for tag in tags: + element = tag[0] + class_name = tag[1] + + soup = BeautifulSoup(new_html, "html.parser") + + for xtag in soup.find_all(element): + xtag["class"] = class_name + + new_html = str(soup) + + return new_html + + +def convert_markdown_template(mdf, test=False): + content_text = "" + + if not test: + APP_ROOT = get_root_path("notifications-admin") + file = "app/content/" + mdf + ".md" + md_file = os.path.join(APP_ROOT, file) + with open(md_file) as f: + content_text = f.read() + else: + content_text = mdf + + jn_render = render_template_string(content_text) + md_render = markdown.markdown(jn_render) + + return md_render + + def convert_to_boolean(value): if isinstance(value, str): if value.lower() in ["t", "true", "on", "yes", "1"]: diff --git a/app/main/forms.py b/app/main/forms.py index 2520474fc..d9a35b72a 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -1235,15 +1235,20 @@ class ChangeNameForm(StripWhitespaceForm): new_name = GovukTextInputField("Your name") +# https://en.wikipedia.org/wiki/List_of_tz_database_time_zones class ChangePreferredTimezoneForm(StripWhitespaceForm): def __init__(self, *args, **kwargs): super(ChangePreferredTimezoneForm, self).__init__(*args, **kwargs) self.new_preferred_timezone.choices = [ + ("America/Puerto_Rico", "America/Puerto_Rico"), ("US/Eastern", "US/Eastern"), ("US/Central", "US/Central"), ("US/Mountain", "US/Mountain"), ("US/Pacific", "US/Pacific"), + ("US/Alaska", "US/Alaska"), ("US/Hawaii", "US/Hawaii"), + ("US/Aleutian", "US/Aleutian"), + ("US/Samoa", "US/Samoa"), ] new_preferred_timezone = GovukRadiosField( diff --git a/app/main/views/index.py b/app/main/views/index.py index 044543526..f4e3a67db 100644 --- a/app/main/views/index.py +++ b/app/main/views/index.py @@ -2,6 +2,7 @@ from flask import abort, redirect, render_template, request, url_for from flask_login import current_user from app import status_api_client +from app.formatters import apply_html_class, convert_markdown_template from app.main import main from app.main.views.pricing import CURRENT_SMS_RATE from app.main.views.sub_navigation_dictionaries import features_nav, using_notify_nav @@ -137,9 +138,20 @@ def get_started_old(): @main.route("/using-notify/get-started") @user_is_logged_in def get_started(): + markdown = convert_markdown_template("get-started") + html_style = apply_html_class( + [ + ["ol", "usa-process-list"], + ["li", "usa-process-list__item padding-bottom-4 margin-top-2"], + ["h2", "usa-process-list__heading line-height-sans-3"], + ], + markdown, + ) + return render_template( "views/get-started.html", navigation_links=using_notify_nav(), + content=html_style, ) diff --git a/app/main/views/service_settings.py b/app/main/views/service_settings.py index feb1e4388..1cac1410c 100644 --- a/app/main/views/service_settings.py +++ b/app/main/views/service_settings.py @@ -124,6 +124,14 @@ def service_switch_live(service_id): if form.validate_on_submit(): current_service.update_status(live=form.enabled.data) + if form.enabled.data is True: + billing_api_client.create_or_update_free_sms_fragment_limit( + service_id, 250000 + ) + else: + billing_api_client.create_or_update_free_sms_fragment_limit( + service_id, 40000 + ) return redirect(url_for(".service_settings", service_id=service_id)) return render_template( diff --git a/app/navigation.py b/app/navigation.py index e824d6de2..94f970540 100644 --- a/app/navigation.py +++ b/app/navigation.py @@ -87,39 +87,7 @@ class HeaderNavigation(Navigation): "uploads", "view_job", "view_jobs", - "confirm_edit_user_email", - "confirm_edit_user_mobile_number", - "edit_user_email", - "edit_user_mobile_number", - "edit_user_permissions", - "invite_user", - "manage_users", - "remove_user_from_service", "usage", - "link_service_to_organization", - "service_add_email_reply_to", - "service_add_sms_sender", - "service_confirm_delete_email_reply_to", - "service_confirm_delete_sms_sender", - "service_edit_email_reply_to", - "service_edit_sms_sender", - "service_email_reply_to", - "service_name_change", - "service_set_auth_type", - "service_set_channel", - "send_files_by_email_contact_details", - "service_set_inbound_number", - "service_set_inbound_sms", - "service_set_international_sms", - "service_set_reply_to_email", - "service_set_sms_prefix", - "service_verify_reply_to_address", - "service_verify_reply_to_address_updates", - "service_settings", - "service_sms_senders", - "set_free_sms_allowance", - "set_message_limit", - "set_rate_limit", }, "pricing": { "how_to_pay", @@ -236,6 +204,21 @@ class MainNavigation(Navigation): "usage": { "usage", }, + "user-profile": { + "user_profile", + "user_profile_confirm_delete_mobile_number", + "user_profile_email", + "user_profile_email_authenticate", + "user_profile_email_confirm", + "user_profile_mobile_number", + "user_profile_mobile_number_authenticate", + "user_profile_mobile_number_confirm", + "user_profile_mobile_number_delete", + "user_profile_name", + "user_profile_password", + "user_profile_preferred_timezone", + "user_profile_disable_platform_admin_view", + }, "settings": { "link_service_to_organization", "service_add_email_reply_to", @@ -297,6 +280,58 @@ class CaseworkNavigation(Navigation): } +class SecondaryNavigation(Navigation): + mapping = { + "settings": { + "link_service_to_organization", + "service_add_email_reply_to", + "service_add_sms_sender", + "service_confirm_delete_email_reply_to", + "service_confirm_delete_sms_sender", + "service_edit_email_reply_to", + "service_edit_sms_sender", + "service_email_reply_to", + "service_name_change", + "service_set_auth_type", + "service_set_channel", + "send_files_by_email_contact_details", + "service_set_inbound_number", + "service_set_inbound_sms", + "service_set_international_sms", + "service_set_reply_to_email", + "service_set_sms_prefix", + "service_verify_reply_to_address", + "service_verify_reply_to_address_updates", + "service_settings", + "service_sms_senders", + "set_free_sms_allowance", + "set_message_limit", + "set_rate_limit", + "confirm_edit_user_email", + "confirm_edit_user_mobile_number", + "edit_user_email", + "edit_user_mobile_number", + "edit_user_permissions", + "invite_user", + "manage_users", + "remove_user_from_service", + "user_profile", + "user_profile_confirm_delete_mobile_number", + "user_profile_email", + "user_profile_email_authenticate", + "user_profile_email_confirm", + "user_profile_mobile_number", + "user_profile_mobile_number_authenticate", + "user_profile_mobile_number_confirm", + "user_profile_mobile_number_delete", + "user_profile_name", + "user_profile_password", + "user_profile_preferred_timezone", + "user_profile_disable_platform_admin_view", + }, + } + + class OrgNavigation(Navigation): mapping = { "dashboard": { diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html index 86482f829..c48f768ce 100644 --- a/app/templates/admin_template.html +++ b/app/templates/admin_template.html @@ -58,26 +58,37 @@ "text": "Features", "active": header_navigation.is_selected('features') }, - { - "href": url_for('main.user_profile'), - "text": current_user.name, - "active": header_navigation.is_selected('user-profile') - }, { "href": url_for('main.platform_admin_splash_page'), "text": "Platform admin", "active": header_navigation.is_selected('platform-admin') }, - { - "href": url_for('main.sign_out'), - "text": "Sign out" - }, { "href": url_for('main.support'), "text": "Contact us", "active": header_navigation.is_selected('support') } ] %} + {% if current_service %} + {% set secondaryNavigation = [ + { + "href": url_for('main.service_settings', service_id=current_service.id), + "text": "Settings", + "active": secondary_navigation.is_selected('settings') + }, + { + "href": url_for('main.sign_out'), + "text": "Sign out" + } + ] %} + {% else %} + {% set secondaryNavigation = [ + { + "href": url_for('main.sign_out'), + "text": "Sign out" + } + ] %} + {% endif %} {% else %} {% set navigation = [ { @@ -104,13 +115,29 @@ "href": url_for('main.user_profile'), "text": "User profile", "active": header_navigation.is_selected('user-profile') - }, - { - "href": url_for('main.sign_out'), - "text": "Sign out" } ] %} - {% endif %} + {% if current_service %} + {% set secondaryNavigation = [ + { + "href": url_for('main.service_settings', service_id=current_service.id), + "text": "Settings", + "active": secondary_navigation.is_selected('settings') + }, + { + "href": url_for('main.sign_out'), + "text": "Sign out" + } + ] %} + {% else %} + {% set secondaryNavigation = [ + { + "href": url_for('main.sign_out'), + "text": "Sign out" + } + ] %} + {% endif %} + {% endif %} {% else %} {# {% set navigation = [ @@ -142,6 +169,7 @@ "productName": "Notify", "navigation": navigation, "navigationClasses": "govuk-header__navigation--end", + "secondaryNavigation": secondaryNavigation, "assetsPath": asset_path + "images" }) }} {% endblock %} @@ -236,7 +264,7 @@ Please choose to extend your session or sign out. Your session will expire in 5 minutes or less.You have been inactive for too long. +
You have been inactive for too long. Your session will expire in .
Create an account for free and add your first Notify service. When you add a new service it will start in trial mode.
- {% else %} -Create an account for free and add your first Notify service. When you add a new service, it will start in trial mode.
- {% endif %} -Add message templates with examples of the content you plan to send. You can use our guidance to help you.
-Review your settings to add message customization and sender information.
-Add team members and check their permissions.
- {% else %} -Review your settings to add message customization and sender information.
-Add team members and check their permissions.
- {% endif %} -When you’re ready to send messages to people outside your team, go to the Settings page and select Request to go live. We’ll approve your request within one working day.
- {% else %} -You should request to go live when you’re ready to send messages to people outside your team. We’ll approve your request within one working day.
- {% endif %} - -