yw5n/yw5ncom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: html static templates
All checks were successful
/ deploy (push) Successful in 46s
Details

Browse Source
This commit is contained in:
ange 2024-12-14 08:34:47 +00:00
parent 9d0da00371
commit e9fc659a5a
Signed by: ange
GPG Key ID: 9E0C4157BB7BEB1D
12 changed files with 91 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Dockerfile
View File

@ -6,8 +6,9 @@ COPY src/ .
RUN CGO_ENABLED=0 go build -o /app RUN CGO_ENABLED=0 go build -o /app
FROM scratch FROM scratch
COPY --from=build /app /app COPY --from=build /app .
COPY static/ /static/ COPY html/ html/
COPY html/ /html/ COPY static/ static/
COPY tmpl/ tmpl/
EXPOSE 3000 EXPOSE 3000
CMD ["/app"] CMD ["./app"]

7
compose.yaml
View File

@ -10,7 +10,10 @@ services:
path: src/ path: src/
- action: sync+restart - action: sync+restart
path: html/ path: html/
target: html target: html/
- action: sync+restart
path: tmpl/
target: tmpl/
- action: sync - action: sync
path: static/ path: static/
target: static target: static/

33
html/about.html
View File

@ -1,33 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>Ange DUHAYON</title>
<link rel="stylesheet" href="style.css"/>
</head>
<body>
<div id="header">
<a id="headerLink" href="/">Ange DUHAYON</a>
<span id="headerSubtitle">DevOps Engineer</span>
<span class="right" style="font-size: .4em;">Website heavily inspired from <a href="//suckless.org/" target="_blank" rel="noreferrer noopener">suckless.org</a></span>
</div>
<div id="menu">
<a href="/">contact</a>
<a href="/resume">resume</a>
<a href="/about"><b>about me</b></a>
<span class="right">
<a href="//git.gmoker.com/yw5n/" target="_blank" rel="noreferrer noopener">source</a>
</span>
</div>
<div id="content">
<!--
<div id="nav">
<ul>
</ul>
</div>
-->
<div id="main">
</div>
</div>
</body>
</html>

36
html/index.html → html/contact.html
View File

@ -1,41 +1,11 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<meta charset="UTF-8"> {{template "head.tmpl" .}}
<title>Ange DUHAYON</title>
<link rel="stylesheet" href="style.css"/>
<script>
function copyElem(id, r='') {
navigator.clipboard.writeText(
document.getElementById(id).innerText.replaceAll(r, ''),
);
}
function copyFile(id) {
fetch(document.getElementById(id).childNodes[0].href).then(f => {
f.text().then(t => {
navigator.clipboard.writeText(t);
})
})
}
</script>
</head> </head>
<body> <body>
<div id="header"> <script src="static/copy.js"></script>
<a id="headerLink" href="/">Ange DUHAYON</a> {{template "header.tmpl" .}}
<span id="headerSubtitle">DevOps Engineer</span>
<span class="right" style="font-size: .4em;">Website heavily inspired from <a href="//suckless.org/" target="_blank" rel="noreferrer noopener">suckless.org</a></span>
</div>
<div id="menu">
<a href="/"><b>contact</b></a>
<a href="/resume">resume</a>
<!--
<a href="/about">about me</a>
-->
<span class="right">
<a href="//git.gmoker.com/yw5n/" target="_blank" rel="noreferrer noopener">source</a>
</span>
</div>
<div id="content"> <div id="content">
<!-- <!--
<div id="nav"> <div id="nav">

22
html/resume.html
View File

@ -1,26 +1,8 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> {{template "head.tmpl" .}}
<meta charset="UTF-8">
<title>Ange DUHAYON</title>
<link rel="stylesheet" href="style.css"/>
</head>
<body> <body>
<div id="header"> {{template "header.tmpl". }}
<a id="headerLink" href="/">Ange DUHAYON</a>
<span id="headerSubtitle">DevOps Engineer</span>
<span class="right" style="font-size: .4em;">Website heavily inspired from <a href="//suckless.org/" target="_blank" rel="noreferrer noopener">suckless.org</a></span>
</div>
<div id="menu">
<a href="/">contact</a>
<a href="/resume"><b>resume</b></a>
<!--
<a href="/about">about me</a>
-->
<span class="right">
<a href="//git.gmoker.com/yw5n/" target="_blank" rel="noreferrer noopener">source</a>
</span>
</div>
<div id="content"> <div id="content">
<div id="nav"> <div id="nav">
<!-- <!--

