From c2ab8ee9409ac26a95e9a4c80c8ada51a22313f1 Mon Sep 17 00:00:00 2001 From: ewy Date: Thu, 9 Apr 2026 21:29:25 +0200 Subject: upd --- main.go | 1 - pages/create.go | 25 +++++++------- pages/create.gohtml | 32 ------------------ pages/header.gohtml | 12 ------- pages/html/create.gohtml | 28 ++++++++++++++++ pages/html/header.gohtml | 12 +++++++ pages/html/landing.gohtml | 44 +++++++++++++++++++++++++ pages/html/meta.gohtml | 15 +++++++++ pages/html/style.gohtml | 84 +++++++++++++++++++++++++++++++++++++++++++++++ pages/landing.go | 2 +- pages/landing.gohtml | 45 ------------------------- pages/style.gohtml | 84 ----------------------------------------------- 12 files changed, 198 insertions(+), 186 deletions(-) delete mode 100644 pages/create.gohtml delete mode 100644 pages/header.gohtml create mode 100644 pages/html/create.gohtml create mode 100644 pages/html/header.gohtml create mode 100644 pages/html/landing.gohtml create mode 100644 pages/html/meta.gohtml create mode 100644 pages/html/style.gohtml delete mode 100644 pages/landing.gohtml delete mode 100644 pages/style.gohtml diff --git a/main.go b/main.go index e06c63f..009219a 100644 --- a/main.go +++ b/main.go @@ -2,7 +2,6 @@ package main import ( "delayed.link/pages" - _ "delayed.link/pages" "delayed.link/storage" "delayed.link/storage/sqlite" "github.com/spf13/pflag" diff --git a/pages/create.go b/pages/create.go index 5469ee8..f16d2d8 100644 --- a/pages/create.go +++ b/pages/create.go @@ -2,10 +2,13 @@ package pages import ( "delayed.link/storage" + "embed" _ "embed" "html/template" + "io/fs" "net/http" "net/url" + "path/filepath" "strconv" "strings" "time" @@ -83,17 +86,17 @@ func Create(w http.ResponseWriter, r *http.Request) { } } -//go:embed create.gohtml -var recContent string - -//go:embed style.gohtml -var style string - -//go:embed header.gohtml -var header string +//go:embed html +var pages embed.FS func init() { - template.Must(tmpl.Parse(style)) - template.Must(tmpl.Parse(header)) - template.Must(tmpl.New("create").Parse(recContent)) + entries, _ := pages.ReadDir("html") + for _, entry := range entries { + name := entry.Name() + if !entry.IsDir() && strings.HasSuffix(name, ".gohtml") { + tmplName := strings.SplitN(name, ".", 2)[0] + content, _ := fs.ReadFile(pages, filepath.Join("html", name)) + template.Must(tmpl.New(tmplName).Parse(string(content))) + } + } } diff --git a/pages/create.gohtml b/pages/create.gohtml deleted file mode 100644 index d50582a..0000000 --- a/pages/create.gohtml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - delayed.link: created - {{ template "style" . }} - - -{{ template "header" . }} -

- This link will unlock at {{.OpensStr}} -

- It will occur in approximately {{ .MinutesLeft }} minute{{ if gt .MinutesLeft 1 }}s{{end}}. -

- It can be opened {{ .OpensLeft }} time{{ if gt .OpensLeft 1 }}s{{end}}. -

- Be mindful embedding services might take visits off the counter. -

- This page is completely ephemeral. Once you close it, you cannot access the link again. -

- - \ No newline at end of file diff --git a/pages/header.gohtml b/pages/header.gohtml deleted file mode 100644 index 5af455e..0000000 --- a/pages/header.gohtml +++ /dev/null @@ -1,12 +0,0 @@ -{{ define "header" }} -

- -

- delayed.link -

- - - send something now, they unlock it later - -

-{{end}} \ No newline at end of file diff --git a/pages/html/create.gohtml b/pages/html/create.gohtml new file mode 100644 index 0000000..c08fd93 --- /dev/null +++ b/pages/html/create.gohtml @@ -0,0 +1,28 @@ + + + + delayed.link: created + {{ template "meta" . }} + {{ template "style" . }} + + +{{ template "header" . }} +

+ This link will unlock at {{.OpensStr}} +

+ It will occur in approximately {{ .MinutesLeft }} minute{{ if gt .MinutesLeft 1 }}s{{end}}. +

+ It can be opened {{ .OpensLeft }} time{{ if gt .OpensLeft 1 }}s{{end}}. +

+ Be mindful embedding services might take visits off the counter. +

+ This page is completely ephemeral. Once you close it, you cannot access the link again. +

+ + \ No newline at end of file diff --git a/pages/html/header.gohtml b/pages/html/header.gohtml new file mode 100644 index 0000000..5af455e --- /dev/null +++ b/pages/html/header.gohtml @@ -0,0 +1,12 @@ +{{ define "header" }} +

+ +

+ delayed.link +

+ + + send something now, they unlock it later + +

+{{end}} \ No newline at end of file diff --git a/pages/html/landing.gohtml b/pages/html/landing.gohtml new file mode 100644 index 0000000..268ae90 --- /dev/null +++ b/pages/html/landing.gohtml @@ -0,0 +1,44 @@ + + + + delayed.link + {{ template "style" . }} + + +{{ template "meta" . }} +{{ template "header" . }} +

+ +

+ + + \ No newline at end of file diff --git a/pages/html/meta.gohtml b/pages/html/meta.gohtml new file mode 100644 index 0000000..07d515b --- /dev/null +++ b/pages/html/meta.gohtml @@ -0,0 +1,15 @@ +{{ define "meta" }} + + + + + + + {{ if (eq . nil) }} + + {{ else }} + + {{ end }} + +{{end}} \ No newline at end of file diff --git a/pages/html/style.gohtml b/pages/html/style.gohtml new file mode 100644 index 0000000..bb15fb9 --- /dev/null +++ b/pages/html/style.gohtml @@ -0,0 +1,84 @@ +{{ define "style"}} + +{{end}} \ No newline at end of file diff --git a/pages/landing.go b/pages/landing.go index d2c2fc3..a4a6f90 100644 --- a/pages/landing.go +++ b/pages/landing.go @@ -6,7 +6,7 @@ import ( "net/http" ) -//go:embed landing.gohtml +//go:embed html/landing.gohtml var landContent string func Land(w http.ResponseWriter, r *http.Request) { diff --git a/pages/landing.gohtml b/pages/landing.gohtml deleted file mode 100644 index 021cb95..0000000 --- a/pages/landing.gohtml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - delayed.link - {{ template "style" . }} - - -{{ template "header" . }} -

- -

- - - \ No newline at end of file diff --git a/pages/style.gohtml b/pages/style.gohtml deleted file mode 100644 index bb15fb9..0000000 --- a/pages/style.gohtml +++ /dev/null @@ -1,84 +0,0 @@ -{{ define "style"}} - -{{end}} \ No newline at end of file -- cgit v1.3