diff --git a/ccdb/contrib/__init__.py b/ccdb/contrib/__init__.py deleted file mode 100644 index 40a96af..0000000 --- a/ccdb/contrib/__init__.py +++ /dev/null @@ -1 +0,0 @@ -# -*- coding: utf-8 -*- diff --git a/ccdb/contrib/sites/__init__.py b/ccdb/contrib/sites/__init__.py deleted file mode 100644 index 40a96af..0000000 --- a/ccdb/contrib/sites/__init__.py +++ /dev/null @@ -1 +0,0 @@ -# -*- coding: utf-8 -*- diff --git a/ccdb/contrib/sites/migrations/0001_initial.py b/ccdb/contrib/sites/migrations/0001_initial.py deleted file mode 100644 index 555d02c..0000000 --- a/ccdb/contrib/sites/migrations/0001_initial.py +++ /dev/null @@ -1,31 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations -import django.contrib.sites.models - - -class Migration(migrations.Migration): - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='Site', - fields=[ - ('id', models.AutoField(verbose_name='ID', primary_key=True, serialize=False, auto_created=True)), - ('domain', models.CharField(verbose_name='domain name', max_length=100, validators=[django.contrib.sites.models._simple_domain_name_validator])), - ('name', models.CharField(verbose_name='display name', max_length=50)), - ], - options={ - 'verbose_name_plural': 'sites', - 'verbose_name': 'site', - 'db_table': 'django_site', - 'ordering': ('domain',), - }, - managers=[ - (b'objects', django.contrib.sites.models.SiteManager()), - ], - ), - ] diff --git a/ccdb/contrib/sites/migrations/0002_set_site_domain_and_name.py b/ccdb/contrib/sites/migrations/0002_set_site_domain_and_name.py deleted file mode 100644 index aea3458..0000000 --- a/ccdb/contrib/sites/migrations/0002_set_site_domain_and_name.py +++ /dev/null @@ -1,40 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations - - -def update_site_forward(apps, schema_editor): - """Set site domain and name.""" - Site = apps.get_model("sites", "Site") - Site.objects.update_or_create( - id=settings.SITE_ID, - defaults={ - "domain": "ccdb.info", - "name": "ccdb" - } - ) - - -def update_site_backward(apps, schema_editor): - """Revert site domain and name to default.""" - Site = apps.get_model("sites", "Site") - Site.objects.update_or_create( - id=settings.SITE_ID, - defaults={ - "domain": "example.com", - "name": "example.com" - } - ) - - -class Migration(migrations.Migration): - - dependencies = [ - ('sites', '0001_initial'), - ] - - operations = [ - migrations.RunPython(update_site_forward, update_site_backward), - ] diff --git a/ccdb/contrib/sites/migrations/0003_auto_20151221_2141.py b/ccdb/contrib/sites/migrations/0003_auto_20151221_2141.py deleted file mode 100644 index 832c4ad..0000000 --- a/ccdb/contrib/sites/migrations/0003_auto_20151221_2141.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models -import django.contrib.sites.models - - -class Migration(migrations.Migration): - - dependencies = [ - ('sites', '0002_set_site_domain_and_name'), - ] - - operations = [ - migrations.AlterModelManagers( - name='site', - managers=[ - ('objects', django.contrib.sites.models.SiteManager()), - ], - ), - ] diff --git a/ccdb/contrib/sites/migrations/__init__.py b/ccdb/contrib/sites/migrations/__init__.py deleted file mode 100644 index 40a96af..0000000 --- a/ccdb/contrib/sites/migrations/__init__.py +++ /dev/null @@ -1 +0,0 @@ -# -*- coding: utf-8 -*- diff --git a/ccdb/static/fonts/.gitkeep b/ccdb/static/.gitkeep similarity index 100% rename from ccdb/static/fonts/.gitkeep rename to ccdb/static/.gitkeep diff --git a/ccdb/static/css/project.css b/ccdb/static/css/project.css deleted file mode 100644 index f24ff66..0000000 --- a/ccdb/static/css/project.css +++ /dev/null @@ -1,22 +0,0 @@ -.alert-debug { - background-color: #fff; - border-color: #d6e9c6; - color: #000; } - -.alert-error { - background-color: #f2dede; - border-color: #eed3d7; - color: #b94a48; } - -@media (max-width: 47.9em) { - .navbar-nav .nav-item { - display: inline-block; - float: none; - width: 100%; } - .navbar-nav .nav-item + .nav-item { - margin-left: 0; } - .nav.navbar-nav.pull-right { - float: none !important; } } - -[hidden][style="display: block;"] { - display: block !important; } diff --git a/ccdb/static/images/favicon.ico b/ccdb/static/images/favicon.ico deleted file mode 100644 index e1c1dd1..0000000 Binary files a/ccdb/static/images/favicon.ico and /dev/null differ diff --git a/ccdb/static/js/project.js b/ccdb/static/js/project.js deleted file mode 100644 index d26d23b..0000000 --- a/ccdb/static/js/project.js +++ /dev/null @@ -1 +0,0 @@ -/* Project specific Javascript goes here. */ diff --git a/ccdb/static/sass/project.scss b/ccdb/static/sass/project.scss deleted file mode 100644 index 37c69e4..0000000 --- a/ccdb/static/sass/project.scss +++ /dev/null @@ -1,51 +0,0 @@ -// project specific CSS goes here - -// Alert colors - -$white: #fff; -$mint-green: #d6e9c6; -$black: #000; -$pink: #f2dede; -$dark-pink: #eed3d7; -$red: #b94a48; - -// bootstrap alert CSS, translated to the django-standard levels of -// debug, info, success, warning, error - -.alert-debug { - background-color: $white; - border-color: $mint-green; - color: $black; -} - -.alert-error { - background-color: $pink; - border-color: $dark-pink; - color: $red; -} - -// This is a fix for the bootstrap4 alpha release - -@media (max-width: 47.9em) { - .navbar-nav .nav-item { - display: inline-block; - float: none; - width: 100%; - } - - .navbar-nav .nav-item + .nav-item { - margin-left: 0; - } - - .nav.navbar-nav.pull-right { - float: none !important; - } -} - -// Display django-debug-toolbar. -// See https://github.com/django-debug-toolbar/django-debug-toolbar/issues/742 -// and https://github.com/pydanny/cookiecutter-django/issues/317 - -[hidden][style="display: block;"] { - display: block !important; -} diff --git a/ccdb/templates/404.html b/ccdb/templates/404.html deleted file mode 100644 index b9cb608..0000000 --- a/ccdb/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/ccdb/templates/500.html b/ccdb/templates/500.html deleted file mode 100644 index 919cf1c..0000000 --- a/ccdb/templates/500.html +++ /dev/null @@ -1,14 +0,0 @@ -{% extends "base.html" %} - -{% block title %}Server Error{% endblock %} - -{% block content %} -

