diff options
| author | Daniel Jones <daniel@danieljon.es> | 2017-12-11 22:43:34 -0500 |
|---|---|---|
| committer | Daniel Jones <daniel@danieljon.es> | 2017-12-11 22:43:34 -0500 |
| commit | c5183fb9f2b2b1420a6b393540f975b628daaf9e (patch) | |
| tree | 400d0000e6ad9a7576233b7a82c765b005023b1f | |
| parent | 7b6a7f8ebd675db5fdfba4befad57da32953bd4d (diff) | |
| parent | a67ae3de9e2222486883fc5c739cbd21b758f73d (diff) | |
| download | website-c5183fb9f2b2b1420a6b393540f975b628daaf9e.tar.gz website-c5183fb9f2b2b1420a6b393540f975b628daaf9e.zip | |
Merge branch 'master' of /home/daniel/git/website
| -rw-r--r-- | htaccess.txt | 8 | ||||
| -rwxr-xr-x | setup.sh | 1 | ||||
| -rw-r--r-- | template.txt | 5 |
3 files changed, 9 insertions, 5 deletions
diff --git a/htaccess.txt b/htaccess.txt new file mode 100644 index 0000000..49ba89a --- /dev/null +++ b/htaccess.txt @@ -0,0 +1,8 @@ +Options +SymLinksIfOwnerMatch +Order Allow,Deny +Allow from all +RewriteEngine On +RewriteCond %{REQUEST_FILENAME} !-f +RewriteCond %{REQUEST_FILENAME} !-d +RewriteRule ^([A-Za-z0-9-]+)/?$ $1.html [NC,QSA] +DirectoryIndex 1.html @@ -23,4 +23,3 @@ echo "<h1>Second blog post title</h1> <h3>11/23/3333</h3> <p> blog content here! echo "<div class='cover'><img src='https://danieljon.es/waifus/media/nico.png' alt='Nico Yazawa'></div><div class='viewing'><h3>Nico Yazawa</h3>Nico's better-than-you nature and <a href='https://danieljon.es/nico'>awesome idol skill</a> makes her the perfect number one waifu. Seriously, she has it all, great looks, <a href='https://www.youtube.com/watch?v=xX050NcDNAU'>flat-as-a-pancake</a> physique and <a href='https://www.youtube.com/watch?v=T4iC52d-fVY'>the bestest catchphrase</a> ever." > content/waifus/index.txt #make content/viewings/index.txt echo "<div class='middiv'><div class='cover'><img src='https://danieljon.es/viewings/media/kon1_cover.jpg' alt='k-on! cover'></div><div class='viewing'><h3>K-On!</h3>K-On I believe was the first anime I had ever watched while not a little kid (those were cartoons, but some technically anime) and definitely was a big part in introducing me to the 'cute girls doing cute things' genre, which to this day is my most viewed and enjoyed. <br><br>The story revolves around four (later five) girls entering highschool and selecting to join the 'light music' club, that members of that club had all graduated the prior year, so they were entirely on their own. They were to eventually form a band, write and create songs that they performed at various venues. However, really it's all about the girls eating snacks and having whacky fun. <br><br>The <a href='https://www.youtube.com/watch?v=TIpA_B5khZc'>OP of K-On!</a> is one I think I will never skip, it's so energetic and fun, definitely worth a watch if you haven't seen it. The ED wasn't anything spectacular music wise, but the art was great.</div></div>" > content/viewings/index.txt - diff --git a/template.txt b/template.txt index 26bf722..160f6d5 100644 --- a/template.txt +++ b/template.txt @@ -23,10 +23,7 @@ div.cover{display:inline-block; vertical-align: top; padding-top: 28px; padding- <body> <div class="middle"> <h1>danieljon.es</h1>free of Javascript, minimal CSS.<br><br> -<a href="https://danieljon.es">index</a> <a href="https://danieljon.es/blog">blog</a> <a href="https://danieljon.es/portfolio.html">portfolio</a> <br> <br> -<a href="https://reddit.com/u/daniel_j-">reddit</a> -<a href="https://steamcommunity.com/id/imnotstraightatall/">steam</a> -<a href="https://github.com/daniel-Jones">github</a> +<a href="/">index</a> <a href="/blog">blog</a> <a href="/portfolio.html">portfolio</a> <a href="https://git.danieljon.es">git</a> {INFO} </div> {CONTENT} |