Skip to content

Commit

Permalink
Completed module
Browse files Browse the repository at this point in the history
  • Loading branch information
luismu78 committed Mar 24, 2020
1 parent 55e9e0c commit 956f73b
Show file tree
Hide file tree
Showing 29 changed files with 161 additions and 3 deletions.
2 changes: 2 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/inspectionProfiles/profiles_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/python-django-models-authentication.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Empty file.
Empty file.
Empty file.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Empty file.
Empty file.
Empty file.
Empty file.
17 changes: 17 additions & 0 deletions .idea/sonarlint/issuestore/index.pb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions blogproj/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
'django.contrib.staticfiles',
'crispy_forms',
'mainapp',
'users',
]

MIDDLEWARE = [
Expand Down Expand Up @@ -131,3 +132,7 @@
STATICFILES_DIRS = [
os.path.join(BASE_DIR, "static"),
]

LOGIN_URL = 'login'
LOGIN_REDIRECT_URL = 'index'
AUTH_USER_MODEL = 'users.User'
1 change: 1 addition & 0 deletions blogproj/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
from .views import redirect_root

urlpatterns = [
path('accounts/', include('users.urls')),
path('admin/', admin.site.urls),
path('blog/', include('mainapp.urls')),
path('', redirect_root)
Expand Down
19 changes: 19 additions & 0 deletions mainapp/migrations/0003_auto_20200323_1924.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Generated by Django 2.2.9 on 2020-03-23 19:24

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('mainapp', '0002_auto_20191004_0501'),
]

operations = [
migrations.DeleteModel(
name='BlogPost',
),
migrations.DeleteModel(
name='Tag',
),
]
6 changes: 3 additions & 3 deletions templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

<div class="collapse navbar-collapse w-100 order-3 dual-collapse2" id="navbarNavDropdown">
<ul class="navbar-nav ml-auto">
{% comment %}

{% if user.is_authenticated %}
<li class="nav-item">
<a class="nav-link" href="{% url 'logout' %}">Logout</a>
Expand All @@ -41,8 +41,8 @@
</li>
{% endif %}
</li>
{% endcomment %}
</ul>

º </ul>
</div>
</nav>
</header>
Expand Down
Empty file added users/__init__.py
Empty file.
6 changes: 6 additions & 0 deletions users/admin.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
from django.contrib import admin
from django.contrib.auth.admin import UserAdmin

from .models import User

admin.site.register(User, UserAdmin)
5 changes: 5 additions & 0 deletions users/apps.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
from django.apps import AppConfig


class UsersConfig(AppConfig):
name = 'users'
44 changes: 44 additions & 0 deletions users/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# Generated by Django 2.2.9 on 2020-03-23 19:24

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', '0011_update_proxy_permissions'),
]

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=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()),
],
),
]
Empty file added users/migrations/__init__.py
Empty file.
6 changes: 6 additions & 0 deletions users/models.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
from django.db import models

from django.contrib.auth.models import AbstractUser

class User(AbstractUser):
pass
File renamed without changes.
3 changes: 3 additions & 0 deletions users/tests.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from django.test import TestCase

# Create your tests here.
9 changes: 9 additions & 0 deletions users/urls.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
from django.contrib.auth import views as auth_views
from django.urls import path
from . import views


urlpatterns = [
path('login/', auth_views.LoginView.as_view(template_name='login.html'), name='login'),
path('logout/', auth_views.LogoutView.as_view(next_page='index'), name='logout'),
]
3 changes: 3 additions & 0 deletions users/views.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from django.shortcuts import render

# Create your views here.

0 comments on commit 956f73b

Please sign in to comment.