Error

- -

Sorry about that, it 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/ccdb/templates/account/base.html b/ccdb/templates/account/base.html deleted file mode 100644 index 4c86ad8..0000000 --- a/ccdb/templates/account/base.html +++ /dev/null @@ -1,6 +0,0 @@ -{% extends "base.html" %} - -{% block title %} - {% block head_title %} - {% endblock head_title %} -{% endblock title %} diff --git a/ccdb/templates/account/email.html b/ccdb/templates/account/email.html deleted file mode 100644 index 490ea43..0000000 --- a/ccdb/templates/account/email.html +++ /dev/null @@ -1,76 +0,0 @@ -{% extends "account/base.html" %} -{% block navbar_class-users:detail %}active{% endblock %} - -{% load i18n %} -{% load crispy_forms_tags %} - -{% block head_title %}{% trans "Account" %}{% endblock %} - -{% block content %} -
-
-

{% trans "E-mail Addresses" %}

- {% if user.emailaddress_set.all %} -

{% trans 'The following e-mail addresses are associated with your account:' %}

- - {% else %} -

- {% trans 'Warning:'%} - {% blocktrans %} - 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. - {% endblocktrans %} -

- {% endif %} -

{% trans "Add E-mail Address" %}

-
- {% csrf_token %} - {{ form|crispy }} - -
-
-
-{% endblock %} - -{% block extra_body %} - -{% endblock %} diff --git a/ccdb/templates/account/email_confirm.html b/ccdb/templates/account/email_confirm.html deleted file mode 100644 index 117f856..0000000 --- a/ccdb/templates/account/email_confirm.html +++ /dev/null @@ -1,35 +0,0 @@ -{% extends "account/base.html" %} - -{% load i18n %} -{% load account %} - -{% block head_title %}{% trans "Confirm E-mail Address" %}{% endblock %} - -{% block content %} -
-
-

