james/yarr
4
0
Fork 0
mirror of https://github.com/nkanaev/yarr.git synced 2025-05-24 21:19:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix headers

Browse Source
This commit is contained in:
Nazar Kanaev 2020-07-24 16:17:35 +01:00
parent 3085d6c848
commit 24aa8859b3
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/handlers.go
View File

@ -57,7 +57,7 @@ type NewFolder struct {
func FolderListHandler(rw http.ResponseWriter, req *http.Request) { func FolderListHandler(rw http.ResponseWriter, req *http.Request) {
if req.Method == "GET" { if req.Method == "GET" {
list := db(req).ListFolders() list := db(req).ListFolders()
json.NewEncoder(rw).Encode(list) writeJSON(rw, list)
} else if req.Method == "POST" { } else if req.Method == "POST" {
var body NewFolder var body NewFolder
if err := json.NewDecoder(req.Body).Decode(&body); err != nil { if err := json.NewDecoder(req.Body).Decode(&body); err != nil {
@ -72,7 +72,7 @@ func FolderListHandler(rw http.ResponseWriter, req *http.Request) {
} }
folder := db(req).CreateFolder(body.Title) folder := db(req).CreateFolder(body.Title)
rw.WriteHeader(http.StatusCreated) rw.WriteHeader(http.StatusCreated)
json.NewEncoder(rw).Encode(folder) writeJSON(rw, folder)
} else { } else {
rw.WriteHeader(http.StatusMethodNotAllowed) rw.WriteHeader(http.StatusMethodNotAllowed)
} }
@ -123,7 +123,7 @@ type UpdateFeed struct {
func FeedListHandler(rw http.ResponseWriter, req *http.Request) { func FeedListHandler(rw http.ResponseWriter, req *http.Request) {
if req.Method == "GET" { if req.Method == "GET" {
list := db(req).ListFeeds() list := db(req).ListFeeds()
json.NewEncoder(rw).Encode(list) writeJSON(rw, list)
} else if req.Method == "POST" { } else if req.Method == "POST" {
var feed NewFeed var feed NewFeed
if err := json.NewDecoder(req.Body).Decode(&feed); err != nil { if err := json.NewDecoder(req.Body).Decode(&feed); err != nil {
@ -318,7 +318,6 @@ func ItemListHandler(rw http.ResponseWriter, req *http.Request) {
} }
items := db(req).ListItems(filter, (curPage-1)*perPage, perPage) items := db(req).ListItems(filter, (curPage-1)*perPage, perPage)
count := db(req).CountItems(filter) count := db(req).CountItems(filter)
rw.WriteHeader(http.StatusOK)
writeJSON(rw, map[string]interface{}{ writeJSON(rw, map[string]interface{}{
"page": map[string]int{ "page": map[string]int{
"cur": curPage, "cur": curPage,
@ -344,7 +343,6 @@ func ItemListHandler(rw http.ResponseWriter, req *http.Request) {
func SettingsHandler(rw http.ResponseWriter, req *http.Request) { func SettingsHandler(rw http.ResponseWriter, req *http.Request) {
if req.Method == "GET" { if req.Method == "GET" {
rw.WriteHeader(http.StatusOK)
writeJSON(rw, db(req).GetSettings()) writeJSON(rw, db(req).GetSettings())
} else if req.Method == "PUT" { } else if req.Method == "PUT" {
settings := make(map[string]interface{}) settings := make(map[string]interface{})

2
template/static/javascripts/api.js
View File

@ -4,7 +4,7 @@
var api = function(method, endpoint, data) { var api = function(method, endpoint, data) {
return fetch(endpoint, { return fetch(endpoint, {
method: method, method: method,
headers: {'content-type': 'application/json'}, headers: {'Content-Type': 'application/json'},
body: JSON.stringify(data), body: JSON.stringify(data),
}) })
} }