modified users url and views to implement login view

Felipe Henrique de Almeida Bormann
1 parent 87d60759
Showing 3 changed files with 37 additions and 16 deletions Show diff stats
users/migrations/0002_auto_20161219_2218.py
users/templates/users/login.html
users/views.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-12-20 01:18
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='type_profile',
+            field=models.IntegerField(blank=True, choices=[(1, 'Professor'), (2, 'Student'), (3, 'Coordinator')], null=True, verbose_name='Type'),
+        ),
+    ]
@@ -64,17 +64,17 @@
             <button type="submite" class="btn btn-success btn-raised btn-block" form="form-login" style="position: initial;"> {% trans 'Log in' %} </button>
           </div>
           <div class="col-md-5 col-xs-6 col-sm-6 col-lg-5 text-center">
-            <a class="btn btn-default btn-raised btn-block" href="{% url 'core:guest' %}" formaction="#" style="position: initial;">{% trans 'Guest' %}</a>
+            <a class="btn btn-default btn-raised btn-block" href="#" formaction="#" style="position: initial;">{% trans 'Guest' %}</a>
           </div>
         </div>
         <div class="row">
           <div class="col-md-offset-1 col-md-10 text-right forgotPassword">
-            <a href="{% url 'core:password_reset' %}">{% trans 'Forgot your password?' %}</a>
+            <a href="#">{% trans 'Forgot your password?' %}</a>
           </div>
         </div>
       </div>
     </div>
-    <a class="btn btn-raised btn-primary btn-block" href="{% url 'core:register' %}">{% trans 'Sign Up' %} </a>
+    <a class="btn btn-raised btn-primary btn-block" href="#">{% trans 'Sign Up' %} </a>
   </div>
 </div>
-from django.shortcuts import get_object_or_404,redirect
+from django.shortcuts import get_object_or_404,redirect, render
 from django.db.models import Q
 from django.views import generic
 from django.contrib import messages
@@ -24,7 +24,7 @@ from rest_framework.permissions import IsAuthenticated, IsAuthenticatedOrReadOnl
 class UsersListView(HasRoleMixin, LoginRequiredMixin, generic.ListView):
 	allowed_roles = ['system_admin']
-	login_url = reverse_lazy("core:home")
+	#login_url = reverse_lazy("core:home")
 	redirect_field_name = 'next'
 	template_name = 'list_users.html'
 	context_object_name = 'users'
@@ -48,7 +48,7 @@ class UsersListView(HasRoleMixin, LoginRequiredMixin, generic.ListView):
 class Create(HasRoleMixin, LoginRequiredMixin, generic.edit.CreateView):
 	allowed_roles = ['system_admin']
-	login_url = reverse_lazy("core:home")
+	#login_url = reverse_lazy("core:home")
 	redirect_field_name = 'next'
 	template_name = 'users/create.html'
 	form_class = UserForm
@@ -78,7 +78,7 @@ class Create(HasRoleMixin, LoginRequiredMixin, generic.edit.CreateView):
 class Update(HasRoleMixin, LoginRequiredMixin, generic.UpdateView):
 	allowed_roles = ['system_admin']
-	login_url = reverse_lazy("core:home")
+	#login_url = reverse_lazy("core:home")
 	redirect_field_name = 'next'
 	template_name = 'users/update.html'
 	slug_field = 'username'
@@ -111,7 +111,7 @@ class Update(HasRoleMixin, LoginRequiredMixin, generic.UpdateView):
 class View(LoginRequiredMixin, generic.DetailView):
-	login_url = reverse_lazy("core:home")
+	#login_url = reverse_lazy("core:home")
 	redirect_field_name = 'next'
 	model = User
 	context_object_name = 'acc'
@@ -134,7 +134,7 @@ def remove_account(request,username):
 	user = get_object_or_404(User,username = username)
 	user.delete()
 	messages.success(request,_("User deleted Successfully!"))
-	return redirect('core:logout')
+	#return redirect('core:logout')
 class Change_password(generic.TemplateView):
 	template_name = 'users/change_password.html'
@@ -153,7 +153,7 @@ class Remove_account(generic.TemplateView):
 		return context
 class UpdateProfile(LoginRequiredMixin, generic.edit.UpdateView):
-	login_url = reverse_lazy("core:home")
+	#login_url = reverse_lazy("core:home")
 	template_name = 'users/edit_profile.html'
 	form_class = UpdateProfileForm
 	success_url = reverse_lazy('users:profile')
