From 735f99addd98f232ae126cac11d93a9dbbcc3c79 Mon Sep 17 00:00:00 2001
From: Steve Manuel <nilslice@gmail.com>
Date: Sat, 22 Oct 2016 01:39:19 -0700
Subject: adding initial support to edit and add admin users

---
 system/admin/admin.go | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 116 insertions(+)

(limited to 'system/admin/admin.go')

diff --git a/system/admin/admin.go b/system/admin/admin.go
index b375eb6..e56453f 100644
--- a/system/admin/admin.go
+++ b/system/admin/admin.go
@@ -4,9 +4,12 @@ package admin
 
 import (
 	"bytes"
+	"encoding/json"
 	"html/template"
+	"net/http"
 
 	"github.com/bosssauce/ponzu/content"
+	"github.com/bosssauce/ponzu/system/admin/user"
 	"github.com/bosssauce/ponzu/system/db"
 )
 
@@ -241,6 +244,119 @@ func Login() ([]byte, error) {
 	return buf.Bytes(), nil
 }
 
+// UsersList ...
+func UsersList(req *http.Request) ([]byte, error) {
+	html := `
+    <div class="card">
+        <form class="row" enctype="multipart/form-data" action="/admin/configure/users/edit" method="post">
+            <div>Edit your account:</div>
+            <div class="input-feild col s12">
+                <label class="active">Email Address</label>
+                <input type="email" name="email" value="{{ .User.Email }}"/>
+            </div>
+
+            <div>To approve changes, enter your password:</div>
+            <div class="input-feild col s12">
+                <label class="active">Current Password</label>
+                <input type="password" name="password"/>
+            </div>
+
+            <div class="input-feild col s12">
+                <label class="active">New Password: (leave blank if no password change needed)</label>
+                <input type="email" name="new_password" type="password"/>
+            </div>
+
+            <button class="btn waves-effect waves-light green" type="submit">Save</button>
+        </form>
+
+        <form class="row" enctype="multipart/form-data" action="/admin/configure/users" method="post">
+            <div>Add a new user:</div>
+            <div class="input-feild col s12">
+                <label class="active">Email Address</label>
+                <input type="email" name="email" value=""/>
+            </div>
+
+            <div class="input-feild col s12">
+                <label class="active">Password</label>
+                <input type="password" name="password"/>
+            </div>
+
+            <button class="btn waves-effect waves-light green" type="submit">Add User</button>
+        </form>        
+
+        <ul class="users row">
+            {{ range .Users }}
+            <li class="col s12">
+                {{ .Email }}
+                <form enctype="multipart/form-data" class="delete-user __ponzu right" action="/admin/configure/users/delete" method="post">
+                    <span>Delete</span>
+                    <input type="hidden" name="email" value="{{ .Email }}"/>
+                    <input type="hidden" name="id" value="{{ .ID }}"/>
+                </form>
+            <li>
+            {{ end }}
+        </ul>
+    </div>
+    `
+	script := `
+    <script>
+        $(function() {
+            var del = $('.delete-user.__ponzu span');
+            del.on('click', function(e) {
+                if (confirm("[Ponzu] Please confirm:\n\nAre you sure you want to delete this user?\nThis cannot be undone.")) {
+                    $(e.target).parent().submit();
+                }
+            });
+        });
+    </script>
+    `
+	var usr user.User
+	var usrs []user.User
+	// get current user out to pass as data to execute template
+	j, err := db.CurrentUser(req)
+	if err != nil {
+		return nil, err
+	}
+	err = json.Unmarshal(j, &usr)
+	if err != nil {
+		return nil, err
+	}
+
+	// get all users to list
+	jj, err := db.UserAll()
+	if err != nil {
+		return nil, err
+	}
+	for i := range jj {
+		var u user.User
+		err = json.Unmarshal(jj[i], &u)
+		if err != nil {
+			return nil, err
+		}
+		usrs = append(usrs, u)
+	}
+
+	// make buffer to execute html into then pass buffer's bytes to Admin
+	buf := &bytes.Buffer{}
+	tmpl := template.Must(template.New("users").Parse(html + script))
+	data := map[string]interface{}{
+		"User":  usr,
+		"Users": usrs,
+	}
+
+	err = tmpl.Execute(buf, data)
+	if err != nil {
+		return nil, err
+	}
+
+	view, err := Admin(buf.Bytes())
+	if err != nil {
+		return nil, err
+	}
+
+	return view, nil
+}
+
 var err400HTML = `
 <div class="error-page e400 col s6">
 <div class="card">
-- 
cgit v1.2.3


From 5d23a75c98e291fe10c7f84f927906d01e4ca098 Mon Sep 17 00:00:00 2001
From: Steve Manuel <nilslice@gmail.com>
Date: Sat, 22 Oct 2016 01:48:16 -0700
Subject: adding initial support to edit and add admin users

---
 system/admin/admin.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'system/admin/admin.go')

diff --git a/system/admin/admin.go b/system/admin/admin.go
index e56453f..6d2e40d 100644
--- a/system/admin/admin.go
+++ b/system/admin/admin.go
@@ -266,7 +266,7 @@ func UsersList(req *http.Request) ([]byte, error) {
                 <input type="email" name="new_password" type="password"/>
             </div>
 
-            <button class="btn waves-effect waves-light green" type="submit">Save</button>
+            <button class="btn waves-effect waves-light green right" type="submit">Save</button>
         </form>
 
         <form class="row" enctype="multipart/form-data" action="/admin/configure/users" method="post">
@@ -281,7 +281,7 @@ func UsersList(req *http.Request) ([]byte, error) {
                 <input type="password" name="password"/>
             </div>
 
-            <button class="btn waves-effect waves-light green" type="submit">Add User</button>
+            <button class="btn waves-effect waves-light green right" type="submit">Add User</button>
         </form>        
 
         <ul class="users row">
-- 
cgit v1.2.3


From e86dda5e6c9b10e540022aa3100eeffa6b369799 Mon Sep 17 00:00:00 2001
From: Steve Manuel <nilslice@gmail.com>
Date: Sat, 22 Oct 2016 01:51:40 -0700
Subject: adding initial support to edit and add admin users

---
 system/admin/admin.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/admin/admin.go')

diff --git a/system/admin/admin.go b/system/admin/admin.go
index 6d2e40d..459fa6d 100644
--- a/system/admin/admin.go
+++ b/system/admin/admin.go
@@ -247,7 +247,7 @@ func Login() ([]byte, error) {
 // UsersList ...
 func UsersList(req *http.Request) ([]byte, error) {
 	html := `