{% trans "Confirm E-mail Address" %}

- {% if confirmation %} - {% user_display confirmation.email_address.user as user_display %} -

- {% blocktrans with confirmation.email_address.email as email %} - Please confirm that {{ email }} - is an e-mail address for user {{ user_display }}. - {% endblocktrans %} -

-
- {% csrf_token %} - -
- {% else %} - {% url 'account_email' as email_url %} -

- {% blocktrans %} - This e-mail confirmation link expired or is invalid. Please - issue a new e-mail confirmation request. - {% endblocktrans %} -

- {% endif %} -
-
-{% endblock %} diff --git a/ccdb/templates/account/email_confirmed.html b/ccdb/templates/account/email_confirmed.html deleted file mode 100644 index ed282f9..0000000 --- a/ccdb/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 %} -
-
-

{% trans "Confirm E-mail Address" %}

- {% user_display email_address.user as user_display %} -

- {% blocktrans with email_address.email as email %} - You have confirmed that {{ email }} - is an e-mail address for user {{ user_display }}. - {% endblocktrans %} -

-
-
-{% endblock %} diff --git a/ccdb/templates/account/login.html b/ccdb/templates/account/login.html deleted file mode 100644 index 4979147..0000000 --- a/ccdb/templates/account/login.html +++ /dev/null @@ -1,25 +0,0 @@ -{% extends "account/base.html" %} -{% block navbar_class-account_login %}active{% endblock %} - -{% load i18n %} -{% load account %} -{% load crispy_forms_tags %} - -{% block head_title %}{% trans "Sign In" %}{% endblock %} - -{% block content %} -
-
-

{% trans "Sign In" %}

- -
-
-{% endblock %} diff --git a/ccdb/templates/account/logout.html b/ccdb/templates/account/logout.html deleted file mode 100644 index b55404b..0000000 --- a/ccdb/templates/account/logout.html +++ /dev/null @@ -1,22 +0,0 @@ -{% extends "account/base.html" %} -{% block navbar_class-account_logout %}active{% endblock %} - -{% load i18n %} - -{% block head_title %}{% trans "Sign Out" %}{% endblock %} - -{% block content %} -
-
-

{% trans "Sign Out" %}

-

{% trans 'Are you sure you want to sign out?' %}

-
- {% csrf_token %} - {% if redirect_field_value %} - - {% endif %} - -
-
-
-{% endblock %} diff --git a/ccdb/templates/account/password_change.html b/ccdb/templates/account/password_change.html deleted file mode 100644 index ee373bb..0000000 --- a/ccdb/templates/account/password_change.html +++ /dev/null @@ -1,18 +0,0 @@ -{% extends "account/base.html" %} - -{% load i18n %} -{% load crispy_forms_tags %} -{% block head_title %}{% trans "Change Password" %}{% endblock %} - -{% block content %} -
-
-

{% trans "Change Password" %}

-
- {% csrf_token %} - {{ form|crispy }} - -
-
-
-{% endblock %} diff --git a/ccdb/templates/account/password_reset.html b/ccdb/templates/account/password_reset.html deleted file mode 100644 index 57b8c6d..0000000 --- a/ccdb/templates/account/password_reset.html +++ /dev/null @@ -1,38 +0,0 @@ -{% extends "account/base.html" %} - -{% load i18n %} -{% load account %} -{% load crispy_forms_tags %} - -{% block head_title %}{% trans "Password Reset" %}{% endblock %} - -{% block content %} -
-
-

{% trans "Password Reset" %}

- {% if user.is_authenticated %} - {% include "account/snippets/already_logged_in.html" %} - {% endif %} -

- {% trans "Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it." %} -

-
- {% csrf_token %} - {{ form|crispy }} - -
-

- {% blocktrans %} - Please contact us if you have any trouble resetting your password. - {% endblocktrans %} -

