diff --git a/main.go b/main.go index 699fc9c7e531aab231d5297efcfa4f50cdf0d5b5..f0c5c9ee09a29fe144c863df27be02a3a1bf7a3e 100644 --- a/main.go +++ b/main.go @@ -7,9 +8,7 @@ "embed" "flag" "fmt" //go:generate templ generate //go:generate templ generate -//go:generate templ generate - "net/http" "os" "path/filepath" @@ -23,8 +22,6 @@ func maine() error { fs := flag.NewFlagSet("blog", flag.ExitOnError) outFlag := fs.String("out", "out", "Output directory") fs.StringVar(outFlag, "o", *outFlag, "--out") - serveFlag := fs.Bool("serve", false, "Serve output dir after generation") - fs.BoolVar(serveFlag, "s", *serveFlag, "--serve") if err := fs.Parse(os.Args[1:]); err != nil { return err } @@ -58,29 +55,14 @@ return err } -//go:generate go run . - if err := copyFile(sakuraDst, "sakura.css"); err != nil { - return err - } - - if err != nil { return err } defer fi.Close() - if err := IndexTemplate(articles).Render(context.Background(), fi); err != nil { - return err -//go:generate go run . "embed" - - if *serveFlag { - http.Handle("/", http.FileServer(http.Dir("out"))) - http.ListenAndServe(":8080", nil) - } - - return nil +package main } func writeArticle(out string, article Article) error { @@ -113,26 +95,6 @@ if err := CSS.WriteCSS(fi, styles.Get("catppuccin-mocha")); err != nil { return err } fi.WriteString("}") - return nil -} - -func copyFile(dst, src string) error { - srcFi, err := os.Open(src) - if err != nil { - return err - } - defer srcFi.Close() - - dstFi, err := os.Create(dst) - if err != nil { - return err - } - defer dstFi.Close() - - if _, err := io.Copy(dstFi, srcFi); err != nil { - return err - } - return nil } diff --git a/sakura.css b/sakura.css deleted file mode 100644 index 22b5a0a468044f3b8c4e4730e8439938c097c6c1..0000000000000000000000000000000000000000 --- a/sakura.css +++ /dev/null @@ -1,245 +0,0 @@ -/* Sakura.css v1.5.0 - * ================ - * Minimal css theme. - * Project: https://github.com/oxalorg/sakura/ - */ - -:root { - --blossom: #179299; - --fade: #ea76cb; - --bg: #eff1f5; - --bg-alt: #dce0e8; - --text: #4c4f69; -} - -@media (prefers-color-scheme: dark) { - :root { - --blossom: #94e2d5; - --fade: #f5c2e7; - --bg: #1e1e2e; - --bg-alt: #11111b; - --text: #cdd6f4; - } -} - -/* Body */ -html { - font-size: 62.5%; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif; -} - -body { - font-size: 1.8rem; - line-height: 1.618; - max-width: 38em; - margin: auto; - color: var(--text); - background-color: var(--bg); - padding: 13px; -} - -@media (max-width: 684px) { - body { - font-size: 1.53rem; - } -} -@media (max-width: 382px) { - body { - font-size: 1.35rem; - } -} -h1, h2, h3, h4, h5, h6 { - line-height: 1.1; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif; - font-weight: 700; - margin-top: 3rem; - margin-bottom: 1.5rem; - overflow-wrap: break-word; - word-wrap: break-word; - -ms-word-break: break-all; - word-break: break-word; -} - -h1 { - font-size: 2.35em; -} - -h2 { - font-size: 2em; -} - -h3 { - font-size: 1.75em; -} - -h4 { - font-size: 1.5em; -} - -h5 { - font-size: 1.25em; -} - -h6 { - font-size: 1em; -} - -p { - margin-top: 0px; - margin-bottom: 2.5rem; -} - -small, sub, sup { - font-size: 75%; -} - -hr { - border-color: var(--blossom); -} - -a { - text-decoration: none; - color: var(--blossom); -} -a:visited { - color: #144f5a; -} -a:hover { - color: var(--fade); - border-bottom: 2px solid var(--text); -} - -ul { - padding-left: 1.4em; - margin-top: 0px; - margin-bottom: 2.5rem; -} - -li { - margin-bottom: 0.4em; -} - -blockquote { - margin-left: 0px; - margin-right: 0px; - padding-left: 1em; - padding-top: 0.8em; - padding-bottom: 0.8em; - padding-right: 0.8em; - border-left: 5px solid var(--blossom); - margin-bottom: 2.5rem; - background-color: var(--bg-alt); -} - -blockquote p { - margin-bottom: 0; -} - -img, video { - height: auto; - max-width: 100%; - margin-top: 0px; - margin-bottom: 2.5rem; -} - -/* Pre and Code */ -pre { - background-color: var(--bg-alt); - display: block; - padding: 1em; - overflow-x: auto; - margin-top: 0px; - margin-bottom: 2.5rem; - font-size: 0.9em; -} - -code, kbd, samp { - font-size: 0.9em; - padding: 0 0.5em; - background-color: var(--bg-alt); - white-space: pre-wrap; -} - -pre > code { - padding: 0; - background-color: transparent; - white-space: pre; - font-size: 1em; -} - -/* Tables */ -table { - text-align: justify; - width: 100%; - border-collapse: collapse; - margin-bottom: 2rem; -} - -td, th { - padding: 0.5em; - border-bottom: 1px solid var(--bg-alt); -} - -/* Buttons, forms and input */ -input, textarea { - border: 1px solid var(--text); -} -input:focus, textarea:focus { - border: 1px solid var(--blossom); -} - -textarea { - width: 100%; -} - -.button, button, input[type=submit], input[type=reset], input[type=button], input[type=file]::file-selector-button { - display: inline-block; - padding: 5px 10px; - text-align: center; - text-decoration: none; - white-space: nowrap; - background-color: var(--blossom); - color: var(--bg); - border-radius: 1px; - border: 1px solid var(--blossom); - cursor: pointer; - box-sizing: border-box; -} -.button[disabled], button[disabled], input[type=submit][disabled], input[type=reset][disabled], input[type=button][disabled], input[type=file]::file-selector-button[disabled] { - cursor: default; - opacity: 0.5; -} -.button:hover, button:hover, input[type=submit]:hover, input[type=reset]:hover, input[type=button]:hover, input[type=file]::file-selector-button:hover { - background-color: var(--fade); - color: var(--bg); - outline: 0; -} -.button:focus-visible, button:focus-visible, input[type=submit]:focus-visible, input[type=reset]:focus-visible, input[type=button]:focus-visible, input[type=file]::file-selector-button:focus-visible { - outline-style: solid; - outline-width: 2px; -} - -textarea, select, input { - color: var(--text); - padding: 6px 10px; /* The 6px vertically centers text on FF, ignored by Webkit */ - margin-bottom: 10px; - background-color: var(--bg-alt); - border: 1px solid var(--bg-alt); - border-radius: 4px; - box-shadow: none; - box-sizing: border-box; -} -textarea:focus, select:focus, input:focus { - border: 1px solid var(--blossom); - outline: 0; -} - -input[type=checkbox]:focus { - outline: 1px dotted var(--blossom); -} - -label, legend, fieldset { - display: block; - margin-bottom: 0.5rem; - font-weight: 600; -} diff --git a/templates.templ b/templates.templ index d974b5833560129812c609934c2a97b293f617fc..daee1e81f364b2c7d571ffe38b7e3eb24d24def0 100644 --- a/templates.templ +++ b/templates.templ @@ -9,7 +9,7 @@ { title } - + @@ -37,7 +37,7 @@ templ ArticleTemplate(article Article) { @baseTemplate(article.Title, article.Summary) {

{ article.Title }

-

{ article.Date.Format("01/02/2006") }

+

{ article.Date.Format("01/02/2006") }

@templ.Raw(article.Content)
} diff --git a/templates_templ.go b/templates_templ.go index 0ee91ec438bb7e3ec1045cac3e9e52db9e72d059..eb1a5286ff88f24036184a633dcb98ac78aa66d5 100644 --- a/templates_templ.go +++ b/templates_templ.go @@ -48,7 +48,7 @@ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(description)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\">") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\">") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -181,7 +181,7 @@ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("

") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -190,7 +190,7 @@ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("

") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err }