From 16ffe6f1ba2b1dd4d593ea5ce94853a89d467ca8 Mon Sep 17 00:00:00 2001 From: CLAIRE GATENBY Date: Tue, 14 Feb 2017 11:09:47 -0800 Subject: [PATCH 1/6] change ul styles --- neuropy/neuropy/static/neuropy/sticky-footer-navbar.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/neuropy/neuropy/static/neuropy/sticky-footer-navbar.css b/neuropy/neuropy/static/neuropy/sticky-footer-navbar.css index ba725f0..e08c435 100755 --- a/neuropy/neuropy/static/neuropy/sticky-footer-navbar.css +++ b/neuropy/neuropy/static/neuropy/sticky-footer-navbar.css @@ -49,3 +49,7 @@ code { overflow: auto; margin-bottom: 30px; } + +.unstyled { + list-style: none; +} From 21bb720db3c0fef08e552eb373f9972b66c80ddf Mon Sep 17 00:00:00 2001 From: CLAIRE GATENBY Date: Tue, 14 Feb 2017 11:10:14 -0800 Subject: [PATCH 2/6] removed unnecessary nav --- neuropy/neuropy/templates/neuropy/base.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/neuropy/neuropy/templates/neuropy/base.html b/neuropy/neuropy/templates/neuropy/base.html index dd20935..0fc2092 100644 --- a/neuropy/neuropy/templates/neuropy/base.html +++ b/neuropy/neuropy/templates/neuropy/base.html @@ -12,8 +12,6 @@ {% endblock stylesheets %} - {% block body %} {% endblock body %} From b6824278f1179df604f9644e9e8a8d0849957a74 Mon Sep 17 00:00:00 2001 From: CLAIRE GATENBY Date: Tue, 14 Feb 2017 11:10:38 -0800 Subject: [PATCH 3/6] added title and link back to profile --- .../templates/userprofile/edit_profile.html | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/neuropy/userprofile/templates/userprofile/edit_profile.html b/neuropy/userprofile/templates/userprofile/edit_profile.html index 85cd129..067b912 100644 --- a/neuropy/userprofile/templates/userprofile/edit_profile.html +++ b/neuropy/userprofile/templates/userprofile/edit_profile.html @@ -1,7 +1,20 @@ {% extends 'neuropy/layout.html' %} {% block content %} -
{% csrf_token %} + +
+
+
+
+ Profile +
+
+

Edit your profile

+
+
+
+{% csrf_token %} {{ form.as_p }} - + +
{% endblock %} From c42c672b1c9cbd156e765e7331419127fc42e187 Mon Sep 17 00:00:00 2001 From: CLAIRE GATENBY Date: Tue, 14 Feb 2017 11:11:01 -0800 Subject: [PATCH 4/6] added link to edit profile --- .../templates/userprofile/profile.html | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/neuropy/userprofile/templates/userprofile/profile.html b/neuropy/userprofile/templates/userprofile/profile.html index baaa6de..affc60b 100644 --- a/neuropy/userprofile/templates/userprofile/profile.html +++ b/neuropy/userprofile/templates/userprofile/profile.html @@ -1,13 +1,22 @@ {% extends 'neuropy/layout.html' %} {% block content %} -

Welcome {{user.username}}!

-
    -
  • Name: {{user.first_name|title}} {{user.last_name|title}}
    • -
  • Email: {{user.email}}
    • -
  • Active Period Start: {{ user.profile.active_period_start }}
    • -
  • Active Period End: {{ user.profile.active_period_end }}
    • -
  • Peak Period: {{ user.profile.peak_period }}
    • -
  • Dose Time: {{ user.profile.dose_time }}
    • + +
    +
    +
    +
    + Edit Profile +
    +
    +

    Welcome {{user.username}}!

    +
    +
    +
      +
    • Name: {{user.first_name|title}} {{user.last_name|title}}
      • +
    • Email: {{user.email}}
      • +
    • Active Period Start: {{ user.profile.active_period_start }}
      • +
    • Active Period End: {{ user.profile.active_period_end }}
      • +
    • Peak Period: {{ user.profile.peak_period }}
      • +
    • Dose Time: {{ user.profile.dose_time }}
    - {% endblock %} From 918473f9894aa8d53bbbba0689e094ebaf38b9a6 Mon Sep 17 00:00:00 2001 From: CLAIRE GATENBY Date: Tue, 14 Feb 2017 11:11:22 -0800 Subject: [PATCH 5/6] removed login decorator --- neuropy/userprofile/urls.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/neuropy/userprofile/urls.py b/neuropy/userprofile/urls.py index 2153232..3c8672e 100644 --- a/neuropy/userprofile/urls.py +++ b/neuropy/userprofile/urls.py @@ -1,9 +1,8 @@ """Profile urls.""" from django.conf.urls import url from .views import ProfileView, EditProfile -from django.contrib.auth.decorators import login_required urlpatterns = [ - url(r'^edit/$', login_required(EditProfile.as_view()), name='edit-profile'), - url(r'^$', login_required(ProfileView.as_view()), name='profile') + url(r'^edit/$', EditProfile.as_view(), name='edit-profile'), + url(r'^$', ProfileView.as_view(), name='profile') ] From 0bcc8389855bc35d84a1b34687cd6cf5117300a5 Mon Sep 17 00:00:00 2001 From: CLAIRE GATENBY Date: Tue, 14 Feb 2017 11:11:34 -0800 Subject: [PATCH 6/6] used login required mixin --- neuropy/userprofile/views.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/neuropy/userprofile/views.py b/neuropy/userprofile/views.py index 7961d89..10bf0e9 100644 --- a/neuropy/userprofile/views.py +++ b/neuropy/userprofile/views.py @@ -1,14 +1,18 @@ """Views for profile.""" -from django.views.generic import detail, UpdateView -from userprofile.models import Profile + +from django.contrib.auth.mixins import LoginRequiredMixin +from django.http import HttpResponseRedirect from django.urls import reverse_lazy +from django.views.generic import DetailView, UpdateView + from userprofile.forms import ProfileForm -from django.http import HttpResponseRedirect +from userprofile.models import Profile -class ProfileView(detail.DetailView): - """View for profle.""" +class ProfileView(LoginRequiredMixin, DetailView): + """View for profile.""" + login_required = True model = Profile template_name = 'userprofile/profile.html' slug_field = 'id' @@ -18,9 +22,10 @@ def get_object(self): return self.request.user -class EditProfile(UpdateView): - """Add Album.""" +class EditProfile(LoginRequiredMixin, UpdateView): + """Edit users profile.""" + login_required = True template_name = 'userprofile/edit_profile.html' model = Profile form_class = ProfileForm