Added asset sort on latest vs stars

Author: britzl

_includes/tagfilter.html

@@ -3,12 +3,12 @@
 	{%- assign tags = alltags | uniq | sort -%}
 	<p>FILTER</p>
 	<div style="display: grid; grid-template-columns: repeat(auto-fit, minmax(150px, 1fr)); grid-gap: 0 1rem; font-size: 0.9em;">
-		{%- if page.tag -%}
+		{%- if include.tag -%}
 			{%- assign class="" -%}
 		{%- else -%}
 			{%- assign class="active" -%}
 		{%- endif-%}
-		<a class="filter {{ class }}" href="/assets">ALL ({{ site.data.assetindex.size }})</a>
+		<a class="filter {{ class }}" href="/assets_{{ include.sort }}">ALL ({{ site.data.assetindex.size }})</a>
 		{%- for tag in tags -%}
 			{% assign tagged_assets = site.data.assetindex | where: "tags", tag %}
 			{% assign tag_no_space = tag | replace: " ", "" | downcase %}
@@ -17,8 +17,13 @@
 			{%- else -%}
 				{%- assign class="" -%}
 			{%- endif-%}
-			<a class="filter {{ class }}" href="/tags/{{ tag | replace: ' ' | downcase }}">{{ tag }} ({{ tagged_assets.size }})</a>
+			<a class="filter {{ class }}" href="/tags/{{ include.sort }}/{{ tag | replace: ' ' | downcase }}">{{ tag }} ({{ tagged_assets.size }})</a>
 		{%- endfor -%}
 	</div>
 	<br/>
+	{%- if include.tag -%}
+		<p>SORT BY: <a href="/tags/stars/{{ include.tag }}">Stars</a>, <a href="/tags/timestamp/{{ include.tag }}">Latest</a></p>
+	{%- else -%}
+		<p>SORT BY: <a href="/assets_stars">Stars</a>, <a href="/assets_timestamp">Latest</a></p>
+	{%- endif-%}
 </div>

_layouts/asset.html

@@ -93,7 +93,7 @@ <h5>Discuss</h5>
 						<td valign="top">Tags</td>
 						<td valign="top">
 							{%- for tag in asset.tags -%}
-								<a href="/tags/{{ tag | downcase | remove: ' ' }}">{{ tag }}</a><br/>
+								<a href="/tags/stars/{{ tag | downcase | remove: ' ' }}">{{ tag }}</a><br/>
 							{%- endfor -%}
 						</td>
 					</tr>

_layouts/assetportal.html

@@ -15,23 +15,19 @@ <h1>Asset portal</h1>
 				{% include secondary_button.html link="/submit_asset" text="Submit asset" %}
 			</div>
 		</div>
+		{%- assign sort_order = page.sort | default: "stars" -%}
 		{%- if page.tag -%}
 			{%- assign tag = site.data.tags[page.tag] -%}
 			{%- assign tagid = tag.id -%}
 			{%- assign assetname = tag.name -%}
+			{%- assign assetids = tag.assets | sort: sort_order | reverse | map: "id" -%}
 
-			{%- if page.sort == "stars" -%}
-			{%- assign assetids = tag.assets | sort: "stars" | reverse | map: "id" -%}
-			{%- else -%}
-			{%- assign assetids = tag.assets | map: "id" -%}
-			{% endif %}
-
-			{%- include tagfilter.html tag=tagid -%}
+			{%- include tagfilter.html tag=tagid sort=sort_order -%}
 			{%- include assetgrid.html assetids=assetids showfilter=true title=assetname -%}
 		{%- else -%}
-			{%- assign assetids = site.data.assetindex | sort: "stars" | reverse | map: "id" -%}
+			{%- assign assetids = site.data.assetindex | sort: sort_order | reverse | map: "id" -%}
 
-			{%- include tagfilter.html -%}
+			{%- include tagfilter.html sort=sort_order -%}
 			{%- include assetgrid.html assetids=assetids showfilter=true title="All" -%}
 		{%- endif -%}
 		<div class="row" style="margin-top: 30px">

assets_stars.html

@@ -0,0 +1,4 @@
+---
+layout: assetportal
+sort: stars
+---

assets_timestamp.html

@@ -0,0 +1,4 @@
+---
+layout: assetportal
+sort: timestamp
+---

tags/stars.html

@@ -0,0 +1,4 @@
+---
+layout: assetportal
+sort: stars
+---

tags/timestamp.html

@@ -0,0 +1,4 @@
+---
+layout: assetportal
+sort: timestamp
+---

update.py

@@ -52,11 +52,11 @@
 ---
 """
 
-TAG_SORT_STARS_MD_FRONTMATTER = """---
+TAG_SORT_MD_FRONTMATTER = """---
 layout: assetportal
 tag: {}
 title: {}
-sort: stars
+sort: {}
 ---
 """
 
@@ -472,10 +472,6 @@ def process_assets(download = False):
         author_collection_dir = "authors"
         rmmkdir(author_collection_dir)
 
-        # Jekyll tags collection
-        tag_collection_dir = "tags"
-        rmmkdir(tag_collection_dir)
-
         # Jekyll asset data
         asset_data_dir = os.path.join("_data", "assets")
         rmmkdir(asset_data_dir)
@@ -519,7 +515,8 @@ def process_assets(download = False):
                 "id": asset_id,
                 "tags": asset["tags"],
                 "platforms": asset["platforms"],
-                "stars": asset.get("stars") or 0
+                "stars": asset.get("stars") or 0,
+                "timestamp": asset.get("timestamp") or 0
             })
 
             # build tag index
@@ -532,7 +529,8 @@ def process_assets(download = False):
                     }
                 tagindex[tag]["assets"].append({
                     "id": asset_id,
-                    "stars": asset.get("stars") or 0
+                    "stars": asset.get("stars") or 0,
+                    "timestamp": asset.get("timestamp") or 0
                 })
 
             # build platform index
@@ -591,14 +589,25 @@ def process_assets(download = False):
         platformlist.sort(key=lambda x: x.get("id").lower())
         write_as_json(PLATFORMINDEX_JSON, platformlist)
 
+        # Jekyll tags collection (one subdirectory per sort order)
+        tag_collection_dir = "tags"
+        sort_orders = ["stars", "timestamp"]
+        for sort_order in sort_orders:
+            rmmkdir(os.path.join(tag_collection_dir, sort_order))
+
         # write tag data
         for tag in taglist:
             tag["assets"].sort(key=lambda x: x.get("id"))
+
+            # _data/tags
             filename = os.path.join(tag_data_dir, tag["id"] + ".json")
             with open(filename, "w") as f:
                 f.write(json.dumps(tag, indent=2, sort_keys=True))
-            with open(os.path.join(tag_collection_dir, tag["id"] + ".md"), "w") as f:
-                f.write(TAG_SORT_STARS_MD_FRONTMATTER.format(tag["id"], tag["name"]))
+
+            # tags/stars, tags/timestamp
+            for sort_order in sort_orders:
+                with open(os.path.join(tag_collection_dir, sort_order, tag["id"] + ".md"), "w") as f:
+                    f.write(TAG_SORT_MD_FRONTMATTER.format(tag["id"], tag["name"], sort_order))