From 35458ab391c5bd33abca867fc28adcf1d85bc7ea Mon Sep 17 00:00:00 2001 From: Sebastian Lohff Date: Tue, 14 Feb 2017 22:26:16 +0100 Subject: [PATCH] Zwischencommit --- .gitignore | 6 +++ dncore/admin.py | 4 +- dncore/migrations/0001_initial.py | 46 +++++++++++++++++++++ dncore/templates/profile/profile.html | 15 +++++++ dncore/urls.py | 12 ++++++ dncore/views.py | 12 +++++- dnmgmt/__pycache__/__init__.cpython-35.pyc | Bin 136 -> 0 bytes dnmgmt/__pycache__/settings.cpython-35.pyc | Bin 2345 -> 0 bytes dnmgmt/settings.py | 3 +- dnmgmt/urls.py | 14 +++++-- whoisdb/migrations/0001_initial.py | 25 +++++++++++ whoisdb/urls.py | 8 ++++ 12 files changed, 139 insertions(+), 6 deletions(-) create mode 100644 .gitignore create mode 100644 dncore/migrations/0001_initial.py create mode 100644 dncore/templates/profile/profile.html create mode 100644 dncore/urls.py delete mode 100644 dnmgmt/__pycache__/__init__.cpython-35.pyc delete mode 100644 dnmgmt/__pycache__/settings.cpython-35.pyc create mode 100644 whoisdb/migrations/0001_initial.py create mode 100644 whoisdb/urls.py diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..39e8f86 --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +.*.swp +.*.swo +*.pyc +*.pyo +__pycache__ +db.sqlite3 diff --git a/dncore/admin.py b/dncore/admin.py index 8c38f3f..c444238 100644 --- a/dncore/admin.py +++ b/dncore/admin.py @@ -1,3 +1,5 @@ from django.contrib import admin -# Register your models here. +from .models import User + +admin.site.register(User) diff --git a/dncore/migrations/0001_initial.py b/dncore/migrations/0001_initial.py new file mode 100644 index 0000000..2d5e9c9 --- /dev/null +++ b/dncore/migrations/0001_initial.py @@ -0,0 +1,46 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2017-02-13 03:01 +from __future__ import unicode_literals + +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', '0008_alter_user_username_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=30, verbose_name='first name')), + ('last_name', models.CharField(blank=True, max_length=30, 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_plural': 'users', + 'verbose_name': 'user', + 'abstract': False, + }, + managers=[ + ('objects', django.contrib.auth.models.UserManager()), + ], + ), + ] diff --git a/dncore/templates/profile/profile.html b/dncore/templates/profile/profile.html new file mode 100644 index 0000000..969f8e7 --- /dev/null +++ b/dncore/templates/profile/profile.html @@ -0,0 +1,15 @@ +{% extends "base.html" %} + +{% block content %} +
+
+
+
Header
+
+ Body +
+
+
+
+{% endblock %} + diff --git a/dncore/urls.py b/dncore/urls.py new file mode 100644 index 0000000..aab6521 --- /dev/null +++ b/dncore/urls.py @@ -0,0 +1,12 @@ +from django.conf.urls import url +from django.contrib.auth import views as auth_views + +from . import views as dncore_views + +urlpatterns = [ + url(r'^$', dncore_views.dashboard, name='dashboard'), + + url(r'^login/$', auth_views.login, name='login'), + url(r'^logout/$', auth_views.logout, {'next_page': '/'}, name='logout'), + url(r'^profile/$', dncore_views.profile, name='profile'), +] diff --git a/dncore/views.py b/dncore/views.py index 91ea44a..90ff661 100644 --- a/dncore/views.py +++ b/dncore/views.py @@ -1,3 +1,13 @@ from django.shortcuts import render +from django.contrib.auth.decorators import login_required -# Create your views here. +@login_required +def profile(request): + return render(request, "profile/profile.html", {}) + +@login_required +def dashboard(request): + pass + +def index(request): + return render(request, "index.html", {}) diff --git a/dnmgmt/__pycache__/__init__.cpython-35.pyc b/dnmgmt/__pycache__/__init__.cpython-35.pyc deleted file mode 100644 index 58dd47f0191e255c942d85b365a0aba7cb9db3e8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 136 zcmWgV<>fl@aZUsS5IhDEFu(|8H~?`m3y?@*U~wiuF?xi?Z`lOY~Fna?^9+RD679US>&ryk0@&Ee@O9{FKt1R6CGy#X!se E0E6ryZvX%Q diff --git a/dnmgmt/__pycache__/settings.cpython-35.pyc b/dnmgmt/__pycache__/settings.cpython-35.pyc deleted file mode 100644 index 57eaf068dd81935565671e558ae5b8124cace9e2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2345 zcmb7GTX)k&5FTG5J0{^0prp`J0WBnHBasGD=;@&-wg^7>k`u{<>P1J^Ze%68811Sd zdgX8Q5A>h(H|Vubee7$WI+E?g$Kjl&UTHO&%Qv&LGb`U(T&(@^_iyi(7Xbc*sUN<> zOT5|h0ssLpa4rBTf>!{e0JH#yMK~;-Bg#PM;A3HY83K?J7!@F8Fsk4n&ODGgAjn5% z6$rl8z!AWx0l5TZ0mved%RsIGxeDYOI2ACEzXS$~t^>INYGfKvvy0B#u^j1!^01Ow6T0{IGv2;|-*;445ehWqfb2rgczjPC9Md63Z=@%4oG zWOkC9iNNCC_JP#muj^g8qmn%l!*Nk@e#>Q)-B?@fylTO@v-J3F=hxNjxjf+jmOec zG=GJdei%{F4G`Y9xElr{UVPx9L)W9Ze`RIZNxttt-&$jq z6F8nto_(MXpFOnwEoXft3@qB-vrWBeyT* z=}WH9a$`P7?#wVV6B=-SGNdfIH6vt{G0f+AfsX>qL5th7794lL&hpNZ^|8!%3GwK$ z6;X*%JC0m_B57lyeJV?y%tDQwOH=mRh&N@mdfo|cs2>JWJ%9X%DvJ)JI!Z4iuASH0l;P|mCW)FhZjX{TWwrH*MR=}#bZFT}SoG4nSCQq@?l3EE zHf48d)J;+xc`U7LEA=;Or;*5GG*11Yhn*$$5rzh2QutCMZ!&!>W@)+6+|$ykvb$^M zRHeJCH@h7zUCOKD12?f(Y>YaLSh6yUeqKi+v>!Xk+66Qt`X1YcC*O{BPb)Y}_$QFF zjYu|UluwiV34@6YYdb%Aq+{l|k~JJ+e)G*sD})|cvBy(E?d&u=>S;}r{#oYOd(Y)` zGc9+NwwlyXH0C6)XM)K~WoR*W97e>%W5Ff4AF0P^r0}diV@@^KcRed>g|{P(FiKur z6she7t{?j?8aRA#X8-d=?MI!lJC5-T;N?XDIT+5!O+0x`GcAT#ZbOR?Fzs#>U{$9TtIu*y)ikq%!!(WRwxX$7Ev7Y1t?#M2`9}RE zoolGuy`6MXX|=lhYQucp)pRYr-0WyNvXFrVtfjSfv(ad&`^ui0F6?!?y4l-n)w`Wn z>AbGCcUy|CYU$N|ZKs*(x0-b&tM#;e7`j0^-%xZVbFQV!N>6`n?kbwL-`#7NZ*>7S?aAoMAI2>O;h{v0O0mjt0wLeAaVd?_1Os)#Te!oRH#_RIhP diff --git a/dnmgmt/settings.py b/dnmgmt/settings.py index 058b14c..4f40ba7 100644 --- a/dnmgmt/settings.py +++ b/dnmgmt/settings.py @@ -11,6 +11,7 @@ https://docs.djangoproject.com/en/1.10/ref/settings/ """ import os +from django.contrib import messages # Build paths inside the project like this: os.path.join(BASE_DIR, ...) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) @@ -130,7 +131,7 @@ MESSAGE_TAGS = { messages.ERROR: 'danger', } -AUTH_USER_MODEL = 'contest.User' +AUTH_USER_MODEL = 'dncore.User' LOGIN_REDIRECT_URL = '/' LOGIN_URL = '/login/' diff --git a/dnmgmt/urls.py b/dnmgmt/urls.py index df1e153..94c98dd 100644 --- a/dnmgmt/urls.py +++ b/dnmgmt/urls.py @@ -13,11 +13,19 @@ Including another URLconf 1. Import the include() function: from django.conf.urls import url, include 2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls')) """ -from django.conf.urls import url +from django.conf.urls import url, include from django.contrib import admin +import dncore.urls +import dncore.views +import whoisdb.urls + + urlpatterns = [ + url(r'^$', dncore.views.index), + url(r'^dashboard/$', dncore.views.dashboard), + url(r'^admin/', admin.site.urls), - url(r'^user/', dncore.urls), - url(r'^whoisdb/', whoisdb.urls), + url(r'^user/', include(dncore.urls, namespace='user')), + url(r'^whoisdb/', include(whoisdb.urls, namespace='whoisdb')), ] diff --git a/whoisdb/migrations/0001_initial.py b/whoisdb/migrations/0001_initial.py new file mode 100644 index 0000000..74b26b9 --- /dev/null +++ b/whoisdb/migrations/0001_initial.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2017-02-13 03:01 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name='Maintainer', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('auth', models.ManyToManyField(to=settings.AUTH_USER_MODEL)), + ], + ), + ] diff --git a/whoisdb/urls.py b/whoisdb/urls.py new file mode 100644 index 0000000..8e2fb07 --- /dev/null +++ b/whoisdb/urls.py @@ -0,0 +1,8 @@ +from django.conf.urls import url + +from . import views as whoisdb_views + +urlpatterns = [ + #url(r'^$', dncore_views.dashboard, name='dashboard'), +] +