From f31c13d76e5de8ab0420ecaf0f570e52f6218066 Mon Sep 17 00:00:00 2001
From: Steve Manuel <nilslice@gmail.com>
Date: Wed, 21 Sep 2016 13:40:38 -0700
Subject: reorganizing code to resemble a package + command structure.
 documented the install process

---
 README.md         |   6 ++-
 cmd/cms/server.go | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 system/server.go  | 119 ------------------------------------------------------
 3 files changed, 124 insertions(+), 120 deletions(-)
 create mode 100644 cmd/cms/server.go
 delete mode 100644 system/server.go

diff --git a/README.md b/README.md
index cf64bdc..80f1444 100644
--- a/README.md
+++ b/README.md
@@ -2,4 +2,8 @@
 ### (WIP)
 
 Creating a CMS thing for Go developers. Not ready for use, but would be happy 
-to get thoughts/feedback!
\ No newline at end of file
+to get thoughts/feedback!
+
+```
+$ go get github.com/nilslice/cms/...
+```
\ No newline at end of file
diff --git a/cmd/cms/server.go b/cmd/cms/server.go
new file mode 100644
index 0000000..d8fa224
--- /dev/null
+++ b/cmd/cms/server.go
@@ -0,0 +1,119 @@
+package main
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"net/http"
+
+	"github.com/nilslice/cms/content"
+	"github.com/nilslice/cms/management/editor"
+	"github.com/nilslice/cms/management/manager"
+	"github.com/nilslice/cms/system/admin"
+	"github.com/nilslice/cms/system/db"
+)
+
+func main() {
+	http.HandleFunc("/admin", func(res http.ResponseWriter, req *http.Request) {
+		adminView := admin.Admin(nil)
+
+		res.Header().Set("Content-Type", "text/html")
+		res.Write(adminView)
+	})
+
+	http.HandleFunc("/admin/posts", func(res http.ResponseWriter, req *http.Request) {
+		q := req.URL.Query()
+		t := q.Get("type")
+		if t == "" {
+			res.WriteHeader(http.StatusBadRequest)
+		}
+
+		posts := db.GetAll(t)
+		b := &bytes.Buffer{}
+		p := content.Types[t]().(editor.Editable)
+
+		html := `<a href="/admin/edit?type=` + t + `" class="button">New ` + t + `</a>
+			<ul class="posts">`
+		for i := range posts {
+			json.Unmarshal(posts[i], &p)
+			post := `<li><a href="/admin/edit?type=` +
+				t + `&id=` + fmt.Sprintf("%d", p.ContentID()) +
+				`">` + p.ContentName() + `</a></li>`
+			b.Write([]byte(post))
+		}
+		html = html + b.String()
+
+		adminView := admin.Admin([]byte(html))
+
+		res.Header().Set("Content-Type", "text/html")
+		res.Write(adminView)
+	})
+
+	http.HandleFunc("/admin/edit", func(res http.ResponseWriter, req *http.Request) {
+		switch req.Method {
+		case http.MethodGet:
+			q := req.URL.Query()
+			i := q.Get("id")
+			t := q.Get("type")
+			contentType, ok := content.Types[t]
+			if !ok {
+				fmt.Fprintf(res, content.ErrTypeNotRegistered, t)
+				return
+			}
+			post := contentType()
+
+			if i != "" {
+				data, err := db.Get(t + ":" + i)
+				if err != nil {
+					fmt.Println(err)
+					res.WriteHeader(http.StatusInternalServerError)
+					return
+				}
+
+				err = json.Unmarshal(data, post)
+				if err != nil {
+					fmt.Println(err)
+					res.WriteHeader(http.StatusInternalServerError)
+					return
+				}
+			}
+
+			m, err := manager.Manage(post.(editor.Editable), t)
+			adminView := admin.Admin(m)
+			if err != nil {
+				fmt.Println(err)
+				res.WriteHeader(http.StatusInternalServerError)
+				return
+			}
+			res.Header().Set("Content-Type", "text/html")
+			res.Write(adminView)
+
+		case http.MethodPost:
+			err := req.ParseForm()
+			if err != nil {
+				fmt.Println(err)
+				res.WriteHeader(http.StatusBadRequest)
+				return
+			}
+
+			cid := req.FormValue("id")
+			t := req.FormValue("type")
+			id, err := db.Set(t+":"+cid, req.PostForm)
+			if err != nil {
+				fmt.Println(err)
+				res.WriteHeader(http.StatusInternalServerError)
+				return
+			}
+
+			scheme := req.URL.Scheme
+			host := req.URL.Host
+			path := req.URL.Path
+			sid := fmt.Sprintf("%d", id)
+			desURL := scheme + host + path + "?type=" + t + "&id=" + sid
+			http.Redirect(res, req, desURL, http.StatusFound)
+		}
+	})
+
+	http.ListenAndServe(":8080", nil)
+
+}
diff --git a/system/server.go b/system/server.go
deleted file mode 100644
index d8fa224..0000000
--- a/system/server.go
+++ /dev/null
@@ -1,119 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"net/http"
-
-	"github.com/nilslice/cms/content"
-	"github.com/nilslice/cms/management/editor"
-	"github.com/nilslice/cms/management/manager"
-	"github.com/nilslice/cms/system/admin"
-	"github.com/nilslice/cms/system/db"
-)
-
-func main() {
-	http.HandleFunc("/admin", func(res http.ResponseWriter, req *http.Request) {
-		adminView := admin.Admin(nil)
-
-		res.Header().Set("Content-Type", "text/html")
-		res.Write(adminView)
-	})
-
-	http.HandleFunc("/admin/posts", func(res http.ResponseWriter, req *http.Request) {
-		q := req.URL.Query()
-		t := q.Get("type")
-		if t == "" {
-			res.WriteHeader(http.StatusBadRequest)
-		}
-
-		posts := db.GetAll(t)
-		b := &bytes.Buffer{}
-		p := content.Types[t]().(editor.Editable)
-
-		html := `<a href="/admin/edit?type=` + t + `" class="button">New ` + t + `</a>
-			<ul class="posts">`
-		for i := range posts {
-			json.Unmarshal(posts[i], &p)
-			post := `<li><a href="/admin/edit?type=` +
-				t + `&id=` + fmt.Sprintf("%d", p.ContentID()) +
-				`">` + p.ContentName() + `</a></li>`
-			b.Write([]byte(post))
-		}
-		html = html + b.String()
-
-		adminView := admin.Admin([]byte(html))
-
-		res.Header().Set("Content-Type", "text/html")
-		res.Write(adminView)
-	})
-
-	http.HandleFunc("/admin/edit", func(res http.ResponseWriter, req *http.Request) {
-		switch req.Method {
-		case http.MethodGet:
-			q := req.URL.Query()
-			i := q.Get("id")
-			t := q.Get("type")
-			contentType, ok := content.Types[t]
-			if !ok {
-				fmt.Fprintf(res, content.ErrTypeNotRegistered, t)
-				return
-			}
-			post := contentType()
-
-			if i != "" {
-				data, err := db.Get(t + ":" + i)
-				if err != nil {
-					fmt.Println(err)
-					res.WriteHeader(http.StatusInternalServerError)
-					return
-				}
-
-				err = json.Unmarshal(data, post)
-				if err != nil {
-					fmt.Println(err)
-					res.WriteHeader(http.StatusInternalServerError)
-					return
-				}
-			}
-
-			m, err := manager.Manage(post.(editor.Editable), t)
-			adminView := admin.Admin(m)
-			if err != nil {
-				fmt.Println(err)
-				res.WriteHeader(http.StatusInternalServerError)
-				return
-			}
-			res.Header().Set("Content-Type", "text/html")
-			res.Write(adminView)
-
-		case http.MethodPost:
-			err := req.ParseForm()
-			if err != nil {
-				fmt.Println(err)
-				res.WriteHeader(http.StatusBadRequest)
-				return
-			}
-
-			cid := req.FormValue("id")
-			t := req.FormValue("type")
-			id, err := db.Set(t+":"+cid, req.PostForm)
-			if err != nil {
-				fmt.Println(err)
-				res.WriteHeader(http.StatusInternalServerError)
-				return
-			}
-
-			scheme := req.URL.Scheme
-			host := req.URL.Host
-			path := req.URL.Path
-			sid := fmt.Sprintf("%d", id)
-			desURL := scheme + host + path + "?type=" + t + "&id=" + sid
-			http.Redirect(res, req, desURL, http.StatusFound)
-		}
-	})
-
-	http.ListenAndServe(":8080", nil)
-
-}
-- 
cgit v1.2.3