-    <div class="card">
+    <div class="card user-management">
         <form class="row" enctype="multipart/form-data" action="/admin/configure/users/edit" method="post">
             <div>Edit your account:</div>
             <div class="input-feild col s12">
-- 
cgit v1.2.3


From 34ea2f841e5b227b7aa8e2e35f605a2a942849a9 Mon Sep 17 00:00:00 2001
From: Steve Manuel <nilslice@gmail.com>
Date: Sat, 22 Oct 2016 01:54:31 -0700
Subject: adding initial support to edit and add admin users

---
 system/admin/admin.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'system/admin/admin.go')

diff --git a/system/admin/admin.go b/system/admin/admin.go
index 459fa6d..472d4df 100644
--- a/system/admin/admin.go
+++ b/system/admin/admin.go
@@ -310,13 +310,13 @@ func UsersList(req *http.Request) ([]byte, error) {
         });
     </script>
     `
-	var usr user.User
-	var usrs []user.User
 	// get current user out to pass as data to execute template
 	j, err := db.CurrentUser(req)
 	if err != nil {
 		return nil, err
 	}
+
+	var usr user.User
 	err = json.Unmarshal(j, &usr)
 	if err != nil {
 		return nil, err
@@ -327,6 +327,7 @@ func UsersList(req *http.Request) ([]byte, error) {
 	if err != nil {
 		return nil, err
 	}
+	usrs := make([]user.User, len(jj), len(jj))
 	for i := range jj {
 		var u user.User
 		err = json.Unmarshal(jj[i], &u)
-- 
cgit v1.2.3


From e3b642ae979493c3cd48b4702e8d06f3448f8d7a Mon Sep 17 00:00:00 2001
From: Steve Manuel <nilslice@gmail.com>
Date: Sat, 22 Oct 2016 01:59:54 -0700
Subject: adding initial support to edit and add admin users

---
 system/admin/admin.go | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'system/admin/admin.go')

diff --git a/system/admin/admin.go b/system/admin/admin.go
index 472d4df..f3ab3ac 100644
--- a/system/admin/admin.go
+++ b/system/admin/admin.go
@@ -250,20 +250,20 @@ func UsersList(req *http.Request) ([]byte, error) {
     <div class="card user-management">
         <form class="row" enctype="multipart/form-data" action="/admin/configure/users/edit" method="post">
             <div>Edit your account:</div>
-            <div class="input-feild col s12">
+            <div class="input-feild col s9">
                 <label class="active">Email Address</label>
                 <input type="email" name="email" value="{{ .User.Email }}"/>
             </div>
 
             <div>To approve changes, enter your password:</div>
-            <div class="input-feild col s12">
+            <div class="input-feild col s9">
                 <label class="active">Current Password</label>
                 <input type="password" name="password"/>
             </div>
 
-            <div class="input-feild col s12">
+            <div class="input-feild col s9">
                 <label class="active">New Password: (leave blank if no password change needed)</label>
-                <input type="email" name="new_password" type="password"/>
+                <input name="new_password" type="password"/>
             </div>
 
             <button class="btn waves-effect waves-light green right" type="submit">Save</button>
@@ -271,12 +271,12 @@ func UsersList(req *http.Request) ([]byte, error) {
 
         <form class="row" enctype="multipart/form-data" action="/admin/configure/users" method="post">
             <div>Add a new user:</div>
-            <div class="input-feild col s12">
+            <div class="input-feild col s9">
                 <label class="active">Email Address</label>
                 <input type="email" name="email" value=""/>
             </div>
 
-            <div class="input-feild col s12">
+            <div class="input-feild col s9">
                 <label class="active">Password</label>
                 <input type="password" name="password"/>
             </div>
@@ -327,14 +327,17 @@ func UsersList(req *http.Request) ([]byte, error) {
 	if err != nil {
 		return nil, err
 	}
-	usrs := make([]user.User, len(jj), len(jj))
+
+	var usrs []user.User
 	for i := range jj {
 		var u user.User
 		err = json.Unmarshal(jj[i], &u)
 		if err != nil {
 			return nil, err
 		}
-		usrs = append(usrs, u)
+		if u.Email != usr.Email {
+			usrs = append(usrs, u)
+		}
 	}
 
 	// make buffer to execute html into then pass buffer's bytes to Admin
-- 
cgit v1.2.3


From 77f9716046255955c459ad449b0604f945f31e5d Mon Sep 17 00:00:00 2001
From: Steve Manuel <nilslice@gmail.com>
Date: Sat, 22 Oct 2016 02:03:32 -0700
Subject: adding initial support to edit and add admin users

---
 system/admin/admin.go | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'system/admin/admin.go')

diff --git a/system/admin/admin.go b/system/admin/admin.go
index f3ab3ac..49dce10 100644
--- a/system/admin/admin.go
+++ b/system/admin/admin.go
@@ -249,7 +249,7 @@ func UsersList(req *http.Request) ([]byte, error) {
 	html := `
     <div class="card user-management">
         <form class="row" enctype="multipart/form-data" action="/admin/configure/users/edit" method="post">
