From 6802fe68007f0ec934013e9cb5f57dfbc9973208 Mon Sep 17 00:00:00 2001 From: Jordan Date: Thu, 30 Jan 2014 23:11:06 -0600 Subject: [PATCH] Changed to indent JSON Changed default username to admin (instead of jordan) --- controllers/api.go | 2 +- db/db.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/controllers/api.go b/controllers/api.go index 3b27fa05..80e20f5c 100644 --- a/controllers/api.go +++ b/controllers/api.go @@ -36,7 +36,7 @@ func API_Campaigns(w http.ResponseWriter, r *http.Request) { if err != nil { fmt.Println(err) } - d, err := json.Marshal(cs) + d, err := json.MarshalIndent(cs, "", " ") if err != nil { fmt.Println(err) } diff --git a/db/db.go b/db/db.go index b737016c..76973d2d 100644 --- a/db/db.go +++ b/db/db.go @@ -42,7 +42,7 @@ func Setup() error { } //Create the default user init_user := models.User{ - Username: "jordan", + Username: "admin", Hash: "$2a$10$d4OtT.RkEOQn.iruVWIQ5u8CeV/85ZYF41y8wKeUwsAPqPNFvTccW", APIKey: "12345678901234567890123456789012", }