From f2fe1d3eba2946231b4e09970bc851de057aedc6 Mon Sep 17 00:00:00 2001 From: Gabriel Augendre Date: Sat, 21 Nov 2020 11:41:15 +0100 Subject: [PATCH] Add auth and exercises apps --- src/__init__.py | 1 - src/{tests => custom_auth}/__init__.py | 0 src/custom_auth/admin.py | 5 +++ src/custom_auth/apps.py | 5 +++ src/custom_auth/migrations/0001_initial.py | 44 ++++++++++++++++++++++ src/custom_auth/migrations/__init__.py | 0 src/custom_auth/models.py | 5 +++ src/custom_auth/tests.py | 3 ++ src/custom_auth/views.py | 3 ++ src/exercises/__init__.py | 0 src/exercises/admin.py | 3 ++ src/exercises/apps.py | 5 +++ src/exercises/migrations/__init__.py | 0 src/exercises/models.py | 3 ++ src/exercises/tests.py | 3 ++ src/exercises/views.py | 3 ++ manage.py => src/manage.py | 2 +- src/tests/test_workout_suggest.py | 5 --- src/workout_suggest/settings.py | 4 ++ 19 files changed, 87 insertions(+), 7 deletions(-) delete mode 100644 src/__init__.py rename src/{tests => custom_auth}/__init__.py (100%) create mode 100644 src/custom_auth/admin.py create mode 100644 src/custom_auth/apps.py create mode 100644 src/custom_auth/migrations/0001_initial.py create mode 100644 src/custom_auth/migrations/__init__.py create mode 100644 src/custom_auth/models.py create mode 100644 src/custom_auth/tests.py create mode 100644 src/custom_auth/views.py create mode 100644 src/exercises/__init__.py create mode 100644 src/exercises/admin.py create mode 100644 src/exercises/apps.py create mode 100644 src/exercises/migrations/__init__.py create mode 100644 src/exercises/models.py create mode 100644 src/exercises/tests.py create mode 100644 src/exercises/views.py rename manage.py => src/manage.py (87%) delete mode 100644 src/tests/test_workout_suggest.py diff --git a/src/__init__.py b/src/__init__.py deleted file mode 100644 index 3dc1f76..0000000 --- a/src/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__version__ = "0.1.0" diff --git a/src/tests/__init__.py b/src/custom_auth/__init__.py similarity index 100% rename from src/tests/__init__.py rename to src/custom_auth/__init__.py diff --git a/src/custom_auth/admin.py b/src/custom_auth/admin.py new file mode 100644 index 0000000..f91be8f --- /dev/null +++ b/src/custom_auth/admin.py @@ -0,0 +1,5 @@ +from django.contrib import admin +from django.contrib.auth.admin import UserAdmin +from .models import User + +admin.site.register(User, UserAdmin) diff --git a/src/custom_auth/apps.py b/src/custom_auth/apps.py new file mode 100644 index 0000000..b6ebb65 --- /dev/null +++ b/src/custom_auth/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class CustomAuthConfig(AppConfig): + name = 'custom_auth' diff --git a/src/custom_auth/migrations/0001_initial.py b/src/custom_auth/migrations/0001_initial.py new file mode 100644 index 0000000..3b3cb29 --- /dev/null +++ b/src/custom_auth/migrations/0001_initial.py @@ -0,0 +1,44 @@ +# Generated by Django 3.1.3 on 2020-11-21 10:40 + +import django.contrib.auth.models +import django.contrib.auth.validators +from django.db import migrations, models +import django.utils.timezone + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('auth', '0012_alter_user_first_name_max_length'), + ] + + operations = [ + migrations.CreateModel( + name='User', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('password', models.CharField(max_length=128, verbose_name='password')), + ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')), + ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')), + ('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')), + ('first_name', models.CharField(blank=True, max_length=150, verbose_name='first name')), + ('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')), + ('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')), + ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')), + ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')), + ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')), + ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups')), + ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions')), + ], + options={ + 'verbose_name': 'user', + 'verbose_name_plural': 'users', + 'abstract': False, + }, + managers=[ + ('objects', django.contrib.auth.models.UserManager()), + ], + ), + ] diff --git a/src/custom_auth/migrations/__init__.py b/src/custom_auth/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/custom_auth/models.py b/src/custom_auth/models.py new file mode 100644 index 0000000..472e692 --- /dev/null +++ b/src/custom_auth/models.py @@ -0,0 +1,5 @@ +from django.contrib.auth.models import AbstractUser +from django.db import models + +class User(AbstractUser): + pass diff --git a/src/custom_auth/tests.py b/src/custom_auth/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/src/custom_auth/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/src/custom_auth/views.py b/src/custom_auth/views.py new file mode 100644 index 0000000..91ea44a --- /dev/null +++ b/src/custom_auth/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here. diff --git a/src/exercises/__init__.py b/src/exercises/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/exercises/admin.py b/src/exercises/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/src/exercises/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/src/exercises/apps.py b/src/exercises/apps.py new file mode 100644 index 0000000..75ba1e0 --- /dev/null +++ b/src/exercises/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class ExercisesConfig(AppConfig): + name = 'exercises' diff --git a/src/exercises/migrations/__init__.py b/src/exercises/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/exercises/models.py b/src/exercises/models.py new file mode 100644 index 0000000..71a8362 --- /dev/null +++ b/src/exercises/models.py @@ -0,0 +1,3 @@ +from django.db import models + +# Create your models here. diff --git a/src/exercises/tests.py b/src/exercises/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/src/exercises/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/src/exercises/views.py b/src/exercises/views.py new file mode 100644 index 0000000..91ea44a --- /dev/null +++ b/src/exercises/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here. diff --git a/manage.py b/src/manage.py similarity index 87% rename from manage.py rename to src/manage.py index debd633..21c1740 100755 --- a/manage.py +++ b/src/manage.py @@ -6,7 +6,7 @@ import sys def main(): """Run administrative tasks.""" - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "src.workout_suggest.settings") + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "workout_suggest.settings") try: from django.core.management import execute_from_command_line except ImportError as exc: diff --git a/src/tests/test_workout_suggest.py b/src/tests/test_workout_suggest.py deleted file mode 100644 index 6e09536..0000000 --- a/src/tests/test_workout_suggest.py +++ /dev/null @@ -1,5 +0,0 @@ -from src import __version__ - - -def test_version(): - assert __version__ == "0.1.0" diff --git a/src/workout_suggest/settings.py b/src/workout_suggest/settings.py index c95d3a0..443942d 100644 --- a/src/workout_suggest/settings.py +++ b/src/workout_suggest/settings.py @@ -37,6 +37,8 @@ INSTALLED_APPS = [ "django.contrib.sessions", "django.contrib.messages", "django.contrib.staticfiles", + "custom_auth", + "exercises", ] MIDDLEWARE = [ @@ -118,3 +120,5 @@ USE_TZ = True # https://docs.djangoproject.com/en/3.1/howto/static-files/ STATIC_URL = "/static/" + +AUTH_USER_MODEL = "custom_auth.User"