-            <div>Edit your account:</div>
+            <div class="card-title">Edit your account:</div>
             <div class="input-feild col s9">
                 <label class="active">Email Address</label>
                 <input type="email" name="email" value="{{ .User.Email }}"/>
@@ -266,11 +266,13 @@ func UsersList(req *http.Request) ([]byte, error) {
                 <input name="new_password" type="password"/>
             </div>
 
-            <button class="btn waves-effect waves-light green right" type="submit">Save</button>
+            <div class="input-feild col s9">                        
+                <button class="btn waves-effect waves-light green right" type="submit">Save</button>
+            </div>
         </form>
 
         <form class="row" enctype="multipart/form-data" action="/admin/configure/users" method="post">
-            <div>Add a new user:</div>
+            <div class="card-title">Add a new user:</div>
             <div class="input-feild col s9">
                 <label class="active">Email Address</label>
                 <input type="email" name="email" value=""/>
@@ -281,10 +283,13 @@ func UsersList(req *http.Request) ([]byte, error) {
                 <input type="password" name="password"/>
             </div>
 
-            <button class="btn waves-effect waves-light green right" type="submit">Add User</button>
+            <div class="input-feild col s9">            
+                <button class="btn waves-effect waves-light green right" type="submit">Add User</button>
+            </div>   
         </form>        
 
         <ul class="users row">
+        <div class="card-title">Remove Admin Users</div>
             {{ range .Users }}
             <li class="col s12">
                 {{ .Email }}
-- 
cgit v1.2.3


From ff15bfb9725e2a295221a346ecd82570f3646238 Mon Sep 17 00:00:00 2001
From: Steve Manuel <nilslice@gmail.com>
Date: Sat, 22 Oct 2016 02:05:16 -0700
Subject: adding initial support to edit and add admin users

---
 system/admin/admin.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'system/admin/admin.go')

diff --git a/system/admin/admin.go b/system/admin/admin.go
index 49dce10..053602c 100644
--- a/system/admin/admin.go
+++ b/system/admin/admin.go
@@ -255,8 +255,9 @@ func UsersList(req *http.Request) ([]byte, error) {
                 <input type="email" name="email" value="{{ .User.Email }}"/>
             </div>
 
-            <div>To approve changes, enter your password:</div>
             <div class="input-feild col s9">
+                <div>To approve changes, enter your password:</div>
+                
                 <label class="active">Current Password</label>
                 <input type="password" name="password"/>
             </div>
-- 
cgit v1.2.3


From a0ea25a4abd67332f7a4a85c91f1490b0274b318 Mon Sep 17 00:00:00 2001
From: Steve Manuel <nilslice@gmail.com>
Date: Sat, 22 Oct 2016 02:12:55 -0700
Subject: adding initial support to edit and add admin users

---
 system/admin/admin.go | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'system/admin/admin.go')

diff --git a/system/admin/admin.go b/system/admin/admin.go
index 053602c..3beef21 100644
--- a/system/admin/admin.go
+++ b/system/admin/admin.go
@@ -334,6 +334,7 @@ func UsersList(req *http.Request) ([]byte, error) {
 		return nil, err
 	}
 
+	var tmpUsrs []user.User
 	var usrs []user.User
 	for i := range jj {
 		var u user.User
@@ -346,6 +347,13 @@ func UsersList(req *http.Request) ([]byte, error) {
 		}
 	}
 
+	// filter out empty user records
+	for i := range tmpUsrs {
+		if tmpUsrs[i].Email != "" {
+			usrs = append(usrs, tmpUsrs[i])
+		}
+	}
+
 	// make buffer to execute html into then pass buffer's bytes to Admin
 	buf := &bytes.Buffer{}
 	tmpl := template.Must(template.New("users").Parse(html + script))
-- 
cgit v1.2.3


From 80f84a6d61714945cbd92f646d2131ba650c6912 Mon Sep 17 00:00:00 2001
From: Steve Manuel <nilslice@gmail.com>
Date: Sat, 22 Oct 2016 02:13:50 -0700
Subject: adding initial support to edit and add admin users

---
 system/admin/admin.go | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'system/admin/admin.go')

