From eef2ff3f9a1851973e920d3ba71e80d7d589dd33 Mon Sep 17 00:00:00 2001 From: Eliot Berriot Date: Sun, 4 Mar 2018 16:05:41 +0100 Subject: [PATCH] Fixed broken daphne and removed useless templates --- api/compose/django/daphne.sh | 2 +- api/funkwhale_api/templates/404.html | 9 -- api/funkwhale_api/templates/500.html | 13 --- api/funkwhale_api/templates/base.html | 107 ------------------- api/funkwhale_api/templates/pages/about.html | 1 - api/funkwhale_api/templates/pages/home.html | 1 - 6 files changed, 1 insertion(+), 132 deletions(-) delete mode 100644 api/funkwhale_api/templates/404.html delete mode 100644 api/funkwhale_api/templates/500.html delete mode 100644 api/funkwhale_api/templates/base.html delete mode 100644 api/funkwhale_api/templates/pages/about.html delete mode 100644 api/funkwhale_api/templates/pages/home.html diff --git a/api/compose/django/daphne.sh b/api/compose/django/daphne.sh index 16b4d50b8..4fa304143 100755 --- a/api/compose/django/daphne.sh +++ b/api/compose/django/daphne.sh @@ -1,3 +1,3 @@ #!/bin/bash -eux python /app/manage.py collectstatic --noinput -/usr/local/bin/daphne --root-path=/app -b 0.0.0.0 -p 5000 config.asgi:application +/usr/local/bin/daphne -b 0.0.0.0 -p 5000 config.asgi:application diff --git a/api/funkwhale_api/templates/404.html b/api/funkwhale_api/templates/404.html deleted file mode 100644 index b9cb60846..000000000 --- a/api/funkwhale_api/templates/404.html +++ /dev/null @@ -1,9 +0,0 @@ -{% extends "base.html" %} - -{% block title %}Page Not found{% endblock %} - -{% block content %} -

Page Not found

- -

This is not the page you were looking for.

-{% endblock content %} diff --git a/api/funkwhale_api/templates/500.html b/api/funkwhale_api/templates/500.html deleted file mode 100644 index 21df60665..000000000 --- a/api/funkwhale_api/templates/500.html +++ /dev/null @@ -1,13 +0,0 @@ -{% extends "base.html" %} - -{% block title %}Server Error{% endblock %} - -{% block content %} -

Ooops!!! 500

- -

Looks like something went wrong!

- -

We track these errors automatically, but if the problem persists feel free to contact us. In the meantime, try refreshing.

-{% endblock content %} - - diff --git a/api/funkwhale_api/templates/base.html b/api/funkwhale_api/templates/base.html deleted file mode 100644 index e8788f44a..000000000 --- a/api/funkwhale_api/templates/base.html +++ /dev/null @@ -1,107 +0,0 @@ -{% load staticfiles i18n %} - - - - - {% block title %}funkwhale_api{% endblock title %} - - - - - - - - {% block css %} - - - - - - - - {% endblock %} - - {% block angular %} - - {% endblock %} - - - - - -
- -
- -
- - {% if messages %} - {% for message in messages %} -
{{ message }}
- {% endfor %} - {% endif %} - - {% block content %} -

Use this document as a way to quick start any new project.

- {% endblock content %} - -
- - {% block modal %}{% endblock modal %} - - - - {% block javascript %} - - - - - - - - - - - {% endblock javascript %} - - diff --git a/api/funkwhale_api/templates/pages/about.html b/api/funkwhale_api/templates/pages/about.html deleted file mode 100644 index 63913c188..000000000 --- a/api/funkwhale_api/templates/pages/about.html +++ /dev/null @@ -1 +0,0 @@ -{% extends "base.html" %} \ No newline at end of file diff --git a/api/funkwhale_api/templates/pages/home.html b/api/funkwhale_api/templates/pages/home.html deleted file mode 100644 index 63913c188..000000000 --- a/api/funkwhale_api/templates/pages/home.html +++ /dev/null @@ -1 +0,0 @@ -{% extends "base.html" %} \ No newline at end of file