Added view graphs for the individual routes.

Made some minor improvements to Cosora.
2018-01-05 22:47:13 +00:00 · 2018-01-05 22:47:13 +00:00 · d0b6559df9
parent e259a575e9
commit d0b6559df9
10 changed files with 266 additions and 115 deletions
--- a/common/extend.go
+++ b/common/extend.go
@ -98,6 +98,7 @@ var PreRenderHooks = map[string][]func(http.ResponseWriter, *http.Request, *User
 	"pre_render_panel_edit_forum":            nil,
 	"pre_render_panel_analytics":             nil,
 	"pre_render_panel_analytics_routes":      nil,
+	"pre_render_panel_analytics_route_views": nil,
 	"pre_render_panel_settings":              nil,
 	"pre_render_panel_setting":               nil,
 	"pre_render_panel_word_filters":          nil,
--- a/common/pages.go
+++ b/common/pages.go
@ -177,6 +177,16 @@ type PanelAnalyticsRoutesPage struct {
 	ItemList    []PanelAnalyticsRoutesItem
 }

+type PanelAnalyticsRoutePage struct {
+	Title        string
+	CurrentUser  User
+	Header       *HeaderVars
+	Stats        PanelStats
+	Zone         string
+	Route        string
+	PrimaryGraph PanelTimeGraph
+}
+
 type PanelThemesPage struct {
 	Title         string
 	CurrentUser   User
--- a/gen_router.go
+++ b/gen_router.go
@ -51,6 +51,7 @@ var RouteMap = map[string]interface{}{
 	"routePanelUsersEditSubmit": routePanelUsersEditSubmit,
 	"routePanelAnalyticsViews": routePanelAnalyticsViews,
 	"routePanelAnalyticsRoutes": routePanelAnalyticsRoutes,
+	"routePanelAnalyticsRouteViews": routePanelAnalyticsRouteViews,
 	"routePanelGroups": routePanelGroups,
 	"routePanelGroupsEdit": routePanelGroupsEdit,
 	"routePanelGroupsEditPerms": routePanelGroupsEditPerms,
@ -116,31 +117,32 @@ var routeMapEnum = map[string]int{
 	"routePanelUsersEditSubmit": 33,
 	"routePanelAnalyticsViews": 34,
 	"routePanelAnalyticsRoutes": 35,
-	"routePanelGroups": 36,
-	"routePanelGroupsEdit": 37,
-	"routePanelGroupsEditPerms": 38,
-	"routePanelGroupsEditSubmit": 39,
-	"routePanelGroupsEditPermsSubmit": 40,
-	"routePanelGroupsCreateSubmit": 41,
-	"routePanelBackups": 42,
-	"routePanelLogsMod": 43,
-	"routePanelDebug": 44,
-	"routePanel": 45,
-	"routeAccountEditCritical": 46,
-	"routeAccountEditCriticalSubmit": 47,
-	"routeAccountEditAvatar": 48,
-	"routeAccountEditAvatarSubmit": 49,
-	"routeAccountEditUsername": 50,
-	"routeAccountEditUsernameSubmit": 51,
-	"routeAccountEditEmail": 52,
-	"routeAccountEditEmailTokenSubmit": 53,
-	"routeProfile": 54,
-	"routeBanSubmit": 55,
-	"routeUnban": 56,
-	"routeActivate": 57,
-	"routeIps": 58,
-	"routeDynamic": 59,
-	"routeUploads": 60,
+	"routePanelAnalyticsRouteViews": 36,
+	"routePanelGroups": 37,
+	"routePanelGroupsEdit": 38,
+	"routePanelGroupsEditPerms": 39,
+	"routePanelGroupsEditSubmit": 40,
+	"routePanelGroupsEditPermsSubmit": 41,
+	"routePanelGroupsCreateSubmit": 42,
+	"routePanelBackups": 43,
+	"routePanelLogsMod": 44,
+	"routePanelDebug": 45,
+	"routePanel": 46,
+	"routeAccountEditCritical": 47,
+	"routeAccountEditCriticalSubmit": 48,
+	"routeAccountEditAvatar": 49,
+	"routeAccountEditAvatarSubmit": 50,
+	"routeAccountEditUsername": 51,
+	"routeAccountEditUsernameSubmit": 52,
+	"routeAccountEditEmail": 53,
+	"routeAccountEditEmailTokenSubmit": 54,
+	"routeProfile": 55,
+	"routeBanSubmit": 56,
+	"routeUnban": 57,
+	"routeActivate": 58,
+	"routeIps": 59,
+	"routeDynamic": 60,
+	"routeUploads": 61,
 }
 var reverseRouteMapEnum = map[int]string{ 
 	0: "routeAPI",
@ -179,31 +181,32 @@ var reverseRouteMapEnum = map[int]string{
 	33: "routePanelUsersEditSubmit",
 	34: "routePanelAnalyticsViews",
 	35: "routePanelAnalyticsRoutes",
-	36: "routePanelGroups",
-	37: "routePanelGroupsEdit",
-	38: "routePanelGroupsEditPerms",
-	39: "routePanelGroupsEditSubmit",
-	40: "routePanelGroupsEditPermsSubmit",
-	41: "routePanelGroupsCreateSubmit",
-	42: "routePanelBackups",
-	43: "routePanelLogsMod",
-	44: "routePanelDebug",
-	45: "routePanel",
-	46: "routeAccountEditCritical",
-	47: "routeAccountEditCriticalSubmit",
-	48: "routeAccountEditAvatar",
-	49: "routeAccountEditAvatarSubmit",
-	50: "routeAccountEditUsername",
-	51: "routeAccountEditUsernameSubmit",
-	52: "routeAccountEditEmail",
-	53: "routeAccountEditEmailTokenSubmit",
-	54: "routeProfile",
-	55: "routeBanSubmit",
-	56: "routeUnban",
-	57: "routeActivate",
-	58: "routeIps",
-	59: "routeDynamic",
-	60: "routeUploads",
+	36: "routePanelAnalyticsRouteViews",
+	37: "routePanelGroups",
+	38: "routePanelGroupsEdit",
+	39: "routePanelGroupsEditPerms",
+	40: "routePanelGroupsEditSubmit",
+	41: "routePanelGroupsEditPermsSubmit",
+	42: "routePanelGroupsCreateSubmit",
+	43: "routePanelBackups",
+	44: "routePanelLogsMod",
+	45: "routePanelDebug",
+	46: "routePanel",
+	47: "routeAccountEditCritical",
+	48: "routeAccountEditCriticalSubmit",
+	49: "routeAccountEditAvatar",
+	50: "routeAccountEditAvatarSubmit",
+	51: "routeAccountEditUsername",
+	52: "routeAccountEditUsernameSubmit",
+	53: "routeAccountEditEmail",
+	54: "routeAccountEditEmailTokenSubmit",
+	55: "routeProfile",
+	56: "routeBanSubmit",
+	57: "routeUnban",
+	58: "routeActivate",
+	59: "routeIps",
+	60: "routeDynamic",
+	61: "routeUploads",
 }

 // TODO: Stop spilling these into the package scope?
@ -577,14 +580,17 @@ func (router *GenRouter) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 				case "/panel/analytics/routes/":
 					common.RouteViewCounter.Bump(35)
 					err = routePanelAnalyticsRoutes(w,req,user)
-				case "/panel/groups/":
+				case "/panel/analytics/route/":
 					common.RouteViewCounter.Bump(36)
+					err = routePanelAnalyticsRouteViews(w,req,user,extraData)
+				case "/panel/groups/":
+					common.RouteViewCounter.Bump(37)
 					err = routePanelGroups(w,req,user)
 				case "/panel/groups/edit/":
-					common.RouteViewCounter.Bump(37)
+					common.RouteViewCounter.Bump(38)
 					err = routePanelGroupsEdit(w,req,user,extraData)
 				case "/panel/groups/edit/perms/":
-					common.RouteViewCounter.Bump(38)
+					common.RouteViewCounter.Bump(39)
 					err = routePanelGroupsEditPerms(w,req,user,extraData)
 				case "/panel/groups/edit/submit/":
 					err = common.NoSessionMismatch(w,req,user)
@ -593,7 +599,7 @@ func (router *GenRouter) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 						return
 					}
 					
-					common.RouteViewCounter.Bump(39)
+					common.RouteViewCounter.Bump(40)
 					err = routePanelGroupsEditSubmit(w,req,user,extraData)
 				case "/panel/groups/edit/perms/submit/":
 					err = common.NoSessionMismatch(w,req,user)
@ -602,7 +608,7 @@ func (router *GenRouter) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 						return
 					}
 					
-					common.RouteViewCounter.Bump(40)
+					common.RouteViewCounter.Bump(41)
 					err = routePanelGroupsEditPermsSubmit(w,req,user,extraData)
 				case "/panel/groups/create/":
 					err = common.NoSessionMismatch(w,req,user)
@ -611,7 +617,7 @@ func (router *GenRouter) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 						return
 					}
 					
-					common.RouteViewCounter.Bump(41)
+					common.RouteViewCounter.Bump(42)
 					err = routePanelGroupsCreateSubmit(w,req,user)
 				case "/panel/backups/":
 					err = common.SuperAdminOnly(w,req,user)
@ -620,10 +626,10 @@ func (router *GenRouter) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 						return
 					}
 					
