Removing Buzz from comments in code
diff --git a/samples/django_sample/buzz/__init__.py b/samples/django_sample/plus/__init__.py
similarity index 100%
rename from samples/django_sample/buzz/__init__.py
rename to samples/django_sample/plus/__init__.py
diff --git a/samples/django_sample/buzz/models.py b/samples/django_sample/plus/models.py
similarity index 100%
rename from samples/django_sample/buzz/models.py
rename to samples/django_sample/plus/models.py
diff --git a/samples/django_sample/buzz/tests.py b/samples/django_sample/plus/tests.py
similarity index 100%
rename from samples/django_sample/buzz/tests.py
rename to samples/django_sample/plus/tests.py
diff --git a/samples/django_sample/buzz/views.py b/samples/django_sample/plus/views.py
similarity index 70%
rename from samples/django_sample/buzz/views.py
rename to samples/django_sample/plus/views.py
index c942aaf..8cc5838 100644
--- a/samples/django_sample/buzz/views.py
+++ b/samples/django_sample/plus/views.py
@@ -8,14 +8,14 @@
from oauth2client.django_orm import Storage
from oauth2client.client import OAuth2WebServerFlow
-from django_sample.buzz.models import CredentialsModel
-from django_sample.buzz.models import FlowModel
+from django_sample.plus.models import CredentialsModel
+from django_sample.plus.models import FlowModel
from apiclient.discovery import build
from django.http import HttpResponseRedirect
from django.shortcuts import render_to_response
-STEP2_URI = 'http://localhost:8000/auth_return'
+STEP2_URI = 'http://localhost:8000/oauth2callback'
@login_required
@@ -24,10 +24,10 @@
credential = storage.get()
if credential is None or credential.invalid == True:
flow = OAuth2WebServerFlow(
- client_id='837647042410.apps.googleusercontent.com',
- client_secret='+SWwMCL9d8gWtzPRa1lXw5R8',
- scope='https://www.googleapis.com/auth/buzz',
- user_agent='buzz-django-sample/1.0',
+ client_id='[[Insert Client ID here.]]',
+ client_secret='[[Insert Client Secret here.]]',
+ scope='https://www.googleapis.com/auth/plus.me',
+ user_agent='plus-django-sample/1.0',
)
authorize_url = flow.step1_get_authorize_url(STEP2_URI)
@@ -37,13 +37,13 @@
else:
http = httplib2.Http()
http = credential.authorize(http)
- service = build("buzz", "v1", http=http)
+ service = build("plus", "v1", http=http)
activities = service.activities()
- activitylist = activities.list(scope='@consumption',
- userId='@me').execute()
+ activitylist = activities.list(collection='public',
+ userId='me').execute()
logging.info(activitylist)
- return render_to_response('buzz/welcome.html', {
+ return render_to_response('plus/welcome.html', {
'activitylist': activitylist,
})
diff --git a/samples/django_sample/settings.py b/samples/django_sample/settings.py
index d0d7c7e..df10f0a 100644
--- a/samples/django_sample/settings.py
+++ b/samples/django_sample/settings.py
@@ -80,5 +80,5 @@
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.sites',
- 'django_sample.buzz'
+ 'django_sample.plus'
)
diff --git a/samples/django_sample/templates/buzz/welcome.html b/samples/django_sample/templates/buzz/welcome.html
deleted file mode 100644
index 07e8027..0000000
--- a/samples/django_sample/templates/buzz/welcome.html
+++ /dev/null
@@ -1,33 +0,0 @@
-
-<html>
- <head>
- <title>Buzz Stuff</title>
- <style type=text/css>
- td { vertical-align: top; padding: 0.5em }
- img { border:0 }
- </style>
- </head>
- <body>
- <table border=0>
- {% for item in activitylist.items %}
- <tr valign=top>
- <td>
- {% if item.actor.thumbnailUrl %}
- <a href="{{ item.actor.profileUrl }}">
- <img src="{{ item.actor.thumbnailUrl }}">
- </a>
- {% endif %}
- <br>
- <a href="{{ item.actor.profileUrl }}">{{ item.actor.name }}</a></td>
- <td>
- {{ item.object.content|safe }}
- </td>
- <td>
- <a href="{{ item.object.links.alternate.0.href }}"><img
- src="/static/go.png"></a>
- </td>
- </tr>
- {% endfor %}
- </table>
- </body>
-</html>
diff --git a/samples/django_sample/templates/buzz/login.html b/samples/django_sample/templates/plus/login.html
similarity index 100%
rename from samples/django_sample/templates/buzz/login.html
rename to samples/django_sample/templates/plus/login.html
diff --git a/samples/django_sample/templates/plus/welcome.html b/samples/django_sample/templates/plus/welcome.html
new file mode 100644
index 0000000..d43698b
--- /dev/null
+++ b/samples/django_sample/templates/plus/welcome.html
@@ -0,0 +1,17 @@
+
+<html>
+ <head>
+ <title>Your Google+ Activity</title>
+ <style type=text/css>
+ td { vertical-align: top; padding: 0.5em }
+ img { border:0 }
+ </style>
+ </head>
+ <body>
+ <table border=1>
+ {% for item in activitylist.items %}
+ <tr><td>{{ item.object.content|safe }}</td></tr>
+ {% endfor %}
+ </table>
+ </body>
+</html>
diff --git a/samples/django_sample/urls.py b/samples/django_sample/urls.py
index aeba620..4c67ff2 100644
--- a/samples/django_sample/urls.py
+++ b/samples/django_sample/urls.py
@@ -7,8 +7,8 @@
urlpatterns = patterns('',
# Example:
- (r'^$', 'django_sample.buzz.views.index'),
- (r'^auth_return', 'django_sample.buzz.views.auth_return'),
+ (r'^$', 'django_sample.plus.views.index'),
+ (r'^oauth2callback', 'django_sample.plus.views.auth_return'),
# Uncomment the admin/doc line below and add 'django.contrib.admindocs'
# to INSTALLED_APPS to enable admin documentation:
@@ -17,7 +17,7 @@
# Uncomment the next line to enable the admin:
(r'^admin/', include(admin.site.urls)),
(r'^accounts/login/$', 'django.contrib.auth.views.login',
- {'template_name': 'buzz/login.html'}),
+ {'template_name': 'plus/login.html'}),
(r'^static/(?P<path>.*)$', 'django.views.static.serve',
{'document_root': os.path.join(os.path.dirname(__file__), 'static')