crappyrules/notehub
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

form submission changed to ajax

Browse Source
This commit is contained in:
Christian Müller
2017-09-23 23:29:06 +02:00
parent bd3e4a30af
commit 53f2dad4a2
7 changed files with 95 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/public/note.js
+20
View File
@@ -0,0 +1,20 @@
"use strict";
function post(url, vals, cb) {
var data = new FormData();
for (var key in vals) {
data.append(key, vals[key]);
}
var xhr = new XMLHttpRequest();
xhr.open('POST', url)
xhr.onreadystatechange = function() { if (xhr.readyState === XMLHttpRequest.DONE) return cb(xhr.status, xhr.responseText) };
xhr.send(data);
}
function report(id) {
var resp = prompt("Please shortly explain the problem with this note.");
if (resp) {
post('/' + id + '/report', { "report": resp })
alert("Thank you!")
}
}
assets/public/style.css
+5
View File
@@ -272,3 +272,8 @@ form {
li {
margin: 0.3em 0;
}
#feedback {
margin-left: 1em;
color: #f66;
}
assets/templates/form.html
+30 -5
View File
@@ -8,19 +8,23 @@
<link href="/style.css" rel="stylesheet" type="text/css" />
<base target="_blank" />
<script src='https://www.google.com/recaptcha/api.js'></script>
<script src='/note.js'></script>
</head>
<body>
<form action="/note" autocomplete="off" method="POST" target="_self">
<textarea autofocus name="text">{{.Text}}</textarea>
<textarea autofocus id="text">{{.Text}}</textarea>
<fieldset>
<input id="id" name="id" value="{{.ID}}" type="hidden" />
<input class="ui-elem" name="password" placeholder="Password for editing" type="text" autocomplete="off" />
<input id="id" value="{{.ID}}" type="hidden" />
<input class="ui-elem" id="password" placeholder="Password for editing" type="text" autocomplete="off" />
<label style="margin-right: 1em">
<input id="tos" name="tos" type="checkbox" onClick="toggleButton()" />
<input id="tos" type="checkbox" onClick="toggleButton()" />
Accept <a href="/TOS.md">Terms of Service</a>
</label>
<div id="captcha" class="g-recaptcha" data-sitekey="6LemnDEUAAAAAC6A4VNRefz0BSLiC343W4sXQd6I"></div>
<input class="button ui-elem" disabled id="publish-button" name="button" type="submit" value="Publish Note" />
<button class="button ui-elem" disabled id="publish-button" type="button" onclick="submitForm()">
{{if .ID}}Update{{else}}Publish{{end}} Note
</button>
<span id="feedback"></span>
</fieldset>
</form>
<footer>
@@ -34,6 +38,27 @@
$('publish-button').disabled = !$('tos').checked;
$('captcha').style.display = $('tos').checked ? 'block' : 'none';
}
function submitForm() {
var id = $("id").value;
var text = $("text").value;
var deletion = id != "" && text == "";
if (deletion && !confirm("Do you want to delete this note?")) {
return;
}
var resp = post("/", {
"id": id,
"text": text,
"tos": $("tos").value,
"password": $("password").value
}, function (status, responseRaw) {
var response = JSON.parse(responseRaw);
if (status < 400 && response.Success) {
window.location.replace(deletion ? "/" : "/" + response.Payload)
} else {
$('feedback').innerHTML = status + ": " + response.Payload;
}
})
}
</script>
</body>
</html>
assets/templates/note.html
+2 -13
View File
@@ -6,6 +6,7 @@
<meta charset="UTF-8" />
<meta content="width=device-width, initial-scale=1.0" name="viewport" />
<link href="/style.css" rel="stylesheet" type="text/css" />
<script src='/note.js'></script>
</head>
<body>
{{.Ads}}
@@ -18,21 +19,9 @@
<a href="/{{.ID}}/stats">statistics</a> &middot;
<a href="/{{.ID}}/edit">edit</a> &middot;
<a href="/{{.ID}}/export">export</a> &middot;
<a href="javascript:void(0)" onclick="report()">report abuse</a> &middot;
<a href="javascript:void(0)" onclick="report({{.ID}})">report abuse</a> &middot;
{{end}}
<a href="/TOS.md">terms of service</a>
<script>
function report() {
var resp = prompt("Please shortly explain the problem with this note.");
if (resp) {
var xhr = new XMLHttpRequest();
xhr.open('POST', '/{{.ID}}/report');
xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
xhr.send("report=" + encodeURIComponent(resp));
alert("Thank you!")
}
}
</script>
</footer>
</body>
</html>
render.go
+2 -17
View File
@@ -2,7 +2,6 @@ package main
import (
"errors"
"fmt"
"html/template"
"io/ioutil"
"net/http"
@@ -28,24 +27,10 @@ var (
rexpNoScriptIframe = regexp.MustCompile("<.*?(iframe|script).*?>")
rexpLink = regexp.MustCompile("(ht|f)tp://[^\\s]+")
errorUnathorised = errors.New("id or password is wrong")
errorUnathorised = errors.New("password is wrong")
errorBadRequest = errors.New("password is empty")
)
func responsePage(code int, details ...string) *Note {
text := statuses[code]
body := text
if len(details) > 0 {
body += ": " + strings.Join(details, ";")
}
n := &Note{
Title: text,
Text: fmt.Sprintf("# %d %s", code, body),
}
n.prepare()
return n
}
func (n *Note) prepare() {
fstLine := rexpNewLine.Split(n.Text, -1)[0]
maxLength := 25
@@ -69,7 +54,7 @@ func md2html(c echo.Context, name string) (*Note, int) {
if err != nil {
c.Logger().Errorf("couldn't open markdown page %s: %v", path, err)
code := http.StatusServiceUnavailable
return responsePage(code), code
return &Note{Title: statuses[code], Text: "# " + statuses[code]}, code
}
c.Logger().Debugf("rendering markdown page %s", name)
return &Note{Title: name, Content: mdTmplHTML(mdContent)}, http.StatusOK
server.go
+35 -23
View File
@@ -57,6 +57,7 @@ func main() {
e.File("/favicon.ico", "assets/public/favicon.ico")
e.File("/robots.txt", "assets/public/robots.txt")
e.File("/style.css", "assets/public/style.css")
e.File("/note.js", "assets/public/note.js")
e.File("/index.html", "assets/public/index.html")
e.File("/", "assets/public/index.html")
@@ -98,30 +99,46 @@ func main() {
return c.Render(code, "Form", n)
})
e.POST("/:id/report", func(c echo.Context) error {
report := c.FormValue("report")
if report != "" {
id := c.Param("id")
c.Logger().Infof("note %s was reported: %s", id, report)
if err := email(id, report); err != nil {
c.Logger().Errorf("couldn't send email: %v", err)
}
}
return c.NoContent(http.StatusNoContent)
})
e.GET("/new", func(c echo.Context) error {
c.Logger().Debug("/new requested")
return c.Render(http.StatusOK, "Form", nil)
})
e.POST("/note", func(c echo.Context) error {
c.Logger().Debug("POST /note requested")
type postResp struct {
Success bool
Payload string
}
e.POST("/", func(c echo.Context) error {
c.Logger().Debug("POST /")
if !skipCaptcha && !checkRecaptcha(c, c.FormValue("g-recaptcha-response")) {
code := http.StatusForbidden
return c.Render(code, "Note", responsePage(code))
return c.JSON(code, postResp{false, statuses[code]})
}
if c.FormValue("tos") != "on" {
code := http.StatusPreconditionFailed
c.Logger().Errorf("POST /note error: %d", code)
return c.Render(code, "Note", responsePage(code))
c.Logger().Errorf("POST / error: %d", code)
return c.JSON(code, postResp{false, statuses[code]})
}
id := c.FormValue("id")
text := c.FormValue("text")
l := len(text)
if (id == "" || id != "" && l != 0) && (10 > l || l > 50000) {
code := http.StatusBadRequest
c.Logger().Errorf("POST /note error: %d", code)
return c.Render(code, "Note",
responsePage(code, "note length not accepted"))
c.Logger().Errorf("POST / error: %d", code)
return c.JSON(code, postResp{false, statuses[code] + ": note length not accepted"})
}
n := &Note{
ID: id,
@@ -137,23 +154,18 @@ func main() {
} else if err == errorBadRequest {
code = http.StatusBadRequest
}
c.Logger().Errorf("POST /note error: %d", code)
return c.Render(code, "Note", responsePage(code, err.Error()))
c.Logger().Errorf("POST / error: %d", code)
return c.JSON(code, postResp{false, statuses[code] + ": " + err.Error()})
}
c.Logger().Infof("note %s saved", n.ID)
return c.Redirect(http.StatusMovedPermanently, "/"+n.ID)
})
e.POST("/:id/report", func(c echo.Context) error {
report := c.FormValue("report")
if report != "" {
id := c.Param("id")
if err := email(id, report); err != nil {
c.Logger().Errorf("couldn't send email: %v", err)
if id == "" {
c.Logger().Infof("note %s created", n.ID)
return c.JSON(http.StatusCreated, postResp{true, n.ID})
} else if text == "" {
c.Logger().Infof("note %s deleted", n.ID)
return c.JSON(http.StatusOK, postResp{true, n.ID})
}
c.Logger().Debugf("note %s was reported", id)
}
return c.NoContent(http.StatusNoContent)
c.Logger().Infof("note %s updated", n.ID)
return c.JSON(http.StatusOK, postResp{true, n.ID})
})
s := &http.Server{
storage.go
+1 -1
View File
@@ -125,7 +125,7 @@ func load(c echo.Context, db *sql.DB) (*Note, int) {
var views int
if err := row.Scan(&id, &text, &published, &editedVal, &password, &views); err != nil {
code := http.StatusNotFound
return responsePage(code), code
return &Note{Title: statuses[code], Text: "# " + statuses[code]}, code
}
n := &Note{
ID: id,