Gravatars, better tags, better project views.

pygame · Mar 3, 2017 · 63faa8d · 63faa8d
1 parent bfd2317
commit 63faa8d
Show file tree

Hide file tree

Showing 13 changed files with 124 additions and 64 deletions.
diff --git a/pygameweb/app.py b/pygameweb/app.py
@@ -24,7 +24,6 @@ def create_app(object_name='pygameweb.config.Config',
     db.init(app, engine, session_factory)
     Mail(app)
 
-
     # https://flask-debugtoolbar.readthedocs.io/en/latest/
     if app.config['DEBUG'] and not app.config['TESTING']:
         app.config['DEBUG_TB_PROFILER_ENABLED'] = True
@@ -38,7 +37,6 @@ def create_app(object_name='pygameweb.config.Config',
         except TypeError:
             DebugToolbarExtension(app)
 
-
     from pygameweb.cache import cache, limiter
     cache.init_app(app)
     limiter.init_app(app)

diff --git a/pygameweb/cache.py b/pygameweb/cache.py
@@ -7,5 +7,4 @@
 # https://flask-limiter.readthedocs.io/en/stable/
 from flask_limiter import Limiter
 from flask_limiter.util import get_remote_address
-limiter = Limiter(key_func=get_remote_address,
-                  global_limits=["200 per day", "50 per hour"])
+limiter = Limiter(key_func=get_remote_address)
diff --git a/pygameweb/config.py b/pygameweb/config.py
@@ -56,3 +56,8 @@ class Config(object):
     CACHE_TYPE = 'null' if truthy_config('APP_DEBUG') else 'simple'
     """ flask_caching is off in debug mode.
     """
+
+    RATELIMIT_GLOBAL = ('5000 per day, 5000 per hour'
+                        if truthy_config('APP_DEBUG')
+                        else '200 per day, 50 per hour')
+
diff --git a/pygameweb/project/models.py b/pygameweb/project/models.py
@@ -36,6 +36,10 @@ class Project(Base):
     def summary_html(self):
         return sanitize_html(self.summary)
 
+    @property
+    def description_html(self):
+        return sanitize_html(self.description)
+
     def image_thumb(self, width, height):
         """ Return path to the thumbnail for this image.
         """

diff --git a/pygameweb/project/views.py b/pygameweb/project/views.py
@@ -81,16 +81,24 @@ def view(project_id):
     return render_template('project/view.html', project=project)
 
 
-@project_blueprint.route('/project/<project_id>/<release_id>', methods=['GET'])
+# @project_blueprint.route('/project/<project_id>/<release_id>', methods=['GET'])
 @project_blueprint.route('/project/<int:project_id>/<int:release_id>', methods=['GET'])
 def release(project_id, release_id):
     """ of the wiki page.
     """
+    # import pdb;pdb.set_trace()
     return render_template('project/view.html',
                            project=project_for(project_id),
                            release=release_for(release_id))
 
 
+
+def inchunks(alist, chunk_size):
+    """ [1,2,3, 4,5,6] -> [[1,2,3], [4,5,6]]
+    """
+    for i in range(0, len(alist), chunk_size):
+        yield alist[i:i + chunk_size]
+
 @project_blueprint.route('/tags/<tag>', methods=['GET'])
 def tags(tag):
     """ shows the projects for the tag.
@@ -109,11 +117,12 @@ def tags(tag):
                 .offset(start)
                 .limit(per_page)
                 .all())
+
     return render_template('project/tags.html',
                            tag=tag,
                            tags=tags,
                            top_tag_counts=top_tag_counts,
-                           projects=projects,
+                           projects=inchunks(projects, 3),
                            prev_start=prev_start,
                            next_start=next_start)
 

diff --git a/pygameweb/static/views.py b/pygameweb/static/views.py
@@ -64,4 +64,8 @@ def add_static_blueprint(app):
     for file in files:
         add_file(app, static_blueprint, file)
 
+
+    from pygameweb.cache import limiter
+    limiter.limit("1000/hour")(static_blueprint)
+
     app.register_blueprint(static_blueprint)
diff --git a/pygameweb/templates/base.html b/pygameweb/templates/base.html
@@ -84,12 +84,9 @@ <h2>Recent Releases</h2>
             </div>
 
 
-            <h2>Projects</h2>
-            <div class="list-group">
+            <div>
             {% for value, count, size in top_tag_counts %}
-                {% set size2 = size//2 %}
-                <a href='/tags/{{value}}' class="list-group-item">{{value}}<span class="pull-right">({{count}})</span></a>
-
+                <a href='/tags/{{value}}' class="btn btn-default" role="button">{{value}} <span class="badge">{{ count }}</span></a>
             {% endfor %}
             </div>
 

diff --git a/pygameweb/templates/project/tags.html b/pygameweb/templates/project/tags.html
@@ -2,40 +2,45 @@
 <h1>Project</h1>
 
 {% block content %}
+    <h1>{{ tag }}</h1>
 
-    <h1>Tags</h1>
-
-    {% for value, count, size in top_tag_counts %}
-    {% set size2 = size//2 %}
-        <a href='/tags/{{value}}' style='font-size:{{size}}px;margin-left:{{size2}}px;margin-right:{{size2}}px;'>{{value}}</a>
-    {% endfor %}
-
-
-    <h3>{{ tag }}</h3>
-
-    <div>
-        {% for project in projects %}
-        <div>
-            <a href="{{ url_for('project.view', project_id=project.id) }}">{{ project.title }}</a>
-            <div>
-            {% set thumb = project.image_thumb(100,100) %}
-            {% if thumb %}
-                <a href="{{ url_for('project.view', project_id=project.id) }}">
-                    <img src="{{ thumb }}">
-                </a>
-            {% endif %}
-            </div>
-            <div>
-            {{ project.summary_html|safe }}
+    <div class="row">
+      <div class="col-md-12">
+        {% for value, count, size in top_tag_counts %}
+            <a href='/tags/{{value}}' class="btn btn-default" role="button">{{value}} <span class="badge">{{ count }}</span></a>
+        {% endfor %}
+      </div>
+    </div>
+    <br>
+
+    {% for chunk in projects %}
+    <div class="row">
+      {% for project in chunk %}
+        <div class="col-md-4">
+            <div class="media">
+              <div class="media-left">
+                {% set thumb = project.image_thumb(100,100) %}
+                {% if thumb %}
+                    <a href="{{ url_for('project.view', project_id=project.id) }}">
+                        <img class="media-object" src="{{ thumb }}" alt="{{ project.title }}">
+                    </a>
+                {% endif %}
+              </div>
+              <div class="media-body">
+                <h4 class="media-heading"><a href="{{ url_for('project.view', project_id=project.id) }}">{{ project.title }}</a></h4>
+                {{ project.summary_html|safe }}
+              </div>
             </div>
+            <br>
         </div>
-        {% endfor %}
-
-        {% if prev_start %}
-            <a href='?start={{prev_start}}'>previous</a>
-        {% endif %}
-        <a href='?start={{next_start}}'>next</a>
+      {% endfor %}
     </div>
+    {% endfor %}
+
+    {% if prev_start %}
+        <a href='?start={{prev_start}}'>previous</a>
+    {% endif %}
+    <a href='?start={{next_start}}'>next</a>
 
 
 

diff --git a/pygameweb/templates/project/view.html b/pygameweb/templates/project/view.html
@@ -3,44 +3,70 @@ <h1>Project</h1>
 
 {% block content %}
   {% cache 60*5 %}
-
-
-    <h1>{{ project.title }}{% if release and release.version %} - {{ release.version }}{% endif %}</h1>
-    <h3>{{ project.user.title }}  ({{ project.user.name }})</h3>
-
-    <h3>Tags:</h3>
-    <div>
-    {% for value, count, size in project.tag_counts %}
-    {% set size2 = size//2 %}
-      <a href='/tags/{{value}}' style='font-size:{{size}}px;margin-left:{{size2}}px;margin-right:{{size2}}px;'>{{value}}</a>
-    {% endfor %}
+    {# So images in description are shown the full width. #}
+    <style>
+    .row.description img, .row.screenshot img {
+      max-width: 100%;
+    }
+    </style>
+
+    <div class="row">
+      <div class="col-md-10">
+        <h1>{{ project.title }}{% if release and release.version %} - {{ release.version }}{% endif %}</h1>
+        <p class="lead">{{ project.summary_html|safe }}</p>
+      </div>
+      <div class="col-md-2">
+        <img src="{{ project.user.email | gravatar }}">
+        <br>
+        {{ project.user.title }}
+        <br>
+        ({{ project.user.name }})
+      </div>
     </div>
 
-    {# update tags input box. #}
+    <div class="row description">
+      <div class="col-md-12">
+        {{ project.description_html|safe }}
+      </div>
+    </div>
 
+    <div class="row">
+      <div class="col-md-6">
+        <img class="img-responsive" src="{{ project.image_thumb(400,400) }}">
+      </div>
+      <div class="col-md-6">
+        {% for value, count, size in project.tag_counts %}
+          <a href='/tags/{{value}}' class="btn btn-default" role="button">{{value}} <span class="badge">{{ count }}</span></a>
+        {% endfor %}
+      </div>
+    </div>
 
-    <h3>Description</h3>
-    {{ project.description_html|safe }}
+    <div class="row">
+    </div>
 
     <h3>Links</h3>
     <div>
       <dl>
         <dt>Home Page</dt>
         <dd><a href="{{ project.uri }}">{{ project.uri }}</a></dd>
         {% if release %}
-          <dt>Source</dt>
-          <dd><a href="{{ release.srcuri }}">{{ release.srcuri }}</a></dd>
-          <dt>Windows</dt>
-          <dd><a href="{{ release.winuri }}">{{ release.winuri }}</a></dd>
-          <dt>Mac</dt>
-          <dd><a href="{{ release.macuri }}">{{ release.macuri }}</a></dd>
+          {% if release.srcuri %}
+            <dt>Source</dt>
+            <dd><a href="{{ release.srcuri }}">{{ release.srcuri }}</a></dd>
+          {% endif %}
+          {% if release.winuri %}
+            <dt>Windows</dt>
+            <dd><a href="{{ release.winuri }}">{{ release.winuri }}</a></dd>
+          {% endif %}
+          {% if release.macuri %}
+            <dt>Mac</dt>
+            <dd><a href="{{ release.macuri }}">{{ release.macuri }}</a></dd>
+          {% endif %}
         {% endif %}
       </dl>
     </div>
 
 
-    <h3>Screenshot</h3>
-    <img src="{{ project.image_thumb(400,400) }}">
 
 
     <h3>Releases</h3>

diff --git a/pygameweb/thumb/views.py b/pygameweb/thumb/views.py
@@ -15,4 +15,7 @@
 def add_thumb_blueprint(app):
     """ to the app.
     """
+    from pygameweb.cache import limiter
+    limiter.limit("1000/hour")(thumb_blueprint)
+
     app.register_blueprint(thumb_blueprint)
diff --git a/pygameweb/user/views.py b/pygameweb/user/views.py
@@ -88,6 +88,15 @@ def add_user_blueprint(app):
     # 'security.reset_password',
     # 'security.send_confirmation',
 
+    # https://pypi.python.org/pypi/Flask-Gravatar
+    from flask_gravatar import Gravatar
+    gravatar = Gravatar(app,
+                        size=100,
+                        rating='g',
+                        default='retro',
+                        force_default=False,
+                        use_ssl=False,
+                        base_url=None)
 
     from flask_security import user_confirmed
     @user_confirmed.connect_via(app)

diff --git a/requirements.txt b/requirements.txt
@@ -7,6 +7,7 @@ flask_admin
 flask-bootstrap
 Flask-Caching
 flask-debugtoolbar
+Flask-Gravatar
 flask_limiter
 flask-nav
 Flask-Security-Fork==2.0.1

diff --git a/tests/functional/pygameweb/dashboard/test_dashboard_views.py b/tests/functional/pygameweb/dashboard/test_dashboard_views.py
@@ -16,7 +16,7 @@ def dashboard_client(app, session, client):
 def test_dashboard_view(dashboard_client, session):
     """ is shown as the default.
     """
-    resp = dashboard_client.get('/dashboard')
+    resp = dashboard_client.get('/dashboard-dev')
     assert resp.status_code == 200
 
     # resp = dashboard_client.get('/screenshot-300/1.jpg')