From e49f5193e2c7b963480b19461c6a29e05ed0cdb1 Mon Sep 17 00:00:00 2001
From: m15o <m15o@pm.me>
Date: Thu, 2 Dec 2021 21:41:17 +0100
Subject: [PATCH] Addig editing

---
 storage/status.go                        |   3 +-
 web/handler/common.go                    |  60 ++++++++++++
 web/handler/html.go                      | 119 +----------------------
 web/handler/html/common/status_form.html |  60 ++++++++++++
 web/handler/html/create_status.html      |   7 +-
 web/handler/html/edit_status.html        |  55 +----------
 web/handler/html/index.html              |  57 +----------
 web/handler/index_show.go                |   2 +
 web/handler/status_create.go             |   7 +-
 9 files changed, 137 insertions(+), 233 deletions(-)
 create mode 100644 web/handler/html/common/status_form.html

diff --git a/storage/status.go b/storage/status.go
index 0858053..f9c60b6 100644
--- a/storage/status.go
+++ b/storage/status.go
@@ -62,10 +62,11 @@ func (s *Storage) CreateStatus(status model.Status) error {
 func (s *Storage) StatusById(id int64) (model.Status, error) {
 	var status model.Status
 	err := s.db.QueryRow(
-		`SELECT id, author, content from statuses WHERE id=$1`, id).Scan(
+		`SELECT id, author, content, face from statuses WHERE id=$1`, id).Scan(
 		&status.Id,
 		&status.User,
 		&status.Content,
+		&status.Face,
 	)
 	return status, err
 }
diff --git a/web/handler/common.go b/web/handler/common.go
index 30be482..fc0f49a 100644
--- a/web/handler/common.go
+++ b/web/handler/common.go
@@ -44,5 +44,65 @@ var TplCommonMap = map[string]string{
 	"status": `{{ define "status" }}
 <div class="status-username"><a href="/users/{{ .User }}">{{ .User }}</a> {{ .Face }} {{ .TimeAgo }}</div>
 <p class="status-content">{{ .Content }}</p>
+{{ end }}`,
+	"status_form": `{{ define "status_form" }}
+<div style="margin-bottom: 1em">
+    <div class="radio">
+        <input type="radio" id="face1" name="face" value="🙂" {{ if or (eq .Face "🙂") (eq .Face "") }}checked{{ end }}>
+        <label for="face1">🙂</label>
+    </div>
+    <div class="radio">
+        <input type="radio" id="face2" name="face" value="😎" {{ if eq .Face "😎" }}checked{{ end }}>
+        <label for="face2">😎</label>
+    </div>
+    <div class="radio">
+        <input type="radio" id="face3" name="face" value="😛" {{ if eq .Face "😛" }}checked{{ end }}>
+        <label for="face3">😛</label>
+    </div>
+    <div class="radio">
+        <input type="radio" id="face4" name="face" value="🥰" {{ if eq .Face "🥰" }}checked{{ end }}>
+        <label for="face4">🥰</label>
+    </div>
+    <div class="radio">
+        <input type="radio" id="face5" name="face" value="👽" {{ if eq .Face "👽" }}checked{{ end }}>
+        <label for="face5">👽</label>
+    </div>
+    <div class="radio">
+        <input type="radio" id="face6" name="face" value="😱" {{ if eq .Face "😱" }}checked{{ end }}>
+        <label for="face6">😱</label>
+    </div>
+    <div class="radio">
+        <input type="radio" id="face7" name="face" value="🤗" {{ if eq .Face "🤗" }}checked{{ end }}>
+        <label for="face7">🤗</label>
+    </div>
+    <div class="radio">
+        <input type="radio" id="face8" name="face" value="😯" {{ if eq .Face "😯" }}checked{{ end }}>
+        <label for="face8">😯</label>
+    </div>
+    <div class="radio">
+        <input type="radio" id="face9" name="face" value="🤒" {{ if eq .Face "🤒" }}checked{{ end }}>
+        <label for="face9">🤒</label>
+    </div>
+    <div class="radio">
+        <input type="radio" id="face10" name="face" value="😡" {{ if eq .Face "😡" }}checked{{ end }}>
+        <label for="face10">😡</label>
+    </div>
+    <div class="radio">
+        <input type="radio" id="face11" name="face" value="🥺" {{ if eq .Face "🥺" }}checked{{ end }}>
+        <label for="face11">🥺</label>
+    </div>
+    <div class="radio">
+        <input type="radio" id="face12" name="face" value="🥳" {{ if eq .Face "🥳" }}checked{{ end }}>
+        <label for="face12">🥳</label>
+    </div>
+    <div class="radio">
+        <input type="radio" id="face13" name="face" value="☕" {{ if eq .Face "☕" }}checked{{ end }}>
+        <label for="face13">☕</label>
+    </div>
+</div>
+<div class="field">
+    <textarea name="content" maxlength="140" placeholder="What's new?" required style="width: 100%; box-sizing: border-box; height: 100px;" autofocus>{{ .Content }}</textarea>
+</div>
+<input type="submit" value="Submit">
 {{ end }}`,
 }
diff --git a/web/handler/html.go b/web/handler/html.go
index 7f9cebf..7f2df8a 100644
--- a/web/handler/html.go
+++ b/web/handler/html.go
@@ -19,6 +19,7 @@ var TplMap = map[string]string{
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>status cafe</title>
+    <link rel="stylesheet" href="/assets/style.css"/>
     <meta name="description" content="your friends' updates">
     <style>
         body {
@@ -36,11 +37,7 @@ var TplMap = map[string]string{
     <p>{{ .flash }}</p>
     {{ end }}
     <form action="/add?silent=1" method="post" name="update-status">
-        <div class="field">
-            <textarea name="content" placeholder="What's new?" required style="width: 100%; box-sizing: border-box; height: 120px" autofocus></textarea>
-        </div>
-        <br>
-        <input type="submit" value="Submit">
+        {{ template "status_form" .status }}
     </form>
 </main>
 </div>
@@ -126,60 +123,7 @@ var TplMap = map[string]string{
     {{ end }}
     {{ template "flash" .flash }}
     <form action="/edit?id={{ .status.Id }}" method="post">
-        <div style="margin-bottom: 1em">
-            <div class="radio">
-                <input type="radio" id="face1" name="face" value="🙂" checked>
-                <label for="face1">🙂</label>
-            </div>
-            <div class="radio">
-                <input type="radio" id="face2" name="face" value="😎">
-                <label for="face2">😎</label>
-            </div>
-            <div class="radio">
-                <input type="radio" id="face3" name="face" value="😛">
-                <label for="face3">😛</label>
-            </div>
-            <div class="radio">
-                <input type="radio" id="face4" name="face" value="🥰">
-                <label for="face4">🥰</label>
-            </div>
-            <div class="radio">
-                <input type="radio" id="face5" name="face" value="👽">
-                <label for="face5">👽</label>
-            </div>
-            <div class="radio">
-                <input type="radio" id="face6" name="face" value="😱">
-                <label for="face6">😱</label>
-            </div>
-            <div class="radio">
-                <input type="radio" id="face7" name="face" value="🤗">
-                <label for="face7">🤗</label>
-            </div>
-            <div class="radio">
-                <input type="radio" id="face8" name="face" value="😯">
-                <label for="face8">😯</label>
-            </div>
-            <div class="radio">
-                <input type="radio" id="face9" name="face" value="🤒">
-                <label for="face9">🤒</label>
-            </div>
-            <div class="radio">
-                <input type="radio" id="face10" name="face" value="😡">
-                <label for="face10">😡</label>
-            </div>
-            <div class="radio">
-                <input type="radio" id="face11" name="face" value="🥺">
-                <label for="face11">🥺</label>
-            </div>
-            <div class="radio">
-                <input type="radio" id="face12" name="face" value="🥳">
-                <label for="face12">🥳</label>
-            </div>
-        </div>
-        <div class="field">
-            <textarea name="content" placeholder="What's new?" required style="width: 100%; box-sizing: border-box;" autofocus>{{ .status.Content }}</textarea>
-        </div>
-        <input type="submit" value="Submit">
+        {{ template "status_form" .status }}
     </form>
 </section>
 {{ end }}`,
@@ -191,62 +135,7 @@ var TplMap = map[string]string{
         <p>{{ .form.Error }}</p>
         {{ end }}
         {{ template "flash" .flash }}
-        <form action="/add" method="post">
-            <div style="margin-bottom: 1em">
-                <div class="radio">
-                    <input type="radio" id="face1" name="face" value="🙂" checked>
-                    <label for="face1">🙂</label>
-                </div>
-                <div class="radio">
-                    <input type="radio" id="face2" name="face" value="😎">
-                    <label for="face2">😎</label>
-                </div>
-                <div class="radio">
-                    <input type="radio" id="face3" name="face" value="😛">
-                    <label for="face3">😛</label>
-                </div>
-                <div class="radio">
-                    <input type="radio" id="face4" name="face" value="🥰">
-                    <label for="face4">🥰</label>
-                </div>
-                <div class="radio">
-                    <input type="radio" id="face5" name="face" value="👽">
-                    <label for="face5">👽</label>
-                </div>
-                <div class="radio">
-                    <input type="radio" id="face6" name="face" value="😱">
-                    <label for="face6">😱</label>
-                </div>
-                <div class="radio">
-                    <input type="radio" id="face7" name="face" value="🤗">
-                    <label for="face7">🤗</label>
-                </div>
-                <div class="radio">
-                    <input type="radio" id="face8" name="face" value="😯">
-                    <label for="face8">😯</label>
-                </div>
-                <div class="radio">
-                    <input type="radio" id="face9" name="face" value="🤒">
-                    <label for="face9">🤒</label>
-                </div>
-                <div class="radio">
-                    <input type="radio" id="face10" name="face" value="😡">
-                    <label for="face10">😡</label>
-                </div>
-                <div class="radio">
-                    <input type="radio" id="face11" name="face" value="🥺">
-                    <label for="face11">🥺</label>
-                </div>
-                <div class="radio">
-                    <input type="radio" id="face12" name="face" value="🥳">
-                    <label for="face12">🥳</label>
-                </div>
-            </div>
-            <div class="field">
-                <textarea name="content" maxlength="140" placeholder="What's new?" required style="width: 100%; box-sizing: border-box; height: 100px;" autofocus></textarea>
-            </div>
-            <input type="submit" value="Submit">
-        </form>
+        <form action="/add" method="post">{{ template "status_form" .status }}</form>
         <ul class="tools">
             <li><a href="/about/status-updater">status updater</a> bookmarklet</li>
             <li><a href="/current-status">status widget</a> for your homepage</li>
diff --git a/web/handler/html/common/status_form.html b/web/handler/html/common/status_form.html
new file mode 100644
index 0000000..548b887
--- /dev/null
+++ b/web/handler/html/common/status_form.html
@@ -0,0 +1,60 @@
+{{ define "status_form" }}
+<div style="margin-bottom: 1em">
+    <div class="radio">
+        <input type="radio" id="face1" name="face" value="🙂" {{ if or (eq .Face "🙂") (eq .Face "") }}checked{{ end }}>
+        <label for="face1">🙂</label>
+    </div>
+    <div class="radio">
+        <input type="radio" id="face2" name="face" value="😎" {{ if eq .Face "😎" }}checked{{ end }}>
+        <label for="face2">😎</label>
+    </div>
+    <div class="radio">
+        <input type="radio" id="face3" name="face" value="😛" {{ if eq .Face "😛" }}checked{{ end }}>
+        <label for="face3">😛</label>
+    </div>
+    <div class="radio">
+        <input type="radio" id="face4" name="face" value="🥰" {{ if eq .Face "🥰" }}checked{{ end }}>
+        <label for="face4">🥰</label>
+    </div>
+    <div class="radio">
+        <input type="radio" id="face5" name="face" value="👽" {{ if eq .Face "👽" }}checked{{ end }}>
+        <label for="face5">👽</label>
+    </div>
+    <div class="radio">
+        <input type="radio" id="face6" name="face" value="😱" {{ if eq .Face "😱" }}checked{{ end }}>
+        <label for="face6">😱</label>
+    </div>
+    <div class="radio">
+        <input type="radio" id="face7" name="face" value="🤗" {{ if eq .Face "🤗" }}checked{{ end }}>
+        <label for="face7">🤗</label>
+    </div>
+    <div class="radio">
+        <input type="radio" id="face8" name="face" value="😯" {{ if eq .Face "😯" }}checked{{ end }}>
+        <label for="face8">😯</label>
+    </div>
+    <div class="radio">
+        <input type="radio" id="face9" name="face" value="🤒" {{ if eq .Face "🤒" }}checked{{ end }}>
+        <label for="face9">🤒</label>
+    </div>
+    <div class="radio">
+        <input type="radio" id="face10" name="face" value="😡" {{ if eq .Face "😡" }}checked{{ end }}>
+        <label for="face10">😡</label>
+    </div>
+    <div class="radio">
+        <input type="radio" id="face11" name="face" value="🥺" {{ if eq .Face "🥺" }}checked{{ end }}>
+        <label for="face11">🥺</label>
+    </div>
+    <div class="radio">
+        <input type="radio" id="face12" name="face" value="🥳" {{ if eq .Face "🥳" }}checked{{ end }}>
+        <label for="face12">🥳</label>
+    </div>
+    <div class="radio">
+        <input type="radio" id="face13" name="face" value="☕" {{ if eq .Face "☕" }}checked{{ end }}>
+        <label for="face13">☕</label>
+    </div>
+</div>
+<div class="field">
+    <textarea name="content" maxlength="140" placeholder="What's new?" required style="width: 100%; box-sizing: border-box; height: 100px;" autofocus>{{ .Content }}</textarea>
+</div>
+<input type="submit" value="Submit">
+{{ end }}
\ No newline at end of file
diff --git a/web/handler/html/create_status.html b/web/handler/html/create_status.html
index 513b564..8989316 100644
--- a/web/handler/html/create_status.html
+++ b/web/handler/html/create_status.html
@@ -4,6 +4,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>status cafe</title>
+    <link rel="stylesheet" href="/assets/style.css"/>
     <meta name="description" content="your friends' updates">
     <style>
         body {
@@ -21,11 +22,7 @@
     <p>{{ .flash }}</p>
     {{ end }}
     <form action="/add?silent=1" method="post" name="update-status">
-        <div class="field">
-            <textarea name="content" placeholder="What's new?" required style="width: 100%; box-sizing: border-box; height: 120px" autofocus></textarea>
-        </div>
-        <br>
-        <input type="submit" value="Submit">
+        {{ template "status_form" .status }}
     </form>
 </main>
 </div>
diff --git a/web/handler/html/edit_status.html b/web/handler/html/edit_status.html
index a7cccdc..a94ea41 100644
--- a/web/handler/html/edit_status.html
+++ b/web/handler/html/edit_status.html
@@ -6,60 +6,7 @@
     {{ end }}
     {{ template "flash" .flash }}
     <form action="/edit?id={{ .status.Id }}" method="post">
-        <div style="margin-bottom: 1em">
-            <div class="radio">
-                <input type="radio" id="face1" name="face" value="🙂" checked>
-                <label for="face1">🙂</label>
-            </div>
-            <div class="radio">
-                <input type="radio" id="face2" name="face" value="😎">
-                <label for="face2">😎</label>
-            </div>
-            <div class="radio">
-                <input type="radio" id="face3" name="face" value="😛">
-                <label for="face3">😛</label>
-            </div>
-            <div class="radio">
-                <input type="radio" id="face4" name="face" value="🥰">
-                <label for="face4">🥰</label>
-            </div>
-            <div class="radio">
-                <input type="radio" id="face5" name="face" value="👽">
-                <label for="face5">👽</label>
-            </div>
-            <div class="radio">
-                <input type="radio" id="face6" name="face" value="😱">
-                <label for="face6">😱</label>
-            </div>
-            <div class="radio">
-                <input type="radio" id="face7" name="face" value="🤗">
-                <label for="face7">🤗</label>
-            </div>
-            <div class="radio">
-                <input type="radio" id="face8" name="face" value="😯">
-                <label for="face8">😯</label>
-            </div>
-            <div class="radio">
-                <input type="radio" id="face9" name="face" value="🤒">
-                <label for="face9">🤒</label>
-            </div>
-            <div class="radio">
-                <input type="radio" id="face10" name="face" value="😡">
-                <label for="face10">😡</label>
-            </div>
-            <div class="radio">
-                <input type="radio" id="face11" name="face" value="🥺">
-                <label for="face11">🥺</label>
-            </div>
-            <div class="radio">
-                <input type="radio" id="face12" name="face" value="🥳">
-                <label for="face12">🥳</label>
-            </div>
-        </div>
-        <div class="field">
-            <textarea name="content" placeholder="What's new?" required style="width: 100%; box-sizing: border-box;" autofocus>{{ .status.Content }}</textarea>
-        </div>
-        <input type="submit" value="Submit">
+        {{ template "status_form" .status }}
     </form>
 </section>
 {{ end }}
\ No newline at end of file
diff --git a/web/handler/html/index.html b/web/handler/html/index.html
index c25e551..bde1c33 100644
--- a/web/handler/html/index.html
+++ b/web/handler/html/index.html
@@ -6,62 +6,7 @@
         <p>{{ .form.Error }}</p>
         {{ end }}
         {{ template "flash" .flash }}
-        <form action="/add" method="post">
-            <div style="margin-bottom: 1em">
-                <div class="radio">
-                    <input type="radio" id="face1" name="face" value="🙂" checked>
-                    <label for="face1">🙂</label>
-                </div>
-                <div class="radio">
-                    <input type="radio" id="face2" name="face" value="😎">
-                    <label for="face2">😎</label>
-                </div>
-                <div class="radio">
-                    <input type="radio" id="face3" name="face" value="😛">
-                    <label for="face3">😛</label>
-                </div>
-                <div class="radio">
-                    <input type="radio" id="face4" name="face" value="🥰">
-                    <label for="face4">🥰</label>
-                </div>
-                <div class="radio">
-                    <input type="radio" id="face5" name="face" value="👽">
-                    <label for="face5">👽</label>
-                </div>
-                <div class="radio">
-                    <input type="radio" id="face6" name="face" value="😱">
-                    <label for="face6">😱</label>
-                </div>
-                <div class="radio">
-                    <input type="radio" id="face7" name="face" value="🤗">
-                    <label for="face7">🤗</label>
-                </div>
-                <div class="radio">
-                    <input type="radio" id="face8" name="face" value="😯">
-                    <label for="face8">😯</label>
-                </div>
-                <div class="radio">
-                    <input type="radio" id="face9" name="face" value="🤒">
-                    <label for="face9">🤒</label>
-                </div>
-                <div class="radio">
-                    <input type="radio" id="face10" name="face" value="😡">
-                    <label for="face10">😡</label>
-                </div>
-                <div class="radio">
-                    <input type="radio" id="face11" name="face" value="🥺">
-                    <label for="face11">🥺</label>
-                </div>
-                <div class="radio">
-                    <input type="radio" id="face12" name="face" value="🥳">
-                    <label for="face12">🥳</label>
-                </div>
-            </div>
-            <div class="field">
-                <textarea name="content" maxlength="140" placeholder="What's new?" required style="width: 100%; box-sizing: border-box; height: 100px;" autofocus></textarea>
-            </div>
-            <input type="submit" value="Submit">
-        </form>
+        <form action="/add" method="post">{{ template "status_form" .status }}</form>
         <ul class="tools">
             <li><a href="/about/status-updater">status updater</a> bookmarklet</li>
             <li><a href="/current-status">status widget</a> for your homepage</li>
diff --git a/web/handler/index_show.go b/web/handler/index_show.go
index cac232a..a8cee64 100644
--- a/web/handler/index_show.go
+++ b/web/handler/index_show.go
@@ -2,6 +2,7 @@ package handler
 
 import (
 	"net/http"
+	"status/model"
 )
 
 type Update struct {
@@ -29,5 +30,6 @@ func (h *Handler) showIndexView(w http.ResponseWriter, r *http.Request) {
 	h.renderLayout(w, "index", map[string]interface{}{
 		"statuses": statuses,
 		"flash":    flash,
+		"status":   &model.Status{},
 	}, user)
 }
diff --git a/web/handler/status_create.go b/web/handler/status_create.go
index 6786267..0484bfa 100644
--- a/web/handler/status_create.go
+++ b/web/handler/status_create.go
@@ -1,6 +1,9 @@
 package handler
 
-import "net/http"
+import (
+	"net/http"
+	"status/model"
+)
 
 func (h *Handler) showNewStatusView(w http.ResponseWriter, r *http.Request) {
 	_, err := h.getUser(r)
@@ -8,5 +11,5 @@ func (h *Handler) showNewStatusView(w http.ResponseWriter, r *http.Request) {
 		unauthorized(w)
 		return
 	}
-	h.view("create_status").Execute(w, nil)
+	h.view("create_status").Execute(w, map[string]interface{}{"status": &model.Status{}})
 }