-					common.RouteViewCounter.Bump(42)
+					common.RouteViewCounter.Bump(43)
 					err = routePanelBackups(w,req,user,extraData)
 				case "/panel/logs/mod/":
-					common.RouteViewCounter.Bump(43)
+					common.RouteViewCounter.Bump(44)
 					err = routePanelLogsMod(w,req,user)
 				case "/panel/debug/":
 					err = common.AdminOnly(w,req,user)
@ -632,10 +638,10 @@ func (router *GenRouter) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 						return
 					}
 					
-					common.RouteViewCounter.Bump(44)
+					common.RouteViewCounter.Bump(45)
 					err = routePanelDebug(w,req,user)
 				default:
-					common.RouteViewCounter.Bump(45)
+					common.RouteViewCounter.Bump(46)
 					err = routePanel(w,req,user)
 			}
 			if err != nil {
@ -650,7 +656,7 @@ func (router *GenRouter) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 						return
 					}
 					
-					common.RouteViewCounter.Bump(46)
+					common.RouteViewCounter.Bump(47)
 					err = routeAccountEditCritical(w,req,user)
 				case "/user/edit/critical/submit/":
 					err = common.NoSessionMismatch(w,req,user)
@ -665,7 +671,7 @@ func (router *GenRouter) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 						return
 					}
 					
