diff options
| -rwxr-xr-x | compile-md.sh | 18 | ||||
| -rw-r--r-- | templates/page-header.html | 4 | ||||
| -rw-r--r-- | www/index.css | 9 | ||||
| -rw-r--r-- | www/wishlist-2.html | 202 | ||||
| -rw-r--r-- | www/wishlist.html | 373 |
5 files changed, 210 insertions, 396 deletions
diff --git a/compile-md.sh b/compile-md.sh index f79f742..7b982c0 100755 --- a/compile-md.sh +++ b/compile-md.sh @@ -2,18 +2,20 @@ set -ex -if [ $# -ne 3 ]; then - echo "./compile-md.sh [page|blog] [in.md] [out.html]" +if [ $# -ne 4 ]; then + echo "./compile-md.sh [page|blog] [title] [in.md] [out.html]" exit 1 fi -in=$2 -out=$3 +ptype=$1 +title=$2 +in=$3 +out=$4 -if [ $1 == "blog" ]; then +if [ $ptype == "blog" ]; then cat templates/blog-header.html > $out else - if [ $1 == "page" ]; then + if [ $ptype == "page" ]; then cat templates/page-header.html > $out else echo "Missing first parameter: [page|blog]" @@ -21,6 +23,10 @@ else fi fi +pclass=$(echo "$title" | tr [:upper:] [:lower:]) +sed -ie "s/PAGE_TITLE/$title/" $out # replace title +sed -ie "s/PAGE_CLASS/$pclass/" $out # replace class + markdown $in >> $out if [ $1 == "blog" ]; then diff --git a/templates/page-header.html b/templates/page-header.html index f7bea88..a759b70 100644 --- a/templates/page-header.html +++ b/templates/page-header.html @@ -3,7 +3,7 @@ <head> <meta charset="utf-8"> <meta name="generator" content="HTML Tidy for HTML5 for Linux version 5.6.0"> - <title>senders.io - {PAGE}</title> + <title>senders.io - PAGE_TITLE</title> <link rel='stylesheet' type='text/css' href='/index.css'> <meta name="viewport" content="width=device-width, initial-scale=1"> </head> @@ -15,4 +15,4 @@ "https://github.com/s3nd3r5">Github</a> </nav> </div> - <div id='body'> + <div id="body" class="PAGE_CLASS"> diff --git a/www/index.css b/www/index.css index 08f630a..bf24d23 100644 --- a/www/index.css +++ b/www/index.css @@ -2,6 +2,10 @@ html,body { margin: 0; font-family: sans-serif; } #body { margin: 16px 10%; } #body article { border-bottom: 1px solid #060606; } #body article:last { border-bottom: none; } +#body table { border-collapse: collapse; border: 1px solid #aaa; } +#body table td, #body table th { border: 1px solid #aaa; padding: 2px 8px; } +#body table tr:nth-child(even) { background-color: #eee; } +#body ul.compact { columns: 2; } #header { background-color: #060606; @@ -56,9 +60,4 @@ code.inline { height: auto; } -#wishlist { margin: 2% } -#wishlist table thead td { border-bottom: 1px solid #aaa } -#wishlist table tbody td { border-bottom: 2px dotted #aaa } -#wishlist ul.compact { columns: 2; } - #tutorial { margin: 2% } diff --git a/www/wishlist-2.html b/www/wishlist-2.html deleted file mode 100644 index 02f0335..0000000 --- a/www/wishlist-2.html +++ /dev/null @@ -1,202 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> - <meta name="generator" content= - "HTML Tidy for HTML5 for Linux version 5.7.45"> - <title>senders.io - {PAGE}</title> - <link rel='stylesheet' type='text/css' href='/index.css'> - <meta name="viewport" content="width=device-width, initial-scale=1"> -</head> -<body> - <div id='header'> - <a class='title' href='/'>senders.io</a> - <nav> - <a href="/resume">Resume</a> <a href="/blog">Blog</a> <a href= - "https://github.com/s3nd3r5">Github</a> - </nav> - </div> - <div id='body'> - <h1>Wishlist</h1> - <p>In general: Records, Gunpla, Warhammer are always welcome and likely to - be most of what the following wishlist will contain.</p> - <h2>Wishlist X-mas 2022</h2> - <h3>Records</h3> - <p>Please <a href="https://www.discogs.com/user/senders/collection">check - my discogs collection</a> to verify what I own or not!</p> - <p>And you <a href="https://www.discogs.com/wantlist?user=senders">check my - discogs wantlist</a> to see some things I have my eyes on - but it is very - much a small subset.</p> - <table> - <thead> - <tr> - <th>Artist</th> - <th>Album</th> - <th style="text-align:center;">Shop(s)</th> - <th style="text-align:center;">💖</th> - </tr> - </thead> - <tbody> - <tr> - <td>Black Sabbath</td> - <td>Black Sabbath</td> - <td style="text-align:center;"> - <a href= - "https://www.discogs.com/artist/144998-Black-Sabbath">Discogs</a> - </td> - <td></td> - </tr> - <tr> - <td>Black Sabbath</td> - <td>Master of Reality</td> - <td style="text-align:center;">^</td> - <td></td> - </tr> - <tr> - <td>Iron Maiden</td> - <td>Iron Maiden</td> - <td style="text-align:center;"> - <a href= - "https://www.discogs.com/artist/251595-Iron-Maiden">Discogs</a> - </td> - <td></td> - </tr> - <tr> - <td>Iron Maiden</td> - <td>Killers</td> - <td style="text-align:center;">^</td> - <td></td> - </tr> - <tr> - <td>Iron Maiden</td> - <td>The Number of the Beast</td> - <td style="text-align:center;">^</td> - <td></td> - </tr> - <tr> - <td>Iron Maiden</td> - <td>Piece of Mind</td> - <td style="text-align:center;">^</td> - <td></td> - </tr> - <tr> - <td>Iron Maiden</td> - <td>Powerslave</td> - <td style="text-align:center;">^</td> - <td></td> - </tr> - <tr> - <td>Iron Maiden</td> - <td>Brave New World</td> - <td style="text-align:center;">^</td> - <td></td> - </tr> - <tr> - <td>Jimi Hendrix</td> - <td>Are You Experinced</td> - <td style="text-align:center;"> - <a href= - "https://www.discogs.com/artist/110593-Jimi-Hendrix">Discogs</a> - </td> - <td></td> - </tr> - <tr> - <td>KANGA</td> - <td>KANGA (CD)</td> - <td style="text-align:center;"> - <a href= - "https://www.discogs.com/release/9368901-Kanga-Kanga">Discogs</a> - </td> - <td style="text-align:center;">💖</td> - </tr> - <tr> - <td>KANGA</td> - <td>Eternal Daughter (CD)</td> - <td style="text-align:center;"> - <a href= - "https://kanga.bandcamp.com/album/eternal-daughter">Bandcamp</a> - </td> - <td style="text-align:center;">💖</td> - </tr> - <tr> - <td>KANGA</td> - <td>You and I Will Never Die (CD)</td> - <td style="text-align:center;"> - <a href= - "https://kanga.bandcamp.com/album/you-and-i-will-never-die">Bandcamp</a> - </td> - <td style="text-align:center;">💖</td> - </tr> - <tr> - <td>Khemmis</td> - <td>Absolution</td> - <td style="text-align:center;"> - <a href="https://www.20buckspin.com/collections/khemmis">LP Merch - Site</a>, <a href= - "https://www.discogs.com/artist/4497438-Khemmis">Discogs</a> - </td> - <td style="text-align:center;">💖</td> - </tr> - <tr> - <td>Khemmis</td> - <td>Hunted</td> - <td style="text-align:center;">^</td> - <td style="text-align:center;">💖</td> - </tr> - <tr> - <td>Khemmis</td> - <td>Desolation</td> - <td style="text-align:center;">^</td> - <td style="text-align:center;">💖</td> - </tr> - <tr> - <td>Raised by Swans</td> - <td>Codes And Secret Longing (CD)</td> - <td style="text-align:center;"> - <a href= - "https://www.discogs.com/release/1173259-Raised-By-Swans-Codes-And-Secret-Longing"> - Discogs</a> - </td> - <td style="text-align:center;"></td> - </tr> - <tr> - <td>Raised By Swans</td> - <td>Öxnadalur (CD)</td> - <td style="text-align:center;"> - <a href= - "https://raisedbyswans6.bandcamp.com/album/xnadalur">Bandcamp</a> - </td> - <td style="text-align:center;">💖</td> - </tr> - </tbody> - </table> - <p>// Items marked with 💖 are things I would try for since they have - official releases</p> - <h4>How to shop for records</h4> - <p>To shop for records generally, if the band is active/modern I try and - link or share their official merch/bandcamp (generally you can websearch - for the bands website where they usually link their US LP store).</p> - <p>But otherwise using Discogs is the easiest way to shop for used records. - Overall, you simply look through their releases filtering for Vinyl and the - album and find a cheaper US release. Try and <strong>avoid good or - fair</strong> quality as it usually means “pretty rough but it works”. VG - is my usual minimum. And do check the sellers shipping options. Sometimes, - they make deals for 2+ records (like flatrate shipping) so sometimes - ordering from the same store can save some money!.</p> - <p>And PLEASE DO NOT EVER spend a lot on a record. Usually $30 is a brand - new repress cost for a 2xLP and my maximum. I would much rather have - something not on the above list - knowing it wasn’t a total rip-off.</p> - <p>Speaking of represses, represses are always fine. If there are - notoriously bad represses/rereleases I’d make it known. But so far only the - first two Iron Maiden albums (Self, Killers) suffer from originally bad - mastering - so it doesn’t <em>really</em> matter if its a repress/release - or not. Its mostly purists/nerds who care.</p> - <h3>Else</h3> - <p>If you are sick of getting me records for gifts - I do need something to - hold some overflow for my records like <a href= - "https://www.etsy.com/market/record_crate">found here on etsy</a></p> - <p>Interesting Fountain Pen ink shades: <a href= - "https://www.jetpens.com/Fountain-Pen-Inks/ct/3250">Jetpens Store</a></p> - </div> -</body> -</html> diff --git a/www/wishlist.html b/www/wishlist.html index c270769..200ef5f 100644 --- a/www/wishlist.html +++ b/www/wishlist.html @@ -2,189 +2,200 @@ <html lang="en"> <head> <meta charset="utf-8"> - <meta name="generator" content= - "HTML Tidy for HTML5 for Linux version 5.7.45"> + <meta name="generator" content="HTML Tidy for HTML5 for Linux version 5.6.0"> + <title>senders.io - wishlist</title> <link rel='stylesheet' type='text/css' href='/index.css'> <meta name="viewport" content="width=device-width, initial-scale=1"> - <title>Senders' Wishlist</title> </head> -<body id="wishlist"> - <h1>Wishlist</h1> - <p>If you have any questions you can always reach out to me or the person - denoted under each section. I have broken things into categories with no real - priority between the areas/items. Gunpla is welcome, and I can update this - with the models I own later, but they're hard to get since most sites - sell out of the ones I want and I have a backlog at the moment.</p> - <h2>Records</h2><strong><a target="_blank" href= - "https://www.discogs.com/wantlist?user=senders">Records I want</a> - Rather - than tabularize the records I have my eye on. I have just tagged them on - discogs.</strong> - <p><a target="_blank" href= - "https://www.discogs.com/user/senders/collection">What I already own</a> - - You can double check with Carolynn</p> - <h3>General suggestions</h3> - <p>Since that list is clearly not exhaustive (I don't have the time to - flag everything). I will essentially just list some bands I like and own very - few records of (sorted alphabetically)</p> - <table> - <thead> - <tr> - <th>Artist</th> - <th>Owned</th> - </tr> - </thead> - <tbody> - <tr> - <td>Black Sabbath</td> - <td>Paranoid</td> - </tr> - <tr> - <td>Cream</td> - </tr> - <tr> - <td>Incubus</td> - <td>S.C.I.E.N.C.E, Trust Fall</td> - </tr> - <tr> - <td>Iron Maiden</td> - </tr> - <tr> - <td>Jefferson Airplane</td> - </tr> - <tr> - <td>Jimi Hendrix</td> - <td>Electric Ladyland, Band of Gypsys</td> - </tr> - <tr> - <td>Khemmis</td> - <td>Deceiver (Preordered)</td> - </tr> - <tr> - <td>Led Zepplin</td> - <td>Dad's Zep 1, Zep 4</td> - </tr> - <tr> - <td>Muse</td> - <td>Dronez</td> - </tr> - <tr> - <td>Pink Floyd</td> - <td>Meddle, Atom Heart Mother, Dark Side of the Moon</td> - </tr> - <tr> - <td>Rage Against The Machine</td> - </tr> - <tr> - <td>Ten Years After</td> - <td>Cricklewood Green</td> - </tr> - <tr> - <td>The Who</td> - <td>Live At Leeds</td> - </tr> - <tr> - <td>Traffic</td> - <td>Dad's John Barlycorn</td> - </tr> - <tr> - <td>Uada</td> - <td>Djinn</td> - </tr> - </tbody> - </table> - <h3>Owned but not listed</h3> - <p>I have some preorders on the way, so I don't have the catalog info to - put into Discogs</p> - <ul> - <li>Blackwater Holylight - Silence/Motion</li> - <li>Emma Ruth Rundle - Some Heavy Ocean, Engine of Hell</li> - <li>Khemmis - Deceiver</li> - <li>Quicksand - Distant Populations</li> - </ul> - <h3>Shopping for records</h3> - <p>If you have used <a href="https://www.discogs.com" target= - "_blank">Discogs</a> before I find it a bit tough to navigate. Just be aware - of what country the seller is from as that typically relates to ship - time.</p> - <p>I would be happy with any record if you think I would like it. Be wary of - quality of the media. Typically anything less than VG+ on discogs is - questionable. I don't care much about getting an original vs reissue.</p> - <p>If a release is 2020 or 2021 - you can do a bit of research and sometimes - find the actual merch store - but watch out for turnaround time with any - actual record label sites/store fronts. Typically, if a record is released - within the last year or so its price is $20-$30 before shipping - so if - it's new (even reissue) try finding a real storefront before going second - hand.</p> - <hr> - <h2>For Information Only - Not recommended</h2> - <h3>Models</h3><strong>Talk to Dan if you have any questions</strong> - <table> - <thead> - <tr> - <th>Item name</th> - <th>Cost</th> - <th>Link</th> - </tr> - </thead> - <tbody> - <tr> - <td>Broodlord</td> - <td>$40</td> - <td> - <a target="_blank" href= - "https://www.games-workshop.com/en-US/Tyranid-Broodlord">https://www.games-workshop.com/en-US/Tyranid-Broodlord</a> - </td> - </tr> - <tr> - <td>Deathleaper</td> - <td>$24.75</td> - <td> - <a target="_blank" href= - "https://www.games-workshop.com/en-US/Tyranid-Deathleaper">https://www.games-workshop.com/en-US/Tyranid-Deathleaper</a> - </td> - </tr> - <tr> - <td>Lictor</td> - <td>24.75</td> - <td> - <a target="_blank" href= - "https://www.games-workshop.com/en-US/Tyranid-Lictor">https://www.games-workshop.com/en-US/Tyranid-Lictor</a> - </td> - </tr> - <tr> - <td>Any cool Warhammer Fantasy Dwarf</td> - <td>Don't spend more than $25</td> - <td>Talk to Dan</td> - </tr> - <tr> - <td>Any cool Warhammer Fantasy Skaven</td> - <td>Don't spend more than $25</td> - <td>Talk to Dan</td> - </tr> - <tr> - <td>A Human to proxy as Felix</td> - <td>Don't spend more than $25</td> - <td>This is for Dan specifically</td> - </tr> - </tbody> - </table> - <p>For the Dwarf/Skaven I want a cool model to build but feel free to get - anything :) O.G Warhammer is a +1.</p> - <h3>Gunpla</h3> - <p>I like anything UC esp 0079 and 0083.</p> - <p>To help avoid and duplicate buys with Gunpla here is a longlist of the - ones I have.</p> - <h4>Gunpla I own</h4> - <ul class='compact'> - <li>HG RX78</li> - <li>HG & RG GP01</li> - <li>RG Titans Gundam Mk2</li> - <li>HG Gundam RX178 Mk2</li> - <li>HG Zaku I</li> - <li>HG GP02A</li> - <li>HG Qubeley</li> - <li>HG Hyaku Shiki</li> - <li>HG MS-04</li> - </ul> +<body> + <div id='header'> + <a class='title' href='/'>senders.io</a> + <nav> + <a href="/resume">Resume</a> <a href="/blog">Blog</a> <a href= + "https://github.com/s3nd3r5">Github</a> + </nav> + </div> + <div id="body" class="wishlist"> + <h1>Wishlist</h1> + <p>In general: Records, Gunpla, Warhammer are always welcome and likely to + be most of what the following wishlist will contain.</p> + <h2>Wishlist X-mas 2022</h2> + <h3>Records</h3> + <p>Please <a href="https://www.discogs.com/user/senders/collection">check + my discogs collection</a> to verify what I own or not!</p> + <p>And you <a href="https://www.discogs.com/wantlist?user=senders">check my + discogs wantlist</a> to see some things I have my eyes on - but it is very + much a small subset.</p> + <table> + <thead> + <tr> + <th>Artist</th> + <th>Album</th> + <th style="text-align:center;">Shop(s)</th> + <th style="text-align:center;">💖</th> + </tr> + </thead> + <tbody> + <tr> + <td>Black Sabbath</td> + <td>Black Sabbath</td> + <td style="text-align:center;"> + <a href= + "https://www.discogs.com/artist/144998-Black-Sabbath">Discogs</a> + </td> + <td></td> + </tr> + <tr> + <td>Black Sabbath</td> + <td>Master of Reality</td> + <td style="text-align:center;">^</td> + <td></td> + </tr> + <tr> + <td>Iron Maiden</td> + <td>Iron Maiden</td> + <td style="text-align:center;"> + <a href= + "https://www.discogs.com/artist/251595-Iron-Maiden">Discogs</a> + </td> + <td></td> + </tr> + <tr> + <td>Iron Maiden</td> + <td>Killers</td> + <td style="text-align:center;">^</td> + <td></td> + </tr> + <tr> + <td>Iron Maiden</td> + <td>The Number of the Beast</td> + <td style="text-align:center;">^</td> + <td></td> + </tr> + <tr> + <td>Iron Maiden</td> + <td>Piece of Mind</td> + <td style="text-align:center;">^</td> + <td></td> + </tr> + <tr> + <td>Iron Maiden</td> + <td>Powerslave</td> + <td style="text-align:center;">^</td> + <td></td> + </tr> + <tr> + <td>Iron Maiden</td> + <td>Brave New World</td> + <td style="text-align:center;">^</td> + <td></td> + </tr> + <tr> + <td>Jimi Hendrix</td> + <td>Are You Experinced</td> + <td style="text-align:center;"> + <a href= + "https://www.discogs.com/artist/110593-Jimi-Hendrix">Discogs</a> + </td> + <td></td> + </tr> + <tr> + <td>KANGA</td> + <td>KANGA (CD)</td> + <td style="text-align:center;"> + <a href= + "https://www.discogs.com/release/9368901-Kanga-Kanga">Discogs</a> + </td> + <td style="text-align:center;">💖</td> + </tr> + <tr> + <td>KANGA</td> + <td>Eternal Daughter (CD)</td> + <td style="text-align:center;"> + <a href= + "https://kanga.bandcamp.com/album/eternal-daughter">Bandcamp</a> + </td> + <td style="text-align:center;">💖</td> + </tr> + <tr> + <td>KANGA</td> + <td>You and I Will Never Die (CD)</td> + <td style="text-align:center;"> + <a href= + "https://kanga.bandcamp.com/album/you-and-i-will-never-die">Bandcamp</a> + </td> + <td style="text-align:center;">💖</td> + </tr> + <tr> + <td>Khemmis</td> + <td>Absolution</td> + <td style="text-align:center;"> + <a href="https://www.20buckspin.com/collections/khemmis">LP Merch + Site</a>, <a href= + "https://www.discogs.com/artist/4497438-Khemmis">Discogs</a> + </td> + <td style="text-align:center;">💖</td> + </tr> + <tr> + <td>Khemmis</td> + <td>Hunted</td> + <td style="text-align:center;">^</td> + <td style="text-align:center;">💖</td> + </tr> + <tr> + <td>Khemmis</td> + <td>Desolation</td> + <td style="text-align:center;">^</td> + <td style="text-align:center;">💖</td> + </tr> + <tr> + <td>Raised by Swans</td> + <td>Codes And Secret Longing (CD)</td> + <td style="text-align:center;"> + <a href= + "https://www.discogs.com/release/1173259-Raised-By-Swans-Codes-And-Secret-Longing"> + Discogs</a> + </td> + <td style="text-align:center;"></td> + </tr> + <tr> + <td>Raised By Swans</td> + <td>Öxnadalur (CD)</td> + <td style="text-align:center;"> + <a href= + "https://raisedbyswans6.bandcamp.com/album/xnadalur">Bandcamp</a> + </td> + <td style="text-align:center;">💖</td> + </tr> + </tbody> + </table> + <p>// Items marked with 💖 are things I would try for since they have + official releases</p> + <h4>How to shop for records</h4> + <p>To shop for records generally, if the band is active/modern I try and + link or share their official merch/bandcamp (generally you can websearch + for the bands website where they usually link their US LP store).</p> + <p>But otherwise using Discogs is the easiest way to shop for used records. + Overall, you simply look through their releases filtering for Vinyl and the + album and find a cheaper US release. Try and <strong>avoid good or + fair</strong> quality as it usually means “pretty rough but it works”. VG + is my usual minimum. And do check the sellers shipping options. Sometimes, + they make deals for 2+ records (like flatrate shipping) so sometimes + ordering from the same store can save some money!.</p> + <p>And PLEASE DO NOT EVER spend a lot on a record. Usually $30 is a brand + new repress cost for a 2xLP and my maximum. I would much rather have + something not on the above list - knowing it wasn’t a total rip-off.</p> + <p>Speaking of represses, represses are always fine. If there are + notoriously bad represses/rereleases I’d make it known. But so far only the + first two Iron Maiden albums (Self, Killers) suffer from originally bad + mastering - so it doesn’t <em>really</em> matter if its a repress/release + or not. Its mostly purists/nerds who care.</p> + <h3>Else</h3> + <p>If you are sick of getting me records for gifts - I do need something to + hold some overflow for my records like <a href= + "https://www.etsy.com/market/record_crate">found here on etsy</a></p> + <p>Interesting Fountain Pen ink shades: <a href= + "https://www.jetpens.com/Fountain-Pen-Inks/ct/3250">Jetpens Store</a></p> + </div> </body> </html> |