updated and tweaked various goodies. this is a terrible commit message. i am a terrible person

Author: harperreed

README.md

@@ -24,4 +24,4 @@ Little attention has been paid to making this particularly scalable, but it shou
 ####TODO
 
 * migrate away from app engine mail (maybe?)
-* Make account pages better
+* make email template based.

handlers/site.py

@@ -32,16 +32,39 @@ class UserHandler(framework.BaseHandler):
     @authorized.role('user')
     def get(self, email):
         user = self.get_user()
+
+        # Update enabled state if requested
+        set_enabled = self.request.get('setenabled')
+        if set_enabled == '1':
+            user.enabled = True
+            user.put()
+        elif set_enabled == '0':
+            user.enabled = False
+            user.put()
+
+        # Update tags if sent
+        tags = self.request.get('tags')
+        if tags:
+            user.tags = [s.strip() for s in tags.split(',')]
+            user.put()
+
+
         email = urllib.unquote_plus(email)
         desired_user = user_from_email(email)
         snippets = desired_user.snippet_set
         snippets = sorted(snippets, key=lambda s: s.date, reverse=True)
         following = email in user.following
         tags = [(t, t in user.tags_following) for t in desired_user.tags]
 
+        if user.email == desired_user.email:
+            owner = True
+        else:
+            owner = False
+
         template_values = {
                            'current_user': user,
                            'user': desired_user,
+                           'owner': owner,
                            'snippets': snippets,
                            'following': following,
                            'tags': tags
@@ -73,6 +96,8 @@ class UnfollowHandler(framework.BaseHandler):
     @authorized.role('user')
     def get(self):
         user = self.get_user()
+
+
         desired_tag = self.request.get('tag')
         desired_user = self.request.get('user')
         continue_url = self.request.get('continue')
@@ -113,20 +138,7 @@ class MainHandler(framework.BaseHandler):
     @authorized.role('user')
     def get(self):
         user = self.get_user()
-        # Update enabled state if requested
-        set_enabled = self.request.get('setenabled')
-        if set_enabled == '1':
-            user.enabled = True
-            user.put()
-        elif set_enabled == '0':
-            user.enabled = False
-            user.put()
 
-        # Update tags if sent
-        tags = self.request.get('tags')
-        if tags:
-            user.tags = [s.strip() for s in tags.split(',')]
-            user.put()
 
         # Fetch user list and display
         raw_users = User.all().order('email').fetch(500)
@@ -137,7 +149,14 @@ def get(self):
             all_tags.update(u.tags)
         all_tags = [(t, t in user.tags_following) for t in all_tags]
 
+        d = date_for_retrieval()
+        all_snippets = Snippet.all().filter("date =", d).fetch(500)
+        logging.info(all_snippets)
+        followed_snippets = [s for s in all_snippets if s.user.email in following]
+
         template_values = {
+                           'followed_snippets':followed_snippets,
+                           'retrieval_date':d,
                            'current_user': user,
                            'all_users': all_users,
                            'all_tags': all_tags

index.yaml

@@ -37,8 +37,6 @@
             </p>
             <ul class="nav">
               <li><a href="/user/{{ current_user.email }}">Logged in as {{ current_user.pretty_name }}</a></li>
-              <li>{% if current_user.enabled %}<a class="light" href="?setenabled=0">click to disable</a>{% else %}<a class="light" href="?setenabled=1">click to enable</a>{% endif %}</li>
-
             </ul>
           </div><!--/.nav-collapse -->
         </div>
@@ -54,6 +52,13 @@
         </div>
           {% block body %}{% endblock %}
   </div>
+
+      <div id="footer">
+      <div class="container">
+        <hr>
+        <p class="muted credit">Send your snippets to <a target="_blank" href="mailto:{{site_email}}">{{site_email}}</a> by monday afternoon! <a href="https://github.com/lunarcorp/snippets">fix bugs</a>.</p>
+      </div>
+    </div>
 </body>
 <script src="//netdna.bootstrapcdn.com/twitter-bootstrap/2.2.2/js/bootstrap.min.js"></script>
 </html>

main.py

@@ -4,23 +4,32 @@
 {% block body %}
     <div class="row">
         <div class="span12">
-    <h2><a href="/user/{{ current_user.email }}">{{ current_user.pretty_name }}</a></h2>
+           <h1>Welcome back, <a href="/user/{{ current_user.email }}">{{ current_user.pretty_name }}</a></h1>
 
-    currently
-    {% if current_user.enabled %}
-      enabled (<a class="light" href="?setenabled=0">disable</a>)
-    {% else %}
-      disabled (<a class="light" href="?setenabled=1">enable</a>)
-    {% endif %}
-    <form action="/" method="get">
 
-    my tags <input name="tags" type="text" value="{{ current_user.tags|join:"," }}"/></form>
 
-    </td></tr></table>
-    <br/>
+            Send your snippets to <a target="_blank" href="mailto:{{site_email}}">{{site_email}}</a> by monday afternoon!
+            <br/><br/>
+        </div>
+    </div>
 
-    send your snippets to <a target="_blank" href="mailto:{{site_email}}">{{site_email}}</a> by monday afternoon!
-    <br/><br/>
+{% if followed_snippets %}
+    <div class="row">
+  <div class="span12">
+    <h2>Snippets for this week <small>({{retrieval_date}})</small></h2>
+    {% for snippet in followed_snippets %}
+      <b><a href="/user/{{ snippet.user.email }}">{{ snippet.user.pretty_name }}</a></b><br/>
+      <pre>{{ snippet.text|urlize }}</pre>
+      <br/>
+    {% endfor %}
+   </div>
+ </div>
+ {% else %}
+ <h2>No followed snippets for this week <small>({{retrieval_date}})</small></h2>
+ <p>Follow some people or tags or wait until next week.</p>
+ {% endif %}
+<hr />
+    <div class="row">
     <div class="span4">
 
     <table class="table table-condensed table-striped table-hover table-bordered">
@@ -74,7 +83,6 @@ <h2><a href="/user/{{ current_user.email }}">{{ current_user.pretty_name }}</a><
 </div>
 
 </div>
-</div>
 
 
 {% endblock %}

templates/base.html

@@ -5,15 +5,15 @@
 <div class="row">
   <div class="span12">
 
-    <h1>{{ tag }}
+    <h1>Snippets tagged '{{ tag }}'
       <small>
 
     {% if following %}
       ✓ <a class="light" href="/unfollow?tag={{ tag }}&continue=/tag/{{ tag }}">unfollow</a>
     {% else %}
       <a class="light" href="/follow?tag={{ tag }}&continue=/tag/{{ tag }}">follow</a>
     {% endif %}
-    <small>
+    </small>
     </h1>
 
   </div>
@@ -23,9 +23,9 @@ <h1>{{ tag }}
   <div class="span12">
 
     {% for snippet in snippets %}
-      <b>{{ snippet.user.pretty_name }}</b><br/>
+       <b><a href="/user/{{ snippet.user.email }}">{{ snippet.user.pretty_name }}</a></b><br/>
       <pre>{{ snippet.text|urlize }}</pre>
-      <br/></br>
+      <br/>
     {% endfor %}
    </div>
  </div>

templates/index.html

@@ -4,31 +4,49 @@
 <div class="row">
   <div class="span12">
 
-    <h1>{{ user.email }} <small>{% if following %}
+    <h2>Snippets for {{ user.email }} <small>{% if following %}
       ✓ <a class="light" href="/unfollow?user={{ user.email }}&continue=/user/{{ user.email }}">unfollow</a>
     {% else %}
       <a class="light" href="/follow?user={{ user.email }}&continue=/user/{{ user.email }}">follow</a>
-    {% endif %}</small></h1>
+    {% endif %}</small></h2>
 
 
 </div>
 </div>
+
+{%if owner %}
 <div class="row">
-<div class="span2 pull-right well">
+  <div class="span12">
+    <b>This is you!</b> Currently
+    {% if current_user.enabled %}
+      enabled (<a class="light" href="?setenabled=0">disable</a>)
+    {% else %}
+      disabled (<a class="light" href="?setenabled=1">enable</a>)
+    {% endif %}
+  </div>
+</div>
+{% endif %}
+
+<div class="row">
+<div class="span3 pull-right well">
     <b>Tags</b><br/>
-    {% for tag in tags %}
-        {{ tag.0 }}
-		    {% if tag.1 %}
-		      ✓ <a class="light" href="/unfollow?tag={{ tag.0 }}&continue=/user/{{ user.email }}">unfollow</a>
-		    {% else %}
-		      <a class="light" href="/follow?tag={{ tag.0 }}&continue=/user/{{ user.email }}">follow</a>
-		    {% endif %}
-        <br/>
-    {% endfor %}
+    {%if not owner %}
+      {% for tag in tags %}
+          {{ tag.0 }}
+  		    {% if tag.1 %}
+  		      ✓ <a class="light" href="/unfollow?tag={{ tag.0 }}&continue=/user/{{ user.email }}">unfollow</a>
+  		    {% else %}
+  		      <a class="light" href="/follow?tag={{ tag.0 }}&continue=/user/{{ user.email }}">follow</a>
+  		    {% endif %}
+          <br/>
+      {% endfor %}
+    {% else %}
+      <form method="get"><input name="tags" class="span2" type="text" placeholder="tag1, tag2"  value="{{ current_user.tags|join:"," }}"/></form>
+    {% endif %}
 
   </div>
 
-  <div class="span10">
+  <div class="span8">
     {% for snippet in snippets %}
       <b>{{ snippet.date }}</b><br/>
       <pre>{{ snippet.text|urlize }}</pre>

templates/tag.html

@@ -62,7 +62,7 @@ def check_login(self, *args, **kwargs):
                     self.error(403)
                 else:
                     logging.debug("User not logged in -- force login")
-                    return self.redirect(users.create_login_url(self.request.uri))
+                    return self.redirect(users.create_login_url())
             elif role == "user" or (role == "admin" and
                                     users.is_current_user_admin()):
                 logging.debug("Role is %s so will allow handler", role)