From 866a0d368737a4a3f58daed8f10d97c3d954caaf Mon Sep 17 00:00:00 2001
From: Izzan Fakhril Islam <izzan.fakhril@ui.ac.id>
Date: Wed, 27 Nov 2019 21:27:17 +0700
Subject: [PATCH] fixing migration errors
---
tutorial_2/migrations/0001_initial.py | 2 +-
tutorial_7/migrations/0001_initial.py | 5 +++--
.../migrations/0002_auto_20191114_1836.py | 21 ------------------
tutorial_7/migrations/0002_user_last_login.py | 22 +++++++++++++++++++
tutorial_7/models.py | 1 +
tutorial_7/templates/layout/base.html | 2 +-
tutorial_7/templates/partials/header.html | 2 +-
tutorial_7/templates/tutorial_7.html | 2 +-
tutorial_7/views.py | 2 +-
9 files changed, 31 insertions(+), 28 deletions(-)
delete mode 100644 tutorial_7/migrations/0002_auto_20191114_1836.py
create mode 100644 tutorial_7/migrations/0002_user_last_login.py
diff --git a/tutorial_2/migrations/0001_initial.py b/tutorial_2/migrations/0001_initial.py
index bee2c84..8d9b7f6 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 3df977c..0871b72 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 f5ea263..0000000
--- 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 0000000..fd90b26
--- /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 1f2495b..cb1b316 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 7b6fbf0..07135e6 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 7b28dea..c0f6b01 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 e2f1557..3067516 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 79d01bc..57d1682 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()
--
GitLab