From 161cac42f144f57cafbf86fa2c8571a216a8ee6d Mon Sep 17 00:00:00 2001
From: inkletblot <solomonlaing@protonmail.com>
Date: Thu, 13 Feb 2020 23:17:33 +1030
Subject: [PATCH] tinkering with styling and layout, purely cosmetic changes

---
 scripts/auth.controllers.js |  8 ++++----
 scripts/forum.controller.js | 10 ++++++++++
 styles/h5.css               |  8 +++++++-
 views/create_category.html  |  4 ++--
 views/create_topic.html     |  4 ++--
 views/home.html             |  3 ++-
 views/topics.html           |  6 ++----
 7 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/scripts/auth.controllers.js b/scripts/auth.controllers.js
index 5037e1e..a42a893 100644
--- a/scripts/auth.controllers.js
+++ b/scripts/auth.controllers.js
@@ -14,7 +14,7 @@ daddy.controller("loginCtrlr", function($scope, $cookies, $location, $http, stat
     $scope.message = message
 
     $scope.setSignup = () => {
-        stateData.setPage("things")
+        stateData.setPage("forum")
         $location.path("/signup")
     }
 
@@ -37,8 +37,8 @@ daddy.controller("loginCtrlr", function($scope, $cookies, $location, $http, stat
                 console.log("set cookie")
                 stateData.setUser(res.data[0])
                 console.log("set data")
-                stateData.setPage("things")
-                $location.path("/things")
+                stateData.setPage("forum")
+                $location.path("/")
             }
         }).catch((res) => {
             if (res.status == 400) {
@@ -73,7 +73,7 @@ daddy.controller("signupCtrlr", function($scope, $http, $location, stateData) {
     $scope.status = false
 
     $scope.setLogin = () => {
-        stateData.setPage("things")
+        stateData.setPage("forum")
         $location.path("/login")
     }
     
diff --git a/scripts/forum.controller.js b/scripts/forum.controller.js
index 487f7e2..4290578 100644
--- a/scripts/forum.controller.js
+++ b/scripts/forum.controller.js
@@ -11,6 +11,16 @@ daddy.controller("forumCtrlr", function($scope, $http, $location) {
         }
     }
 
+    $scope.messages = {
+        welcome : "Hello one and all, please ignore the unfinished state of \
+                   this forum, it is a work in progress. However, all offered \
+                   features sould currently work as expected.",
+        context : "This forum is a personal project that is being used as a \
+                   learning tool to explore all sorts of things, from node \
+                   development to hosting containers, created using Docker, \
+                   on a small Odroid-MC1 and N2 kubernetes cluster."
+    }
+
     $scope.errors = {
         topic : {
             show : false,
diff --git a/styles/h5.css b/styles/h5.css
index e9dff65..d9fae1e 100644
--- a/styles/h5.css
+++ b/styles/h5.css
@@ -159,7 +159,7 @@ nav .userbar {
   display: block;
   margin: auto;
   width: min-content;
-  margin-bottom: 50px;
+  margin-bottom: 10px;
 }
 
 .border {
@@ -172,6 +172,11 @@ nav .userbar {
   display: block;
 }
 
+.message {
+  width: 60%;
+  text-align: justify;
+}
+
 /* START forum CSS */
 
 table {
@@ -179,6 +184,7 @@ table {
 	border-collapse: collapse;
   width: fit-content;
   margin: auto;
+  min-width: 50%;
 }
 
 table, td, th {
diff --git a/views/create_category.html b/views/create_category.html
index 3795acb..5914287 100644
--- a/views/create_category.html
+++ b/views/create_category.html
@@ -1,5 +1,5 @@
 <article ng-controller="createCategoryCtrlr" ng-init="start()">
-    <section ng-show="!(error.userLevel.show)" class="item border">
+    <section ng-show="!(error.userLevel.show)" class="item center border">
         <h3>{{titles.form}}</h3>
         <form id="categoryForm" name="categoryForm" ng-submit="createCategory()">
             <label for="catName">Name: </label> <br />
@@ -10,7 +10,7 @@
         </form>
         <p class="status" ng-show="status.show">{{status.text}}</p>
     </section>
-    <section ng-show="error.userLevel.show" class="item border">
+    <section ng-show="error.userLevel.show" class="item center border" style="width: 30%;">
         <p ng-show="error.userName.show">{{error.loggedIn.text1}} <span class="link" ng-click="setLogin()">{{error.loggedIn.link1}}</span> {{error.loggedIn.text2}}</p>
         <p ng-show="!(erro.userName.show)">{{error.userLevel.text1}}</p>
     </section>
diff --git a/views/create_topic.html b/views/create_topic.html
index 4c1443d..3d88f82 100644
--- a/views/create_topic.html
+++ b/views/create_topic.html
@@ -1,5 +1,5 @@
 <article ng-controller="createTopicCtrlr" ng-init="start()">
-        <section ng-show="!(error.loggedIn.show)" class="item border">
+        <section ng-show="!(error.loggedIn.show)" class="item center border">
             <h3>{{titles.form}}</h3>
             <p ng-show="error.category.show && !error.userLevel.show">{{error.category.text1}} <span class="link" ng-click="setCreateCat()">{{error.category.link1}}</span> {{error.category.text2}}</p>
             <p ng-show="error.category.show && error.userLevel.show">{{error.userLevel.text1}} <br /> {{error.userLevel.text2}}</p>
@@ -17,7 +17,7 @@
             </form>
             <p class="status" ng-show="status.show">{{status.text}}</p>
         </section>
-        <section ng-show="error.loggedIn.show" class="item border">
+        <section ng-show="error.loggedIn.show" class="item center border" style="width: 30%;">
             <p>{{error.loggedIn.text1}} <span class="link" ng-click="setLogin()">{{error.loggedIn.link1}}</span> {{error.loggedIn.text2}}</p>
         </section>
 </article>
\ No newline at end of file
diff --git a/views/home.html b/views/home.html
index 15da4ac..0eed58c 100644
--- a/views/home.html
+++ b/views/home.html
@@ -2,7 +2,8 @@
 
     <section class="item stretch border">    
         <h3>{{titles.main.heading}}</h3>
-        <br />
+        <p class="center message">{{messages.welcome}}</p>
+        <p class="center message">{{messages.context}}</p>
         <h3>{{titles.recent.heading}}</h3> <br />
         <table>
             <tr>
diff --git a/views/topics.html b/views/topics.html
index 849b7fe..be218b1 100644
--- a/views/topics.html
+++ b/views/topics.html
@@ -3,8 +3,6 @@
         <h3>{{topic.topicSubject}}</h3> <em><p>by {{topic.posts[0].user.userName}}</p></em> <br />
 
         <table>
-
-
             <tr>
                 <th colspan="2">{{topic.topicSubject}}</th>
             </tr>
@@ -35,8 +33,8 @@
                         ng-click="setSignup()">{{logged.link2}}</span> {{logged.text3}}</td>
                 <td colspan="2" ng-show="state.user.userNo != null">
                     <form name="replyForm" id="replyForm" ng-submit="makeReply(topic.topicNo)">
-                        <label for="replyCotnent">Reply:</label>
-                        <textarea name="replyContent" ng-model="reply.postContent" required></textarea>
+                        <label for="replyCotnent">Reply:</label> <br />
+                        <textarea name="replyContent" ng-model="reply.postContent" required></textarea> <br />
                         <input type="submit" name="replySubmit" ng-model="reply.submit" value="Reply" />
                     </form>
                     <p class="status" ng-show="status.show">{{status.text}}</p>