-					common.RouteViewCounter.Bump(47)
+					common.RouteViewCounter.Bump(48)
 					err = routeAccountEditCriticalSubmit(w,req,user)
 				case "/user/edit/avatar/":
 					err = common.MemberOnly(w,req,user)
@ -674,7 +680,7 @@ func (router *GenRouter) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 						return
 					}
 					
-					common.RouteViewCounter.Bump(48)
+					common.RouteViewCounter.Bump(49)
 					err = routeAccountEditAvatar(w,req,user)
 				case "/user/edit/avatar/submit/":
 					err = common.MemberOnly(w,req,user)
@ -683,7 +689,7 @@ func (router *GenRouter) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 						return
 					}
 					
-					common.RouteViewCounter.Bump(49)
+					common.RouteViewCounter.Bump(50)
 					err = routeAccountEditAvatarSubmit(w,req,user)
 				case "/user/edit/username/":
 					err = common.MemberOnly(w,req,user)
@ -692,7 +698,7 @@ func (router *GenRouter) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 						return
 					}
 					
-					common.RouteViewCounter.Bump(50)
+					common.RouteViewCounter.Bump(51)
 					err = routeAccountEditUsername(w,req,user)
 				case "/user/edit/username/submit/":
 					err = common.NoSessionMismatch(w,req,user)