-
-
-{% endblock %} - -{% block javascript %} -{{ block.super }} - -{% endblock javascript %} diff --git a/ccdb/templates/account/password_reset_done.html b/ccdb/templates/account/password_reset_done.html deleted file mode 100644 index 3835608..0000000 --- a/ccdb/templates/account/password_reset_done.html +++ /dev/null @@ -1,23 +0,0 @@ -{% extends "account/base.html" %} - -{% load i18n %} -{% load account %} - -{% block head_title %}{% trans "Password Reset" %}{% endblock %} - -{% block content %} -
-
-

{% trans "Password Reset" %}

- {% if user.is_authenticated %} - {% include "account/snippets/already_logged_in.html" %} - {% endif %} -

- {% blocktrans %} - We have sent you an e-mail. Please contact us if you do not - receive it within a few minutes. - {% endblocktrans %} -

-
-
-{% endblock %} diff --git a/ccdb/templates/account/password_reset_from_key.html b/ccdb/templates/account/password_reset_from_key.html deleted file mode 100644 index 94a2af6..0000000 --- a/ccdb/templates/account/password_reset_from_key.html +++ /dev/null @@ -1,40 +0,0 @@ -{% extends "account/base.html" %} - -{% load i18n %} -{% load crispy_forms_tags %} - -{% block head_title %}{% trans "Change Password" %}{% endblock %} - -{% block content %} -
-
-

- {% if token_fail %} - {% trans "Bad Token" %} - {% else %} - {% trans "Change Password" %} - {% endif %} -

- {% if token_fail %} - {% url 'account_reset_password' as passwd_reset_url %} -

- {% blocktrans %} - The password reset link was invalid, possibly because it has already - been used. Please request a new - password reset. - {% endblocktrans %} -

- {% else %} - {% if form %} -
- {% csrf_token %} - {{ form|crispy }} - -
- {% else %} -

{% trans 'Your password is now changed.' %}

- {% endif %} - {% endif %} -
-
-{% endblock %} diff --git a/ccdb/templates/account/password_reset_from_key_done.html b/ccdb/templates/account/password_reset_from_key_done.html deleted file mode 100644 index 8440069..0000000 --- a/ccdb/templates/account/password_reset_from_key_done.html +++ /dev/null @@ -1,13 +0,0 @@ -{% extends "account/base.html" %} - -{% load i18n %} -{% block head_title %}{% trans "Change Password" %}{% endblock %} - -{% block content %} -
-
-

{% trans "Change Password" %}

-

{% trans 'Your password is now changed.' %}

-
-
-{% endblock %} diff --git a/ccdb/templates/account/password_set.html b/ccdb/templates/account/password_set.html deleted file mode 100644 index d5c39f6..0000000 --- a/ccdb/templates/account/password_set.html +++ /dev/null @@ -1,19 +0,0 @@ - -{% extends "account/base.html" %} - -{% load i18n crispy_forms_tags %} - -{% block head_title %}{% trans "Set Password" %}{% endblock %} - -{% block content %} -
-
-

{% trans "Set Password" %}

-
- {% csrf_token %} - {{ form|crispy }} - -
-
-
-{% endblock %} diff --git a/ccdb/templates/account/signup.html b/ccdb/templates/account/signup.html deleted file mode 100644 index 217df06..0000000 --- a/ccdb/templates/account/signup.html +++ /dev/null @@ -1,29 +0,0 @@ -{% extends "account/base.html" %} -{% block navbar_class-account_signup %}active{% endblock %} - -{% load i18n %} -{% load crispy_forms_tags %} - -{% block title %}{% trans "Signup" %}{% endblock title %} - -{% block content %} -
-
-

{% trans "Sign Up" %}

-

- {% blocktrans %} - Already have an account? Then please - sign in. - {% endblocktrans %} -

- -
-
-{% endblock content %} diff --git a/ccdb/templates/account/signup_closed.html b/ccdb/templates/account/signup_closed.html deleted file mode 100644 index c18daf7..0000000 --- a/ccdb/templates/account/signup_closed.html +++ /dev/null @@ -1,14 +0,0 @@ -{% extends "account/base.html" %} - -{% load i18n %} - -{% block head_title %}{% trans "Sign Up Closed" %}{% endblock %} - -{% block content %} -
-
-

{% trans "Sign Up Closed" %}

-

{% trans "We are sorry, but the sign up is currently closed." %}

