Merge pull request creativecommons#8 from creativecommons/refactor_filtering

Refactoring sorting code to use models instead of JSON data...

Author: kgodey

content/gsoc-2019/contents.lr

@@ -6,4 +6,4 @@ body:
 
 Creative Commons is applying to be a mentoring organization for [Google Summer of Code 2019](https://summerofcode.withgoogle.com/).
 
-Check out our [Project Ideas](/gsoc-2019/project-ideas) and [Application Instructions](/gsoc-2019/application-instructions)!
+Check out our [Project Ideas](/gsoc-2019/project-ideas/all) and [Application Instructions](/gsoc-2019/application-instructions)!

content/gsoc-2019/project-ideas/project-ideas-list/archive-cc-licensed-content/contents.lr renamed to content/gsoc-2019/project-ideas-collection/archive-cc-licensed-content/contents.lr

@@ -0,0 +1,3 @@
+_model: project-ideas-collection
+---
+_hidden: yes

content/gsoc-2019/project-ideas/project-ideas-list/button-for-contact/contents.lr renamed to content/gsoc-2019/project-ideas-collection/button-for-contact/contents.lr

@@ -0,0 +1,9 @@
+_model: project-ideas
+---
+nav_label: All Projects
+---
+field:
+---
+value:
+---
+order: 1

content/gsoc-2019/project-ideas/project-ideas-list/cc-plugins/contents.lr renamed to content/gsoc-2019/project-ideas-collection/cc-plugins/contents.lr

@@ -1,3 +1,5 @@
-_model: project-ideas
+_model: redirect
 ---
-title: GSoC 2019: Project Ideas
+target: /gsoc-2019/project-ideas/all/
+---
+_discoverable: no

content/gsoc-2019/project-ideas/project-ideas-list/cc-resource-archive/contents.lr renamed to content/gsoc-2019/project-ideas-collection/cc-resource-archive/contents.lr

@@ -1,3 +1,9 @@
 _model: project-ideas
 ---
-title: GSoC 2019: Project Ideas
+nav_label: Difficulty: Easy
+---
+field: difficulty
+---
+value: Easy
+---
+order: 2

content/gsoc-2019/project-ideas-collection/contents.lr

@@ -1,3 +1,9 @@
 _model: project-ideas
 ---
-title: GSoC 2019: Project Ideas
+nav_label: Difficulty: Hard
+---
+field: difficulty
+---
+value: Hard
+---
+order: 4

content/gsoc-2019/project-ideas/project-ideas-list/js-cc-search-library/contents.lr renamed to content/gsoc-2019/project-ideas-collection/js-cc-search-library/contents.lr

@@ -1,3 +1,9 @@
 _model: project-ideas
 ---
-title: GSoC 2019: Project Ideas
+nav_label: Difficulty: Medium
+---
+field: difficulty
+---
+value: Medium
+---
+order: 3

content/gsoc-2019/project-ideas/project-ideas-list/js-license-chooser-widget/contents.lr renamed to content/gsoc-2019/project-ideas-collection/js-license-chooser-widget/contents.lr

@@ -1,3 +1,9 @@
 _model: project-ideas
 ---
-title: GSoC 2019: Project Ideas
+nav_label: Skill: JavaScript
+---
+field: recommended_skill
+---
+value: JavaScript
+---
+order: 5

content/gsoc-2019/project-ideas/project-ideas-list/narrow-use-case-search/contents.lr renamed to content/gsoc-2019/project-ideas-collection/narrow-use-case-search/contents.lr

@@ -1,3 +1,9 @@
 _model: project-ideas
 ---
-title: GSoC 2019: Project Ideas
+nav_label: Skill: Python
+---
+field: recommended_skill
+---
+value: Python
+---
+order: 6

content/gsoc-2019/project-ideas/project-ideas-list/new-license-pathway/contents.lr renamed to content/gsoc-2019/project-ideas-collection/new-license-pathway/contents.lr

@@ -1,3 +1,9 @@
 _model: project-ideas
 ---
-title: GSoC 2019: Project Ideas
+nav_label: Skill: WordPress
+---
+field: recommended_skill
+---
+value: WordPress
+---
+order: 7

content/gsoc-2019/project-ideas/project-ideas-list/no-click-attribution/contents.lr renamed to content/gsoc-2019/project-ideas-collection/no-click-attribution/contents.lr

@@ -1,5 +1,5 @@
 [model]
-name = Project Ideas
+name = Project Ideas List
 label = {{ this.title }}
 hidden = yes
 protected = yes

content/gsoc-2019/project-ideas/project-ideas-list/obtain-id/contents.lr renamed to content/gsoc-2019/project-ideas-collection/obtain-id/contents.lr

@@ -1,9 +1,29 @@
 [model]
-name = Project Ideas Page
+name = Project Ideas
 label = {{ this.title }}
 hidden = yes
 protected = yes
 
+[children]
+model = project-idea
+order_by = title
+
+[fields.nav_label]
+label = Filter Navigation Label
+type = string
+
+[fields.field]
+label = Filter Field
+type = string
+
+[fields.value]
+label = Filter Value
+type = string
+
 [fields.title]
 label = Title
 type = string
+
+[fields.order]
+label = Sort Key
+type = sort_key

content/gsoc-2019/project-ideas/project-ideas-list/reimagine-translation-pipeline/contents.lr renamed to content/gsoc-2019/project-ideas-collection/reimagine-translation-pipeline/contents.lr

@@ -0,0 +1,7 @@
+[model]
+name = Redirect
+
+[fields.target]
+label = Redirect Target
+type = string
+description = Target is of type 'string' to allow relative paths. Converted to url in the template

content/gsoc-2019/project-ideas/project-ideas-list/reward-and-delight/contents.lr renamed to content/gsoc-2019/project-ideas-collection/reward-and-delight/contents.lr

@@ -33,7 +33,7 @@
             <a class="nav-link" href="/gsoc-2019/" id="navbarDropdown" role="button">Google Summer of Code 2019</a>
             <div class="dropdown-menu" aria-labelledby="navbarDropdown">
               {% for href, title in [
-                ['/gsoc-2019/project-ideas', 'Project Ideas'],
+                ['/gsoc-2019/project-ideas/all', 'Project Ideas'],
                 ['/gsoc-2019/application-instructions', 'Application Instructions'],
               ] %}
                 <a class="dropdown-item" href="{{ href|url }}">{{ title }}</a>
@@ -49,7 +49,7 @@
     <div class="row justify-content-md-center">
       <div class="col-9 content-wrap">
         <div class="page py-3">
-          <h2 class="pb-2"><strong>{{ this.title }}</strong></h2>
+          <h2 class="pb-2"><strong>{% block header %}{{ this.title }}{% endblock %}</strong></h2>
           {% block body %}{% endblock %}
         </div>
       </div>

content/gsoc-2019/project-ideas/project-ideas-list/supercharge-our-indexing-engine/contents.lr renamed to content/gsoc-2019/project-ideas-collection/supercharge-our-indexing-engine/contents.lr

@@ -1,34 +1,27 @@
 {% extends "layout.html" %}
 {% block title %}Project Ideas for GSoC 2019{% endblock %}
 
+{% block header %}GSoC 2019: Project Ideas{% endblock %}
 {% block body %}
   <p class="text-muted">This is the project idea list for the <a href="/gsoc-2019">Google Summer of Code 2019</a> program. We have a mix of projects that are meant to be installed widely (such as plugins for other software) and projects that are more focused on improving user experience for users of Creative Commons licenses. Regardless of scope, these projects all have a broad and positive community impact.</p>
   <a name="ideas-top"></a>
   <hr/>
   <!-- We display all ideas by default. -->
-  {% set ideas = site.query('/gsoc-2019/project-ideas/project-ideas-list').include_undiscoverable(true) %}
-  <!-- The following code filters the ideas to display based on the current URL. These mappings are defined in the "databags" folder. 
-  Jinja does not support changing values of variables inside loops, so we have to use namespace objects.
-  See "Scoping Behavior" here: http://jinja.pocoo.org/docs/2.10/templates/#assignments -->
-  {% set ns = namespace(field=None, value=None) %}
-  {% for slug, data in bag('project-filters').iteritems() %}
-    {% if this._slug == slug %}
-      {% set ns.field = data['field'] %}
-      {% set ns.value = data['value'] %}
-    {% endif %}
-  {% endfor %}
-  {% if ns.field == 'difficulty' %}
-    {% set ideas = ideas.filter(F.difficulty == ns.value) %}
-  {% endif %}
-  {% if ns.field == 'skill' %}
-    {% set ideas = ideas.filter(F.skills_recommended.contains(ns.value)) %}
+  {% set ideas = site.query('/gsoc-2019/project-ideas-collection').include_undiscoverable(true) %}
+  {% set filters = site.query('/gsoc-2019/project-ideas').include_undiscoverable(true).order_by('order') %}
+  {% set current_filter = filters.filter(F._slug == this._slug).first() %}
+  <!-- The following code filters the ideas to display based on the current URL. -->
+  {% if current_filter.field == 'difficulty' %}
+    {% set ideas = ideas.filter(F.difficulty == current_filter.value) %}
+  {% elif current_filter.field == 'recommended_skill' %}
+    {% set ideas = ideas.filter(F.skills_recommended.contains(current_filter.value)) %}
   {% endif %}
   <div class="mt-4">
     <div>
-      {% for slug, data in bag('project-filters').iteritems() %}
-        <a href="{{ data['path'] }}">
-          <button type="button" class="btn btn-sm {% if this._path == data['path'] %}btn-dark{% else %}btn-primary{% endif %}" {% if this._path == data['path'] %}disabled{% endif %}>
-            {{ data['nav_label'] }}
+      {% for filter in filters %}
+        <a href="{{ filter.url_path }}">
+          <button type="button" class="m-1 btn btn-sm {% if this._slug == filter._slug %}btn-dark{% else %}btn-primary{% endif %}" {% if this._slug == filter._slug %}disabled{% endif %}>
+            {{ filter.nav_label }}
           </button>
         </a>
       {% endfor %}

content/gsoc-2019/project-ideas/project-ideas-list/visualize-cc-catalog/contents.lr renamed to content/gsoc-2019/project-ideas-collection/visualize-cc-catalog/contents.lr

@@ -0,0 +1 @@
+<meta http-equiv="refresh" content="0; URL='{{ this.target|url }}'" />