@ -707,7 +713,7 @@ func (router *GenRouter) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 						return
 					}
 					
-					common.RouteViewCounter.Bump(51)
+					common.RouteViewCounter.Bump(52)
 					err = routeAccountEditUsernameSubmit(w,req,user)
 				case "/user/edit/email/":
 					err = common.MemberOnly(w,req,user)
@ -716,7 +722,7 @@ func (router *GenRouter) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 						return
 					}
 					
-					common.RouteViewCounter.Bump(52)
+					common.RouteViewCounter.Bump(53)
 					err = routeAccountEditEmail(w,req,user)
 				case "/user/edit/token/":
 					err = common.NoSessionMismatch(w,req,user)
@ -731,11 +737,11 @@ func (router *GenRouter) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 						return
 					}
 					
-					common.RouteViewCounter.Bump(53)
+					common.RouteViewCounter.Bump(54)
 					err = routeAccountEditEmailTokenSubmit(w,req,user,extraData)
 				default:
 					req.URL.Path += extraData
-					common.RouteViewCounter.Bump(54)
+					common.RouteViewCounter.Bump(55)
 					err = routeProfile(w,req,user)
 			}
 			if err != nil {
@ -756,7 +762,7 @@ func (router *GenRouter) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 						return
 					}
 					
-					common.RouteViewCounter.Bump(55)
+					common.RouteViewCounter.Bump(56)
 					err = routeBanSubmit(w,req,user,extraData)
 				case "/users/unban/":
 					err = common.NoSessionMismatch(w,req,user)
@ -771,7 +777,7 @@ func (router *GenRouter) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 						return
 					}
 					
-					common.RouteViewCounter.Bump(56)
+					common.RouteViewCounter.Bump(57)
 					err = routeUnban(w,req,user,extraData)
 				case "/users/activate/":
 					err = common.NoSessionMismatch(w,req,user)
@ -786,7 +792,7 @@ func (router *GenRouter) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 						return
 					}
 					
-					common.RouteViewCounter.Bump(57)
+					common.RouteViewCounter.Bump(58)
 					err = routeActivate(w,req,user,extraData)
 				case "/users/ips/":
 					err = common.MemberOnly(w,req,user)
@ -795,7 +801,7 @@ func (router *GenRouter) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 						return
 					}
 					
-					common.RouteViewCounter.Bump(58)
+					common.RouteViewCounter.Bump(59)
 					err = routeIps(w,req,user)
 			}
 			if err != nil {
@ -812,7 +818,7 @@ func (router *GenRouter) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 				common.NotFound(w,req)
 				return
 			}
-			common.RouteViewCounter.Bump(60)
+			common.RouteViewCounter.Bump(61)
 			req.URL.Path += extraData
 			// TODO: Find a way to propagate errors up from this?
 			router.UploadHandler(w,req) // TODO: Count these views