-
-
-{% endblock %} diff --git a/ccdb/templates/account/verification_sent.html b/ccdb/templates/account/verification_sent.html deleted file mode 100644 index b23e4c8..0000000 --- a/ccdb/templates/account/verification_sent.html +++ /dev/null @@ -1,20 +0,0 @@ -{% extends "account/base.html" %} - -{% load i18n %} - -{% block head_title %}{% trans "Verify Your E-mail Address" %}{% endblock %} - -{% block content %} -
-
-

{% trans "Verify Your E-mail Address" %}

-

- {% blocktrans %} - We have sent an e-mail to {{ email }} - 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 %} -

-
-
-{% endblock %} diff --git a/ccdb/templates/account/verified_email_required.html b/ccdb/templates/account/verified_email_required.html deleted file mode 100644 index d844a4a..0000000 --- a/ccdb/templates/account/verified_email_required.html +++ /dev/null @@ -1,34 +0,0 @@ -{% extends "account/base.html" %} - -{% load i18n %} - -{% block head_title %}{% trans "Verify Your E-mail Address" %}{% endblock %} - -{% block content %} -
-
-

{% trans "Verify Your E-mail Address" %}

- {% url 'account_email' as email_url %} -

- {% 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 %} -

-

- {% 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 %} -

-

- {% blocktrans %} - Note: you can still change - your e-mail address. - {% endblocktrans %} -

-
-
-{% endblock %} diff --git a/ccdb/templates/base.html b/ccdb/templates/base.html deleted file mode 100644 index 42e702b..0000000 --- a/ccdb/templates/base.html +++ /dev/null @@ -1,99 +0,0 @@ -{% load staticfiles %} -{% load i18n %} - - - - - - - {% block title %}CCDB{% endblock title %} - - - - - - - - {% block css %} - - - {% endblock %} - - - -
- -
- -
- {% if messages %} - {% for message in messages %} -
{{ message }}
- {% endfor %} - {% endif %} - - {% block content %} -

PLACEHOLDER

