diff --git a/.gitignore b/.gitignore index d1bf903..5f20007 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ data/ dist/ pip-wheel-metadata/ celerybeat-schedule +.envrc diff --git a/config/__init__.py b/config/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/config/base.py b/config/base.py deleted file mode 100644 index 20bdfff..0000000 --- a/config/base.py +++ /dev/null @@ -1,13 +0,0 @@ -APPS_SPEC = { - "gitea": { - "url": "https://git.autonomic.zone/compose-stacks/gitea", - "secrets": [ - "db_passwd", - "db_root_passwd", - "internal_token", - "jwt_secret", - "secret_key", - ], - "configs": ["app_ini"], - } -} diff --git a/config/local.py b/config/local.py deleted file mode 100644 index 41dd929..0000000 --- a/config/local.py +++ /dev/null @@ -1,5 +0,0 @@ -SECRET_KEY = 'replace-with-truly-random-string-for-production' - -SERVER_NAME = 'localhost:5001' - -DEBUG = True diff --git a/magic_app/templates/app_install.html b/magic_app/templates/app_install.html index 764d59a..b0f2477 100644 --- a/magic_app/templates/app_install.html +++ b/magic_app/templates/app_install.html @@ -1,19 +1,14 @@ +{% extends "base.html" %} {% from "macros.html" import with_errors %} - - - - - Install {{ app_name | capitalize }} - - -

Install {{ app_name | capitalize }}

-
- {% for field in form %} - {{ field.label() }} {{ with_errors(field, style='font-weight: bold') }} - {% endfor %} - -
- - - +{% block title %}Install {{ app_name }} {{ super() }}{% endblock %} + +{% block content %} +

Install {{ app_name }}

+
+ {% for field in form %} + {{ field.label() }} {{ with_errors(field, style='font-weight: bold') }} + {% endfor %} + +
+{% endblock content %} diff --git a/magic_app/templates/app_list.html b/magic_app/templates/app_list.html index 167c106..97ac71a 100644 --- a/magic_app/templates/app_list.html +++ b/magic_app/templates/app_list.html @@ -1,17 +1,13 @@ - - - - - Application Listing - - - - - - +{% extends "base.html" %} + +{% block content %} +

Installable apps

+

Where the magic happens.

+ +{% endfor %} +{% endblock content %} diff --git a/magic_app/templates/base.html b/magic_app/templates/base.html new file mode 100644 index 0000000..735e3d1 --- /dev/null +++ b/magic_app/templates/base.html @@ -0,0 +1,36 @@ + + + + + + + {% block meta %} + + + {% endblock meta %} + + + {% if debug %} + {% else %} + + {% endif %} + + {% block title %}🎩{% endblock %} + + + {% block content %}{% endblock %} + + + diff --git a/scripts/wsgi.py b/scripts/wsgi.py index 7c2e3cb..f35b84b 100644 --- a/scripts/wsgi.py +++ b/scripts/wsgi.py @@ -5,4 +5,5 @@ from magic_app.app import create_app from magic_app.config import CONFIG config = CONFIG[os.environ["FLASK_ENV"]] + app = create_app(config=config)