Improve spacing in accounts

Author: tdunn891

accounts/models.py

@@ -2,21 +2,22 @@
 from django.contrib.auth.models import User
 from django.db.models.signals import post_save
 from django.dispatch import receiver
-
-# Create your models here.
+from tickets.models import Ticket
+from datetime import datetime
 
 
 class Profile(models.Model):
+    """Profile class is required to allow additional User fields to be saved"""
     user = models.OneToOneField(User, on_delete=models.CASCADE)
     is_pro_user = models.BooleanField(default=False)
+    pro_user_since_date = models.DateTimeField(null=True, default=None)
+    image = models.ImageField(
+        upload_to='profile_image', null=True, default=None)
+    zoom_id = models.CharField(max_length=50, null=True, default=None)
 
     def __str__(self):
         return self.user.username
 
-    # bio = models.TextField(max_length=500, blank=True)
-    # location = models.CharField(max_length=30, blank=True)
-    # birth_date = models.DateField(null=True, blank=True)
-
 
 @receiver(post_save, sender=User)
 def create_user_profile(sender, instance, created, **kwargs):

accounts/urls.py

@@ -1,11 +1,16 @@
-from django.conf.urls import url, include
+from django.conf.urls import url
 from . import views
-from accounts.views import index, logout, login, registration, user_profile, user_list
+from accounts.views import index, logout, login, registration, user_profile, user_list, update_first_name, update_last_name, update_zoomid, grant_staff_access
 
 urlpatterns = [
     url(r'^logout/$', logout, name='logout'),
     url(r'^login/$', login, name='login'),
     url(r'^register/$', registration, name='registration'),
     url(r'^profile/$', user_profile, name='profile'),
     url(r'^user_list/$', user_list, name='user_list'),
+    url(r'^update_first_name/$', update_first_name, name='update_first_name'),
+    url(r'^update_last_name/$', update_last_name, name='update_last_name'),
+    url(r'^update_zoomid/(?P<pk>\d+)/$', update_zoomid, name='update_zoomid'),
+    url(r'^grant_staff_access/(?P<pk>\d+)/$',
+        grant_staff_access, name='grant_staff_access')
 ]

accounts/views.py

@@ -1,23 +1,21 @@
-from django.shortcuts import render, redirect, reverse
+from django.shortcuts import render, redirect, reverse, get_object_or_404
 from django.contrib import auth, messages
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.models import User
 from .models import Profile
-from accounts.forms import UserLoginForm, UserRegistrationForm
-
-# Create your views here.
+from accounts.forms import UserLoginForm, UserRegistrationForm, EditProfileForm
 
 
 def index(request):
-    """Render Index.html"""
+    """Render Home Page"""
     return render(request, 'index.html')
 
 
 @login_required()
 def logout(request):
     """Log the user out"""
     auth.logout(request)
-    messages.success(request, "You have been successfully logged out.")
+    messages.success(request, "Logged out.")
     return redirect(reverse('index'))
 
 
@@ -32,15 +30,14 @@ def login(request):
                                      password=request.POST['password'])
             if user:
                 messages.success(
-                    request, "Welcome, " + user.username + ". You have been successfully logged in.")
+                    request, "Logged in: " + user.username)
                 auth.login(user=user, request=request)
                 return redirect(reverse('tickets'))
             else:
                 login_form.add_error(
                     None, "Your username or password is incorrect.")
     else:
         login_form = UserLoginForm()
-    # login_form = UserLoginForm()
     return render(request, 'login.html', {'login_form': login_form})
 
 
@@ -54,7 +51,6 @@ def registration(request):
 
         if registration_form.is_valid():
             user = registration_form.save()
-
             user = auth.authenticate(username=request.POST['username'],
                                      password=request.POST['password1'])
             if user:
@@ -71,25 +67,95 @@ def registration(request):
 
 @login_required()
 def user_profile(request):
-    """User's profile page"""
-    user = User.objects.get(email=request.user.email)
-    return render(request, 'profile.html', {"user": user})
+    """Render User's profile page"""
+    user = get_object_or_404(User, email=request.user.email)
+    user_profile_1 = get_object_or_404(Profile, user_id=request.user.id)
+    if (request.method == 'POST'):
+        form = EditProfileForm(
+            request.POST, request.FILES, instance=user_profile_1)
+        if form.is_valid():
+            user_profile_1.save()
+            messages.success(request, "Profile image updated.")
+            return redirect(user_profile)
+    else:
+        form = EditProfileForm(instance=user_profile_1)
+    return render(request, 'profile.html', {"user": user, "form": form})
 
 
 @login_required()
 def user_list(request):
     """Shows list of all users"""
-    # users = User.objects.filter()
-    sort_field = request.GET['sort_by'] if 'sort_by' in request.GET else 'id'
-    users = User.objects.filter().order_by(sort_field)
-    # Staff
-    staff = User.objects.filter(is_staff=1).order_by(sort_field)
-    # Submitters
-    submitters = User.objects.filter(is_staff=0).order_by(sort_field)
+    users = User.objects.filter()
+    staff = User.objects.filter(is_staff=1)
+    submitters = User.objects.filter(is_staff=0)
     return render(request, 'user_list.html', {"users": users,
                                               "staff": staff,
                                               "submitters": submitters})
 
-# @login_required()
-# def update_email(request):
-#     """Updates User Email"""
+
+@login_required()
+def update_first_name(request):
+    """User Updates First Name"""
+    user = User.objects.get(email=request.user.email)
+    if request.method == 'POST':
+        form = request.POST
+        if form['updated_first_name']:
+            user.first_name = form['updated_first_name']
+            messages.success(request, "First name updated.")
+        else:
+            user.first_name = ''
+            messages.success(request, "First name cleared.")
+        user.save()
+    return redirect(user_profile)
+
+
+@login_required()
+def update_last_name(request):
+    """User Updates Last Name"""
+    user = User.objects.get(email=request.user.email)
+    if request.method == 'POST':
+        form = request.POST
+        if form['updated_last_name']:
+            user.last_name = form['updated_last_name']
+            messages.success(request, "Last name updated.")
+        else:
+            user.last_name = ''
+            messages.success(request, "Last name cleared.")
+        user.save()
+    return redirect(user_profile)
+
+
+@login_required()
+def update_zoomid(request, pk):
+    """User Updates Zoom ID"""
+    user = get_object_or_404(User, pk=pk)
+    if request.method == 'POST':
+        form = request.POST
+        if form['updated_zoomid']:
+            user.profile.zoom_id = form['updated_zoomid']
+            messages.success(request, "Zoom ID updated successfully.")
+        else:
+            user.profile.zoom_id = None
+            messages.success(request, "Zoom ID cleared.")
+        user.profile.save()
+    return redirect(user_profile)
+
+
+@login_required()
+def grant_staff_access(request, pk):
+    """Allows Code Institute assessors to be immediately granted Staff Access.
+    This is to ensure Assessors can see the full feature set.
+    In a non-assessment situation, clicking Request Staff Access link would send email to Admin,
+    who could then set is_staff to True
+    """
+    user = get_object_or_404(User, pk=pk)
+    if request.method == 'POST':
+        if user.is_staff:
+            messages.info(
+                request, "You already have staff access.")
+        else:
+            user.is_staff = True
+            user.save()
+            messages.success(
+                request, "You have been granted Staff Access as a CI Assessor. You can now edit all tickets.")
+    return redirect(user_profile)