@@ -178,9 +178,10 @@ class UpdateProfile(LoginRequiredMixin, generic.edit.UpdateView):
 class DeleteUser(LoginRequiredMixin, generic.edit.DeleteView):
 	allowed_roles = ['student']
-	login_url = reverse_lazy("core:home")
+	#login_url = reverse_lazy("core:home")
 	model = User
-	success_url = reverse_lazy('core:index')
+	
+	#success_url = reverse_lazy('core:index')
 	success_message = "Deleted Successfully"
 	def get_queryset(self):
@@ -190,7 +191,7 @@ class DeleteUser(LoginRequiredMixin, generic.edit.DeleteView):
 class Profile(LoginRequiredMixin, generic.DetailView):
-	login_url = reverse_lazy("core:home")
+	#login_url = reverse_lazy("core:home")
 	redirect_field_name = 'next'
 	context_object_name = 'user'
 	template_name = 'users/profile.html'
@@ -206,7 +207,7 @@ class Profile(LoginRequiredMixin, generic.DetailView):
 class SearchView(LoginRequiredMixin, generic.ListView):
-	login_url = reverse_lazy("core:home")
+	#login_url = reverse_lazy("core:home")
 	redirect_field_name = 'next'
 	queryset = None
 	template_name = 'users/search.html'
@@ -220,7 +221,7 @@ class SearchView(LoginRequiredMixin, generic.ListView):
 		return context
-def login(self, request):
+def login(request):
 	context = {}
 	context['title'] = 'Log In'
@@ -237,7 +238,7 @@ def login(self, request):
 	elif request.user.is_authenticated:
 		return redirect(reverse('users:login'))
-	return render(request,"index.html",context)
+	return render(request,"users/login.html",context)
 # API VIEWS
@@ -0,0 +1,20 @@		@@ -0,0 +1,20 @@
	1	+# -- coding: utf-8 --
	2	+# Generated by Django 1.10 on 2016-12-20 01:18
	3	+from __future__ import unicode_literals
	4	+
	5	+from django.db import migrations, models
	6	+
	7	+
	8	+class Migration(migrations.Migration):
	9	+
	10	+ dependencies = [
	11	+ ('users', '0001_initial'),
	12	+ ]
	13	+
	14	+ operations = [
	15	+ migrations.AlterField(
	16	+ model_name='user',
	17	+ name='type_profile',
	18	+ field=models.IntegerField(blank=True, choices=[(1, 'Professor'), (2, 'Student'), (3, 'Coordinator')], null=True, verbose_name='Type'),
	19	+ ),
	20	+ ]
	@@ -64,17 +64,17 @@		@@ -64,17 +64,17 @@
64	<button type="submite" class="btn btn-success btn-raised btn-block" form="form-login" style="position: initial;"> {% trans 'Log in' %} </button>	64	<button type="submite" class="btn btn-success btn-raised btn-block" form="form-login" style="position: initial;"> {% trans 'Log in' %} </button>
65	</div>	65	</div>
66	<div class="col-md-5 col-xs-6 col-sm-6 col-lg-5 text-center">	66	<div class="col-md-5 col-xs-6 col-sm-6 col-lg-5 text-center">
67	- <a class="btn btn-default btn-raised btn-block" href="{% url 'core:guest' %}" formaction="#" style="position: initial;">{% trans 'Guest' %}</a>	67	+ <a class="btn btn-default btn-raised btn-block" href="#" formaction="#" style="position: initial;">{% trans 'Guest' %}</a>
68	</div>	68	</div>
69	</div>	69	</div>
70	<div class="row">	70	<div class="row">
71	<div class="col-md-offset-1 col-md-10 text-right forgotPassword">	71	<div class="col-md-offset-1 col-md-10 text-right forgotPassword">
72	- <a href="{% url 'core:password_reset' %}">{% trans 'Forgot your password?' %}</a>	72	+ <a href="#">{% trans 'Forgot your password?' %}</a>
73	</div>	73	</div>
74	</div>	74	</div>
75	</div>	75	</div>
76	</div>	76	</div>
77	- <a class="btn btn-raised btn-primary btn-block" href="{% url 'core:register' %}">{% trans 'Sign Up' %} </a>	77	+ <a class="btn btn-raised btn-primary btn-block" href="#">{% trans 'Sign Up' %} </a>
78	</div>	78	</div>
79	</div>	79	</div>
80		80