darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-24 16:24:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Moved convert_markdown_template to formatters

Browse Source
This commit is contained in:
Anastasia Gradova
2023-12-22 10:03:43 -07:00
parent 86af8fcaa4
commit 0989246334
2 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/formatters.py
View File

@@ -6,11 +6,14 @@ from functools import partial
from math import floor, log10 from math import floor, log10
from numbers import Number from numbers import Number
import markdown
import os
import ago import ago
import dateutil import dateutil
import humanize import humanize
import pytz import pytz
from flask import Markup, url_for from flask import Markup, url_for, render_template_string
from flask.helpers import get_root_path
from notifications_utils.field import Field from notifications_utils.field import Field
from notifications_utils.formatters import make_quotes_smart from notifications_utils.formatters import make_quotes_smart
from notifications_utils.formatters import nl2br as utils_nl2br from notifications_utils.formatters import nl2br as utils_nl2br
@@ -21,6 +24,18 @@ from app.utils.csv import get_user_preferred_timezone
from app.utils.time import parse_naive_dt from app.utils.time import parse_naive_dt
def convert_markdown_template(mdf):
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()
md_render = markdown.markdown(content_text)
jn_render = render_template_string(md_render)
return jn_render
def convert_to_boolean(value): def convert_to_boolean(value):
if isinstance(value, str): if isinstance(value, str):
if value.lower() in ["t", "true", "on", "yes", "1"]: if value.lower() in ["t", "true", "on", "yes", "1"]:

23
app/main/views/index.py
View File

@@ -4,37 +4,19 @@ from flask import (
make_response, make_response,
redirect, redirect,
render_template, render_template,
render_template_string,
request, request,
url_for url_for
) )
from flask_login import current_user from flask_login import current_user
from flask.helpers import get_root_path
from notifications_utils.template import HTMLEmailTemplate from notifications_utils.template import HTMLEmailTemplate
import markdown
import os
from app import email_branding_client, status_api_client from app import email_branding_client, status_api_client
from app.main import main from app.main import main
from app.main.forms import FieldWithNoneOption from app.main.forms import FieldWithNoneOption
from app.main.views.pricing import CURRENT_SMS_RATE from app.main.views.pricing import CURRENT_SMS_RATE
from app.main.views.sub_navigation_dictionaries import features_nav, using_notify_nav from app.main.views.sub_navigation_dictionaries import features_nav, using_notify_nav
from app.utils.user import user_is_logged_in from app.utils.user import user_is_logged_in
from app.formatters import convert_markdown_template
#Should find a better home
def get_md(mdf):
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()
md_render = markdown.markdown(content_text)
jn_render = render_template_string(md_render)
return jn_render
@main.route("/") @main.route("/")
def index(): def index():
@@ -274,7 +256,8 @@ def get_started_old():
def get_started(): def get_started():
return render_template( return render_template(
"views/get-started.html", "views/get-started.html",
navigation_links=using_notify_nav(), content=get_md('get-started') navigation_links=using_notify_nav(),
content=convert_markdown_template('get-started')
) )