diff --git a/system/admin/admin.go b/system/admin/admin.go
index 3beef21..243af1f 100644
--- a/system/admin/admin.go
+++ b/system/admin/admin.go
@@ -5,6 +5,7 @@ package admin
 import (
 	"bytes"
 	"encoding/json"
+	"fmt"
 	"html/template"
 	"net/http"
 
@@ -334,7 +335,6 @@ func UsersList(req *http.Request) ([]byte, error) {
 		return nil, err
 	}
 
-	var tmpUsrs []user.User
 	var usrs []user.User
 	for i := range jj {
 		var u user.User
@@ -347,12 +347,7 @@ func UsersList(req *http.Request) ([]byte, error) {
 		}
 	}
 
-	// filter out empty user records
-	for i := range tmpUsrs {
-		if tmpUsrs[i].Email != "" {
-			usrs = append(usrs, tmpUsrs[i])
-		}
-	}
+	fmt.Println(usrs)
 
 	// make buffer to execute html into then pass buffer's bytes to Admin
 	buf := &bytes.Buffer{}
-- 
cgit v1.2.3


From f6f50b620e7f4a4ba25f4cb24fc8ea52e2b97975 Mon Sep 17 00:00:00 2001
From: Steve Manuel <nilslice@gmail.com>
Date: Sat, 22 Oct 2016 02:15:44 -0700
Subject: adding initial support to edit and add admin users

---
 system/admin/admin.go | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'system/admin/admin.go')

