diff --git a/api/funkwhale_api/templates/account/base.html b/api/funkwhale_api/templates/account/base.html deleted file mode 100644 index c64b47a4a9499be12deee48f0efc6ccb4afabf10..0000000000000000000000000000000000000000 --- a/api/funkwhale_api/templates/account/base.html +++ /dev/null @@ -1,2 +0,0 @@ -{% extends "base.html" %} -{% block title %}{% block head_title %}{% endblock head_title %}{% endblock title %} diff --git a/api/funkwhale_api/templates/account/email.html b/api/funkwhale_api/templates/account/email.html deleted file mode 100644 index 7c52a4a27718d87aa48111d6b96b0ec90c43421e..0000000000000000000000000000000000000000 --- a/api/funkwhale_api/templates/account/email.html +++ /dev/null @@ -1,80 +0,0 @@ -{% extends "account/base.html" %} - -{% load i18n %} -{% load crispy_forms_tags %} - -{% block head_title %}{% trans "Account" %}{% endblock %} - -{% block content %} -<div class="container"> - <div class="row"> - <div class="col-md-5"> - <h2>{% trans "E-mail Addresses" %}</h2> - {% if user.emailaddress_set.all %} - <p>{% trans 'The following e-mail addresses are associated with your account:' %}</p> - - <form action="{% url 'account_email' %}" class="email_list" method="post"> - {% csrf_token %} - <fieldset class="blockLabels"> - - {% for emailaddress in user.emailaddress_set.all %} - <div class="ctrlHolder"> - <label for="email_radio_{{ forloop.counter }}" class="{% if emailaddress.primary %}primary_email{% endif %}"> - - <input id="email_radio_{{ forloop.counter }}" type="radio" name="email" {% if emailaddress.primary %}checked="checked"{% endif %} value="{{ emailaddress.email }}"/> - - {{ emailaddress.email }} - {% if emailaddress.verified %} - <span class="verified">{% trans "Verified" %}</span> - {% else %} - <span class="unverified">{% trans "Unverified" %}</span> - {% endif %} - {% if emailaddress.primary %}<span class="primary">{% trans "Primary" %}</span>{% endif %} - </label> - </div> - {% endfor %} - - <div class="buttonHolder"> - <button class="secondaryAction" type="submit" name="action_primary" >{% trans 'Make Primary' %}</button> - <button class="secondaryAction" type="submit" name="action_send" >{% trans 'Re-send Verification' %}</button> - <button class="primaryAction" type="submit" name="action_remove" >{% trans 'Remove' %}</button> - </div> - - </fieldset> - </form> - - {% else %} - <p><strong>{% trans 'Warning:'%}</strong> {% trans "You currently do not have any e-mail address set up. You should really add an e-mail address so you can receive notifications, reset your password, etc." %}</p> - - {% endif %} - - - <h2>{% trans "Add E-mail Address" %}</h2> - - <form method="post" action="." class="add_email"> - {% csrf_token %} - {{ form|crispy }} - <button class="btn" name="action_add" type="submit">{% trans "Add E-mail" %}</button> - </form> - </div> - </div> -</div> -{% endblock %} - - -{% block extra_body %} -<script type="text/javascript"> -(function() { - var message = "{% trans 'Do you really want to remove the selected e-mail address?' %}"; - var actions = document.getElementsByName('action_remove'); - if (actions.length) { - actions[0].addEventListener("click", function(e) { - if (! confirm(message)) { - e.preventDefault(); - } - }); - } -})(); -</script> -{% endblock %} - diff --git a/api/funkwhale_api/templates/account/email_confirm.html b/api/funkwhale_api/templates/account/email_confirm.html deleted file mode 100644 index 4395d46bfbc724cc30eebc54191d5be505603a7d..0000000000000000000000000000000000000000 --- a/api/funkwhale_api/templates/account/email_confirm.html +++ /dev/null @@ -1,37 +0,0 @@ -{% extends "account/base.html" %} - -{% load i18n %} -{% load account %} - -{% block head_title %}{% trans "Confirm E-mail Address" %}{% endblock %} - - -{% block content %} -<div class="container"> - <div class="row"> - <div class="col-xs-12"> - <h2>{% trans "Confirm E-mail Address" %}</h2> - - {% if confirmation %} - - {% user_display confirmation.email_address.user as user_display %} - - <p>{% blocktrans with confirmation.email_address.email as email %}Please confirm that <a href="mailto:{{ email }}">{{ email }}</a> is an e-mail address for user {{ user_display }}.{% endblocktrans %}</p> - - <form method="post" action="{% url 'account_confirm_email' confirmation.key %}"> - {% csrf_token %} - <button id="confirm-button" class="submit" type="submit">{% trans 'Confirm' %}</button> - </form> - - {% else %} - - {% url 'account_email' as email_url %} - - <p>{% blocktrans %}This e-mail confirmation link expired or is invalid. Please <a href="{{ email_url }}">issue a new e-mail confirmation request</a>.{% endblocktrans %}</p> - - {% endif %} - </div> - </div> -</div> -{% endblock %} - diff --git a/api/funkwhale_api/templates/account/email_confirmed.html b/api/funkwhale_api/templates/account/email_confirmed.html deleted file mode 100644 index 7b2edf08b8d1169305311911e73fb7c0b48b2a53..0000000000000000000000000000000000000000 --- a/api/funkwhale_api/templates/account/email_confirmed.html +++ /dev/null @@ -1,21 +0,0 @@ -{% extends "account/base.html" %} - -{% load i18n %} -{% load account %} - -{% block head_title %}{% trans "Confirm E-mail Address" %}{% endblock %} - - -{% block content %} -<div class="container"> - <div class="row"> - <div class="col-xs-12"> - <h2>{% trans "Confirm E-mail Address" %}</h2> - - {% user_display email_address.user as user_display %} - - <p>{% blocktrans with email_address.email as email %}You have confirmed that <a href="mailto:{{ email }}">{{ email }}</a> is an e-mail address for user {{ user_display }}.{% endblocktrans %}</p> - </div> - </div> -</div> -{% endblock %} diff --git a/api/funkwhale_api/templates/account/login.html b/api/funkwhale_api/templates/account/login.html deleted file mode 100644 index 4a05dc772876f6f8dbc45de6909f004f98cb2ba0..0000000000000000000000000000000000000000 --- a/api/funkwhale_api/templates/account/login.html +++ /dev/null @@ -1,48 +0,0 @@ -{% extends "account/base.html" %} - -{% load i18n %} -{% load account %} -{% load socialaccount %} -{% load crispy_forms_tags %} - -{% block head_title %}{% trans "Sign In" %}{% endblock %} - -{% block content %} -<div class="container"> - <div class="row"> - <div class="col-md-5"> - <h2>{% trans "Sign In" %}</h2> - {% get_providers as socialaccount_providers %} - {% if socialaccount_providers %} - <p>{% blocktrans with site.name as site_name %}Please sign in with one - of your existing third party accounts. Or, <a href="{{ signup_url }}">sign up</a> - for a {{ site_name }} account and sign in below:{% endblocktrans %}</p> - - <div class="socialaccount_ballot"> - - <ul class="socialaccount_providers"> - {% include "socialaccount/snippets/provider_list.html" with process="login" %} - </ul> - - <div class="login-or">{% trans 'or' %}</div> - - </div> - - {% include "socialaccount/snippets/login_extra.html" %} - - {% endif %} - - <form class="login" method="POST" action="{% url 'account_login' %}"> - {% csrf_token %} - {{ form|crispy }} - {% if redirect_field_value %} - <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}" /> - {% endif %} - <button id="sign-in-button" class="btn btn-primary" type="submit">{% trans "Sign In" %}</button> - <a class="button secondaryAction" href="{% url 'account_reset_password' %}">{% trans "Forgot Password?" %}</a> - </form> - </div> - </div> -</div> -{% endblock %} - diff --git a/api/funkwhale_api/templates/account/logout.html b/api/funkwhale_api/templates/account/logout.html deleted file mode 100644 index 4f1f8f3e6697c6c15d39501b2e847f0a75b6cb1e..0000000000000000000000000000000000000000 --- a/api/funkwhale_api/templates/account/logout.html +++ /dev/null @@ -1,28 +0,0 @@ -{% extends "account/base.html" %} - -{% load i18n %} - -{% block head_title %}{% trans "Sign Out" %}{% endblock %} - -{% block content %} -<div class="container"> - <div class="row"> - <div class="col-md-5"> - - <h2>{% trans "Sign Out" %}</h2> - - <p>{% trans 'Are you sure you want to sign out?' %}</p> - - <form method="post" action="{% url 'account_logout' %}"> - {% csrf_token %} - {% if redirect_field_value %} - <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}"/> - {% endif %} - <button class="btn btn-danger" type="submit">{% trans 'Sign Out' %}</button> - </form> - </div> - </div> -</div> - -{% endblock %} - diff --git a/api/funkwhale_api/templates/account/password_change.html b/api/funkwhale_api/templates/account/password_change.html deleted file mode 100644 index e282b14ad96ce6785d499b9dd15b460ad70afceb..0000000000000000000000000000000000000000 --- a/api/funkwhale_api/templates/account/password_change.html +++ /dev/null @@ -1,22 +0,0 @@ -{% extends "account/base.html" %} - -{% load i18n %} -{% load crispy_forms_tags %} -{% block head_title %}{% trans "Change Password" %}{% endblock %} - -{% block content %} -<div class="container"> - <div class="row"> - <div class="col-md-5"> - <h2>{% trans "Change Password" %}</h2> - - <form method="POST" action="./" class="password_change"> - {% csrf_token %} - {{ form|crispy }} - <button class="btn" type="submit" name="action">{% trans "Change Password" %}</button> - </form> - </div> - </div> -</div> -{% endblock %} - diff --git a/api/funkwhale_api/templates/account/password_reset.html b/api/funkwhale_api/templates/account/password_reset.html deleted file mode 100644 index efdfbd05ca98700231af26ddf2f51cac7f240f16..0000000000000000000000000000000000000000 --- a/api/funkwhale_api/templates/account/password_reset.html +++ /dev/null @@ -1,39 +0,0 @@ -{% extends "account/base.html" %} - -{% load i18n %} -{% load account %} -{% load crispy_forms_tags %} - -{% block head_title %}{% trans "Password Reset" %}{% endblock %} - -{% block content %} -<div class="container"> - <div class="row"> - <div class="col-md-5"> - - <h2>{% trans "Password Reset" %}</h2> - {% if user.is_authenticated %} - {% include "account/snippets/already_logged_in.html" %} - {% endif %} - - <p>{% trans "Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it." %}</p> - - <form method="POST" action="./" class="password_reset"> - {% csrf_token %} - {{ form|crispy }} - <button class="btn" type="submit">{% trans "Reset My Password" %}</button> - </form> - - <p>{% blocktrans %}Please contact us if you have any trouble resetting your password.{% endblocktrans %}</p> - </div> - </div> -</div> -{% endblock %} - -{% block javascript %} - {{ block.super }} - <script> - $("#id_email").focus(); - </script> -{% endblock javascript %} - diff --git a/api/funkwhale_api/templates/account/password_reset_done.html b/api/funkwhale_api/templates/account/password_reset_done.html deleted file mode 100644 index 865ecaa0a5a6d21cb21e4c7632993bf37db0759a..0000000000000000000000000000000000000000 --- a/api/funkwhale_api/templates/account/password_reset_done.html +++ /dev/null @@ -1,22 +0,0 @@ -{% extends "account/base.html" %} - -{% load i18n %} -{% load account %} - -{% block head_title %}{% trans "Password Reset" %}{% endblock %} - -{% block content %} -<div class="container"> - <div class="row"> - <div class="col-xs-12"> - <h2>{% trans "Password Reset" %}</h2> - - {% if user.is_authenticated %} - {% include "account/snippets/already_logged_in.html" %} - {% endif %} - - <p>{% blocktrans %}We have sent you an e-mail. Please contact us if you do not receive it within a few minutes.{% endblocktrans %}</p> - </div> - </div> -</div> -{% endblock %} diff --git a/api/funkwhale_api/templates/account/password_reset_from_key.html b/api/funkwhale_api/templates/account/password_reset_from_key.html deleted file mode 100644 index 41b50843f776021b404a03358e19c040fdccc861..0000000000000000000000000000000000000000 --- a/api/funkwhale_api/templates/account/password_reset_from_key.html +++ /dev/null @@ -1,32 +0,0 @@ -{% extends "account/base.html" %} - -{% load i18n %} -{% load crispy_forms_tags %} - -{% block head_title %}{% trans "Change Password" %}{% endblock %} - -{% block content %} -<div class="container"> - <div class="row"> - <div class="col-xs-12"> - <h2>{% if token_fail %}{% trans "Bad Token" %}{% else %}{% trans "Change Password" %}{% endif %}</h2> - - {% if token_fail %} - {% url 'account_reset_password' as passwd_reset_url %} - <p>{% blocktrans %}The password reset link was invalid, possibly because it has already been used. Please request a <a href="{{ passwd_reset_url }}">new password reset</a>.{% endblocktrans %}</p> - {% else %} - {% if form %} - <form method="POST" action="./"> - {% csrf_token %} - {{ form|crispy }} - <button type="submit" name="action">{% trans "change password" %}</button> - </form> - {% else %} - <p>{% trans 'Your password is now changed.' %}</p> - {% endif %} - {% endif %} - </div> - </div> -</div> -{% endblock %} - diff --git a/api/funkwhale_api/templates/account/password_reset_from_key_done.html b/api/funkwhale_api/templates/account/password_reset_from_key_done.html deleted file mode 100644 index e940eb83df2d5ef7676314d2d5ac8da7a70396d9..0000000000000000000000000000000000000000 --- a/api/funkwhale_api/templates/account/password_reset_from_key_done.html +++ /dev/null @@ -1,16 +0,0 @@ -{% extends "account/base.html" %} - -{% load i18n %} -{% block head_title %}{% trans "Change Password" %}{% endblock %} - -{% block content %} -<div class="container"> - <div class="row"> - <div class="col-md-5"> - <h2>{% trans "Change Password" %}</h2> - <p>{% trans 'Your password is now changed.' %}</p> - </div> - </div> -</div> -{% endblock %} - diff --git a/api/funkwhale_api/templates/account/password_set.html b/api/funkwhale_api/templates/account/password_set.html deleted file mode 100644 index 03e2fcd2d90b0cb98dbce5e542d79465c658d832..0000000000000000000000000000000000000000 --- a/api/funkwhale_api/templates/account/password_set.html +++ /dev/null @@ -1,23 +0,0 @@ - -{% extends "account/base.html" %} - -{% load i18n crispy_forms_tags %} - -{% block head_title %}{% trans "Set Password" %}{% endblock %} - -{% block content %} -<div class="container"> - <div class="row"> - <div class="col-md-5"> - <h2>{% trans "Set Password" %}</h2> - - <form method="POST" action="./" class="password_set"> - {% csrf_token %} - {{ form|crispy }} - <input type="submit" name="action" value="{% trans "Set Password" %}"/> - </form> - </div> - </div> -</div> -{% endblock %} - diff --git a/api/funkwhale_api/templates/account/signup.html b/api/funkwhale_api/templates/account/signup.html deleted file mode 100644 index 5db1cac7774dfb35f53db204359da722cb0d9c09..0000000000000000000000000000000000000000 --- a/api/funkwhale_api/templates/account/signup.html +++ /dev/null @@ -1,33 +0,0 @@ -{% extends "account/base.html" %} - -{% load i18n %} -{% load crispy_forms_tags %} - -{% block title %}{% trans "Signup" %}{% endblock title %} - -{% block content %} - -<div class="container"> - <div class="row"> - <div class="col-md-5"> - <h1>{% trans "Sign Up" %}</h1> - - <p>{% blocktrans %}Already have an account? Then please <a href="{{ login_url }}">sign in</a>.{% endblocktrans %}</p> - - <form class="signup" id="signup_form" method="post" action="{% url 'account_signup' %}"> - {% csrf_token %} - {{ form|crispy }} - {% if redirect_field_value %} - <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}" /> - {% endif %} - <button id="sign-up-button" class="btn btn-primary" type="submit">{% trans "Sign Up" %} »</button> - </form> - </div> - </div> -</div> - - -{% endblock content %} - - - diff --git a/api/funkwhale_api/templates/account/signup_closed.html b/api/funkwhale_api/templates/account/signup_closed.html deleted file mode 100644 index 24e93d7bc801316cf9c773f76f83fde0f886bd27..0000000000000000000000000000000000000000 --- a/api/funkwhale_api/templates/account/signup_closed.html +++ /dev/null @@ -1,18 +0,0 @@ -{% extends "account/base.html" %} - -{% load i18n %} - -{% block head_title %}{% trans "Sign Up Closed" %}{% endblock %} - -{% block content %} -<div class="container"> - <div class="row"> - <div class="col-md-5"> - <h2>{% trans "Sign Up Closed" %}</h2> - - <p>{% trans "We are sorry, but the sign up is currently closed." %}</p> - </div> - </div> -</div> -{% endblock %} - diff --git a/api/funkwhale_api/templates/account/verification_sent.html b/api/funkwhale_api/templates/account/verification_sent.html deleted file mode 100644 index f994b46e0fee1d4a5d8e71b3bb9b387000f91e85..0000000000000000000000000000000000000000 --- a/api/funkwhale_api/templates/account/verification_sent.html +++ /dev/null @@ -1,18 +0,0 @@ -{% extends "account/base.html" %} - -{% load i18n %} - -{% block head_title %}{% trans "Verify Your E-mail Address" %}{% endblock %} - -{% block content %} -<div class="container"> - <div class="row"> - <div class="col-md-5"> - <h2>{% trans "Verify Your E-mail Address" %}</h2> - - <p>{% blocktrans %}We have sent an e-mail to <a href="mailto:{{ email }}">{{ email }}</a> for verification. Follow the link provided to finalize the signup process. Please contact us if you do not receive it within a few minutes.{% endblocktrans %}</p> - </div> - </div> -</div> - -{% endblock %} diff --git a/api/funkwhale_api/templates/account/verified_email_required.html b/api/funkwhale_api/templates/account/verified_email_required.html deleted file mode 100644 index bf4887a4aeca5037394a596765a27ba69519938b..0000000000000000000000000000000000000000 --- a/api/funkwhale_api/templates/account/verified_email_required.html +++ /dev/null @@ -1,28 +0,0 @@ -{% extends "account/base.html" %} - -{% load i18n %} - -{% block head_title %}{% trans "Verify Your E-mail Address" %}{% endblock %} - -{% block content %} -<div class="container"> - <div class="row"> - <div class="col-md-5"> - <h2>{% trans "Verify Your E-mail Address" %}</h2> - - {% url 'account_email' as email_url %} - - <p>{% blocktrans %}This part of the site requires us to verify that - you are who you claim to be. For this purpose, we require that you - verify ownership of your e-mail address. {% endblocktrans %}</p> - - <p>{% blocktrans %}We have sent an e-mail to you for - verification. Please click on the link inside this e-mail. Please - contact us if you do not receive it within a few minutes.{% endblocktrans %}</p> - - <p>{% blocktrans %}<strong>Note:</strong> you can still <a href="{{ email_url }}">change your e-mail address</a>.{% endblocktrans %}</p> - </div> - </div> -</div> -{% endblock %} - diff --git a/api/funkwhale_api/templates/users/user_detail.html b/api/funkwhale_api/templates/users/user_detail.html deleted file mode 100644 index f8deb6b726cde67e8d93209f96d0bfe7357d1f15..0000000000000000000000000000000000000000 --- a/api/funkwhale_api/templates/users/user_detail.html +++ /dev/null @@ -1,36 +0,0 @@ -{% extends "base.html" %} -{% load static %} - -{% block title %}User: {{ object.username }}{% endblock %} - -{% block content %} -<div class="container"> - - <div class="row"> - <div class="col-sm-12"> - - <h2>{{ object.username }}</h2> - {% if object.name %} - <p>{{ object.name }}</p> - {% endif %} - </div> - </div> - -{% if object == request.user %} -<!-- Action buttons --> -<div class="row"> - - <div class="col-sm-12 "> - <a class="btn btn-primary" href="{% url 'users:update' %}">My Info</a> - <a class="btn btn-primary" href="{% url 'account_email' %}">E-Mail</a> - <!-- Your Stuff: Custom user template urls --> - </div> - -</div> -<!-- End Action buttons --> -{% endif %} - - -</div> -{% endblock content %} - diff --git a/api/funkwhale_api/templates/users/user_form.html b/api/funkwhale_api/templates/users/user_form.html deleted file mode 100644 index c07b8f2fce122a35af4d504b80a1326212cc7d58..0000000000000000000000000000000000000000 --- a/api/funkwhale_api/templates/users/user_form.html +++ /dev/null @@ -1,17 +0,0 @@ -{% extends "base.html" %} -{% load crispy_forms_tags %} - -{% block title %}{{ user.username }}{% endblock %} - -{% block content %} - <h1>{{ user.username }}</h1> - <form class="form-horizontal" method="post" action="{% url 'users:update' %}"> - {% csrf_token %} - {{ form|crispy }} - <div class="control-group"> - <div class="controls"> - <button type="submit" class="btn">Update</button> - </div> - </div> - </form> -{% endblock %} diff --git a/api/funkwhale_api/templates/users/user_list.html b/api/funkwhale_api/templates/users/user_list.html deleted file mode 100644 index 7fbcc52d4af5c3c51d23f8ae3fb98da2d6875c4f..0000000000000000000000000000000000000000 --- a/api/funkwhale_api/templates/users/user_list.html +++ /dev/null @@ -1,20 +0,0 @@ -{% extends "base.html" %} -{% load static %}{% load i18n %} -{% block title %}Members{% endblock %} - -{% block content %} - -<div class="container"> - - <h2>Users</h2> - - <div class="list-group"> - {% for user in user_list %} - <a href="{% url 'users:detail' user.username %}" class="list-group-item"> - <h4 class="list-group-item-heading">{{ user.username }}</h4> - </a> - {% endfor %} - - </div> - -{% endblock content %} diff --git a/api/funkwhale_api/users/urls.py b/api/funkwhale_api/users/urls.py deleted file mode 100644 index 94b18b2644efcb5737cefaf656d6eb07653ea5a7..0000000000000000000000000000000000000000 --- a/api/funkwhale_api/users/urls.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import absolute_import, unicode_literals - -from django.conf.urls import url - -from . import views - -urlpatterns = [ - -] diff --git a/api/requirements/base.txt b/api/requirements/base.txt index 0b9e03090a3f258b34f808494b1df500bc66bc8b..ae851962a47279cf40070fe5e053a77ab8fb5620 100644 --- a/api/requirements/base.txt +++ b/api/requirements/base.txt @@ -6,12 +6,6 @@ django-environ==0.4.0 django-secure==1.0.1 whitenoise==2.0.6 - -# Forms -django-braces==1.8.1 -# django-crispy-forms==1.5.2 -# django-floppyforms==1.5.2 - # Models django-model-utils==2.3.1 @@ -26,10 +20,6 @@ django-allauth==0.24.1 # Python-PostgreSQL Database Adapter psycopg2==2.6.1 -# Unicode slugification -unicode-slugify==0.1.3 -django-autoslug==1.9.3 - # Time zones support pytz==2015.7 @@ -42,21 +32,21 @@ celery==3.1.19 # Your custom requirements go here -django-cors-headers -musicbrainzngs +django-cors-headers==2.1.0 +musicbrainzngs==0.6 youtube_dl>=2015.12.21 -djangorestframework -djangorestframework-jwt -django-celery -django-mptt -google-api-python-client -arrow -django-taggit -persisting_theory -django-versatileimagefield -django-cachalot -django-rest-auth -beautifulsoup4 -markdown -ipython -mutagen +djangorestframework==3.6.3 +djangorestframework-jwt==1.11.0 +django-celery==3.2.1 +django-mptt==0.8.7 +google-api-python-client==1.6.2 +arrow==0.10.0 +django-taggit==0.22.1 +persisting-theory==0.2.1 +django-versatileimagefield==1.7.1 +django-cachalot==1.5.0 +django-rest-auth==0.9.1 +beautifulsoup4==4.6.0 +Markdown==2.6.8 +ipython==6.1.0 +mutagen==1.38