summaryrefslogtreecommitdiff
path: root/srv/src
diff options
context:
space:
mode:
authorBrian Picciano <mediocregopher@gmail.com>2022-05-20 10:13:46 -0600
committerBrian Picciano <mediocregopher@gmail.com>2022-05-20 10:13:46 -0600
commit75044eef0331bb9448da813288aafc6735ce7c22 (patch)
treea2fb34b0811cb524d87016e968255d2b6771d06d /srv/src
parent0bc0204f0b718464d7ea9d97d6d03ee81f1953c6 (diff)
Implement edit post page
Diffstat (limited to 'srv/src')
-rw-r--r--srv/src/api/api.go3
-rw-r--r--srv/src/api/assets.go4
-rw-r--r--srv/src/api/posts.go32
-rw-r--r--srv/src/api/tpl.go4
-rw-r--r--srv/src/api/tpl/edit-post.html82
-rw-r--r--srv/src/api/tpl/index.html4
-rw-r--r--srv/src/api/tpl/post.html4
-rw-r--r--srv/src/api/tpl/posts.html2
8 files changed, 126 insertions, 9 deletions
diff --git a/srv/src/api/api.go b/srv/src/api/api.go
index fc6f6a2..bc56164 100644
--- a/srv/src/api/api.go
+++ b/srv/src/api/api.go
@@ -214,7 +214,8 @@ func (a *api) handler() http.Handler {
v2Mux.Handle("/follow.html", a.renderDumbTplHandler("follow.html"))
v2Mux.Handle("/posts/", http.StripPrefix("/posts",
apiutil.MethodMux(map[string]http.Handler{
- "GET": a.renderPostHandler(),
+ "GET": a.renderPostHandler(),
+ "EDIT": a.editPostHandler(),
"DELETE": authMiddleware(auther,
formMiddleware(a.deletePostHandler()),
),
diff --git a/srv/src/api/assets.go b/srv/src/api/assets.go
index c1cd75e..47be14c 100644
--- a/srv/src/api/assets.go
+++ b/srv/src/api/assets.go
@@ -149,7 +149,7 @@ func (a *api) postPostAssetHandler() http.Handler {
return http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
id := r.PostFormValue("id")
- if id == "" {
+ if id == "/" {
apiutil.BadRequest(rw, r, errors.New("id is required"))
return
}
@@ -176,7 +176,7 @@ func (a *api) deletePostAssetHandler() http.Handler {
id := filepath.Base(r.URL.Path)
- if id == "" {
+ if id == "/" {
apiutil.BadRequest(rw, r, errors.New("id is required"))
return
}
diff --git a/srv/src/api/posts.go b/srv/src/api/posts.go
index a906f14..e5916e1 100644
--- a/srv/src/api/posts.go
+++ b/srv/src/api/posts.go
@@ -138,13 +138,43 @@ func (a *api) renderPostsIndexHandler() http.Handler {
})
}
+func (a *api) editPostHandler() http.Handler {
+
+ tpl := a.mustParseBasedTpl("edit-post.html")
+
+ return http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
+
+ id := filepath.Base(r.URL.Path)
+
+ var storedPost post.StoredPost
+
+ if id != "/" {
+
+ var err error
+ storedPost, err = a.params.PostStore.GetByID(id)
+
+ if errors.Is(err, post.ErrPostNotFound) {
+ http.Error(rw, "Post not found", 404)
+ return
+ } else if err != nil {
+ apiutil.InternalServerError(
+ rw, r, fmt.Errorf("fetching post with id %q: %w", id, err),
+ )
+ return
+ }
+ }
+
+ executeTemplate(rw, r, tpl, storedPost)
+ })
+}
+
func (a *api) deletePostHandler() http.Handler {
return http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
id := filepath.Base(r.URL.Path)
- if id == "" {
+ if id == "/" {
apiutil.BadRequest(rw, r, errors.New("id is required"))
return
}
diff --git a/srv/src/api/tpl.go b/srv/src/api/tpl.go
index 5e33bea..9818b10 100644
--- a/srv/src/api/tpl.go
+++ b/srv/src/api/tpl.go
@@ -8,6 +8,7 @@ import (
"net/http"
"path/filepath"
"strings"
+ "time"
"github.com/mediocregopher/blog.mediocregopher.com/srv/api/apiutil"
)
@@ -50,6 +51,9 @@ func (a *api) mustParseTpl(name string) *template.Template {
path := filepath.Join("posts", id)
return blogURL(path)
},
+ "DateTimeFormat": func(t time.Time) string {
+ return t.Format("2006-01-02")
+ },
})
tpl = template.Must(tpl.Parse(mustReadTplFile(name)))
diff --git a/srv/src/api/tpl/edit-post.html b/srv/src/api/tpl/edit-post.html
new file mode 100644
index 0000000..9e30d4d
--- /dev/null
+++ b/srv/src/api/tpl/edit-post.html
@@ -0,0 +1,82 @@
+{{ define "body" }}
+
+ <form method="POST" action="{{ BlogURL "posts/" }}">
+
+ <div class="row">
+
+ <div class="columns six">
+ <label for="idInput">Unique ID (e.g. "how-to-fly-a-kite")</label>
+ <input
+ id="idInput"
+ name="id"
+ class="u-full-width"
+ type="text"
+ value="{{ .Payload.ID }}" />
+ </div>
+
+ <div class="columns three">
+ <label for="tagsInput">Tags (space separated)</label>
+ <input
+ id="tagsInput"
+ name="tags"
+ class="u-full-width"
+ type="text"
+ value="{{ range $i, $tag := .Payload.Tags }}{{ if ne $i 0 }} {{ end }}{{ $tag }}{{ end }}" />
+ </div>
+
+ <div class="columns three">
+ <label for="seriesInput">Series</label>
+ <input
+ id="seriesInput"
+ name="series"
+ class="u-full-width"
+ type="text"
+ value="{{ .Payload.Series }}" />
+ </div>
+
+ </div>
+
+ <div class="row">
+
+ <div class="columns six">
+ <label for="titleInput">Title</label>
+ <input
+ id="titleInput"
+ name="title"
+ class="u-full-width"
+ type="text"
+ value="{{ .Payload.Title }}" />
+ </div>
+
+ <div class="columns six">
+ <label for="descrInput">Description</label>
+ <input
+ id="descrInput"
+ name="description"
+ class="u-full-width"
+ type="text"
+ value="{{ .Payload.Description }}" />
+ </div>
+
+ </div>
+
+ <div class="row">
+ <div class="columns twelve">
+ <textarea
+ name="body"
+ class="u-full-width"
+ placeholder="Blog body"
+ style="height: 50vh;"
+ >
+ {{ .Payload.Body }}
+ </textarea>
+ </div>
+ </div>
+
+ <input type="submit" value="Save" />
+
+ </form>
+
+{{ end }}
+
+{{ template "base.html" . }}
diff --git a/srv/src/api/tpl/index.html b/srv/src/api/tpl/index.html
index 946a3e4..e27cbef 100644
--- a/srv/src/api/tpl/index.html
+++ b/srv/src/api/tpl/index.html
@@ -7,9 +7,9 @@
<h2>
<a href="{{ PostURL .ID }}">{{ .Title }}</a>
</h2>
- <span>{{ .PublishedAt.Format "2006-01-02" }}</span>
+ <span>{{ DateTimeFormat .PublishedAt }}</span>
{{ if not .LastUpdatedAt.IsZero }}
- <span>(Updated {{ .LastUpdatedAt.Format "2006-01-02" }})</span>
+ <span>(Updated {{ DateTimeFormat .LastUpdatedAt }})</span>
{{ end }}
<p>{{ .Description }}</p>
</li>
diff --git a/srv/src/api/tpl/post.html b/srv/src/api/tpl/post.html
index fadab3c..474d7c2 100644
--- a/srv/src/api/tpl/post.html
+++ b/srv/src/api/tpl/post.html
@@ -5,10 +5,10 @@
{{ .Payload.Title }}
</h1>
<div class="light">
- {{ .Payload.PublishedAt.Format "2006-01-02" }}
+ {{ DateTimeFormat .Payload.PublishedAt }}
&nbsp;•&nbsp;
{{ if not .Payload.LastUpdatedAt.IsZero }}
- (Updated {{ .Payload.LastUpdatedAt.Format "2006-01-02" }})
+ (Updated {{ DateTimeFormat .Payload.LastUpdatedAt }})
&nbsp;•&nbsp;
{{ end }}
<em>{{ .Payload.Description }}</em>
diff --git a/srv/src/api/tpl/posts.html b/srv/src/api/tpl/posts.html
index e701f59..714cf07 100644
--- a/srv/src/api/tpl/posts.html
+++ b/srv/src/api/tpl/posts.html
@@ -22,7 +22,7 @@
<p style="text-align: center;">
- <a href="{{ BlogURL "posts/" }}?method=new">
+ <a href="{{ BlogURL "posts/" }}?method=edit">
<button>New Post</button>
</a>
</p>