5
src/main.go
View File

@ -7,9 +7,8 @@ import (
func main() { func main() {
http.HandleFunc("/", route) http.HandleFunc("/", route)
generateTmpl()
err := http.ListenAndServe(":3000", nil) if err := http.ListenAndServe(":3000", nil); err != nil {
if err != nil {
log.Fatal(err) log.Fatal(err)
} }
} }

3
src/route.go
View File

@ -34,8 +34,9 @@ func route(w http.ResponseWriter, r *http.Request) {
http.Error( http.Error(
w, "405 method not allowed", http.StatusMethodNotAllowed, w, "405 method not allowed", http.StatusMethodNotAllowed,
) )
fmt.Println(r.Method, r.URL.Path) return
} }
fmt.Println(r.Method, r.URL.Path)
rt.handler(w, r.WithContext( rt.handler(w, r.WithContext(
context.WithValue(r.Context(), URLParam{}, matches[1:])), context.WithValue(r.Context(), URLParam{}, matches[1:])),
) )

29
src/tmpl.go Normal file
View File

@ -0,0 +1,29 @@
package main
import (
"bytes"
"html/template"
"path/filepath"
"regexp"
)
var TMPL map[string][]byte
// TODO not use a global
// TODO use range instead of if else in header.html
func generateTmpl() {
files, _ := filepath.Glob("html/*.html")
re := regexp.MustCompile("html(/.+).html")
TMPL = make(map[string][]byte, len(files))
for _, f := range files {
b := new(bytes.Buffer)
name := re.FindStringSubmatch(f)[1]
t, _ := template.ParseFiles(f)
t.ParseGlob("tmpl/*.tmpl")
t.Execute(b, map[string]any{
"name": name,
})
TMPL[name] = b.Bytes()
}
}

12
src/views.go
View File

@ -2,15 +2,15 @@ package main
import ( import (
"net/http" "net/http"
"path/filepath"
) )
func index(w http.ResponseWriter, r *http.Request) { func index(w http.ResponseWriter, r *http.Request) {
http.ServeFile(w, r, filepath.Join("html", "index.html")) r.URL.Path = "/contact"
html(w, r)
} }
func style(w http.ResponseWriter, r *http.Request) { func style(w http.ResponseWriter, r *http.Request) {
http.ServeFile(w, r, "/html/style.css") http.ServeFile(w, r, "html/style.css")
} }
func static(w http.ResponseWriter, r *http.Request) { func static(w http.ResponseWriter, r *http.Request) {
@ -18,5 +18,9 @@ func static(w http.ResponseWriter, r *http.Request) {
} }
func html(w http.ResponseWriter, r *http.Request) { func html(w http.ResponseWriter, r *http.Request) {
http.ServeFile(w, r, filepath.Join("html", r.URL.Path + ".html")) if t, found := TMPL[r.URL.Path]; found {
w.Write(t)
} else {
http.NotFound(w, r)
}
} }

13
static/copy.js Normal file
View File

@ -0,0 +1,13 @@
function copyElem(id, r='') {
navigator.clipboard.writeText(
document.getElementById(id).innerText.replaceAll(r, ''),
);
}
function copyFile(id) {
fetch(document.getElementById(id).childNodes[0].href).then(f => {
f.text().then(t => {
navigator.clipboard.writeText(t);
})
})
}

5
tmpl/head.tmpl Normal file
View File

@ -0,0 +1,5 @@
<head>
<meta charset="UTF-8">
<title>Ange DUHAYON</title>
<link rel="stylesheet" href="style.css"/>
</head>

17
tmpl/header.tmpl Normal file
View File

@ -0,0 +1,17 @@
<div id="header">
<a id="headerLink" href="/">Ange DUHAYON</a>
<span id="headerSubtitle">DevOps Engineer</span>
<span class="right" style="font-size: .4em;">Website heavily inspired from <a href="//suckless.org/" target="_blank" rel="noreferrer noopener">suckless.org</a></span>
</div>
<div id="menu">
{{if eq .name "/contact"}}
<a href="/"><b>contact</b></a>
<a href="/resume">resume</a>
{{else if eq .name "/resume"}}
<a href="/">contact</a>
<a href="/resume"><b>resume</b></a>
{{end}}
<span class="right">
<a href="//git.gmoker.com/yw5n" target="_blank" rel="noreferrer noopener">source</a>
</span>
</div>