@ -856,7 +862,7 @@ func (router *GenRouter) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 			router.RUnlock()
 			
 			if ok {
-				common.RouteViewCounter.Bump(59) // TODO: Be more specific about *which* dynamic route it is
+				common.RouteViewCounter.Bump(60) // TODO: Be more specific about *which* dynamic route it is
 				req.URL.Path += extraData
 				err = handle(w,req,user)
 				if err != nil {
--- a/panel_routes.go
+++ b/panel_routes.go
@ -510,7 +510,7 @@ func routePanelAnalyticsRoutes(w http.ResponseWriter, r *http.Request, user comm
 	var routeMap = make(map[string]int)

 	acc := qgen.Builder.Accumulator()
-	rows, err := acc.Select("viewchunks").Columns("count, createdAt, route").Where("route != ''").DateCutoff("createdAt", 1, "day").Query()
+	rows, err := acc.Select("viewchunks").Columns("count, route").Where("route != ''").DateCutoff("createdAt", 1, "day").Query()
 	if err != nil && err != ErrNoRows {
 		return common.InternalError(err, w, r)
 	}
@ -518,15 +518,13 @@ func routePanelAnalyticsRoutes(w http.ResponseWriter, r *http.Request, user comm

 	for rows.Next() {
 		var count int
-		var createdAt time.Time
 		var route string
-		err := rows.Scan(&count, &createdAt, &route)
+		err := rows.Scan(&count, &route)
 		if err != nil {
 			return common.InternalError(err, w, r)
 		}

 		log.Print("count: ", count)
-		log.Print("createdAt: ", createdAt)
 		log.Print("route: ", route)
 		routeMap[route] += count
 	}
@ -557,6 +555,81 @@ func routePanelAnalyticsRoutes(w http.ResponseWriter, r *http.Request, user comm
 	return nil
 }

+func routePanelAnalyticsRouteViews(w http.ResponseWriter, r *http.Request, user common.User, route string) common.RouteError {
+	headerVars, stats, ferr := common.PanelUserCheck(w, r, &user)
+	if ferr != nil {
+		return ferr
+	}
+	headerVars.Stylesheets = append(headerVars.Stylesheets, "chartist/chartist.min.css")
+	headerVars.Scripts = append(headerVars.Scripts, "chartist/chartist.min.js")
+
+	var revLabelList []int64
+	var labelList []int64
+	var viewMap = make(map[int64]int64)
+	var currentTime = time.Now().Unix()
+
+	for i := 1; i <= 12; i++ {
+		var label = currentTime - int64(i*60*30)
+		revLabelList = append(revLabelList, label)
+		viewMap[label] = 0
+	}
+	for _, value := range revLabelList {
+		labelList = append(labelList, value)
+	}
+
+	var viewList []int64
+	log.Print("in routePanelAnalyticsRouteViews")
+
+	acc := qgen.Builder.Accumulator()
+	rows, err := acc.Select("viewchunks").Columns("count, createdAt").Where("route = ?").DateCutoff("createdAt", 6, "hour").Query(route)
+	if err != nil && err != ErrNoRows {
+		return common.InternalError(err, w, r)
+	}
+	defer rows.Close()
+
+	for rows.Next() {
+		var count int64
+		var createdAt time.Time
+		err := rows.Scan(&count, &createdAt)
+		if err != nil {
+			return common.InternalError(err, w, r)
+		}
+		log.Print("count: ", count)
+		log.Print("createdAt: ", createdAt)
+
+		var unixCreatedAt = createdAt.Unix()
+		log.Print("unixCreatedAt: ", unixCreatedAt)
+		for _, value := range labelList {
+			if unixCreatedAt > value {
+				viewMap[value] += count
+				break
+			}
+		}
+	}
+	err = rows.Err()
+	if err != nil {
+		return common.InternalError(err, w, r)
+	}
+
+	for _, value := range revLabelList {
+		viewList = append(viewList, viewMap[value])
+	}
+	graph := common.PanelTimeGraph{Series: viewList, Labels: labelList}
+	log.Printf("graph: %+v\n", graph)
+
+	pi := common.PanelAnalyticsRoutePage{common.GetTitlePhrase("panel-analytics"), user, headerVars, stats, "analytics", html.EscapeString(route), graph}
+	if common.PreRenderHooks["pre_render_panel_analytics_route_views"] != nil {
+		if common.RunPreRenderHook("pre_render_panel_analytics_route_views", w, r, &user, &pi) {
+			return nil
+		}
+	}
+	err = common.Templates.ExecuteTemplate(w, "panel-analytics-route-views.html", pi)
+	if err != nil {
+		return common.InternalError(err, w, r)
+	}
+	return nil
+}
+
 func routePanelSettings(w http.ResponseWriter, r *http.Request, user common.User) common.RouteError {
 	headerVars, stats, ferr := common.PanelUserCheck(w, r, &user)
 	if ferr != nil {
--- a/router_gen/routes.go
+++ b/router_gen/routes.go
@ -91,6 +91,7 @@ func buildPanelRoutes() {

 		View("routePanelAnalyticsViews", "/panel/analytics/views/"),
 		View("routePanelAnalyticsRoutes", "/panel/analytics/routes/"),
+		View("routePanelAnalyticsRouteViews", "/panel/analytics/route/", "extraData"),

 		View("routePanelGroups", "/panel/groups/"),
 		View("routePanelGroupsEdit", "/panel/groups/edit/", "extraData"),
--- a/templates/account-own-edit-email.html
+++ b/templates/account-own-edit-email.html
@ -1,16 +1,16 @@
 {{template "header.html" . }}
-<div class="colstack account">
+<div class="colstack account account_emails">
 	{{template "account-menu.html" . }}
 	<main class="colstack_right">
 		<div class="colstack_item colstack_head rowhead">
 			<div class="rowitem"><h1>Emails</h1></div>
 		</div>
-		<div class="colstack_item">
+		<div class="colstack_item rowlist">
 			<!-- TODO: Do we need this inline CSS? -->
 			{{range .ItemList}}
 			<div class="rowitem" style="font-weight: normal;">
 				<a style="text-transform: none;">{{.Email}}</a>
-				<span style="float: right">
+				<span style="float: right" class="to_right">
 					<span class="username">{{if .Primary}}Primary{{else}}Secondary{{end}}</span>
 					{{if .Validated}}<span class="username" style="color: green;">Verified</span>{{else}}<a class="username" style="color: crimson;">Resend Verification Email</a>{{end}}
 				</span>
--- a/templates/panel-analytics-route-views.html
+++ b/templates/panel-analytics-route-views.html
@ -0,0 +1,40 @@
+{{template "header.html" . }}
+<div class="colstack panel_stack">
+{{template "panel-menu.html" . }}
+	<main id="panel_dashboard_right" class="colstack_right">
+		<div class="colstack_item colstack_head">
+			<div class="rowitem"><a>{{.Route}} Views</a></div>
+		</div>
+		<div id="panel_analytics_views" class="colstack_graph_holder">
+			<div class="ct-chart"></div>
+		</div>
+	</main>
+</div>
+<script>
+let labels = [];
+let rawLabels = [{{range .PrimaryGraph.Labels}}
+{{.}},{{end}}
+];
+for(const i in rawLabels) {
+	let date = new Date(rawLabels[i]*1000);
+	console.log("date: ", date);
+	let minutes = "0" + date.getMinutes();
+	let label = date.getHours() + ":" + minutes.substr(-2);
+	console.log("label:", label);
+	labels.push(label);
+}
+labels = labels.reverse()
+
+let seriesData = [{{range .PrimaryGraph.Series}}
+{{.}},{{end}}
+];
+seriesData = seriesData.reverse();
+
+Chartist.Line('.ct-chart', {
+  labels: labels,
+  series: [seriesData],
+}, {
+  height: '250px',
+});
+</script>
+{{template "footer.html" . }}
--- a/templates/panel-analytics-routes.html
+++ b/templates/panel-analytics-routes.html
@ -3,13 +3,13 @@
 {{template "panel-menu.html" . }}
 	<main id="panel_dashboard_right" class="colstack_right">
 		<div class="colstack_item colstack_head">
-			<div class="rowitem"><a>Routes</a></div>
+			<div class="rowitem"><a>Routes (24 hours)</a></div>
 		</div>
 		<div id="panel_analytics_routes" class="colstack_item rowlist">
 			{{range .ItemList}}
 			<div class="rowitem panel_compactrow editable_parent">
-				<a href="/panel/groups/edit/{{.Route}}" class="panel_upshift">{{.Route}}</a>
-				<span class="panel_compacttext to_right">{{.Count}}</span>
+				<a href="/panel/analytics/route/{{.Route}}" class="panel_upshift">{{.Route}}</a>
+				<span class="panel_compacttext to_right">{{.Count}} views</span>
 			</div>
 			{{end}}
 		</div>
--- a/templates/panel-groups.html
+++ b/templates/panel-groups.html
@ -35,7 +35,7 @@
 		<form action="/panel/groups/create/?session={{.CurrentUser.Session}}" method="post">
 			<div class="formrow">
 				<div class="formitem formlabel"><a>Name</a></div>
-				<div class="formitem"><input name="group-name" type="text" /></div>
+				<div class="formitem"><input name="group-name" type="text" placeholder="Administrator" /></div>
 			</div>
 			<div class="formrow">
 				<div class="formitem formlabel"><a>Type</a></div>
--- a/themes/cosora/public/main.css
+++ b/themes/cosora/public/main.css
@ -406,16 +406,15 @@ ul {
 	height: 27px;
 	width: 100px;
 	margin-left: 10px;
-	border: none;
-	border-bottom: 1px solid var(--header-border-color);
-	outline: none;
 }
 .topic_name_row input, .ip_search_input {
 	width: 100%;
-	border: none;
-	border-bottom: 1px solid var(--header-border-color);
 	display: inline-block;
 	padding-left: 8px;
+}
+input, select {
+	border: none;
+	border-bottom: 1px solid var(--header-border-color);
 	outline: none;
 }
 .topic_content_row textarea {
@ -423,11 +422,16 @@ ul {
 	width: 100%;
 }

+.formbutton {
+	margin-top: 12px;
+	margin-left: auto;
+	margin-right: auto;
+}
 .quick_button_row .formitem {
 	display: flex;
 	margin-left: 2px;
 }
-.quick_button_row button, .quick_button_row label, .ip_search_search {
+.quick_button_row button, .quick_button_row label, .ip_search_search, .formbutton {
 	padding-left: 10px;
 	padding-right: 10px;
 	padding-top: 6px;
@ -443,6 +447,9 @@ ul {
 	background: hsl(209, 97%, 56%);
 	border-radius: 2px;
 }
+.quick_button_row button, .quick_button_row label, .ip_search_search {
+	margin-right: 0px;
+}
 .quick_button_row button, .quick_button_row label {
 	margin-left: 10px;
 	margin-top: 8px;
@ -463,12 +470,24 @@ label.uploadItem {
 	padding-left: 33px;
 }

-select, input, textarea, button {
+button {
 	border: 1px solid var(--header-border-color);
+}
+select, input, textarea, button {
 	background: var(--element-background-color);
 	padding: 5px;
 	color: hsl(0,0%,30%);
 }
+input, select {
+	color: var(--primary-text-color);
+}
+input:not(:focus):not([type="submit"]), select:not(:focus) {
+	color: var(--light-text-color);
+}
+textarea {
+	outline: none;
+	border: 1px solid var(--header-border-color);
+}

 .topic_reply_container {
 	display: flex;
@ -1003,6 +1022,7 @@ select, input, textarea, button {
 }
 .formitem:only-child {
 	width: 100%;
+	display: flex;
 }
 .the_form .formitem:only-child button {
 	margin-left: auto;
@ -1100,7 +1120,7 @@ select, input, textarea, button {
 }
 #themeSelectorSelect {
 	padding: 3px;
-	margin-top: 2px;
+	margin-top: 0px;
 }

 .colstack_grid {