From f4218775ae9250e89c199252f90e0c6a12fcfd1e Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Sat, 18 Aug 2012 09:17:04 -0700 Subject: [PATCH 1/6] Move login template to index.html --- templates/{login.html => index.html} | 0 views.py | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename templates/{login.html => index.html} (100%) diff --git a/templates/login.html b/templates/index.html similarity index 100% rename from templates/login.html rename to templates/index.html diff --git a/views.py b/views.py index a536f83..ea5be8c 100644 --- a/views.py +++ b/views.py @@ -12,7 +12,7 @@ def index(request): # Set a test cookie. When the user clicks the 'Login' button, test and make # sure this cookie was set properly. request.session.set_test_cookie() - return render_to_response('login.html', RequestContext(request)) + return render_to_response('index.html', RequestContext(request)) def login(request): @@ -24,7 +24,7 @@ def login(request): return redirect('/login/github/') else: # Render an error -- fix your damn cookies! - return render_to_response('login.html', + return render_to_response('index.html', { 'error': "Fix your damn cookies!" }) From 2d81fb01436fcc5366e4d431460dfe93e3168b80 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Sat, 18 Aug 2012 09:27:56 -0700 Subject: [PATCH 2/6] Check if user is authenticated and show follower_graph --- views.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/views.py b/views.py index ea5be8c..9ae2254 100644 --- a/views.py +++ b/views.py @@ -1,4 +1,5 @@ from django.contrib.auth.decorators import login_required +from django.http import HttpResponse from django.shortcuts import redirect, render_to_response from django.template import RequestContext @@ -7,7 +8,7 @@ def index(request): '''Index page. Everyone starts here. If the user is logged in (that is, they have a session id) return the follower_graph view. Otherwise, render the index page.''' - if request.session.get('sessionid', False): + if request.user.is_authenticated(): return follower_graph(request) # Set a test cookie. When the user clicks the 'Login' button, test and make # sure this cookie was set properly. @@ -30,4 +31,4 @@ def login(request): @login_required def follower_graph(request): - return 'Hello!' + return render_to_response('index.html', RequestContext(request)) From 41718d128a26054edc086dcc9a1b9a3039cdeff4 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Sat, 18 Aug 2012 09:47:09 -0700 Subject: [PATCH 3/6] Navbar --- templates/navbar.html | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 templates/navbar.html diff --git a/templates/navbar.html b/templates/navbar.html new file mode 100644 index 0000000..db95ce4 --- /dev/null +++ b/templates/navbar.html @@ -0,0 +1,14 @@ +{# vim: set ft=htmldjango #} +
+
+
+ Cool name + + +
+
+
From 1fb1bec70e814e94277e244c2fdc242262f3b19b Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Sat, 18 Aug 2012 09:47:22 -0700 Subject: [PATCH 4/6] Graph base template --- templates/graph_base.html | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 templates/graph_base.html diff --git a/templates/graph_base.html b/templates/graph_base.html new file mode 100644 index 0000000..3ff2730 --- /dev/null +++ b/templates/graph_base.html @@ -0,0 +1,19 @@ +{# vim: set ft=htmldjango #} +{% extends "base.html" %} + +{% block head_css %} + +{% endblock %} + +{% block container %} +{% include "navbar.html" %} +
+ {% block graph %}

PUT A GRAPH HERE

{% endblock %} +
+{% endblock container %} From 127ae209b12ab93028c2f49bd82875e294d5a182 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Sat, 18 Aug 2012 09:49:08 -0700 Subject: [PATCH 5/6] Render the graph template when rendering followers view --- views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views.py b/views.py index 9ae2254..89ccfc7 100644 --- a/views.py +++ b/views.py @@ -31,4 +31,4 @@ def login(request): @login_required def follower_graph(request): - return render_to_response('index.html', RequestContext(request)) + return render_to_response('graph.html', RequestContext(request)) From 99f37ede0376d44f8c4b6ee2f25601aa05752e58 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Sat, 18 Aug 2012 09:52:40 -0700 Subject: [PATCH 6/6] Rename follower_graph to graph_followers Create graph_followers template Add urlconf for graph_followers Redirect use to followers view instead of just calling it --- templates/graph_followers.html | 2 ++ urls.py | 1 + views.py | 6 +++--- 3 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 templates/graph_followers.html diff --git a/templates/graph_followers.html b/templates/graph_followers.html new file mode 100644 index 0000000..8252d3b --- /dev/null +++ b/templates/graph_followers.html @@ -0,0 +1,2 @@ +{# vim: set ft=htmldjango #} +{% extends "graph_base.html" %} diff --git a/urls.py b/urls.py index 00f6c56..44491e3 100644 --- a/urls.py +++ b/urls.py @@ -11,6 +11,7 @@ admin.autodiscover() urlpatterns = patterns('', url(r'^%s(?P.*)$' % re.escape(settings.STATIC_URL.lstrip('/')), 'django.contrib.staticfiles.views.serve', {'insecure': True}), url(r'^admin/', include(admin.site.urls)), + url(r'^followers/', views.graph_followers, name='followers'), url(r'^login/$', views.login, name='login'), url(r'^$', views.index, name='index'), url(r'', include('social_auth.urls')), diff --git a/views.py b/views.py index 89ccfc7..608007e 100644 --- a/views.py +++ b/views.py @@ -9,7 +9,7 @@ def index(request): have a session id) return the follower_graph view. Otherwise, render the index page.''' if request.user.is_authenticated(): - return follower_graph(request) + return redirect('followers') # Set a test cookie. When the user clicks the 'Login' button, test and make # sure this cookie was set properly. request.session.set_test_cookie() @@ -30,5 +30,5 @@ def login(request): @login_required -def follower_graph(request): - return render_to_response('graph.html', RequestContext(request)) +def graph_followers(request): + return render_to_response('graph_followers.html', RequestContext(request))