diff --git a/api/compose/django/daphne.sh b/api/compose/django/daphne.sh index 16b4d50b800d8177bafe5027aa571509c0d2c149..4fa3041436e11e4bfb4a2740223b37060a018bb4 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 b9cb608462af84a0054690deeb0c77df3da794d0..0000000000000000000000000000000000000000 --- a/api/funkwhale_api/templates/404.html +++ /dev/null @@ -1,9 +0,0 @@ -{% extends "base.html" %} - -{% block title %}Page Not found{% endblock %} - -{% block content %} -<h1>Page Not found</h1> - -<p>This is not the page you were looking for.</p> -{% endblock content %} diff --git a/api/funkwhale_api/templates/500.html b/api/funkwhale_api/templates/500.html deleted file mode 100644 index 21df606657d8e34c7fa9db7ce6ed4b00dc22ee04..0000000000000000000000000000000000000000 --- a/api/funkwhale_api/templates/500.html +++ /dev/null @@ -1,13 +0,0 @@ -{% extends "base.html" %} - -{% block title %}Server Error{% endblock %} - -{% block content %} -<h1>Ooops!!! 500</h1> - -<h3>Looks like something went wrong!</h3> - -<p>We track these errors automatically, but if the problem persists feel free to contact us. In the meantime, try refreshing.</p> -{% endblock content %} - - diff --git a/api/funkwhale_api/templates/base.html b/api/funkwhale_api/templates/base.html deleted file mode 100644 index e8788f44ae340fcb580677c23a4f293cee00ebaa..0000000000000000000000000000000000000000 --- a/api/funkwhale_api/templates/base.html +++ /dev/null @@ -1,107 +0,0 @@ -{% load staticfiles i18n %}<!DOCTYPE html> -<html lang="en" ng-app> - <head> - <meta charset="utf-8"> - <meta http-equiv="x-ua-compatible" content="ie=edge"> - <title>{% block title %}funkwhale_api{% endblock title %}</title> - <meta name="viewport" content="width=device-width, initial-scale=1.0"> - <meta name="description" content=""> - <meta name="author" content=""> - - <!-- HTML5 shim, for IE6-8 support of HTML5 elements --> - <!--[if lt IE 9]> - <script src="https://html5shim.googlecode.com/svn/trunk/html5.js"></script> - <![endif]--> - - {% block css %} - <!-- Latest compiled and minified CSS --> - <link rel="stylesheet" href="https://cdn.rawgit.com/twbs/bootstrap/v4-dev/dist/css/bootstrap.css"> - - <!-- Your stuff: Third-party css libraries go here --> - - <!-- This file store project specific CSS --> - <link href="{% static 'css/project.css' %}" rel="stylesheet"> - {% endblock %} - - {% block angular %} - <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.4.8/angular.min.js"></script> - {% endblock %} - - </head> - - <body> - - <div class="m-b"> - <nav class="navbar navbar-dark navbar-static-top bg-inverse"> - <div class="container"> - <a class="navbar-brand" href="/">funkwhale_api</a> - <button type="button" class="navbar-toggler hidden-sm-up pull-right" data-toggle="collapse" data-target="#bs-navbar-collapse-1"> - ☰ - </button> - - <!-- Collect the nav links, forms, and other content for toggling --> - <div class="collapse navbar-toggleable-xs" id="bs-navbar-collapse-1"> - <ul class="nav navbar-nav"> - <li class="nav-item"> - <a class="nav-link" href="">Home</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="">About</a> - </li> - </ul> - - <ul class="nav navbar-nav pull-right"> - {% if request.user.is_authenticated %} - <li class="nav-item"> - <a class="nav-link" href="{% url 'users:detail' request.user.username %}">{% trans "My Profile" %}</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="{% url 'account_logout' %}">{% trans "Logout" %}</a> - </li> - {% else %} - <li class="nav-item"> - <a id="sign-up-link" class="nav-link" href="{% url 'account_signup' %}">{% trans "Sign Up" %}</a> - </li> - <li class="nav-item"> - <a id="log-in-link" class="nav-link" href="{% url 'account_login' %}">{% trans "Log In" %}</a> - </li> - {% endif %} - </ul> - </div> - </div> - </nav> - </div> - - <div class="container"> - - {% if messages %} - {% for message in messages %} - <div class="alert {% if message.tags %}alert-{{ message.tags }}{% endif %}">{{ message }}</div> - {% endfor %} - {% endif %} - - {% block content %} - <p>Use this document as a way to quick start any new project.</p> - {% endblock content %} - - </div> <!-- /container --> - - {% block modal %}{% endblock modal %} - - <!-- Le javascript - ================================================== --> - <!-- Placed at the end of the document so the pages load faster --> - {% block javascript %} - <!-- Latest JQuery --> - <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script> - - <!-- Latest compiled and minified JavaScript --> - <script src="https://cdn.rawgit.com/twbs/bootstrap/v4-dev/dist/js/bootstrap.js"></script> - - <!-- Your stuff: Third-party javascript libraries go here --> - - <!-- place project specific Javascript in this file --> - <script src="{% static 'js/project.js' %}"></script> - {% endblock javascript %} - </body> -</html> diff --git a/api/funkwhale_api/templates/pages/about.html b/api/funkwhale_api/templates/pages/about.html deleted file mode 100644 index 63913c18881dda8ff719a126bf225d93128c276d..0000000000000000000000000000000000000000 --- 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 63913c18881dda8ff719a126bf225d93128c276d..0000000000000000000000000000000000000000 --- a/api/funkwhale_api/templates/pages/home.html +++ /dev/null @@ -1 +0,0 @@ -{% extends "base.html" %} \ No newline at end of file