add talks support (#40)

* add talks support

* gosimplify
This commit is contained in:
Cadey Ratio 2019-05-21 21:47:09 -04:00 committed by GitHub
parent a275fc754b
commit d64c666255
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 267 additions and 15 deletions

View File

@ -2,8 +2,8 @@ FROM xena/go:1.12.1 AS build
ENV GOPROXY https://cache.greedo.xeserv.us ENV GOPROXY https://cache.greedo.xeserv.us
COPY . /site COPY . /site
WORKDIR /site WORKDIR /site
RUN CGO_ENABLED=0 go test ./... RUN CGO_ENABLED=0 go test -v ./...
RUN CGO_ENABLED=0 GOBIN=/root go install ./cmd/site RUN CGO_ENABLED=0 GOBIN=/root go install -v ./cmd/site
FROM xena/alpine FROM xena/alpine
EXPOSE 5000 EXPOSE 5000
@ -13,6 +13,7 @@ COPY --from=build /root/site .
COPY ./static /site/static COPY ./static /site/static
COPY ./templates /site/templates COPY ./templates /site/templates
COPY ./blog /site/blog COPY ./blog /site/blog
COPY ./talks /site/talks
COPY ./css /site/css COPY ./css /site/css
COPY ./app /app COPY ./app /app
COPY ./app.json . COPY ./app.json .

View File

@ -66,9 +66,53 @@ func (s *Site) renderTemplatePage(templateFname string, data interface{}) http.H
var postView = promauto.NewCounterVec(prometheus.CounterOpts{ var postView = promauto.NewCounterVec(prometheus.CounterOpts{
Name: "posts_viewed", Name: "posts_viewed",
Help: "The number of views per post", Help: "The number of views per post or talk",
}, []string{"base"}) }, []string{"base"})
func (s *Site) showTalk(w http.ResponseWriter, r *http.Request) {
if r.RequestURI == "/talks/" {
http.Redirect(w, r, "/talks", http.StatusSeeOther)
return
}
cmp := r.URL.Path[1:]
var p blog.Post
var found bool
for _, pst := range s.Talks {
if pst.Link == cmp {
p = pst
found = true
}
}
if !found {
w.WriteHeader(http.StatusNotFound)
s.renderTemplatePage("error.html", "no such post found: "+r.RequestURI).ServeHTTP(w, r)
return
}
const dateFormat = `2006-01-02`
h := s.renderTemplatePage("talkpost.html", struct {
Title string
Link string
BodyHTML template.HTML
Date string
SlidesLink string
}{
Title: p.Title,
Link: p.Link,
BodyHTML: p.BodyHTML,
Date: p.Date.Format(dateFormat),
SlidesLink: p.SlidesLink,
})
if h == nil {
panic("how did we get here?")
}
h.ServeHTTP(w, r)
}
func (s *Site) showPost(w http.ResponseWriter, r *http.Request) { func (s *Site) showPost(w http.ResponseWriter, r *http.Request) {
if r.RequestURI == "/blog/" { if r.RequestURI == "/blog/" {
http.Redirect(w, r, "/blog", http.StatusSeeOther) http.Redirect(w, r, "/blog", http.StatusSeeOther)

View File

@ -6,6 +6,7 @@ import (
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"os" "os"
"sort"
"time" "time"
"christine.website/internal/blog" "christine.website/internal/blog"
@ -54,6 +55,7 @@ func main() {
// Site is the parent object for https://christine.website's backend. // Site is the parent object for https://christine.website's backend.
type Site struct { type Site struct {
Posts blog.Posts Posts blog.Posts
Talks blog.Posts
Resume template.HTML Resume template.HTML
rssFeed *feeds.Feed rssFeed *feeds.Feed
@ -134,12 +136,24 @@ func Build() (*Site, error) {
xffmw: xffmw, xffmw: xffmw,
} }
posts, err := blog.LoadPosts("./blog/") posts, err := blog.LoadPosts("./blog/", "blog")
if err != nil { if err != nil {
return nil, err return nil, err
} }
s.Posts = posts s.Posts = posts
talks, err := blog.LoadPosts("./talks", "talks")
if err != nil {
return nil, err
}
s.Talks = talks
var everything blog.Posts
everything = append(everything, posts...)
everything = append(everything, talks...)
sort.Sort(sort.Reverse(everything))
resumeData, err := ioutil.ReadFile("./static/resume/resume.md") resumeData, err := ioutil.ReadFile("./static/resume/resume.md")
if err != nil { if err != nil {
return nil, err return nil, err
@ -147,7 +161,7 @@ func Build() (*Site, error) {
s.Resume = template.HTML(blackfriday.Run(resumeData)) s.Resume = template.HTML(blackfriday.Run(resumeData))
for _, item := range s.Posts { for _, item := range everything {
s.rssFeed.Items = append(s.rssFeed.Items, &feeds.Item{ s.rssFeed.Items = append(s.rssFeed.Items, &feeds.Item{
Title: item.Title, Title: item.Title,
Link: &feeds.Link{Href: "https://christine.website/" + item.Link}, Link: &feeds.Link{Href: "https://christine.website/" + item.Link},
@ -184,11 +198,13 @@ func Build() (*Site, error) {
s.mux.Handle("/metrics", promhttp.Handler()) s.mux.Handle("/metrics", promhttp.Handler())
s.mux.Handle("/resume", middleware.Metrics("resume", s.renderTemplatePage("resume.html", s.Resume))) s.mux.Handle("/resume", middleware.Metrics("resume", s.renderTemplatePage("resume.html", s.Resume)))
s.mux.Handle("/blog", middleware.Metrics("blog", s.renderTemplatePage("blogindex.html", s.Posts))) s.mux.Handle("/blog", middleware.Metrics("blog", s.renderTemplatePage("blogindex.html", s.Posts)))
s.mux.Handle("/talks", middleware.Metrics("talks", s.renderTemplatePage("talkindex.html", s.Talks)))
s.mux.Handle("/contact", middleware.Metrics("contact", s.renderTemplatePage("contact.html", nil))) s.mux.Handle("/contact", middleware.Metrics("contact", s.renderTemplatePage("contact.html", nil)))
s.mux.Handle("/blog.rss", middleware.Metrics("blog.rss", http.HandlerFunc(s.createFeed))) s.mux.Handle("/blog.rss", middleware.Metrics("blog.rss", http.HandlerFunc(s.createFeed)))
s.mux.Handle("/blog.atom", middleware.Metrics("blog.atom", http.HandlerFunc(s.createAtom))) s.mux.Handle("/blog.atom", middleware.Metrics("blog.atom", http.HandlerFunc(s.createAtom)))
s.mux.Handle("/blog.json", middleware.Metrics("blog.json", http.HandlerFunc(s.createJSONFeed))) s.mux.Handle("/blog.json", middleware.Metrics("blog.json", http.HandlerFunc(s.createJSONFeed)))
s.mux.Handle("/blog/", middleware.Metrics("blogpost", http.HandlerFunc(s.showPost))) s.mux.Handle("/blog/", middleware.Metrics("blogpost", http.HandlerFunc(s.showPost)))
s.mux.Handle("/talks/", middleware.Metrics("talks", http.HandlerFunc(s.showTalk)))
s.mux.Handle("/css/", http.FileServer(http.Dir("."))) s.mux.Handle("/css/", http.FileServer(http.Dir(".")))
s.mux.Handle("/static/", http.FileServer(http.Dir("."))) s.mux.Handle("/static/", http.FileServer(http.Dir(".")))
s.mux.HandleFunc("/sw.js", func(w http.ResponseWriter, r *http.Request) { s.mux.HandleFunc("/sw.js", func(w http.ResponseWriter, r *http.Request) {

View File

@ -20,6 +20,7 @@ type Post struct {
Summary string `json:"summary,omitifempty"` Summary string `json:"summary,omitifempty"`
Body string `json:"-"` Body string `json:"-"`
BodyHTML template.HTML `json:"body"` BodyHTML template.HTML `json:"body"`
SlidesLink string `json:"slides_link"`
Date time.Time Date time.Time
DateString string `json:"date"` DateString string `json:"date"`
} }
@ -37,10 +38,11 @@ func (p Posts) Less(i, j int) bool {
func (p Posts) Swap(i, j int) { p[i], p[j] = p[j], p[i] } func (p Posts) Swap(i, j int) { p[i], p[j] = p[j], p[i] }
// LoadPosts loads posts for a given directory. // LoadPosts loads posts for a given directory.
func LoadPosts(path string) (Posts, error) { func LoadPosts(path string, prepend string) (Posts, error) {
type postFM struct { type postFM struct {
Title string Title string
Date string Date string
SlidesLink string `yaml:"slides_link"`
} }
var result Posts var result Posts
@ -78,13 +80,17 @@ func LoadPosts(path string) (Posts, error) {
return err return err
} }
fname := filepath.Base(path)
fname = strings.TrimSuffix(fname, filepath.Ext(fname))
p := Post{ p := Post{
Title: fm.Title, Title: fm.Title,
Date: date, Date: date,
DateString: fm.Date, DateString: fm.Date,
Link: strings.Split(path, ".")[0], Link: filepath.Join(prepend, fname),
Body: string(remaining), Body: string(remaining),
BodyHTML: template.HTML(output), BodyHTML: template.HTML(output),
SlidesLink: fm.SlidesLink,
} }
result = append(result, p) result = append(result, p)

View File

@ -5,8 +5,44 @@ import (
) )
func TestLoadPosts(t *testing.T) { func TestLoadPosts(t *testing.T) {
_, err := LoadPosts("../../blog") posts, err := LoadPosts("../../blog", "blog")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
for _, post := range posts {
t.Run(post.Link, post.test)
}
}
func TestLoadTalks(t *testing.T) {
talks, err := LoadPosts("../../talks", "talks")
if err != nil {
t.Fatal(err)
}
for _, talk := range talks {
t.Run(talk.Link, talk.test)
if talk.SlidesLink == "" {
t.Errorf("talk %s (%s) doesn't have a slides link", talk.Title, talk.DateString)
}
}
}
func (p Post) test(t *testing.T) {
if p.Title == "" {
t.Error("no post title")
}
if p.DateString == "" {
t.Error("no date")
}
if p.Link == "" {
t.Error("no link")
}
if p.Body == "" {
t.Error("no body")
}
} }

View File

@ -5,11 +5,13 @@ self.addEventListener('install', function(event) {
event.waitUntil(preLoad()); event.waitUntil(preLoad());
}); });
const cacheName = "cache-2019-05-21";
var preLoad = function(){ var preLoad = function(){
console.log('[PWA Builder] Install Event processing'); console.log('[PWA Builder] Install Event processing');
return caches.open('offline').then(function(cache) { return caches.open(cacheName).then(function(cache) {
console.log('[PWA Builder] Cached index and offline page during Install'); console.log('[PWA Builder] Cached index and offline page during Install');
return cache.addAll(['/blog/', '/blog', '/', '/contact', '/resume']); return cache.addAll(['/blog/', '/blog', '/', '/contact', '/resume', '/talks']);
}); });
}; };
@ -37,7 +39,7 @@ var checkResponse = function(request){
}; };
var addToCache = function(request){ var addToCache = function(request){
return caches.open('offline').then(function (cache) { return caches.open(cacheName).then(function (cache) {
return fetch(request).then(function (response) { return fetch(request).then(function (response) {
console.log('[PWA Builder] add page to offline: ' + response.url); console.log('[PWA Builder] add page to offline: ' + response.url);
return cache.put(request, response); return cache.put(request, response);
@ -46,7 +48,7 @@ var addToCache = function(request){
}; };
var returnFromCache = function(request){ var returnFromCache = function(request){
return caches.open('offline').then(function (cache) { return caches.open(cacheName).then(function (cache) {
return cache.match(request).then(function (matching) { return cache.match(request).then(function (matching) {
if(!matching || matching.status == 404) { if(!matching || matching.status == 404) {
return cache.match('offline.html'); return cache.match('offline.html');

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,13 @@
---
title: "IRC: Why it Failed"
date: 2018-05-17
slides_link: /static/talks/irc-why-it-failed.pdf
---
# IRC: Why it Failed
A brief discussion of the IRC protocol and why it has failed in today's internet.
Originally presented at the Pony Developers panel at Everfree Northwest, 2018.
Please check out [pony.dev](https://pony.dev) for more information.

View File

@ -0,0 +1,11 @@
---
title: "Thinking Different"
date: 2018-11-03
slides_link: /static/talks/thinking-different.pdf
---
# Thinking Different
A look over [ilo Kesi](https://github.com/Xe/x/tree/master/discord/ilo-kesi), a chatbot of mine that parses commands from the grammar of [Toki Pona](http://tokipona.org).
Originally presented privately at an internal work get-together for Heroku.

View File

@ -59,7 +59,7 @@
{{ template "scripts" . }} {{ template "scripts" . }}
<div class="container"> <div class="container">
<header> <header>
<p><a href="/">Christine Dodrill</a> - <a href="/blog">Blog</a> - <a href="/contact">Contact</a> - <a href="/resume">Resume</a> | <a target="_blank" rel="noopener noreferrer" href="https://graphviz.christine.website">GraphViz</a> - <a target="_blank" rel="noopener noreferrer" href="https://when-then-zen.christine.website/">When Then Zen</a></p> <p><a href="/">Christine Dodrill</a> - <a href="/blog">Blog</a> - <a href="/contact">Contact</a> - <a href="/resume">Resume</a> - <a href="/talks">Talks</a> | <a target="_blank" rel="noopener noreferrer" href="https://graphviz.christine.website">GraphViz</a> - <a target="_blank" rel="noopener noreferrer" href="https://when-then-zen.christine.website/">When Then Zen</a></p>
</header> </header>
<div class="snowframe"> <div class="snowframe">

20
templates/talkindex.html Normal file
View File

@ -0,0 +1,20 @@
{{ define "title" }}
<title>Blog - Christine Dodrill</title>
{{ end }}
{{ define "content" }}
<h1>Talks</h1>
<p>Here is a link to all of the talks I have done at conferences. Each of these will have links to the slides (PDF) as well as some brief information about them.</p>
<p>If you have a compatible reader, be sure to check out my <a href="/blog.rss">RSS Feed</a> for automatic updates. Also check out the <a href="/blog.json">JSONFeed</a>.</p>
<p>
<ul>
{{ range . }}
<li>{{ .DateString }} - <a href="{{ .Link }}">{{ .Title }}</a></li>
{{ end }}
</ul>
</p>
{{ end }}

103
templates/talkpost.html Normal file
View File

@ -0,0 +1,103 @@
{{ define "title" }}
<title>{{ .Title }} - Christine Dodrill</title>
<!-- Twitter -->
<meta name="twitter:card" content="summary" />
<meta name="twitter:site" content="@theprincessxena" />
<meta name="twitter:title" content="{{ .Title }}" />
<meta name="twitter:description" content="Posted on {{ .Date }}" />
<!-- Facebook -->
<meta property="og:type" content="website" />
<meta property="og:title" content="{{ .Title }}" />
<meta property="og:site_name" content="Talk by Christine Dodrill" />
<!-- Description -->
<meta name="description" content="{{ .Title }} - Talk by Christine Dodrill" />
<meta name="author" content="Christine Dodrill">
<link rel="canonical" href="https://christine.website/{{ .Link }}">
<script type="application/ld+json">
{
"@context": "http://schema.org",
"@type": "Article",
"headline": "{{ .Title }}",
"image": "https://christine.website/static/img/avatar.png",
"url": "https://christine.website/{{ .Link }}",
"datePublished": "{{ .Date }}",
"mainEntityOfPage": {
"@type": "WebPage",
"@id": "https://christine.website/{{ .Link }}"
},
"author": {
"@type": "Person",
"name": "Christine Dodrill"
},
"publisher": {
"@type": "Person",
"name": "Christine Dodrill"
}
}
</script>
{{ end }}
{{ define "content" }}
{{ .BodyHTML }}
<a href="{{ .SlidesLink }}">Link to the slides</a>
<hr />
<!-- The button that should be clicked. -->
<button onclick="share_on_mastodon()">Share on Mastodon</button>
<script>
// The actual function. Set this as an onclick function for your "Share on Mastodon" button
function share_on_mastodon() {
// Prefill the form with the user's previously-specified Mastodon instance, if applicable
var default_url = localStorage['mastodon_instance'];
// If there is no cached instance/domain, then insert a "https://" with no domain at the start of the prompt.
if (!default_url)
default_url = "https://";
var instance = prompt("Enter your instance's address: (ex: https://linuxrocks.online)", default_url);
if (instance) {
// Handle URL formats
if ( !instance.startsWith("https://") && !instance.startsWith("http://") )
instance = "https://" + instance;
// Get the current page's URL
var url = window.location.href;
// Get the page title from the og:title meta tag, if it exists.
var title = document.querySelectorAll('meta[property="og:title"]')[0].getAttribute("content");
// Otherwise, use the <title> tag as the title
if (!title) var title = document.getElementsByTagName("title")[0].innerHTML;
// Handle slash
if ( !instance.endsWith("/") )
instance = instance + "/";
// Cache the instance/domain for future requests
localStorage['mastodon_instance'] = instance;
// Hashtags
var hashtags = "#blogpost";
// Tagging users, such as offical accounts or the author of the post
var author = "@cadey@mst3k.interlinked.me";
// Create the Share URL
// https://someinstance.tld/share?text=URL%20encoded%20text
mastodon_url = instance + "share?text=" + encodeURIComponent(title + "\n\n" + url + "\n\n" + hashtags + " " + author);
// Open a new window at the share location
window.open(mastodon_url, '_blank');
}
}
</script>
{{ end }}