diff --git a/duskenweb/templates/account.html b/duskenweb/templates/account.html index e69de29..52ee796 100644 --- a/duskenweb/templates/account.html +++ b/duskenweb/templates/account.html @@ -0,0 +1,15 @@ +{% extends "base.html" %} +{% block title %}Dusken - Account{% endblock %} +{% block content %} +
+
+
+

Account details

+ Payment history
+ change password
+ delete account?
+ +
+
+
+{% endblock %} diff --git a/duskenweb/templates/membership_purchase.html b/duskenweb/templates/membership_purchase.html new file mode 100644 index 0000000..920f5de --- /dev/null +++ b/duskenweb/templates/membership_purchase.html @@ -0,0 +1,15 @@ +{% extends "base.html" %} +{% block title %}Dusken - Purchase membership{% endblock %} +{% block content %} +
+
+
+

New membership

+ what you get / incentives
+ price
+ terms
+ purchase button (payex payment screen)
+
+
+
+{% endblock %} diff --git a/duskenweb/templates/nav.html b/duskenweb/templates/nav.html index 0667903..2fd431b 100644 --- a/duskenweb/templates/nav.html +++ b/duskenweb/templates/nav.html @@ -9,7 +9,7 @@ {% endif %} - Dusken + Dusken @@ -20,7 +20,7 @@ {{ user }} diff --git a/duskenweb/templates/profile.html b/duskenweb/templates/profile.html index 388c519..12c1771 100644 --- a/duskenweb/templates/profile.html +++ b/duskenweb/templates/profile.html @@ -4,19 +4,35 @@
-

{{me.first_name}} {{me.last_name }}

+

{{me.first_name}} {{me.last_name }}

-

Profile

+

Profile

  • Name: {{me.first_name}} {{me.last_name}}
  • Username: {{me.username}}
  • Email: {{me.email}}
    • +
  • Facebook Google+
+
+
+

Membership

+
+
+ {% if me.has_valid_membership %} + {% for membership in me.memberships %} + Valid until DATE + {% endfor %} + {% else %} +

Not valid (expired DATE)

+ Purchase membership + {% endif %} +
+
{% if user.is_staff %}
@@ -24,7 +40,7 @@
@@ -34,32 +50,52 @@ {% endif %}
-
-
-

Membership

-
-
- {% if me.has_valid_membership %} - {% for membership in me.memberships %} - Valid until {{ me.}} - {% endfor %} - {% else %} - Not valid (expired DATE) - {% endif %} -
-

Your Groups {{ me.groups|length}}

- {% if not me.groups %} - No groups - {% endif %} -
    - {% for group in me.groups %} -
  • {{ group }}
    • - {% endfor %} -
+ {% if not me.groups %} +
No groups
+ {% endif %} +
    + {% for group in me.groups %} +
  • group-name-shows-up-here:{{ group }}
    • + {% endfor %} +
+
+
+
+

Your Divisions{% if me.divisions %} {{ me.divisions|length}}{% endif %}

+
+ {% if not me.visions %} +
+

+ Not part of any divisions. How do I get involved? +

+
+ {% endif %} +
    + {% for division in me.divisions %} +
  • {{ division }}
    • + {% endfor %} +
+
+
+
+

Your Mailinglists{% if mailinglists_list %} {{ mailinglist_lists|length}}{% endif %}

+
+ {% if not mailinglists_list %} +
+

+ Not on any mailinglists. Subscribe +

+
+ {% endif %} +
    + {% for mailinglist in mailinglists_list %} +
  • {{ mailinglist }}
    • + {% endfor %} +
diff --git a/duskenweb/urls.py b/duskenweb/urls.py index 12bfe56..35ffdcf 100644 --- a/duskenweb/urls.py +++ b/duskenweb/urls.py @@ -28,8 +28,9 @@ urlpatterns += patterns('duskenweb.views', url(r'^$', 'home', name='home'), url(r'^profile/$', 'profile', name='profile'), url(r'^account/$', 'account', name='account'), - url(r'^members/$', 'members_list', name='members_list'), - url(r'^memberships/$', 'memberships_list', name='memberships_list'), + url(r'^members/$', 'members_list', name='members-list'), + url(r'^memberships/$', 'memberships_list', name='memberships-list'), + url(r'^membership/purchase$', 'membership_purchase', name='membership-purchase'), ) diff --git a/duskenweb/views.py b/duskenweb/views.py index 1e35231..4e5c259 100644 --- a/duskenweb/views.py +++ b/duskenweb/views.py @@ -18,6 +18,7 @@ def profile(request, template_name='profile.html'): user_api_conn.set_access_token(request.user.duskenaccesstoken.access_token) me = user_api_conn.members.me()['objects'][0] + # TODO remove debug import pprint pprint.pprint(me) return render(request, template_name, locals()) @@ -50,3 +51,11 @@ def memberships_list(request, template_name='memberships_index.html'): # show graph memberships_list = user_api_conn.memberships.get_list() return render(request, template_name, locals()) + +@login_required +def membership_purchase(request, template_name='membership_purchase.html'): + # TODO put these two lines somewhere else, on authenticate? + if not user_api_conn.is_authenticated() and request.user.duskenaccesstoken: + user_api_conn.set_access_token(request.user.duskenaccesstoken.access_token) + + return render(request, template_name, locals())