Fixed count of votes cast (#108)

* Fixed count of votes cast

* Misc fixes

Author: pikachu0542

api.go

@@ -254,14 +254,21 @@ func GetPollResults(c *gin.Context) {
 		return
 	}
 
-	fmt.Println(len(results))
+	numVotes := 0
+
+	for _, v := range results {
+		for key := range v {
+			numVotes += v[key]
+		}
+	}
+
 	c.HTML(http.StatusOK, "result.tmpl", gin.H{
 		"Id":                   poll.Id,
 		"Title":                poll.Title,
 		"Description":          poll.Description,
 		"VoteType":             poll.VoteType,
 		"Results":              results,
-		"NumVotes":             len(results),
+		"NumVotes":             numVotes,
 		"IsOpen":               poll.Open,
 		"IsHidden":             poll.Hidden,
 		"CanModify":            canModify,

templates/create.tmpl

@@ -34,12 +34,12 @@
           </select>
         </div>
         <div id="customOptions" class="input-group d-none my-3">
-          <label for="customOptions" class="input-group-text">Custom Options</label>
+          <label for="customOptions" class="input-group-text">Custom Vote Options</label>
           <input
             type="text"
             name="customOptions"
             class="form-control"
-            placeholder="Enter a comma separated list of custom options"
+            placeholder="Enter a comma separated list of custom vote options"
           >
         </div>
 
@@ -112,7 +112,7 @@
         </div>
         {{ end }}
 
-        <input type="submit" class="btn btn-primary" value="Create">
+        <input type="submit" class="btn btn-primary my-2" value="Create">
       </form>
     </div>
 

templates/poll.tmpl

@@ -16,14 +16,14 @@
       <form action="/poll/{{ .Id }}" method="POST">
       {{ if eq .PollType "simple" }}
         {{ range $i, $option := .Options }}
-        <div class="form-check fs-4">
+        <div class="form-check fs-4 lh-sm">
           <input class="form-check-input" type="radio" name="option" id="{{ $option }}" value="{{ $option }}" />
           <label class="form-check-label" for="{{ $option }}">{{ $option }}</label>
         </div>
         <br />
         {{ end }}
         {{ if .AllowWriteIns }}
-        <div class="form-check fs-4">
+        <div class="form-check fs-4 lh-sm">
           <input class="form-check-input" type="radio" name="option" value="writein" />
           <input
             type="text"

templates/result.tmpl

@@ -24,7 +24,7 @@
         {{ end }}
       {{ end }}
 
-      <h2>{{ .Title }}</h2>
+      <h2 class="text-break">{{ .Title }}</h2>
       {{ if .Description }}
       <h4>{{ .Description | MakeLinks }}</h4>
       {{ end }}