Show gallery before recent. Part of #5

openscad · May 15, 2013 · f097b85 · f097b85
1 parent 693f86b
commit f097b85
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/assets/js/gallery.js b/assets/js/gallery.js
@@ -4,9 +4,9 @@ $(document).ready(function() {
   var id, title, url, image, image_thumb, image_preview, creator_name, creator_url;
   /*retrieve data from openscad tag*/
 
-  $.getJSON('inc/thingiverse-recent.json', function(response) {
-
-    $.each(response, function(key, val) {
+  $.when($.getJSON('inc/thingiverse-gallery.json'), $.getJSON('inc/thingiverse-recent.json')).done(function(r1, r2) {
+    var things = r1[0].concat(r2[0]);
+    $.each(things, function(key, val) {
       id = val.id;
       title = val.name;
       url = val.public_url;

diff --git a/inc/thingiverse-gallery.json b/inc/thingiverse-gallery.json
@@ -0,0 +1 @@
+[{"id":1339,"name":"OpenSCAD Helical Gears","url":"https:\/\/api.thingiverse.com\/things\/1339","public_url":"http:\/\/www.thingiverse.com\/thing:1339","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/34\/50\/a4\/76\/d4\/4130791241_3a1132b5aa_o_thumb_medium.jpg","creator":{"id":1352,"name":"catarina","full_name":"catarina mota","url":"https:\/\/api.thingiverse.com\/users\/catarina","public_url":"http:\/\/www.thingiverse.com\/catarina","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/fc\/a8\/24\/62\/2d\/5729_124967957888_602927888_2971729_7099136_n_thumb_medium.jpg"}},{"id":40703,"name":"Customizable iPhone Case","url":"https:\/\/api.thingiverse.com\/things\/40703","public_url":"http:\/\/www.thingiverse.com\/thing:40703","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/7e\/a7\/ed\/d2\/7b\/iphone_case_customizer_thumbnail_thumb_medium.jpg","creator":{"id":928,"name":"MakerBot","full_name":"MakerBot","url":"https:\/\/api.thingiverse.com\/users\/MakerBot","public_url":"http:\/\/www.thingiverse.com\/MakerBot","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/ab\/95\/05\/e7\/77\/M_Bot_thingiverse-3_thumb_medium.jpg"}},{"id":59933,"name":"Customizable Stacking Container","url":"https:\/\/api.thingiverse.com\/things\/59933","public_url":"http:\/\/www.thingiverse.com\/thing:59933","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/82\/d0\/4c\/e4\/6e\/IMGP1604_thumb_medium.jpg","creator":{"id":28263,"name":"walter","full_name":"Walter Hsiao","url":"https:\/\/api.thingiverse.com\/users\/walter","public_url":"http:\/\/www.thingiverse.com\/walter","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/aa\/50\/a8\/4c\/b6\/IMGP0363_thumb_medium.jpg"}},{"id":86476,"name":"Square Vase Customizer","url":"https:\/\/api.thingiverse.com\/things\/86476","public_url":"http:\/\/www.thingiverse.com\/thing:86476","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/7c\/40\/77\/1b\/52\/2013_05_12_0167_thumb_medium.jpg","creator":{"id":35966,"name":"Eckerput","full_name":"","url":"https:\/\/api.thingiverse.com\/users\/Eckerput","public_url":"http:\/\/www.thingiverse.com\/Eckerput","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/7d\/fb\/f8\/b1\/83\/Bruce_2_thumb_medium.jpg"}},{"id":16627,"name":"Parametric pulley - lots of tooth profiles","url":"https:\/\/api.thingiverse.com\/things\/16627","public_url":"http:\/\/www.thingiverse.com\/thing:16627","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/45\/e4\/4f\/48\/cf\/Pulleys_thumb_medium.jpg","creator":{"id":10843,"name":"droftarts","full_name":"","url":"https:\/\/api.thingiverse.com\/users\/droftarts","public_url":"http:\/\/www.thingiverse.com\/droftarts","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/3a\/51\/85\/4c\/f5\/GingerDog2_thumb_medium.jpg"}},{"id":82112,"name":"Another compartment box","url":"https:\/\/api.thingiverse.com\/things\/82112","public_url":"http:\/\/www.thingiverse.com\/thing:82112","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/60\/61\/9f\/c5\/5e\/Cajones-organizadores-1_thumb_medium.jpg","creator":{"id":308,"name":"obijuan","full_name":"Juan Gonzalez","url":"https:\/\/api.thingiverse.com\/users\/obijuan","public_url":"http:\/\/www.thingiverse.com\/obijuan","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/18\/e4\/98\/c3\/c8\/Obijuan_thumb_medium.jpg"}},{"id":44150,"name":"Complete set of mechanical anatomically driven fingers","url":"https:\/\/api.thingiverse.com\/things\/44150","public_url":"http:\/\/www.thingiverse.com\/thing:44150","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/41\/03\/6b\/1c\/ac\/DSC02990_b_thumb_medium.jpg","creator":{"id":35612,"name":"robohand","full_name":"Robohand","url":"https:\/\/api.thingiverse.com\/users\/robohand","public_url":"http:\/\/www.thingiverse.com\/robohand","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/30\/e3\/73\/c0\/41\/DSCN0076_thumb_medium.jpg"}},{"id":12208,"name":"Screwless Heart Gears","url":"https:\/\/api.thingiverse.com\/things\/12208","public_url":"http:\/\/www.thingiverse.com\/thing:12208","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/0d\/49\/8d\/6c\/71\/heart1_thumb_medium.jpg","creator":{"id":8844,"name":"emmett","full_name":"Emmett Lalish","url":"https:\/\/api.thingiverse.com\/users\/emmett","public_url":"http:\/\/www.thingiverse.com\/emmett","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/a4\/14\/d9\/2a\/94\/B1_thumb_medium.jpg"}},{"id":13505,"name":"Stretchy Bracelet","url":"https:\/\/api.thingiverse.com\/things\/13505","public_url":"http:\/\/www.thingiverse.com\/thing:13505","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/2f\/e2\/82\/20\/a5\/strechlet1_thumb_medium.jpg","creator":{"id":8844,"name":"emmett","full_name":"Emmett Lalish","url":"https:\/\/api.thingiverse.com\/users\/emmett","public_url":"http:\/\/www.thingiverse.com\/emmett","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/a4\/14\/d9\/2a\/94\/B1_thumb_medium.jpg"}},{"id":34778,"name":"Automatic Transmission Model","url":"https:\/\/api.thingiverse.com\/things\/34778","public_url":"http:\/\/www.thingiverse.com\/thing:34778","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/99\/80\/d1\/1a\/fe\/transmission4_thumb_medium.jpg","creator":{"id":8844,"name":"emmett","full_name":"Emmett Lalish","url":"https:\/\/api.thingiverse.com\/users\/emmett","public_url":"http:\/\/www.thingiverse.com\/emmett","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/a4\/14\/d9\/2a\/94\/B1_thumb_medium.jpg"}},{"id":44579,"name":"Preassembled Secret Heart Box","url":"https:\/\/api.thingiverse.com\/things\/44579","public_url":"http:\/\/www.thingiverse.com\/thing:44579","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/bf\/89\/42\/44\/6a\/SecretHeart1_thumb_medium.jpg","creator":{"id":8844,"name":"emmett","full_name":"Emmett Lalish","url":"https:\/\/api.thingiverse.com\/users\/emmett","public_url":"http:\/\/www.thingiverse.com\/emmett","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/a4\/14\/d9\/2a\/94\/B1_thumb_medium.jpg"}},{"id":37926,"name":"Blossoming Lamp","url":"https:\/\/api.thingiverse.com\/things\/37926","public_url":"http:\/\/www.thingiverse.com\/thing:37926","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/17\/e5\/71\/74\/69\/LampT3_thumb_medium.jpg","creator":{"id":8844,"name":"emmett","full_name":"Emmett Lalish","url":"https:\/\/api.thingiverse.com\/users\/emmett","public_url":"http:\/\/www.thingiverse.com\/emmett","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/a4\/14\/d9\/2a\/94\/B1_thumb_medium.jpg"}},{"id":50716,"name":"Customizable Cube Gears","url":"https:\/\/api.thingiverse.com\/things\/50716","public_url":"http:\/\/www.thingiverse.com\/thing:50716","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/e7\/06\/e7\/d2\/06\/cube1_thumb_medium.jpg","creator":{"id":8844,"name":"emmett","full_name":"Emmett Lalish","url":"https:\/\/api.thingiverse.com\/users\/emmett","public_url":"http:\/\/www.thingiverse.com\/emmett","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/a4\/14\/d9\/2a\/94\/B1_thumb_medium.jpg"}},{"id":53235,"name":"Parametric Music Box","url":"https:\/\/api.thingiverse.com\/things\/53235","public_url":"http:\/\/www.thingiverse.com\/thing:53235","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/9b\/83\/22\/49\/c0\/8539059972_f7d172cb3c_o_thumb_medium.jpg","creator":{"id":55,"name":"wizard23","full_name":"Philipp Tiefenbacher","url":"https:\/\/api.thingiverse.com\/users\/wizard23","public_url":"http:\/\/www.thingiverse.com\/wizard23","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/20\/88\/bb\/c9\/77\/ECOLI16_1024_thumb_medium.jpg"}}]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		[{"id":1339,"name":"OpenSCAD Helical Gears","url":"https:\/\/api.thingiverse.com\/things\/1339","public_url":"http:\/\/www.thingiverse.com\/thing:1339","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/34\/50\/a4\/76\/d4\/4130791241_3a1132b5aa_o_thumb_medium.jpg","creator":{"id":1352,"name":"catarina","full_name":"catarina mota","url":"https:\/\/api.thingiverse.com\/users\/catarina","public_url":"http:\/\/www.thingiverse.com\/catarina","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/fc\/a8\/24\/62\/2d\/5729_124967957888_602927888_2971729_7099136_n_thumb_medium.jpg"}},{"id":40703,"name":"Customizable iPhone Case","url":"https:\/\/api.thingiverse.com\/things\/40703","public_url":"http:\/\/www.thingiverse.com\/thing:40703","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/7e\/a7\/ed\/d2\/7b\/iphone_case_customizer_thumbnail_thumb_medium.jpg","creator":{"id":928,"name":"MakerBot","full_name":"MakerBot","url":"https:\/\/api.thingiverse.com\/users\/MakerBot","public_url":"http:\/\/www.thingiverse.com\/MakerBot","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/ab\/95\/05\/e7\/77\/M_Bot_thingiverse-3_thumb_medium.jpg"}},{"id":59933,"name":"Customizable Stacking Container","url":"https:\/\/api.thingiverse.com\/things\/59933","public_url":"http:\/\/www.thingiverse.com\/thing:59933","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/82\/d0\/4c\/e4\/6e\/IMGP1604_thumb_medium.jpg","creator":{"id":28263,"name":"walter","full_name":"Walter Hsiao","url":"https:\/\/api.thingiverse.com\/users\/walter","public_url":"http:\/\/www.thingiverse.com\/walter","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/aa\/50\/a8\/4c\/b6\/IMGP0363_thumb_medium.jpg"}},{"id":86476,"name":"Square Vase Customizer","url":"https:\/\/api.thingiverse.com\/things\/86476","public_url":"http:\/\/www.thingiverse.com\/thing:86476","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/7c\/40\/77\/1b\/52\/2013_05_12_0167_thumb_medium.jpg","creator":{"id":35966,"name":"Eckerput","full_name":"","url":"https:\/\/api.thingiverse.com\/users\/Eckerput","public_url":"http:\/\/www.thingiverse.com\/Eckerput","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/7d\/fb\/f8\/b1\/83\/Bruce_2_thumb_medium.jpg"}},{"id":16627,"name":"Parametric pulley - lots of tooth profiles","url":"https:\/\/api.thingiverse.com\/things\/16627","public_url":"http:\/\/www.thingiverse.com\/thing:16627","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/45\/e4\/4f\/48\/cf\/Pulleys_thumb_medium.jpg","creator":{"id":10843,"name":"droftarts","full_name":"","url":"https:\/\/api.thingiverse.com\/users\/droftarts","public_url":"http:\/\/www.thingiverse.com\/droftarts","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/3a\/51\/85\/4c\/f5\/GingerDog2_thumb_medium.jpg"}},{"id":82112,"name":"Another compartment box","url":"https:\/\/api.thingiverse.com\/things\/82112","public_url":"http:\/\/www.thingiverse.com\/thing:82112","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/60\/61\/9f\/c5\/5e\/Cajones-organizadores-1_thumb_medium.jpg","creator":{"id":308,"name":"obijuan","full_name":"Juan Gonzalez","url":"https:\/\/api.thingiverse.com\/users\/obijuan","public_url":"http:\/\/www.thingiverse.com\/obijuan","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/18\/e4\/98\/c3\/c8\/Obijuan_thumb_medium.jpg"}},{"id":44150,"name":"Complete set of mechanical anatomically driven fingers","url":"https:\/\/api.thingiverse.com\/things\/44150","public_url":"http:\/\/www.thingiverse.com\/thing:44150","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/41\/03\/6b\/1c\/ac\/DSC02990_b_thumb_medium.jpg","creator":{"id":35612,"name":"robohand","full_name":"Robohand","url":"https:\/\/api.thingiverse.com\/users\/robohand","public_url":"http:\/\/www.thingiverse.com\/robohand","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/30\/e3\/73\/c0\/41\/DSCN0076_thumb_medium.jpg"}},{"id":12208,"name":"Screwless Heart Gears","url":"https:\/\/api.thingiverse.com\/things\/12208","public_url":"http:\/\/www.thingiverse.com\/thing:12208","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/0d\/49\/8d\/6c\/71\/heart1_thumb_medium.jpg","creator":{"id":8844,"name":"emmett","full_name":"Emmett Lalish","url":"https:\/\/api.thingiverse.com\/users\/emmett","public_url":"http:\/\/www.thingiverse.com\/emmett","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/a4\/14\/d9\/2a\/94\/B1_thumb_medium.jpg"}},{"id":13505,"name":"Stretchy Bracelet","url":"https:\/\/api.thingiverse.com\/things\/13505","public_url":"http:\/\/www.thingiverse.com\/thing:13505","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/2f\/e2\/82\/20\/a5\/strechlet1_thumb_medium.jpg","creator":{"id":8844,"name":"emmett","full_name":"Emmett Lalish","url":"https:\/\/api.thingiverse.com\/users\/emmett","public_url":"http:\/\/www.thingiverse.com\/emmett","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/a4\/14\/d9\/2a\/94\/B1_thumb_medium.jpg"}},{"id":34778,"name":"Automatic Transmission Model","url":"https:\/\/api.thingiverse.com\/things\/34778","public_url":"http:\/\/www.thingiverse.com\/thing:34778","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/99\/80\/d1\/1a\/fe\/transmission4_thumb_medium.jpg","creator":{"id":8844,"name":"emmett","full_name":"Emmett Lalish","url":"https:\/\/api.thingiverse.com\/users\/emmett","public_url":"http:\/\/www.thingiverse.com\/emmett","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/a4\/14\/d9\/2a\/94\/B1_thumb_medium.jpg"}},{"id":44579,"name":"Preassembled Secret Heart Box","url":"https:\/\/api.thingiverse.com\/things\/44579","public_url":"http:\/\/www.thingiverse.com\/thing:44579","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/bf\/89\/42\/44\/6a\/SecretHeart1_thumb_medium.jpg","creator":{"id":8844,"name":"emmett","full_name":"Emmett Lalish","url":"https:\/\/api.thingiverse.com\/users\/emmett","public_url":"http:\/\/www.thingiverse.com\/emmett","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/a4\/14\/d9\/2a\/94\/B1_thumb_medium.jpg"}},{"id":37926,"name":"Blossoming Lamp","url":"https:\/\/api.thingiverse.com\/things\/37926","public_url":"http:\/\/www.thingiverse.com\/thing:37926","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/17\/e5\/71\/74\/69\/LampT3_thumb_medium.jpg","creator":{"id":8844,"name":"emmett","full_name":"Emmett Lalish","url":"https:\/\/api.thingiverse.com\/users\/emmett","public_url":"http:\/\/www.thingiverse.com\/emmett","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/a4\/14\/d9\/2a\/94\/B1_thumb_medium.jpg"}},{"id":50716,"name":"Customizable Cube Gears","url":"https:\/\/api.thingiverse.com\/things\/50716","public_url":"http:\/\/www.thingiverse.com\/thing:50716","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/e7\/06\/e7\/d2\/06\/cube1_thumb_medium.jpg","creator":{"id":8844,"name":"emmett","full_name":"Emmett Lalish","url":"https:\/\/api.thingiverse.com\/users\/emmett","public_url":"http:\/\/www.thingiverse.com\/emmett","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/a4\/14\/d9\/2a\/94\/B1_thumb_medium.jpg"}},{"id":53235,"name":"Parametric Music Box","url":"https:\/\/api.thingiverse.com\/things\/53235","public_url":"http:\/\/www.thingiverse.com\/thing:53235","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/9b\/83\/22\/49\/c0\/8539059972_f7d172cb3c_o_thumb_medium.jpg","creator":{"id":55,"name":"wizard23","full_name":"Philipp Tiefenbacher","url":"https:\/\/api.thingiverse.com\/users\/wizard23","public_url":"http:\/\/www.thingiverse.com\/wizard23","thumbnail":"http:\/\/thingiverse-production.s3.amazonaws.com\/renders\/20\/88\/bb\/c9\/77\/ECOLI16_1024_thumb_medium.jpg"}}]