Skip to content

Commit

Permalink
Wishlist updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@niclake
niclake committed Dec 16, 2024
1 parent 75e9404 commit ad18921
Show file tree
Hide file tree
Showing 3 changed files with 133 additions and 89 deletions.
24 changes: 16 additions & 8 deletions src/_data/wishlist/gcs.json
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
[
{
"name": "Mode Keyboards",
"url": "https://modedesigns.com/products/gift-card"
},
{
"name": "Divinikey",
"url": "https://divinikey.com/products/divinikey-gift-card"
"name": "Polymaker (3D Printer Filament)",
"url": "https://us.polymaker.com/products/polymaker-gift-card"
},
{
"name": "Thursday Boots",
Expand All @@ -20,13 +16,25 @@
"url": "https://bookshop.org/gift_cards"
},
{
"name": "Amazon",
"url": "https://www.amazon.com/gift-cards/b?ie=UTF8&node=2238192011"
"name": "Mode Keyboards",
"url": "https://modedesigns.com/products/gift-card"
},
{
"name": "Divinikey",
"url": "https://divinikey.com/products/divinikey-gift-card"
},
{
"name": "Converse",
"url": "https://www.converse.com/c/gift-cards"
},
{
"name": "Nike",
"url": "https://www.nike.com/gift-cards"
},
{
"name": "Amazon",
"url": "https://www.amazon.com/gift-cards/b?ie=UTF8&node=2238192011"
},
{
"name": "Steam (Walmart, Target, GameStop, etc. will have these)"
}
Expand Down
140 changes: 83 additions & 57 deletions src/_data/wishlist/things.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,51 +14,6 @@
"url": "https://a.co/d/931ZpQ9",
"notes": "For the OWC enclosure - 1 to 4 of these"
},
{
"name": "Bambu Lab P1S printer",
"url": "https://us.store.bambulab.com/products/p1s",
"options": [
{"name": "AMS Combo"},
{"name": ".4, .6, .8, and .2mm hotends"},
{"name": "Dual Texture PEI Plate"},
{"name": "Anti-Vibration Feet"}
]
},
{
"name": "3D printer filament",
"options": [
{
"name": "Polymaker PolyLite PLA",
"url": "https://www.amazon.com/dp/B099KTY4HY/",
"notes": "Favs are Purple, Lemon Yellow, Lime Green, Magenta, Green, & Orange"
},
{
"name": "Polymaker Matte PLA",
"url": "https://www.amazon.com/dp/B0CFQXCHDW/",
"notes": "Marble Sandstone, or any other colors you like"
},
{
"name": "Polymaker Panchroma Neon",
"url": "https://www.amazon.com/dp/B0D4PSSZCQ/",
"notes": "Green, Magenta, Orange, and Yellow"
},
{
"name": "Polymaker Matte Multicolor PLA",
"url": "https://www.amazon.com/dp/B0CBMN9F91/",
"notes": "Favs are Fall, Pastel Rainbow, Winter, Foggy Purple, Glacier Blue, Sunrise, Shadow Black, & Shadow Red"
},
{
"name": "FLASHFORGE PLA",
"url": "https://www.amazon.com/dp/B08ZNBGQ2S/",
"notes": "Favs are Rainbow, Burnt Titanium, Obsidian, and Nebula Purple"
},
{
"name": "COOKIECAD PLA",
"url": "https://www.amazon.com/dp/B09LYFS64P/",
"notes": "Mint Chip, plus any of the others"
}
]
},
{
"name": "Raspberry Pi Kit",
"url": "https://vilros.com/products/vilros-raspberry-pi-5-complete-starter-kit?variant=40332876447838"
Expand Down Expand Up @@ -94,32 +49,103 @@
"url": "https://docs.google.com/spreadsheets/d/1-1PcHF6xzFKTaTvxnfjm6bVgo4pd5yIr3nbxsbckoFo/edit?usp=sharing"
},
{
"name": "Lochby Journal",
"name": "Converse All Stars (size 10, standard width)",
"options": [
{
"name": "Pocket Journal",
"url": "https://www.lochby.com/collections/notebooks/products/pocket-journal"
"name": "Charcoal",
"url": "https://www.converse.com/shop/p/chuck-taylor-all-star-classic-unisex-low-top-shoe/M9696MP.html?pid=M9696MP&dwvar_M9696MP_color=charcoal&dwvar_M9696MP_width=standard&styleNo=1J794&pdp=true&cgid=mens-classic-chuck-shoes&vgid=M9166"
},
{
"name": "Field Journal",
"url": "https://www.lochby.com/collections/notebooks/products/field-journal"
"name": "Electric Purple",
"url": "https://www.converse.com/shop/p/chuck-taylor-all-star-classic-unisex-low-top-shoe/M9696MP.html?pid=M9696MP&dwvar_M9696MP_color=electric%20purple&dwvar_M9696MP_width=standard&styleNo=137837F&pdp=true&cgid=mens-classic-chuck-shoes&vgid=M9166"
},
{
"name": "Snorkel Blue",
"url": "https://www.converse.com/shop/p/chuck-taylor-all-star-unisex-low-top-shoe/135514F_100.html?pid=M9696MP&dwvar_M9696MP_size=100&dwvar_M9696MP_color=snorkel%20blue&dwvar_M9696MP_width=standard&styleNo=135514F&pdp=true&cgid=mens-classic-chuck-shoes&buyrec=false"
}
]
},
{
"name": "Converse All Stars (size 10, standard width)",
"name": "3D printer filament",
"options": [
{
"name": "Charcoal",
"url": "https://www.converse.com/shop/p/chuck-taylor-all-star-classic-unisex-low-top-shoe/M9696MP.html?pid=M9696MP&dwvar_M9696MP_color=charcoal&dwvar_M9696MP_width=standard&styleNo=1J794&pdp=true&cgid=mens-classic-chuck-shoes&vgid=M9166"
"name": "I prefer filaments from Polymaker and Bambu. I currently only print using PLA, and use 1.75mm filament."
},
{
"name": "Electric Purple",
"url": "https://www.converse.com/shop/p/chuck-taylor-all-star-classic-unisex-low-top-shoe/M9696MP.html?pid=M9696MP&dwvar_M9696MP_color=electric%20purple&dwvar_M9696MP_width=standard&styleNo=137837F&pdp=true&cgid=mens-classic-chuck-shoes&vgid=M9166"
"name": "I can ALWAYS use more black and/or white filament."
},
{
"name": "Snorkel Blue",
"url": "https://www.converse.com/shop/p/chuck-taylor-all-star-unisex-low-top-shoe/135514F_100.html?pid=M9696MP&dwvar_M9696MP_size=100&dwvar_M9696MP_color=snorkel%20blue&dwvar_M9696MP_width=standard&styleNo=135514F&pdp=true&cgid=mens-classic-chuck-shoes&buyrec=false"
"name": "Polymaker",
"notes": "These are all Amazon links, but you can sometimes find sales on us.polymaker.com",
"options": [
{
"name": "PolyLite PLA",
"url": "https://www.amazon.com/dp/B099KTY4HY/",
"notes": "Favs are Purple, Lemon Yellow, Lime Green, Magenta, Green, & Orange"
},
{
"name": "Matte PLA",
"url": "https://www.amazon.com/dp/B0CFQXCHDW/",
"notes": "Marble Sandstone, or any other colors you like"
},
{
"name": "Matte Multicolor PLA",
"url": "https://www.amazon.com/dp/B0CBMN9F91/",
"notes": "Favs are Fall, Pastel Rainbow, Winter, Foggy Purple, Glacier Blue, Sunrise, Shadow Black, & Shadow Red"
}
]
},
{
"name": "Bambu",
"notes": "You can buy refills instead of filament w/ spools. You get discounts for buying 4+ at once.",
"options": [
{
"name": "PLA Basic",
"url": "https://us.store.bambulab.com/collections/pla/products/pla-basic-filament"
},
{
"name": "PLA Matte",
"url": "https://us.store.bambulab.com/collections/pla/products/pla-matte-filament"
},
{
"name": "PLA Basic Gradient",
"url": "https://us.store.bambulab.com/collections/pla/products/pla-basic-gradient"
},
{
"name": "PLA Silk",
"url": "https://us.store.bambulab.com/collections/pla/products/pla-silk"
},
{
"name": "PLA Silk Dual Color",
"url": "https://us.store.bambulab.com/collections/pla/products/pla-silk-dual-color"
},
{
"name": "PLA Marble",
"url": "https://us.store.bambulab.com/collections/pla/products/pla-marble"
},
{
"name": "PLA Galaxy",
"url": "https://us.store.bambulab.com/collections/pla/products/pla-galaxy"
},
{
"name": "PLA Sparkle",
"url": "https://us.store.bambulab.com/collections/pla/products/pla-sparkle"
},
{
"name": "PLA Metal",
"url": "https://us.store.bambulab.com/collections/pla/products/pla-metal"
}
]
},
{
"name": "FLASHFORGE PLA",
"url": "https://www.amazon.com/dp/B08ZNBGQ2S/",
"notes": "Favs are Rainbow, Burnt Titanium, Obsidian, and Nebula Purple"
},
{
"name": "COOKIECAD PLA",
"url": "https://www.amazon.com/dp/B09LYFS64P/",
"notes": "Mint Chip, plus any of the others"
}
]
}
Expand Down
58 changes: 34 additions & 24 deletions src/pages/wishlist.njk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,16 @@ permalink: /wishlist/index.html
<li>
{% if subthing.url %}<a target="_blank" href="{{ subthing.url }}">{% endif %}{{ subthing.name }}{% if subthing.url %}</a>{% endif %}
{% if subthing.notes %}&nbsp;({{ subthing.notes }}){% endif %}
{% if subthing.options %}
<ul>
{%- for subsubthing in subthing.options -%}
<li>
{% if subsubthing.url %}<a target="_blank" href="{{ subsubthing.url }}">{% endif %}{{ subsubthing.name }}{% if subsubthing.url %}</a>{% endif %}
{% if subsubthing.notes %}&nbsp;({{ subsubthing.notes }}){% endif %}
</li>
{%- endfor -%}
</ul>
{% endif %}
</li>
{%- endfor -%}
</ul>
Expand All @@ -51,6 +61,30 @@ permalink: /wishlist/index.html
</div>
</div>
</div>
<div class="accordion-item">
<h3 class="accordion-header">
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseSeven" aria-expanded="false" aria-controls="collapseSeven">
Gift Certificates
</button>
</h3>
<div id="collapseSeven" class="accordion-collapse collapse" data-bs-parent="#wishlistAccordion">
<div class="accordion-body">
<ul>
{%- for gc in wishlist.gcs -%}
<li>
{% if gc.url %}
<a target="_blank" href="{{ gc.url }}">
{% endif %}
{{ gc.name }}
{% if gc.url %}
</a>
{% endif %}
</li>
{%- endfor -%}
</ul>
</div>
</div>
</div>
<div class="accordion-item">
<h3 class="accordion-header">
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo">
Expand Down Expand Up @@ -233,28 +267,4 @@ permalink: /wishlist/index.html
</div>
</div>
</div>
<div class="accordion-item">
<h3 class="accordion-header">
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseSeven" aria-expanded="false" aria-controls="collapseSeven">
Gift Certificates
</button>
</h3>
<div id="collapseSeven" class="accordion-collapse collapse" data-bs-parent="#wishlistAccordion">
<div class="accordion-body">
<ul>
{%- for gc in wishlist.gcs -%}
<li>
{% if gc.url %}
<a target="_blank" href="{{ gc.url }}">
{% endif %}
{{ gc.name }}
{% if gc.url %}
</a>
{% endif %}
</li>
{%- endfor -%}
</ul>
</div>
</div>
</div>
</div>

0 comments on commit ad18921

Please sign in to comment.