diff --git a/.gitignore b/.gitignore index 330e7a1..49397b4 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ test.txt ledger-quicknote *.txt .htpasswd +data diff --git a/data/lancatlin@pm.me/expense.tpl b/data/lancatlin@pm.me/expense.tpl deleted file mode 100644 index e2f2ce6..0000000 --- a/data/lancatlin@pm.me/expense.tpl +++ /dev/null @@ -1,4 +0,0 @@ -{{ .Date }} {{ with .Name }}{{ . }}{{ else }}{{ .Destination }}{{ end }} - {{ .Destination }} ${{ .Amount }} - {{ with .Source }}{{ . }}{{ else }}cash{{ end }} - diff --git a/route.go b/route.go index 3fc4ebb..ca86200 100644 --- a/route.go +++ b/route.go @@ -1,7 +1,6 @@ package main import ( - "fmt" "io/ioutil" "log" "text/template" @@ -71,12 +70,8 @@ func router() *gin.Engine { }) authZone.GET("/edit", func(c *gin.Context) { - c.Redirect(303, fmt.Sprintf("/edit/%s", DEFAULT_JOURNAL)) - }) - - authZone.GET("/edit/:filename", func(c *gin.Context) { user := getUser(c) - filename := c.Param("filename") + filename := c.Query("filename") list, err := user.List() if err != nil { panic(err) @@ -103,17 +98,18 @@ func router() *gin.Engine { }) }) - authZone.POST("/edit/:filename", func(c *gin.Context) { + authZone.POST("/edit", func(c *gin.Context) { user := getUser(c) - filename := c.Param("filename") + filename := c.PostForm("filename") data := c.PostForm("data") err := user.overwriteFile(filename, data) if err != nil { panic(err) } - HTML(c, 200, "success.html", struct { - Tx string - }{data}) + HTML(c, 200, "success.html", gin.H{ + "FileName": filename, + "Tx": data, + }) }) authZone.GET("/download", func(c *gin.Context) { diff --git a/templates/edit.html b/templates/edit.html index be66bc1..e3d8af5 100644 --- a/templates/edit.html +++ b/templates/edit.html @@ -1,18 +1,18 @@ {{ define "title" }}編輯{{ end }} {{ define "main" }} -
{{ .FileName }}{{ if not .Exists }} - New file{{ end }}
- - {{ end }} diff --git a/templates/success.html b/templates/success.html index 2863a56..97c0a8c 100644 --- a/templates/success.html +++ b/templates/success.html @@ -1,6 +1,6 @@ {{ define "title" }}Success{{ end }} {{ define "main" }}Success
+{{ .Tx }}
-
{{ end }}