- {% endblock content %} -
- - {% block modal %}{% endblock modal %} - - {% block javascript %} - - - - {% endblock javascript %} - - diff --git a/ccdb/templates/django_tables2/table.html b/ccdb/templates/django_tables2/table.html deleted file mode 100644 index 306149d..0000000 --- a/ccdb/templates/django_tables2/table.html +++ /dev/null @@ -1,58 +0,0 @@ -{% load querystring from django_tables2 %} -{% load title from django_tables2 %} -{% load trans blocktrans from i18n %} -{% load bootstrap3 %} - -{% if table.page %} -
-{% endif %} - -{% block table %} - - {% block table.thead %} - - - {% for column in table.columns %} - {% if column.orderable %} - - {% else %} - - {% endif %} - {% endfor %} - - - {% endblock table.thead %} - {% block table.tbody %} - - {% for row in table.page.object_list|default:table.rows %} {# support pagination #} - {% block table.tbody.row %} - - {% for column, cell in row.items %} - - {% endfor %} - - {% endblock table.tbody.row %} - {% empty %} - {% if table.empty_text %} - {% block table.tbody.empty_text %} - - {% endblock table.tbody.empty_text %} - {% endif %} - {% endfor %} - - {% endblock table.tbody %} - {% block table.tfoot %} - - {% endblock table.tfoot %} -
{{ column.header|title }}{{ column.header|title }}
{{ cell }}
{{ table.empty_text }}
-{% endblock table %} - -{% if table.page %} - {% block pagination %} - {% bootstrap_pagination table.page url=request.get_full_path %} - {% endblock pagination %} -{% endif %} - -{% if table.page %} -
-{% endif %} diff --git a/ccdb/templates/pages/about.html b/ccdb/templates/pages/about.html deleted file mode 100644 index 241d395..0000000 --- a/ccdb/templates/pages/about.html +++ /dev/null @@ -1,6 +0,0 @@ -{% extends "base.html" %} -{% block navbar_class-about %}active{% endblock %} - -{% block content %} -

About

-{% endblock content %} diff --git a/ccdb/templates/pages/home.html b/ccdb/templates/pages/home.html deleted file mode 100644 index 7a7e2dd..0000000 --- a/ccdb/templates/pages/home.html +++ /dev/null @@ -1,7 +0,0 @@ -{% extends "base.html" %} - -{% block content %} -

CCDB

- -

This page will have overview data.

-{% endblock content %} diff --git a/ccdb/templates/users/user_detail.html b/ccdb/templates/users/user_detail.html deleted file mode 100644 index f374b9f..0000000 --- a/ccdb/templates/users/user_detail.html +++ /dev/null @@ -1,28 +0,0 @@ -{% extends "base.html" %} -{% block navbar_class-users:detail %}active{% endblock %} -{% load static %} - -{% block title %}User: {{ object.username }}{% endblock %} - -{% block content %} -
-
-

{{ object.username }}

- {% if object.name %} -

{{ object.name }}

- {% endif %} -
-
- -{% if object == request.user %} - -
-
- My Info - E-Mail - -
-
- -{% endif %} -{% endblock content %} diff --git a/ccdb/templates/users/user_form.html b/ccdb/templates/users/user_form.html deleted file mode 100644 index 46842dc..0000000 --- a/ccdb/templates/users/user_form.html +++ /dev/null @@ -1,19 +0,0 @@ -{% extends "base.html" %} -{% block navbar_class-users:detail %}active{% endblock %} -{% load crispy_forms_tags %} -{% load static %} - -{% block title %}{{ user.username }}{% endblock %} - -{% block content %} -
-
-

{{ user.username }}

-
- {% csrf_token %} - {{ form|crispy }} - -
-
-
-{% endblock %} diff --git a/ccdb/templates/users/user_list.html b/ccdb/templates/users/user_list.html deleted file mode 100644 index 6e510ed..0000000 --- a/ccdb/templates/users/user_list.html +++ /dev/null @@ -1,14 +0,0 @@ -{% extends "base.html" %} -{% load static %}{% load i18n %} -{% block title %}Members{% endblock %} - -{% block content %} -

Users

-
- {% for user in user_list %} - -

{{ user.username }}

- - {% endfor %} -
-{% endblock content %} diff --git a/ccdb/users/admin.py b/ccdb/users/admin.py index 51a6ebc..ce6b137 100644 --- a/ccdb/users/admin.py +++ b/ccdb/users/admin.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import absolute_import, unicode_literals - from django import forms from django.contrib import admin from django.contrib.auth.admin import UserAdmin as AuthUserAdmin diff --git a/ccdb/users/models.py b/ccdb/users/models.py index a73b71c..3a8dcb6 100644 --- a/ccdb/users/models.py +++ b/ccdb/users/models.py @@ -1,9 +1,7 @@ -# -*- coding: utf-8 -*- from django.contrib.auth.models import AbstractUser from django.core.urlresolvers import reverse from django.db import models from django.utils.translation import ugettext_lazy as _ -from django.conf import settings import pytz @@ -11,8 +9,9 @@ import pytz class User(AbstractUser): name = models.CharField(_("Name of User"), blank=True, max_length=255) timezone = models.CharField(_("Current Timezone"), max_length=255, - default="UTC", choices=[(x, x) for x in pytz.common_timezones], - blank=False) + default="UTC", + choices=[(x, x) for x in pytz.common_timezones], + blank=False) def __str__(self): return self.username diff --git a/ccdb/users/tests/__init__.py b/ccdb/users/tests/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/ccdb/users/tests/factories.py b/ccdb/users/tests/factories.py deleted file mode 100644 index e2c967d..0000000 --- a/ccdb/users/tests/factories.py +++ /dev/null @@ -1,11 +0,0 @@ -import factory - - -class UserFactory(factory.django.DjangoModelFactory): - username = factory.Sequence(lambda n: 'user-{0}'.format(n)) - email = factory.Sequence(lambda n: 'user-{0}@example.com'.format(n)) - password = factory.PostGenerationMethodCall('set_password', 'password') - - class Meta: - model = 'users.User' - django_get_or_create = ('username', ) diff --git a/ccdb/users/tests/test_admin.py b/ccdb/users/tests/test_admin.py deleted file mode 100644 index 8faf96a..0000000 --- a/ccdb/users/tests/test_admin.py +++ /dev/null @@ -1,39 +0,0 @@ -from test_plus.test import TestCase - -from ..admin import MyUserCreationForm - - -class TestMyUserCreationForm(TestCase): - def setUp(self): - self.user = self.make_user() - - def test_clean_username_success(self): - # Instantiate the form with a new username - form = MyUserCreationForm({ - 'username': 'alamode', - 'password1': '123456', - 'password2': '123456', - }) - # Run is_valid() to trigger the validation - valid = form.is_valid() - self.assertTrue(valid) - - # Run the actual clean_username method - username = form.clean_username() - self.assertEqual('alamode', username) - - def test_clean_username_false(self): - # Instantiate the form with the same username as self.user - form = MyUserCreationForm({ - 'username': self.user.username, - 'password1': '123456', - 'password2': '123456', - }) - # Run is_valid() to trigger the validation, which is going to fail - # because the username is already taken - valid = form.is_valid() - self.assertFalse(valid) - - # The form.errors dict should contain a single error called 'username' - self.assertTrue(len(form.errors) == 1) - self.assertTrue('username' in form.errors) diff --git a/ccdb/users/tests/test_models.py b/ccdb/users/tests/test_models.py deleted file mode 100644 index c0e4df6..0000000 --- a/ccdb/users/tests/test_models.py +++ /dev/null @@ -1,18 +0,0 @@ -from test_plus.test import TestCase - - -class TestUser(TestCase): - def setUp(self): - self.user = self.make_user() - - def test__str__(self): - self.assertEqual( - self.user.__str__(), - "testuser" # This is the default username for self.make_user() - ) - - def test_get_absolute_url(self): - self.assertEqual( - self.user.get_absolute_url(), - '/users/testuser/' - ) diff --git a/ccdb/users/tests/test_views.py b/ccdb/users/tests/test_views.py deleted file mode 100644 index 587331b..0000000 --- a/ccdb/users/tests/test_views.py +++ /dev/null @@ -1,66 +0,0 @@ -from django.test import RequestFactory - -from test_plus.test import TestCase - -from ..views import ( - UserRedirectView, - UserUpdateView -) - - -class BaseUserTestCase(TestCase): - def setUp(self): - self.user = self.make_user() - self.factory = RequestFactory() - - -class TestUserRedirectView(BaseUserTestCase): - def test_get_redirect_url(self): - # Instantiate the view directly. Never do this outside a test! - view = UserRedirectView() - # Generate a fake request - request = self.factory.get('/fake-url') - # Attach the user to the request - request.user = self.user - # Attach the request to the view - view.request = request - # Expect: '/users/testuser/', as that is the default username for - # self.make_user() - self.assertEqual( - view.get_redirect_url(), - '/users/testuser/' - ) - - -class TestUserUpdateView(BaseUserTestCase): - def setUp(self): - # call BaseUserTestCase.setUp() - super(TestUserUpdateView, self).setUp() - # Instantiate the view directly. Never do this outside a test! - self.view = UserUpdateView() - # Generate a fake request - request = self.factory.get('/fake-url') - # Attach the user to the request - request.user = self.user - # Attach the request to the view - self.view.request = request - - def test_get_success_url(self): - # Expect: '/users/testuser/', as that is the default username for - # self.make_user() - self.assertEqual( - self.view.get_success_url(), - '/users/testuser/' - ) - - # TODO: write this test - # def test_get_redirected(self): - # Expect '/users/testuser01/' to redirect, because that isn't the - # currently logged in user - - def test_get_object(self): - # Expect: self.user, as that is the request's user object - self.assertEqual( - self.view.get_object(), - self.user - ) diff --git a/ccdb/users/urls.py b/ccdb/users/urls.py deleted file mode 100644 index 9ae4347..0000000 --- a/ccdb/users/urls.py +++ /dev/null @@ -1,14 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import absolute_import, unicode_literals - -from django.conf.urls import url - -from . import views - - -urlpatterns = [ - url(regex=r'^$', view=views.UserListView.as_view(), name='list'), - url(regex=r'^redirect/$', view=views.UserRedirectView.as_view(), name='redirect'), - url(regex=r'^(?P[\w.@+-]+)/$', view=views.UserDetailView.as_view(), name='detail'), - url(regex=r'^(?P[\w.@+-]+)/update/$', view=views.UserUpdateView.as_view(), name='update'), -] diff --git a/ccdb/users/views.py b/ccdb/users/views.py deleted file mode 100644 index 73a9dbf..0000000 --- a/ccdb/users/views.py +++ /dev/null @@ -1,51 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import absolute_import, unicode_literals - -from django.core.urlresolvers import reverse -from django.views.generic import DetailView, ListView, RedirectView, UpdateView -from django.shortcuts import redirect - -from braces.views import LoginRequiredMixin - -from .models import User - - -class UserDetailView(LoginRequiredMixin, DetailView): - model = User - # These next two lines tell the view to index lookups by username - slug_field = "username" - slug_url_kwarg = "username" - - -class UserRedirectView(LoginRequiredMixin, RedirectView): - permanent = False - - def get_redirect_url(self): - return reverse("users:detail", - kwargs={"username": self.request.user.username}) - - -class UserUpdateView(LoginRequiredMixin, UpdateView): - fields = ['name', 'timezone'] - model = User - - def dispatch(self, request, *args, **kwargs): - if request.user.username != kwargs.pop("username", None): - return redirect(reverse("users:detail", - kwargs={"username": request.user.username})) - return super(UserUpdateView, self).dispatch(request, *args, **kwargs) - - def get_success_url(self): - return reverse("users:detail", - kwargs={"username": self.request.user.username}) - - def get_object(self): - # Only get the User record for the user making the request - return User.objects.get(username=self.request.user.username) - - -class UserListView(LoginRequiredMixin, ListView): - model = User - # These next two lines tell the view to index lookups by username - slug_field = "username" - slug_url_kwarg = "username" diff --git a/config/settings/base.py b/config/settings/base.py index 418d6c6..024c6f9 100644 --- a/config/settings/base.py +++ b/config/settings/base.py @@ -13,24 +13,21 @@ env = environ.Env() # APP CONFIGURATION # ------------------------------------------------------------------------------ DJANGO_APPS = ( - # Default Django apps: 'django.contrib.auth', 'django.contrib.contenttypes', 'django.contrib.sessions', 'django.contrib.sites', 'django.contrib.messages', 'django.contrib.staticfiles', - - # Admin 'grappelli', 'django.contrib.admin', ) THIRD_PARTY_APPS = ( - 'crispy_forms', # Form layouts - 'allauth', # registration - 'allauth.account', # registration - 'bootstrap3', # bootstrappin' - 'django_tables2', # data grids + 'crispy_forms', + 'allauth', + 'allauth.account', + 'bootstrap3', + 'django_tables2', ) # Apps specific for this project go here. @@ -64,12 +61,6 @@ MIDDLEWARE_CLASSES = ( 'ccdb.users.middleware.TimezoneMiddleware', ) -# MIGRATIONS CONFIGURATION -# ------------------------------------------------------------------------------ -MIGRATION_MODULES = { - 'sites': 'ccdb.contrib.sites.migrations' -} - # DEBUG # ------------------------------------------------------------------------------ # See: https://docs.djangoproject.com/en/dev/ref/settings/#debug @@ -125,9 +116,6 @@ LOCALE_PATHS = [ 'locale', ] -# See: https://docs.djangoproject.com/en/dev/ref/settings/#site-id -SITE_ID = 1 - # See: https://docs.djangoproject.com/en/dev/ref/settings/#use-i18n USE_I18N = True diff --git a/config/urls.py b/config/urls.py index 0a21d4b..13ebb3f 100644 --- a/config/urls.py +++ b/config/urls.py @@ -2,21 +2,16 @@ from django.conf import settings from django.conf.urls import include, url from django.conf.urls.static import static from django.contrib import admin -from django.views.generic import TemplateView +from django.views.generic import RedirectView from django.views import defaults as default_views +from django.core.urlresolvers import reverse_lazy urlpatterns = [ - url(r'^$', TemplateView.as_view(template_name='pages/home.html'), name="home"), - url(r'^about/$', TemplateView.as_view(template_name='pages/about.html'), name="about"), - - # Django Admin, use {% url 'admin:index' %} url(r'^grappelli/', include('grappelli.urls')), url(settings.ADMIN_URL, include(admin.site.urls)), - - # User management - url(r'^users/', include("ccdb.users.urls", namespace="users")), - url(r'^accounts/', include('allauth.urls')), - + url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')), + # url(r'^api/', include('ccdb.api.urls', namespace='api')), + url(r'^$', RedirectView.as_view(url=reverse_lazy('admin:index'), permanent=True)), ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) if settings.DEBUG: