~evanj/evanjon.es

df429548e7a531dc916e2d3bc856c5e24115ff6f — Evan M Jones a month ago 723a53a
Feat(favicon+css+html): Adding new favicon. Tweaking CSS/HTML.
M evanjon.es.go => evanjon.es.go +1 -1
@@ 89,7 89,7 @@ func (app *App) ServeHTTP(w http.ResponseWriter, r *http.Request) {
		app.cacheRouter.ServeHTTP(w, r)
		break
	case "/favicon.ico":
		http.Redirect(w, r, "https://favicon.evanjon.es/0/0/255/32/favicon.ico", http.StatusTemporaryRedirect)
		http.Redirect(w, r, "https://e3.evanjon.es/29d0f596-0ff0-4adf-61d6-9a3934532e77.ico", http.StatusTemporaryRedirect)
		break
	case "/ping":
		app.baseRouter.ServeHTTP(w, r)

M internal/s/tmpl/css/main.css => internal/s/tmpl/css/main.css +1 -0
@@ 48,6 48,7 @@ body.list > main > a:hover > section > h2 {
}

body.list > main > a > section > h2 {
  margin-top: 0;
  margin-bottom: 0;
}


M internal/s/tmpl/html/index.html => internal/s/tmpl/html/index.html +1 -1
@@ 12,7 12,7 @@
      <table> 
        <tr>
          <td valign=bottom width=94 height=79>
            <img src="//e3.evanjon.es/b889bd3e-4404-49b7-6a25-6ce2838868f6.jpg"/>
            <img alt="The 'brand' image of the website; it's a close of up Charles' face from Eureka 7" src="//e3.evanjon.es/b889bd3e-4404-49b7-6a25-6ce2838868f6.jpg"/>
          </td>
          <td valign=bottom>
            <h1><a href='/'>{{ .Item.Name }}</a></h1>

M internal/s/tmpl/html/item.html => internal/s/tmpl/html/item.html +1 -1
@@ 12,7 12,7 @@
      <table> 
        <tr>
          <td valign=bottom width=94 height=79>
            <img src="//e3.evanjon.es/b889bd3e-4404-49b7-6a25-6ce2838868f6.jpg"/>
            <img alt="The 'brand' image of the website; it's a close of up Charles' face from Eureka 7" src="//e3.evanjon.es/b889bd3e-4404-49b7-6a25-6ce2838868f6.jpg"/>
          </td>
          <td valign=bottom>
            <h1><a href='/{{ .Item.Slug }}'>{{ .Item.Name }}</a></h1>

M internal/s/tmpl/tmpls_embed.go => internal/s/tmpl/tmpls_embed.go +3 -202
@@ 57,6 57,7 @@ body.list > main > a:hover > section > h2 {
}

body.list > main > a > section > h2 {
  margin-top: 0;
  margin-bottom: 0;
}



@@ 152,45 153,10 @@ img {
}
`

	tmpls["html/_footer.html"] = `<!--
<footer>
  <div>
    <p>&copy 2015-2020 Evan Jones</p>
    <p>Powered by <a href='https://cms.evanjon.es'>https://cms.evanjon.es/</a></p>
  </div>
  <div>
    <a href='https://git.sr.ht/~evanj/evanjon.es/'>{{ template "img/_code-24px.svg" }}</a>
    <a href='mailto:me@evanjon.es'>{{ template "img/_email-24px.svg" }}</a>
    <a href='/rss'>{{ template "img/_rss_feed-24px.svg" }}</a>
    <a href='/static/me@evanjon.es.gpg'>{{ template "img/_vpn_key-24px.svg" }}</a>
  </div>
</footer>
-->

<footer class=list>
  <strong>Footer Things</strong>
  <div class=thing>&copy 2015-2020 Evan Jones</div>
  <div class=thing>Powered by <a href='https://cms.evanjon.es'>https://cms.evanjon.es/</a></div>
  <div class=thing><a href='https://git.sr.ht/~evanj/evanjon.es/'>Source Code</a>
  <div class=thing><a href='mailto:me@evanjon.es'>Email</a>
  <div class=thing><a href='/rss'>RSS Feed</a>
  <div class=thing><a href='//e3.evanjon.es/25dce601-7dab-4647-6f54-4d2710ef18fa.gpg'>Public Key</a>
</footer>

`

	tmpls["html/_head.html"] = `<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
`

	tmpls["html/_header.html"] = `<header>
  <a href='/'>
    <h1>{{ .Item.Name }}</h1>
    <p>/{{ .Item.Slug }}</p>
  </a>
</header>
`

	tmpls["html/index.html"] = `<!DOCTYPE html>
<html lang=en>
<head>


@@ 205,7 171,7 @@ img {
      <table> 
        <tr>
          <td valign=bottom width=94 height=79>
            <img src="//e3.evanjon.es/b889bd3e-4404-49b7-6a25-6ce2838868f6.jpg"/>
            <img alt="The 'brand' image of the website; it's a close of up Charles' face from Eureka 7" src="//e3.evanjon.es/b889bd3e-4404-49b7-6a25-6ce2838868f6.jpg"/>
          </td>
          <td valign=bottom>
            <h1><a href='/'>{{ .Item.Name }}</a></h1>


@@ 227,87 193,6 @@ img {
</html>
`

	tmpls["html/index.html.backup"] = `<!DOCTYPE html>
<html lang=en>
  <head>
    {{ template "html/_head.html" }}
    <title>Evan's Site</title>
    <meta name=description content="{{ .Item.Short }}">
  </head>
  <body class=index>
    <style>{{ template "css/main.css" }}</style>

    <div>
      <header>
        <!--
        <img src='/static/me.jpg' />
        -->
        <h1>Evan Jones</h1>
        <a href='mailto:me@evanjon.es'>me@evanjon.es</a>
        <p>ID, USA</p>
        <br/>
        <blockquote>Blogs are a conversation no one wanted to have with you.</blockquote>
        <cite>Michelle Wolf</cite>
      </header>
  
      <br/>
  
      <main>
        <article>
          {{ .Item.Desc }}
        </article>
      </main>
  
      <br/>
  
      <nav class=list>
        <strong>Website Links</strong>
        <div class=thing><a href='/blog'>Blog posts</a></div>
        <div class=thing><a href='/about'>About me</a></div>
        <div class=thing><a href='/quote'>List of quotes I like</a></div>
        <div class=thing><a href='/anime'>Anime recommendations</a></div>
        <div class=thing><a href='/links'>Cool things on the Internet</a></div>
      </nav>
  
      <br/>
  
      <aside class=list>
        <strong>Some Projects</strong>
  
        <div class=thing><a href='https://git.sr.ht/~evanj/cms'>cms</a></div>
        <div class=thing>A cms for most.</div>
  
        <div class=thing><a href='https://git.sr.ht/~evanj/e3'>e3</a></div>
        <div class=thing>Bare-bones object storage.</div>
  
        <div class=thing><a href='https://git.sr.ht/~evanj/zan'>Zanzibar</a></div>
        <div class=thing>A programming language that cares about your fingers. No implementation yet.</div>
  
        <div class=thing><a href='https://git.sr.ht/~evanj/wtf2'>wtf2</a></div>
        <div class=thing>A modern version of <a href='https://linux.die.net/man/6/wtf'>wtf(6)</a>.</div>
  
        <div class=thing><a href='https://git.sr.ht/~evanj/ascii'>ASCII</a>
        <div class=thing>An API to transform images to ASCII.</div>
  
        <div class=thing><a href='https://git.sr.ht/~evanj/ego'>Ego</a>
        <div class=thing>Evan's Go, a fork of the Go programming language to add the maybe monad (a la Rust result).</div>
  
        <div class=thing><a href='https://git.sr.ht/~evanj/smscp'>smscp</a></div>
        <div class=thing>The easiest way to copy text snippets to and from your devices.</div>
  
        <div class=thing><a href='https://git.sr.ht/~evanj/wigly'>Wigly</a></div>
        <div class=thing>A tiny React inspired UI library for the web.</div>
  
      </aside>
  
      <br/>

      {{ template "html/_footer.html" }}
    </div>
  </body>
</html>
`

	tmpls["html/item.html"] = `<!DOCTYPE html>
<html lang=en>
<head>


@@ 322,7 207,7 @@ img {
      <table> 
        <tr>
          <td valign=bottom width=94 height=79>
            <img src="//e3.evanjon.es/b889bd3e-4404-49b7-6a25-6ce2838868f6.jpg"/>
            <img alt="The 'brand' image of the website; it's a close of up Charles' face from Eureka 7" src="//e3.evanjon.es/b889bd3e-4404-49b7-6a25-6ce2838868f6.jpg"/>
          </td>
          <td valign=bottom>
            <h1><a href='/{{ .Item.Slug }}'>{{ .Item.Name }}</a></h1>


@@ 343,49 228,6 @@ img {
</html>
`

	tmpls["html/item.html.backup"] = `<!DOCTYPE html>
<html lang=en>
  <head>
    {{ template "html/_head.html" }}
    <title>{{ .Item.Name }}</title>
    <meta name=description content="{{ .Item.Short }}">
  </head>
  <body class=item>
    <style>{{ template "css/main.css" }}</style>

    <div>
      <header>
        <h1>{{ .Item.Name }}</h1>
      </header>
  
      <nav>
        {{ if .ShowDate }}
        <a href='/blog'>Go to blog post list</a>
        {{ else }}
        <a href='/'>Go to homepage</a>
        {{ end }}
      </nav>
  
      <br/>
  
      {{ if .ShowDate }}
      <i>{{ .Item.PrettyDate }}</i>
      {{ end }}
  
      <br/>
  
      <main>
        <article>
          {{ .Item.Desc }}
        </article>
      </main>
  
      <footer><!-- for margin -->&nbsp;</footer>
    </div>
  </body>
</html>
`

	tmpls["html/list.html"] = `<!DOCTYPE html>
<html lang=en>
<head>


@@ 412,47 254,6 @@ img {
</html>
`

	tmpls["html/list.html.backup"] = `<!DOCTYPE html>
<html lang=en>
  <head>
    {{ template "html/_head.html" }}
    <title>Evan's Blog</title>
  </head>
  <body class=list>
    <style>{{ template "css/main.css" }}</style>

    <div>
      <header>
        <h1>Blog Posts</h1>
      </header>
  
      <nav>
        <a href='/'>Go to homepage</a>
      </nav>
  
      <br/> 
  
      <main>
        <article>
          {{ range .List }}
          <a class=link href='/{{ .Slug }}'>
            <section class=list>
              <div><strong class=active>{{ .Name }}</strong></div>
              <i class='inactive thing'>{{ .PrettyDate }}</i>
              <p class='inactive thing'>{{ .Short }}</p>
            </section>
          </a>
          <br/> 
          {{ end }}
        </article>
      </main>
  
      <footer><!-- for margin -->&nbsp;</footer>
    </div>
  </body>
</html>
`

	tmpls["img/_code-24px.svg"] = `<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M9.4 16.6L4.8 12l4.6-4.6L8 6l-6 6 6 6 1.4-1.4zm5.2 0l4.6-4.6-4.6-4.6L16 6l6 6-6 6-1.4-1.4z"/></svg>`

	tmpls["img/_email-24px.svg"] = `<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M20 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm0 4l-8 5-8-5V6l8 5 8-5v2z"/><path d="M0 0h24v24H0z" fill="none"/></svg>`