diff --git a/tutorial_2/migrations/0001_initial.py b/tutorial_2/migrations/0001_initial.py
index bee2c84f9b65342e449ae393ac166d343bcde3aa..8d9b7f699f5bdbe70d6764730ece401b1c216ba6 100644
--- a/tutorial_2/migrations/0001_initial.py
+++ b/tutorial_2/migrations/0001_initial.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# Generated by Django 1.11.17 on 2019-11-14 10:36
+# Generated by Django 1.11.17 on 2019-11-27 14:19
from __future__ import unicode_literals
from django.db import migrations, models
diff --git a/tutorial_7/migrations/0001_initial.py b/tutorial_7/migrations/0001_initial.py
index 3df977c8b5ada80154b5d114e37bfb6f3f72266c..0871b72fa83366597438f7ebfa2bec4862b3e964 100644
--- a/tutorial_7/migrations/0001_initial.py
+++ b/tutorial_7/migrations/0001_initial.py
@@ -1,8 +1,9 @@
# -*- coding: utf-8 -*-
-# Generated by Django 1.11.17 on 2019-11-14 10:40
+# Generated by Django 1.11.17 on 2019-11-27 14:19
from __future__ import unicode_literals
from django.db import migrations, models
+import uuid
class Migration(migrations.Migration):
@@ -55,7 +56,7 @@ class Migration(migrations.Migration):
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('email', models.EmailField(max_length=254)),
- ('uid', models.CharField(max_length=255)),
+ ('uid', models.CharField(default=uuid.uuid4, max_length=255)),
],
),
]
diff --git a/tutorial_7/migrations/0002_auto_20191114_1836.py b/tutorial_7/migrations/0002_auto_20191114_1836.py
deleted file mode 100644
index f5ea26374777ec7c9310f4eb281b84001977238c..0000000000000000000000000000000000000000
--- a/tutorial_7/migrations/0002_auto_20191114_1836.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.17 on 2019-11-14 11:36
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import uuid
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('tutorial_7', '0001_initial'),
- ]
-
- operations = [
- migrations.AlterField(
- model_name='token',
- name='uid',
- field=models.CharField(default=uuid.uuid4, max_length=255),
- ),
- ]
diff --git a/tutorial_7/migrations/0002_user_last_login.py b/tutorial_7/migrations/0002_user_last_login.py
new file mode 100644
index 0000000000000000000000000000000000000000..fd90b26ee612d7e06a66ea7a0fa2a72895edd71e
--- /dev/null
+++ b/tutorial_7/migrations/0002_user_last_login.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.17 on 2019-11-27 14:26
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('tutorial_7', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='user',
+ name='last_login',
+ field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
+ preserve_default=False,
+ ),
+ ]
diff --git a/tutorial_7/models.py b/tutorial_7/models.py
index 1f2495b48c72d45c105962d676dfdced74a0352c..cb1b316ef9a15ee664a2074c532a84e0e8c53821 100644
--- a/tutorial_7/models.py
+++ b/tutorial_7/models.py
@@ -27,6 +27,7 @@ class Token(models.Model):
class User(models.Model):
email = models.EmailField(primary_key=True)
+ last_login = models.DateTimeField(auto_now_add=True)
REQUIRED_FIELDS = []
USERNAME_FIELD = 'email'
is_anonymous = False
diff --git a/tutorial_7/templates/layout/base.html b/tutorial_7/templates/layout/base.html
index 7b6fbf09986447e4f3c5b245d2bc4653a17488ee..07135e62b6dc0b6d827b5babd51259c59ebac798 100644
--- a/tutorial_7/templates/layout/base.html
+++ b/tutorial_7/templates/layout/base.html
@@ -18,7 +18,7 @@
@import url(https://fonts.googleapis.com/css?family=Roboto|Roboto+Slab);
.container, .footer-down, .header-up{
font-family: "Roboto", "sans-serif";
- font-weight: normal;
+ font-weight: bold;
}
</style>
diff --git a/tutorial_7/templates/partials/header.html b/tutorial_7/templates/partials/header.html
index 7b28dea8d27685a838e8d8f81c386bed8e5bea3e..c0f6b01fb17c137433dec1972a2f69c9623de595 100644
--- a/tutorial_7/templates/partials/header.html
+++ b/tutorial_7/templates/partials/header.html
@@ -17,7 +17,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <a class="navbar-brand" href="{% url 'tutorial-7:index' %}" style="color: black">Tutorial 7 PMPL</a>
+ <a class="navbar-brand" href="{% url 'tutorial-7:index' %}" style="color: black">Tutorial 7 PMPL Hehe</a>
</div>
</div>
</nav>
diff --git a/tutorial_7/templates/tutorial_7.html b/tutorial_7/templates/tutorial_7.html
index e2f1557d301f82c61fa8f064c65e34bb37ab4646..30675165db89c368945d4f19d6ede6f720152d75 100644
--- a/tutorial_7/templates/tutorial_7.html
+++ b/tutorial_7/templates/tutorial_7.html
@@ -22,7 +22,7 @@
<br>
{% else %}
<form method="POST" action="{% url 'tutorial-7:send_login_email' %}">
- Enter your email to log in: <input id="email" name="email" type="text"/>
+ Enter your email to log in here: <input id="email" name="email" type="text"/>
{% csrf_token %}
</form>
{% endif %}
diff --git a/tutorial_7/views.py b/tutorial_7/views.py
index 79d01bcb6e1690577d53d028bfb048c87aa2adca..57d16827bf2a53b649f5f764fe90f246b7e354fb 100644
--- a/tutorial_7/views.py
+++ b/tutorial_7/views.py
@@ -77,7 +77,7 @@ def add_todo_commentary(request):
comment=request.POST['comment'],
date=date
)
- return HttpResponseRedirect(reverse('tutorial-2:index'))
+ return HttpResponseRedirect(reverse('tutorial-7:index'))
except (ValueError, ValidationError) as e:
print(type(e))
todo_commentary = TodoListCommentary.objects.all().values()