diff --git a/system/admin/admin.go b/system/admin/admin.go
index 243af1f..4a72af0 100644
--- a/system/admin/admin.go
+++ b/system/admin/admin.go
@@ -5,7 +5,6 @@ package admin
 import (
 	"bytes"
 	"encoding/json"
-	"fmt"
 	"html/template"
 	"net/http"
 
@@ -293,6 +292,7 @@ func UsersList(req *http.Request) ([]byte, error) {
         <ul class="users row">
         <div class="card-title">Remove Admin Users</div>
             {{ range .Users }}
+            {{ if .Email}}
             <li class="col s12">
                 {{ .Email }}
                 <form enctype="multipart/form-data" class="delete-user __ponzu right" action="/admin/configure/users/delete" method="post">
@@ -302,6 +302,7 @@ func UsersList(req *http.Request) ([]byte, error) {
                 </form>
             <li>
             {{ end }}
+            {{ end }}
         </ul>
     </div>
     `
@@ -347,8 +348,6 @@ func UsersList(req *http.Request) ([]byte, error) {
 		}
 	}
 
-	fmt.Println(usrs)
-
 	// make buffer to execute html into then pass buffer's bytes to Admin
 	buf := &bytes.Buffer{}
 	tmpl := template.Must(template.New("users").Parse(html + script))
-- 
cgit v1.2.3


From 7f06b2f269e6d87e82131395cc9090a7a95753b5 Mon Sep 17 00:00:00 2001
From: Steve Manuel <nilslice@gmail.com>
Date: Sat, 22 Oct 2016 02:17:29 -0700
Subject: adding initial support to edit and add admin users

---
 system/admin/admin.go | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'system/admin/admin.go')

diff --git a/system/admin/admin.go b/system/admin/admin.go
index 4a72af0..a5ced6d 100644
--- a/system/admin/admin.go
+++ b/system/admin/admin.go
@@ -5,6 +5,7 @@ package admin
 import (
 	"bytes"
 	"encoding/json"
+	"fmt"
 	"html/template"
 	"net/http"
 
@@ -356,6 +357,8 @@ func UsersList(req *http.Request) ([]byte, error) {
 		"Users": usrs,
 	}
 
+	fmt.Println(data)
+
 	err = tmpl.Execute(buf, data)
 	if err != nil {
 		return nil, err
-- 
cgit v1.2.3


From 2bfa37f5c7b65eb3bcc8f757412e1ee400b3187c Mon Sep 17 00:00:00 2001
From: Steve Manuel <nilslice@gmail.com>
Date: Sat, 22 Oct 2016 02:20:12 -0700
Subject: debugging user listing

---
 system/admin/admin.go | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'system/admin/admin.go')

diff --git a/system/admin/admin.go b/system/admin/admin.go
index a5ced6d..dd291e5 100644
--- a/system/admin/admin.go
+++ b/system/admin/admin.go
@@ -5,7 +5,6 @@ package admin
 import (
 	"bytes"
 	"encoding/json"
-	"fmt"
 	"html/template"
 	"net/http"
 
@@ -293,8 +292,7 @@ func UsersList(req *http.Request) ([]byte, error) {
         <ul class="users row">
         <div class="card-title">Remove Admin Users</div>
             {{ range .Users }}
-            {{ if .Email}}
-            <li class="col s12">
+            <li class="col s9">
                 {{ .Email }}
                 <form enctype="multipart/form-data" class="delete-user __ponzu right" action="/admin/configure/users/delete" method="post">
                     <span>Delete</span>
@@ -303,7 +301,6 @@ func UsersList(req *http.Request) ([]byte, error) {
                 </form>
             <li>
             {{ end }}
-            {{ end }}
         </ul>
     </div>
     `
@@ -357,8 +354,6 @@ func UsersList(req *http.Request) ([]byte, error) {
 		"Users": usrs,
 	}
 
-	fmt.Println(data)
-
 	err = tmpl.Execute(buf, data)
 	if err != nil {
 		return nil, err
-- 
cgit v1.2.3


From 8b92fc26a5bb4126c7e2d61ebe81b47f9381267d Mon Sep 17 00:00:00 2001
From: Steve Manuel <nilslice@gmail.com>
Date: Sat, 22 Oct 2016 02:21:56 -0700
Subject: debugging user listing

---
 system/admin/admin.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/admin/admin.go')

diff --git a/system/admin/admin.go b/system/admin/admin.go
index dd291e5..5efacf4 100644
--- a/system/admin/admin.go
+++ b/system/admin/admin.go
@@ -289,8 +289,8 @@ func UsersList(req *http.Request) ([]byte, error) {
             </div>   
         </form>        
 
+        <div class="card-title">Remove Admin Users</div>        
         <ul class="users row">
-        <div class="card-title">Remove Admin Users</div>
             {{ range .Users }}
             <li class="col s9">
                 {{ .Email }}
-- 
cgit v1.2.3


From dbed4fd6c2e296454adb1ebe5186111aa6367fb7 Mon Sep 17 00:00:00 2001
From: Steve Manuel <nilslice@gmail.com>
Date: Sat, 22 Oct 2016 02:23:40 -0700
Subject: debugging user listing

---
 system/admin/admin.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'system/admin/admin.go')

diff --git a/system/admin/admin.go b/system/admin/admin.go
index 5efacf4..824edc8 100644
--- a/system/admin/admin.go
+++ b/system/admin/admin.go
@@ -248,8 +248,8 @@ func Login() ([]byte, error) {
 func UsersList(req *http.Request) ([]byte, error) {
 	html := `
     <div class="card user-management">
+        <div class="card-title">Edit your account:</div>    
         <form class="row" enctype="multipart/form-data" action="/admin/configure/users/edit" method="post">
-            <div class="card-title">Edit your account:</div>
             <div class="input-feild col s9">
                 <label class="active">Email Address</label>
                 <input type="email" name="email" value="{{ .User.Email }}"/>
@@ -272,8 +272,8 @@ func UsersList(req *http.Request) ([]byte, error) {
             </div>
         </form>
 
+        <div class="card-title">Add a new user:</div>        
         <form class="row" enctype="multipart/form-data" action="/admin/configure/users" method="post">
-            <div class="card-title">Add a new user:</div>
             <div class="input-feild col s9">
                 <label class="active">Email Address</label>
                 <input type="email" name="email" value=""/>
@@ -299,7 +299,7 @@ func UsersList(req *http.Request) ([]byte, error) {
                     <input type="hidden" name="email" value="{{ .Email }}"/>
                     <input type="hidden" name="id" value="{{ .ID }}"/>
                 </form>
-            <li>
+            </li>
             {{ end }}
         </ul>
     </div>
-- 
cgit v1.2.3


From 92a4c135101e22e99fc41a5f50cc393fd219c8a5 Mon Sep 17 00:00:00 2001
From: Steve Manuel <nilslice@gmail.com>
Date: Sat, 22 Oct 2016 03:09:46 -0700
Subject: implementing handlers for user configuration

---
 system/admin/admin.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'system/admin/admin.go')

diff --git a/system/admin/admin.go b/system/admin/admin.go
index 824edc8..2b5696e 100644
--- a/system/admin/admin.go
+++ b/system/admin/admin.go
@@ -322,8 +322,8 @@ func UsersList(req *http.Request) ([]byte, error) {
 		return nil, err
 	}
 
-	var usr user.User
-	err = json.Unmarshal(j, &usr)
+	usr := &user.User{}
+	err = json.Unmarshal(j, usr)
 	if err != nil {
 		return nil, err
 	}
@@ -334,10 +334,10 @@ func UsersList(req *http.Request) ([]byte, error) {
 		return nil, err
 	}
 
-	var usrs []user.User
+	var usrs []*user.User
 	for i := range jj {
-		var u user.User
-		err = json.Unmarshal(jj[i], &u)
+		u := &user.User{}
+		err = json.Unmarshal(jj[i], u)
 		if err != nil {
 			return nil, err
 		}
-- 
cgit v1.2.3


From c8343342aa4f8e545c9020a2003a2427387db9a7 Mon Sep 17 00:00:00 2001
From: Steve Manuel <nilslice@gmail.com>
Date: Sat, 22 Oct 2016 03:15:13 -0700
Subject: debuggig

---
 system/admin/admin.go | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'system/admin/admin.go')

diff --git a/system/admin/admin.go b/system/admin/admin.go
index 2b5696e..2ebf1b3 100644
--- a/system/admin/admin.go
+++ b/system/admin/admin.go
@@ -5,6 +5,7 @@ package admin
 import (
 	"bytes"
 	"encoding/json"
+	"fmt"
 	"html/template"
 	"net/http"
 
@@ -319,26 +320,30 @@ func UsersList(req *http.Request) ([]byte, error) {
 	// get current user out to pass as data to execute template
 	j, err := db.CurrentUser(req)
 	if err != nil {
+		fmt.Println("CurrentUser")
 		return nil, err
 	}
 
-	usr := &user.User{}
-	err = json.Unmarshal(j, usr)
+	var usr user.User
+	err = json.Unmarshal(j, &usr)
 	if err != nil {
+		fmt.Println("Unmarshal usr")
 		return nil, err
 	}
 
 	// get all users to list
 	jj, err := db.UserAll()
 	if err != nil {
+		fmt.Println("UserAll")
 		return nil, err
 	}
 
-	var usrs []*user.User
-	for i := range jj {
-		u := &user.User{}
-		err = json.Unmarshal(jj[i], u)
+	var usrs []user.User
+	for i, _ := range jj {
+		var u user.User
+		err = json.Unmarshal(jj[i], &u)
 		if err != nil {
+			fmt.Println("Unmarshal in jj", jj[i])
 			return nil, err
 		}
 		if u.Email != usr.Email {
@@ -356,6 +361,7 @@ func UsersList(req *http.Request) ([]byte, error) {
 
 	err = tmpl.Execute(buf, data)
 	if err != nil {
+		fmt.Println("Execute")
 		return nil, err
 	}
 
-- 
cgit v1.2.3


From af228ca00a4c816f03c3b46f4cf11f26fe32455e Mon Sep 17 00:00:00 2001
From: Steve Manuel <nilslice@gmail.com>
Date: Sat, 22 Oct 2016 03:21:29 -0700
Subject: debugging update user handler and db code

---
 system/admin/admin.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/admin/admin.go')

diff --git a/system/admin/admin.go b/system/admin/admin.go
index 2ebf1b3..285bb8b 100644
--- a/system/admin/admin.go
+++ b/system/admin/admin.go
@@ -339,7 +339,7 @@ func UsersList(req *http.Request) ([]byte, error) {
 	}
 
 	var usrs []user.User
-	for i, _ := range jj {
+	for i := range jj {
 		var u user.User
 		err = json.Unmarshal(jj[i], &u)
 		if err != nil {
-- 
cgit v1.2.3


From a4b2180e32b72729c27614dd3f10fd0da1f42fde Mon Sep 17 00:00:00 2001
From: Steve Manuel <nilslice@gmail.com>
Date: Sat, 22 Oct 2016 03:47:28 -0700
Subject: debugging json output

---
 system/admin/admin.go | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'system/admin/admin.go')

diff --git a/system/admin/admin.go b/system/admin/admin.go
index 285bb8b..9bf0e9b 100644
--- a/system/admin/admin.go
+++ b/system/admin/admin.go
@@ -324,6 +324,8 @@ func UsersList(req *http.Request) ([]byte, error) {
 		return nil, err
 	}
 
+	fmt.Println(string(j))
+
 	var usr user.User
 	err = json.Unmarshal(j, &usr)
 	if err != nil {
-- 
cgit v1.2.3


From 1d2eab63109f2fc4ee2399c47e3aae542e4e9663 Mon Sep 17 00:00:00 2001
From: Steve Manuel <nilslice@gmail.com>
Date: Sat, 22 Oct 2016 03:54:31 -0700
Subject: debugging json content

---
 system/admin/admin.go | 1 +
 1 file changed, 1 insertion(+)

(limited to 'system/admin/admin.go')

diff --git a/system/admin/admin.go b/system/admin/admin.go
index 9bf0e9b..bee723b 100644
--- a/system/admin/admin.go
+++ b/system/admin/admin.go
@@ -329,6 +329,7 @@ func UsersList(req *http.Request) ([]byte, error) {
 	var usr user.User
 	err = json.Unmarshal(j, &usr)
 	if err != nil {
+		fmt.Println(string(j))
 		fmt.Println("Unmarshal usr")
 		return nil, err
 	}
-- 
cgit v1.2.3


From 2fd308a18701d8d9da9f86480eabdc5c367e2f5c Mon Sep 17 00:00:00 2001
From: Steve Manuel <nilslice@gmail.com>
Date: Mon, 24 Oct 2016 15:55:25 -0700
Subject: removing debug printlns and modifying other fmt.Println to
 log.Println for consistency

---
 system/admin/admin.go | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'system/admin/admin.go')

diff --git a/system/admin/admin.go b/system/admin/admin.go
index bee723b..824edc8 100644
--- a/system/admin/admin.go
+++ b/system/admin/admin.go
@@ -5,7 +5,6 @@ package admin
 import (
 	"bytes"
 	"encoding/json"
-	"fmt"
 	"html/template"
 	"net/http"
 
@@ -320,24 +319,18 @@ func UsersList(req *http.Request) ([]byte, error) {
 	// get current user out to pass as data to execute template
 	j, err := db.CurrentUser(req)
 	if err != nil {
-		fmt.Println("CurrentUser")
 		return nil, err
 	}
 
-	fmt.Println(string(j))
-
 	var usr user.User
 	err = json.Unmarshal(j, &usr)
 	if err != nil {
-		fmt.Println(string(j))
-		fmt.Println("Unmarshal usr")
 		return nil, err
 	}
 
 	// get all users to list
 	jj, err := db.UserAll()
 	if err != nil {
-		fmt.Println("UserAll")
 		return nil, err
 	}
 
@@ -346,7 +339,6 @@ func UsersList(req *http.Request) ([]byte, error) {
 		var u user.User
 		err = json.Unmarshal(jj[i], &u)
 		if err != nil {
-			fmt.Println("Unmarshal in jj", jj[i])
 			return nil, err
 		}
 		if u.Email != usr.Email {
@@ -364,7 +356,6 @@ func UsersList(req *http.Request) ([]byte, error) {
 
 	err = tmpl.Execute(buf, data)
 	if err != nil {
-		fmt.Println("Execute")
 		return nil, err
 	}
 
-- 
cgit v1.2.3


From 5737f4f300dfd624bdef292bd6e467ec2cbb6037 Mon Sep 17 00:00:00 2001
From: Steve Manuel <nilslice@gmail.com>
Date: Sat, 29 Oct 2016 20:08:17 -0700
Subject: debugging

---
 system/admin/admin.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/admin/admin.go')

diff --git a/system/admin/admin.go b/system/admin/admin.go
index 824edc8..9ee86c3 100644
--- a/system/admin/admin.go
+++ b/system/admin/admin.go
@@ -414,7 +414,7 @@ var err405HTML = `
 <div class="card">
 <div class="card-content">
     <div class="card-title"><b>405</b> Error: Method Not Allowed</div>
-    <blockquote>Sorry, the page you requested could not be found.</blockquote>
+    <blockquote>Sorry, the method of your request is not allowed.</blockquote>
 </div>
 </div>
 </div>
-- 
cgit v1.2.3