From 0ca691e3ae802192656bb266e299f4940361019f Mon Sep 17 00:00:00 2001
From: DutchEllie <personal@quenten.nl>
Date: Tue, 15 Mar 2022 13:22:59 +0100
Subject: [PATCH] Layout and refactoring

---
 src/aboutpage.go                     |  6 ++-
 src/galaxiespage.go                  |  6 ++-
 src/guestbookform.go                 |  2 +-
 src/guestbookpanel.go                | 15 +++----
 src/homepage.go                      | 62 +++++++++++++++++-----------
 web/blocks/snippets/bannerpanel.html |  0
 web/static/style.css                 | 10 +++++
 7 files changed, 65 insertions(+), 36 deletions(-)
 create mode 100644 web/blocks/snippets/bannerpanel.html

diff --git a/src/aboutpage.go b/src/aboutpage.go
index ee0eee7..a933ef4 100644
--- a/src/aboutpage.go
+++ b/src/aboutpage.go
@@ -16,11 +16,15 @@ func (a *AboutPage) Render() app.UI {
 	return newPage().
 		Title("About me").
 		LeftBar(
-			&bannerPanel{},
+			newHTMLBlock().
+				Class("left").
+				Class("leftbarblock").
+				Src("/web/blocks/snippets/bannerpanel.html"),
 		).
 		Main(
 			newHTMLBlock().
 				Class("right").
+				Class("contentblock").
 				Src("/web/blocks/pages/about.html"),
 		)
 }
diff --git a/src/galaxiespage.go b/src/galaxiespage.go
index 62f563b..353cec8 100644
--- a/src/galaxiespage.go
+++ b/src/galaxiespage.go
@@ -14,11 +14,15 @@ func (f *GalaxiesPage) Render() app.UI {
 	return newPage().
 		Title("Galaxies").
 		LeftBar(
-			&bannerPanel{},
+			newHTMLBlock().
+				Class("left").
+				Class("leftbarblock").
+				Src("/web/blocks/snippets/bannerpanel.html"),
 		).
 		Main(
 			newHTMLBlock().
 				Class("right").
+				Class("contentblock").
 				Src("/web/blocks/pages/galaxies.html"),
 		)
 }
diff --git a/src/guestbookform.go b/src/guestbookform.go
index f27a840..dbf1eda 100644
--- a/src/guestbookform.go
+++ b/src/guestbookform.go
@@ -64,7 +64,7 @@ func (g *guestbookForm) Render() app.UI {
 				},
 			},
 		),
-	).Class("content")
+	)
 }
 
 func (g *guestbookForm) clear() {
diff --git a/src/guestbookpanel.go b/src/guestbookpanel.go
index 9605c1c..74a2b12 100644
--- a/src/guestbookpanel.go
+++ b/src/guestbookpanel.go
@@ -35,15 +35,12 @@ func newGuestbookPanel() *guestbookPanel {
 }
 
 func (g *guestbookPanel) Render() app.UI {
-	return newUIBlock().
-		Class("right").
-		UI(
-			app.Range(g.comments).Slice(func(i int) app.UI {
-				return &guestbookComment{
-					Comment: g.comments[i],
-				}
-			}),
-		)
+	return app.Range(g.comments).Slice(func(i int) app.UI {
+		return &guestbookComment{
+			Comment: g.comments[i],
+		}
+	},
+	)
 }
 
 func (g *guestbookPanel) LoadComments() {
diff --git a/src/homepage.go b/src/homepage.go
index 1ff8955..6c09d5e 100644
--- a/src/homepage.go
+++ b/src/homepage.go
@@ -27,36 +27,50 @@ func (p *Homepage) Render() app.UI {
 	return newPage().
 		Title("Homepage").
 		LeftBar(
-			&bannerPanel{},
+			newHTMLBlock().
+				Class("left").
+				Class("leftbarblock").
+				Src("/web/blocks/snippets/bannerpanel.html"),
 		).
 		Main(
 			newHTMLBlock().
 				Class("right").
+				Class("contentblock").
 				Src("/web/blocks/pages/intro.html"),
-			&guestbookForm{
-				OnSubmit: func(name, message string) {
-					var comment entity.Comment
-					comment.Name = name
-					comment.Message = message
+			newUIBlock().
+				Class("right").
+				Class("contentblock").
+				UI(
+					&guestbookForm{
+						OnSubmit: func(name, message string) {
+							var comment entity.Comment
+							comment.Name = name
+							comment.Message = message
 
-					jsondata, err := json.Marshal(comment)
-					if err != nil {
-						fmt.Printf("err: %v\n", err)
-						return
-					}
-					url := ApiURL
+							jsondata, err := json.Marshal(comment)
+							if err != nil {
+								fmt.Printf("err: %v\n", err)
+								return
+							}
+							url := ApiURL
 
-					req, err := http.Post(url, "application/json", bytes.NewBuffer(jsondata))
-					if err != nil {
-						fmt.Printf("err: %v\n", err)
-						return
-					}
-					if req.StatusCode == 200 {
-						p.Update()
-					}
-					defer req.Body.Close()
-				},
-			},
-			gbp.Render(),
+							req, err := http.Post(url, "application/json", bytes.NewBuffer(jsondata))
+							if err != nil {
+								fmt.Printf("err: %v\n", err)
+								return
+							}
+							if req.StatusCode == 200 {
+								p.Update()
+							}
+							defer req.Body.Close()
+						},
+					},
+				),
+			newUIBlock().
+				Class("right").
+				Class("contentblock").
+				UI(
+					gbp.Render(),
+				),
 		)
 }
diff --git a/web/blocks/snippets/bannerpanel.html b/web/blocks/snippets/bannerpanel.html
new file mode 100644
index 0000000..e69de29
diff --git a/web/static/style.css b/web/static/style.css
index 47f2871..156c89e 100644
--- a/web/static/style.css
+++ b/web/static/style.css
@@ -74,6 +74,16 @@ body {
 	background-color: rgb(54, 39, 48);
 	margin-bottom: 5px;
 	position: relative;
+}
+
+.leftbarblock {
+	float:left;
+	width: 250px;
+	padding: 5px 0px;
+}
+
+.contentblock {
+	float:right;
 	width: 614px;
 	padding: 10px;
 }