OrgWiki/go-org-orgwiki
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update blorg and add it to gh-pages. Update README

Browse source
This commit is contained in:
Niklas Fasching 2020-06-26 20:16:59 +02:00
parent e076412b29
commit d2bbcc8881
21 changed files with 746 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

19
README.org
View file

@ -1,14 +1,25 @@
* go-org [[https://travis-ci.org/niklasfasching/go-org.svg?branch=master]] * go-org [[https://travis-ci.org/niklasfasching/go-org.svg?branch=master]]
An Org mode parser in go. And soon a blog generator. An Org mode parser and static site generator in go.
Take a look at [[https://niklasfasching.github.io/go-org/][github pages]] for some examples and to try it out live in your browser. Take a look at github pages
- for [[https://niklasfasching.github.io/go-org/][org to html conversion]] examples
- for a [[https://niklasfasching.github.io/go-org/blorg][static site]] generated by blorg
- to [[https://niklasfasching.github.io/go-org/convert.html][try it out live]] in your browser
[[https://raw.githubusercontent.com/niklasfasching/go-org/master/etc/example.png]] [[https://raw.githubusercontent.com/niklasfasching/go-org/master/etc/example.png]]
Please note Please note
- the goal for the html export is to produce sensible html output, not to exactly reproduce the output of =org-html-export=. - the goal for the html export is to produce sensible html output, not to exactly reproduce the output of =org-html-export=.
- the goal for the parser is to support a reasonable subset of Org mode. Org mode is *huge* and I like to follow the 80/20 rule. - the goal for the parser is to support a reasonable subset of Org mode. Org mode is *huge* and I like to follow the 80/20 rule.
* usage * usage
** command line ** command line
#+begin_src #+begin_src bash
go-org $ go-org
USAGE: org COMMAND [ARGS]
- org render FILE OUTPUT_FORMAT
OUTPUT_FORMAT: org, html, html-chroma
- org blorg init
- org blorg build
- org blorg serve
#+end_src #+end_src
** as a library ** as a library
see [[https://github.com/niklasfasching/go-org/blob/master/main.go][main.go]] and hugo [[https://github.com/gohugoio/hugo/blob/master/markup/org/convert.go][org/convert.go]] see [[https://github.com/niklasfasching/go-org/blob/master/main.go][main.go]] and hugo [[https://github.com/gohugoio/hugo/blob/master/markup/org/convert.go][org/convert.go]]

15
blorg/config.go
View file

@ -24,6 +24,7 @@ type Config struct {
ContentDir string ContentDir string
PublicDir string PublicDir string
Address string Address string
BaseUrl string
Template *template.Template Template *template.Template
OrgConfig *org.Configuration OrgConfig *org.Configuration
} }
@ -52,7 +53,7 @@ var TemplateFuncs = map[string]interface{}{
} }
func ReadConfig(configFile string) (*Config, error) { func ReadConfig(configFile string) (*Config, error) {
address, publicDir, contentDir, workingDir := ":3000", "public", "content", filepath.Dir(configFile) baseUrl, address, publicDir, contentDir, workingDir := "/", ":3000", "public", "content", filepath.Dir(configFile)
f, err := os.Open(configFile) f, err := os.Open(configFile)
if err != nil { if err != nil {
return nil, err return nil, err
@ -63,6 +64,9 @@ func ReadConfig(configFile string) (*Config, error) {
return nil, document.Error return nil, document.Error
} }
m := document.BufferSettings m := document.BufferSettings
if !strings.HasSuffix(m["BASE_URL"], "/") {
m["BASE_URL"] += "/"
}
if v, exists := m["AUTO_LINK"]; exists { if v, exists := m["AUTO_LINK"]; exists {
orgConfig.AutoLink = v == "true" orgConfig.AutoLink = v == "true"
delete(m, "AUTO_LINK") delete(m, "AUTO_LINK")
@ -71,6 +75,9 @@ func ReadConfig(configFile string) (*Config, error) {
address = v address = v
delete(m, "ADDRESS") delete(m, "ADDRESS")
} }
if _, exists := m["BASE_URL"]; exists {
baseUrl = m["BASE_URL"]
}
if v, exists := m["PUBLIC"]; exists { if v, exists := m["PUBLIC"]; exists {
publicDir = v publicDir = v
delete(m, "PUBLIC") delete(m, "PUBLIC")
@ -87,6 +94,7 @@ func ReadConfig(configFile string) (*Config, error) {
orgConfig.MaxEmphasisNewLines = i orgConfig.MaxEmphasisNewLines = i
delete(m, "MAX_EMPHASIS_NEW_LINES") delete(m, "MAX_EMPHASIS_NEW_LINES")
} }
for k, v := range m { for k, v := range m {
if k == "OPTIONS" { if k == "OPTIONS" {
orgConfig.DefaultSettings[k] = v + " " + orgConfig.DefaultSettings[k] orgConfig.DefaultSettings[k] = v + " " + orgConfig.DefaultSettings[k]
@ -94,11 +102,13 @@ func ReadConfig(configFile string) (*Config, error) {
orgConfig.DefaultSettings[k] = v orgConfig.DefaultSettings[k] = v
} }
} }
config := &Config{ config := &Config{
ConfigFile: configFile, ConfigFile: configFile,
ContentDir: filepath.Join(workingDir, contentDir), ContentDir: filepath.Join(workingDir, contentDir),
PublicDir: filepath.Join(workingDir, publicDir), PublicDir: filepath.Join(workingDir, publicDir),
Address: address, Address: address,
BaseUrl: baseUrl,
Template: template.New("_").Funcs(TemplateFuncs), Template: template.New("_").Funcs(TemplateFuncs),
OrgConfig: orgConfig, OrgConfig: orgConfig,
} }
@ -174,7 +184,8 @@ func (c *Config) RenderContent() ([]*Page, error) {
return err return err
} }
pages = append(pages, p) pages = append(pages, p)
p.PermaLink = "/" + relPath[:len(relPath)-len(".org")] + ".html"
p.PermaLink = c.BaseUrl + relPath[:len(relPath)-len(".org")] + ".html"
return p.Render(publicPath[:len(publicPath)-len(".org")] + ".html") return p.Render(publicPath[:len(publicPath)-len(".org")] + ".html")
}) })
sort.Slice(pages, func(i, j int) bool { return pages[i].Date.After(pages[j].Date) }) sort.Slice(pages, func(i, j int) bool { return pages[i].Date.After(pages[j].Date) })

66
blorg/testdata/blorg.org vendored
View file

@ -1,7 +1,7 @@
#+AUTHOR: author #+AUTHOR: testdata
#+TITLE: blog #+TITLE: blorg
#+BASE_URL: https://www.example.com #+BASE_URL: /go-org/blorg
#+OPTIONS: toc:nil #+OPTIONS: toc:nil title:nil
#+CONTENT: ./content #+CONTENT: ./content
#+PUBLIC: ./public #+PUBLIC: ./public
@ -12,7 +12,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="stylesheet" href="/style.css" type="text/css" /> <link rel="stylesheet" href="/go-org/blorg/style.css" type="text/css" />
<title>{{ .Title }}</title> <title>{{ .Title }}</title>
</head> </head>
#+end_src #+end_src
@ -20,35 +20,12 @@
#+name: header #+name: header
#+begin_src html #+begin_src html
<header class='header'> <header class='header'>
<a class="logo" href="/">home</a> <a class="logo" href="/go-org/blorg">home</a>
<nav> <nav>
<a href="https://www.github.com/niklasfasching">github</a> <a href="https://www.github.com/niklasfasching/go-org">github</a>
<a href="/about">about</a>
</nav> </nav>
</header> </header>
#+end_src #+end_src
** index
#+name: index
#+begin_src html
<!doctype html>
<html>
{{ template "head" . }}
<body>
{{ template "header" . }}
<h1 class="title">{{ .Title }}</h1>
<ul class="posts">
{{ range .Pages }}
<li class="post">
<a href="{{ .PermaLink }}">
<date>{{ .Date.Format "02.01.2006" }}</date>
<span>{{ .Title }}</span>
</a>
</li>
{{ end }}
</ul>
</body>
</html>
#+end_src
** item ** item
#+name: item #+name: item
#+begin_src html #+begin_src html
@ -64,7 +41,7 @@
</h1> </h1>
<ul class="tags"> <ul class="tags">
{{ range .Tags }} {{ range .Tags }}
<li><a href="/tags/{{ . | Slugify }}">{{ . }}</a></li> <li><a href="/go-org/blorg/tags/{{ . | Slugify }}">{{ . }}</a></li>
{{ end }} {{ end }}
</ul> </ul>
{{ .Content }} {{ .Content }}
@ -98,3 +75,30 @@
</body> </body>
</html> </html>
#+end_src #+end_src
** index
#+name: index
#+begin_src html
<!doctype html>
<html>
{{ template "head" . }}
<body>
{{ template "header" . }}
<div class="container">
<h1 class="title">{{ .Title }}</h1>
<p>Only pages that have a date will be listed here - e.g. not <a href="about.html">about.html</a>
<ul class="posts">
{{ range .Pages }}
<li class="post">
<a href="{{ .PermaLink }}">
<date>{{ .Date.Format "02.01.2006" }}</date>
<span>{{ .Title }}</span>
</a>
</li>
{{ end }}
</ul>
<ul>
</div>
</body>
</html>
#+end_src

11
blorg/testdata/content/about.org vendored
View file

@ -1,4 +1,11 @@
#+TITLE: About #+TITLE: About
#+TAG[]: static #+TAGS[]: static
and some content Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod
tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At
vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd
gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum
dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor
invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero
eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no
sea takimata sanctus est Lorem ipsum dolor sit amet.

12
blorg/testdata/content/another-post.org vendored Normal file
View file

@ -0,0 +1,12 @@
#+TITLE: another post
#+DATE: 2020-06-24
#+TAGS[]: another
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod
tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At
vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd
gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum
dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor
invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero
eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no
sea takimata sanctus est Lorem ipsum dolor sit amet.

2
blorg/testdata/content/post.org vendored
View file

@ -1,2 +0,0 @@
#+TITLE: some post
#+TAG[]: post

12
blorg/testdata/content/some-post.org vendored Normal file
View file

@ -0,0 +1,12 @@
#+TITLE: some post
#+DATE: 2020-06-23
#+TAGS[]: some
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod
tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At
vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd
gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum
dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor
invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero
eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no
sea takimata sanctus est Lorem ipsum dolor sit amet.

191
blorg/testdata/content/style.css vendored Normal file
View file

@ -0,0 +1,191 @@
* {
box-sizing: border-box;
margin: 0;
padding: 0;
}
html {
overflow-y: scroll;
height: 100%;
font: 100%/1.5 sans-serif;
word-wrap: break-word;
margin: 0 auto;
padding: 1.5em;
}
@media (min-width: 768px) {
html {
font-size: 125%;
max-width: 42em;
} }
h1, h2, h3, h4 {
margin: 2.5rem 0 1.5rem 0;
line-height: 1.25;
color: #333;
}
a {
color: #fa6432;
text-decoration: none;
}
a:hover, a:focus, a:active {
text-decoration: underline;
}
p {
margin: 1em 0;
line-height: 1.5;
}
p code {
background-color: #eee;
padding: 0.05em 0.2em;
border: 1px solid #ccc;
}
ol, ul {
margin: 1em;
}
ol li ol, ol li ul, ul li ol, ul li ul {
margin: 0 2em;
}
ol li p, ul li p {
margin: 0;
}
dl {
font-family: monospace, monospace;
}
dl dt {
font-weight: bold;
}
dl dd {
margin: -1em 0 1em 1em;
}
img {
max-width: 100%;
display: block;
margin: 0 auto;
padding: 0.5em;
}
blockquote {
padding-left: 1em;
font-style: italic;
border-left: solid 1px #fa6432;
}
table {
font-size: 1rem;
text-align: left;
caption-side: bottom;
margin-bottom: 2em;
}
table * {
border: none;
}
table thead, table tr {
display: table;
table-layout: fixed;
width: 100%;
}
table tr:nth-child(even) {
background-color: rgba(200, 200, 200, 0.2);
}
table tbody {
display: block;
max-height: 70vh;
overflow-y: auto;
}
table td, table th {
padding: 0.25em;
}
table, .highlight > pre, pre.example {
max-height: 70vh;
margin: 1em 0;
padding: 1em;
overflow: auto;
font-size: 0.85rem;
font-family: monospace, monospace;
border: 1px dashed rgba(250, 100, 50, 0.5);
}
.title {
font-size: 2.5em;
}
.subtitle {
font-weight: normal;
font-size: 0.75em;
color: #666;
}
.tags {
margin-top: -1.5rem;
padding-bottom: 1.5em;
}
.tags li {
display: inline;
margin-right: 0.5em;
}
figure {
margin: 1em 0;
}
figure figcaption {
font-family: monospace, monospace;
font-size: 0.75em;
text-align: center;
color: grey;
}
.footnote-definition sup {
margin-left: -1.5em;
float: left;
}
.footnote-definition .footnote-body {
margin: 1em 0;
padding: 0 1em;
border: 1px dashed rgba(250, 100, 50, 0.3);
background-color: rgba(200, 200, 200, 0.2);
}
.footnote-definition .footnote-body p:only-child {
margin: 0.2em 0;
}
header {
display: flex;
justify-content: space-between;
}
header nav {
display: flex;
align-items: center;
justify-content: space-between;
}
header a + a {
margin-left: 1rem;
}
.posts {
margin: 0;
list-style: none;
}
.posts .post a {
display: block;
padding: 0.5em 0;
color: black;
}
.posts .post a:hover, .posts .post a:focus, .posts .post a:active {
text-decoration: none;
background: rgba(200, 200, 200, 0.2);
}
.posts .post date {
font-family: monospace, monospace;
font-size: 0.8rem;
vertical-align: middle;
padding-right: 2rem;
color: grey;
}

12
blorg/testdata/content/yet-another-post/index.org vendored Normal file
View file

@ -0,0 +1,12 @@
#+TITLE: yet another post
#+DATE: 2020-06-25
#+TAGS[]: yet another
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod
tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At
vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd
gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum
dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor
invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero
eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no
sea takimata sanctus est Lorem ipsum dolor sit amet.

20
blorg/testdata/public/about.html vendored
View file

@ -3,16 +3,15 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="stylesheet" href="/style.css" type="text/css" /> <link rel="stylesheet" href="/go-org/blorg/style.css" type="text/css" />
<title>About</title> <title>About</title>
</head> </head>
<body> <body>
<header class='header'> <header class='header'>
<a class="logo" href="/">home</a> <a class="logo" href="/go-org/blorg">home</a>
<nav> <nav>
<a href="https://www.github.com/niklasfasching">github</a> <a href="https://www.github.com/niklasfasching/go-org">github</a>
<a href="/about">about</a>
</nav> </nav>
</header> </header>
@ -23,11 +22,18 @@
</h1> </h1>
<ul class="tags"> <ul class="tags">
<li><a href="/go-org/blorg/tags/static">static</a></li>
</ul> </ul>
<h1 class="title"><p>About</p>
</h1>
<p> <p>
and some content</p> Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod
tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At
vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd
gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum
dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor
invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero
eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no
sea takimata sanctus est Lorem ipsum dolor sit amet.</p>
</div> </div>
</body> </body>

40
blorg/testdata/public/another-post.html vendored Normal file
View file

@ -0,0 +1,40 @@
<!doctype html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="stylesheet" href="/go-org/blorg/style.css" type="text/css" />
<title>another post</title>
</head>
<body>
<header class='header'>
<a class="logo" href="/go-org/blorg">home</a>
<nav>
<a href="https://www.github.com/niklasfasching/go-org">github</a>
</nav>
</header>
<div class="container">
<h1 class="title">another post
<br>
<span class="subtitle"></span>
</h1>
<ul class="tags">
<li><a href="/go-org/blorg/tags/another">another</a></li>
</ul>
<p>
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod
tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At
vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd
gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum
dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor
invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero
eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no
sea takimata sanctus est Lorem ipsum dolor sit amet.</p>
</div>
</body>
</html>

36
blorg/testdata/public/index.html vendored
View file

@ -3,22 +3,46 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="stylesheet" href="/style.css" type="text/css" /> <link rel="stylesheet" href="/go-org/blorg/style.css" type="text/css" />
<title>blog</title> <title>blorg</title>
</head> </head>
<body> <body>
<header class='header'> <header class='header'>
<a class="logo" href="/">home</a> <a class="logo" href="/go-org/blorg">home</a>
<nav> <nav>
<a href="https://www.github.com/niklasfasching">github</a> <a href="https://www.github.com/niklasfasching/go-org">github</a>
<a href="/about">about</a>
</nav> </nav>
</header> </header>
<h1 class="title">blog</h1> <div class="container">
<h1 class="title">blorg</h1>
<p>Only pages that have a date will be listed here - e.g. not <a href="about.html">about.html</a>
<ul class="posts"> <ul class="posts">
<li class="post">
<a href="/go-org/blorg/yet-another-post/index.html">
<date>25.06.2020</date>
<span>yet another post</span>
</a>
</li>
<li class="post">
<a href="/go-org/blorg/another-post.html">
<date>24.06.2020</date>
<span>another post</span>
</a>
</li>
<li class="post">
<a href="/go-org/blorg/some-post.html">
<date>23.06.2020</date>
<span>some post</span>
</a>
</li>
</ul> </ul>
<ul>
</div>
</body> </body>
</html> </html>

32
blorg/testdata/public/post.html vendored
View file

@ -1,32 +0,0 @@
<!doctype html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="stylesheet" href="/style.css" type="text/css" />
<title>some post</title>
</head>
<body>
<header class='header'>
<a class="logo" href="/">home</a>
<nav>
<a href="https://www.github.com/niklasfasching">github</a>
<a href="/about">about</a>
</nav>
</header>
<div class="container">
<h1 class="title">some post
<br>
<span class="subtitle"></span>
</h1>
<ul class="tags">
</ul>
<h1 class="title"><p>some post</p>
</h1>
</div>
</body>
</html>

40
blorg/testdata/public/some-post.html vendored Normal file
View file

@ -0,0 +1,40 @@
<!doctype html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="stylesheet" href="/go-org/blorg/style.css" type="text/css" />
<title>some post</title>
</head>
<body>
<header class='header'>
<a class="logo" href="/go-org/blorg">home</a>
<nav>
<a href="https://www.github.com/niklasfasching/go-org">github</a>
</nav>
</header>
<div class="container">
<h1 class="title">some post
<br>
<span class="subtitle"></span>
</h1>
<ul class="tags">
<li><a href="/go-org/blorg/tags/some">some</a></li>
</ul>
<p>
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod
tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At
vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd
gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum
dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor
invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero
eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no
sea takimata sanctus est Lorem ipsum dolor sit amet.</p>
</div>
</body>
</html>

191
blorg/testdata/public/style.css vendored Normal file
View file

@ -0,0 +1,191 @@
* {
box-sizing: border-box;
margin: 0;
padding: 0;
}
html {
overflow-y: scroll;
height: 100%;
font: 100%/1.5 sans-serif;
word-wrap: break-word;
margin: 0 auto;
padding: 1.5em;
}
@media (min-width: 768px) {
html {
font-size: 125%;
max-width: 42em;
} }
h1, h2, h3, h4 {
margin: 2.5rem 0 1.5rem 0;
line-height: 1.25;
color: #333;
}
a {
color: #fa6432;
text-decoration: none;
}
a:hover, a:focus, a:active {
text-decoration: underline;
}
p {
margin: 1em 0;
line-height: 1.5;
}
p code {
background-color: #eee;
padding: 0.05em 0.2em;
border: 1px solid #ccc;
}
ol, ul {
margin: 1em;
}
ol li ol, ol li ul, ul li ol, ul li ul {
margin: 0 2em;
}
ol li p, ul li p {
margin: 0;
}
dl {
font-family: monospace, monospace;
}
dl dt {
font-weight: bold;
}
dl dd {
margin: -1em 0 1em 1em;
}
img {
max-width: 100%;
display: block;
margin: 0 auto;
padding: 0.5em;
}
blockquote {
padding-left: 1em;
font-style: italic;
border-left: solid 1px #fa6432;
}
table {
font-size: 1rem;
text-align: left;
caption-side: bottom;
margin-bottom: 2em;
}
table * {
border: none;
}
table thead, table tr {
display: table;
table-layout: fixed;
width: 100%;
}
table tr:nth-child(even) {
background-color: rgba(200, 200, 200, 0.2);
}
table tbody {
display: block;
max-height: 70vh;
overflow-y: auto;
}
table td, table th {
padding: 0.25em;
}
table, .highlight > pre, pre.example {
max-height: 70vh;
margin: 1em 0;
padding: 1em;
overflow: auto;
font-size: 0.85rem;
font-family: monospace, monospace;
border: 1px dashed rgba(250, 100, 50, 0.5);
}
.title {
font-size: 2.5em;
}
.subtitle {
font-weight: normal;
font-size: 0.75em;
color: #666;
}
.tags {
margin-top: -1.5rem;
padding-bottom: 1.5em;
}
.tags li {
display: inline;
margin-right: 0.5em;
}
figure {
margin: 1em 0;
}
figure figcaption {
font-family: monospace, monospace;
font-size: 0.75em;
text-align: center;
color: grey;
}
.footnote-definition sup {
margin-left: -1.5em;
float: left;
}
.footnote-definition .footnote-body {
margin: 1em 0;
padding: 0 1em;
border: 1px dashed rgba(250, 100, 50, 0.3);
background-color: rgba(200, 200, 200, 0.2);
}
.footnote-definition .footnote-body p:only-child {
margin: 0.2em 0;
}
header {
display: flex;
justify-content: space-between;
}
header nav {
display: flex;
align-items: center;
justify-content: space-between;
}
header a + a {
margin-left: 1rem;
}
.posts {
margin: 0;
list-style: none;
}
.posts .post a {
display: block;
padding: 0.5em 0;
color: black;
}
.posts .post a:hover, .posts .post a:focus, .posts .post a:active {
text-decoration: none;
background: rgba(200, 200, 200, 0.2);
}
.posts .post date {
font-family: monospace, monospace;
font-size: 0.8rem;
vertical-align: middle;
padding-right: 2rem;
color: grey;
}

40
blorg/testdata/public/tags/another/index.html vendored Normal file
View file

@ -0,0 +1,40 @@
<!doctype html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="stylesheet" href="/go-org/blorg/style.css" type="text/css" />
<title>Another</title>
</head>
<body>
<header class='header'>
<a class="logo" href="/go-org/blorg">home</a>
<nav>
<a href="https://www.github.com/niklasfasching/go-org">github</a>
</nav>
</header>
<div class="container">
<h1 class="title">Another</h1>
<ul class="posts">
<li class="post">
<a href="/go-org/blorg/yet-another-post/index.html">
<date>25.06.2020</date>
<span>yet another post</span>
</a>
</li>
<li class="post">
<a href="/go-org/blorg/another-post.html">
<date>24.06.2020</date>
<span>another post</span>
</a>
</li>
</ul>
<ul>
</div>
</body>
</html>

15
blorg/testdata/public/tag/post/index.html → blorg/testdata/public/tags/some/index.html vendored
View file

@ -3,26 +3,25 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="stylesheet" href="/style.css" type="text/css" /> <link rel="stylesheet" href="/go-org/blorg/style.css" type="text/css" />
<title>Post</title> <title>Some</title>
</head> </head>
<body> <body>
<header class='header'> <header class='header'>
<a class="logo" href="/">home</a> <a class="logo" href="/go-org/blorg">home</a>
<nav> <nav>
<a href="https://www.github.com/niklasfasching">github</a> <a href="https://www.github.com/niklasfasching/go-org">github</a>
<a href="/about">about</a>
</nav> </nav>
</header> </header>
<div class="container"> <div class="container">
<h1 class="title">Post</h1> <h1 class="title">Some</h1>
<ul class="posts"> <ul class="posts">
<li class="post"> <li class="post">
<a href="/post.html"> <a href="/go-org/blorg/some-post.html">
<date>01.01.1970</date> <date>23.06.2020</date>
<span>some post</span> <span>some post</span>
</a> </a>
</li> </li>

9
blorg/testdata/public/tag/static/index.html → blorg/testdata/public/tags/static/index.html vendored
View file

@ -3,16 +3,15 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="stylesheet" href="/style.css" type="text/css" /> <link rel="stylesheet" href="/go-org/blorg/style.css" type="text/css" />
<title>Static</title> <title>Static</title>
</head> </head>
<body> <body>
<header class='header'> <header class='header'>
<a class="logo" href="/">home</a> <a class="logo" href="/go-org/blorg">home</a>
<nav> <nav>
<a href="https://www.github.com/niklasfasching">github</a> <a href="https://www.github.com/niklasfasching/go-org">github</a>
<a href="/about">about</a>
</nav> </nav>
</header> </header>
@ -21,7 +20,7 @@
<ul class="posts"> <ul class="posts">
<li class="post"> <li class="post">
<a href="/about.html"> <a href="/go-org/blorg/about.html">
<date>01.01.1970</date> <date>01.01.1970</date>
<span>About</span> <span>About</span>
</a> </a>

33
blorg/testdata/public/tags/yet/index.html vendored Normal file
View file

@ -0,0 +1,33 @@
<!doctype html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="stylesheet" href="/go-org/blorg/style.css" type="text/css" />
<title>Yet</title>
</head>
<body>
<header class='header'>
<a class="logo" href="/go-org/blorg">home</a>
<nav>
<a href="https://www.github.com/niklasfasching/go-org">github</a>
</nav>
</header>
<div class="container">
<h1 class="title">Yet</h1>
<ul class="posts">
<li class="post">
<a href="/go-org/blorg/yet-another-post/index.html">
<date>25.06.2020</date>
<span>yet another post</span>
</a>
</li>
</ul>
<ul>
</div>
</body>
</html>

42
blorg/testdata/public/yet-another-post/index.html vendored Normal file
View file

@ -0,0 +1,42 @@
<!doctype html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="stylesheet" href="/go-org/blorg/style.css" type="text/css" />
<title>yet another post</title>
</head>
<body>
<header class='header'>
<a class="logo" href="/go-org/blorg">home</a>
<nav>
<a href="https://www.github.com/niklasfasching/go-org">github</a>
</nav>
</header>
<div class="container">
<h1 class="title">yet another post
<br>
<span class="subtitle"></span>
</h1>
<ul class="tags">
<li><a href="/go-org/blorg/tags/yet">yet</a></li>
<li><a href="/go-org/blorg/tags/another">another</a></li>
</ul>
<p>
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod
tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At
vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd
gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum
dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor
invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero
eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no
sea takimata sanctus est Lorem ipsum dolor sit amet.</p>
</div>
</body>
</html>

3
etc/generate-gh-pages
View file

@ -156,3 +156,6 @@ cp etc/_wasm.go gh-pages/wasm.go
GOOS=js GOARCH=wasm go build -o gh-pages/main.wasm gh-pages/wasm.go GOOS=js GOARCH=wasm go build -o gh-pages/main.wasm gh-pages/wasm.go
rm gh-pages/wasm.go rm gh-pages/wasm.go
cp $(go env GOROOT)/misc/wasm/wasm_exec.js gh-pages/wasm_exec.js cp $(go env GOROOT)/misc/wasm/wasm_exec.js gh-pages/wasm_exec.js
mkdir -p gh-pages/blorg
cp -r blorg/testdata/public/* gh-pages/blorg/