Fix a new names, unify on ems

Author: theandrew168

backend/web/accounts.go

@@ -21,7 +21,7 @@ func HandleAccountList(repo *repository.Repository) http.Handler {
 		}
 
 		data := page.AccountsData{
-			BaseData: util.TemplateBaseData(r, w),
+			BaseData: util.GetTemplateBaseData(r, w),
 
 			Accounts: accounts,
 		}

backend/web/auth.go

@@ -108,7 +108,7 @@ func HandleSignIn(enableDebugAuth bool) http.Handler {
 		http.SetCookie(w, &cookie)
 
 		data := page.SignInData{
-			BaseData: util.TemplateBaseData(r, w),
+			BaseData: util.GetTemplateBaseData(r, w),
 
 			EnableDebugAuth: enableDebugAuth,
 		}

backend/web/blog.go

@@ -34,7 +34,7 @@ func HandleBlogRead(repo *repository.Repository) http.Handler {
 		}
 
 		data := page.BlogData{
-			BaseData: util.TemplateBaseData(r, w),
+			BaseData: util.GetTemplateBaseData(r, w),
 
 			Blog:  blog,
 			Posts: posts,

backend/web/blogs.go

@@ -33,11 +33,11 @@ func HandleBlogList(find *finder.Finder) http.Handler {
 		}
 
 		data := page.BlogsData{
-			BaseData: util.TemplateBaseData(r, w),
+			BaseData: util.GetTemplateBaseData(r, w),
 		}
 		for _, blog := range blogs {
 			data.Blogs = append(data.Blogs, page.BlogsBlogData{
-				BaseData: util.TemplateBaseData(r, w),
+				BaseData: util.GetTemplateBaseData(r, w),
 
 				BlogForAccount: blog,
 			})
@@ -202,7 +202,7 @@ func HandleBlogFollowForm(repo *repository.Repository, find *finder.Finder) http
 		// If the request came in via HTMX, re-render the individual blog row.
 		if util.IsHTMXRequest(r) {
 			data := page.BlogsBlogData{
-				BaseData: util.TemplateBaseData(r, w),
+				BaseData: util.GetTemplateBaseData(r, w),
 
 				BlogForAccount: finder.BlogForAccount{
 					ID:          blog.ID(),
@@ -270,7 +270,7 @@ func HandleBlogUnfollowForm(repo *repository.Repository, find *finder.Finder) ht
 		// If the request came in via HTMX, re-render the individual row.
 		if util.IsHTMXRequest(r) {
 			data := page.BlogsBlogData{
-				BaseData: util.TemplateBaseData(r, w),
+				BaseData: util.GetTemplateBaseData(r, w),
 
 				BlogForAccount: finder.BlogForAccount{
 					ID:          blog.ID(),

backend/web/index.go

@@ -99,7 +99,7 @@ func HandleIndexPage(find *finder.Finder) http.Handler {
 		}
 
 		data := page.IndexData{
-			BaseData: util.TemplateBaseData(r, w),
+			BaseData: util.GetTemplateBaseData(r, w),
 
 			Search:       search,
 			Articles:     articles,

backend/web/page/signin.go

@@ -6,7 +6,6 @@ import (
 	"io"
 
 	"github.com/theandrew168/bloggulus/backend/web/layout"
-	"golang.org/x/oauth2"
 )
 
 //go:embed signin.html
@@ -15,9 +14,6 @@ var SignInHTML string
 type SignInData struct {
 	layout.BaseData
 
-	GithubConf *oauth2.Config
-	Errors     map[string]string
-
 	EnableDebugAuth bool
 }
 

backend/web/page/signin.html

@@ -13,27 +13,18 @@ <h2 class="signin__heading">Welcome!</h2>
 				<img class="signin__icon" src="/img/bloggulus.png" />
 				Sign in with Debug
 			</button>
-			{{with .Errors.google}}
-			<p class="signin__error">{{.}}</p>
-			{{end}}
 		</form>
 		{{end}}
 
 		<a class="signin__button" href="/github/signin">
 			<img class="signin__icon" src="/img/github.png" />
 			Sign in with GitHub
 		</a>
-		{{with .Errors.github}}
-		<p class="signin__error">{{.}}</p>
-		{{end}}
 
 		<a class="signin__button" href="/google/signin">
 			<img class="signin__icon" src="/img/google.png" />
 			Sign in with Google
 		</a>
-		{{with .Errors.google}}
-		<p class="signin__error">{{.}}</p>
-		{{end}}
 	</article>
 </section>
 

backend/web/pages.go

@@ -33,7 +33,7 @@ func HandlePageList(repo *repository.Repository) http.Handler {
 		}
 
 		data := page.PagesData{
-			BaseData: util.TemplateBaseData(r, w),
+			BaseData: util.GetTemplateBaseData(r, w),
 
 			Pages: pages,
 		}
@@ -226,7 +226,7 @@ func HandlePageUnfollowForm(repo *repository.Repository) http.Handler {
 			}
 
 			data := page.PagesData{
-				BaseData: util.TemplateBaseData(r, w),
+				BaseData: util.GetTemplateBaseData(r, w),
 
 				Pages: pages,
 			}

backend/web/post.go

@@ -29,7 +29,7 @@ func HandlePostRead(repo *repository.Repository) http.Handler {
 		}
 
 		data := page.PostData{
-			BaseData: util.TemplateBaseData(r, w),
+			BaseData: util.GetTemplateBaseData(r, w),
 
 			Post: post,
 		}

backend/web/util/error.go

@@ -62,7 +62,7 @@ func BadRequestResponse(w http.ResponseWriter, r *http.Request) {
 	tmpl := page.NewError()
 	code := http.StatusBadRequest
 	data := page.ErrorData{
-		BaseData: TemplateBaseData(r, w),
+		BaseData: GetTemplateBaseData(r, w),
 
 		StatusCode: code,
 		StatusText: http.StatusText(code),
@@ -79,7 +79,7 @@ func ForbiddenResponse(w http.ResponseWriter, r *http.Request) {
 	tmpl := page.NewError()
 	code := http.StatusForbidden
 	data := page.ErrorData{
-		BaseData: TemplateBaseData(r, w),
+		BaseData: GetTemplateBaseData(r, w),
 
 		StatusCode: code,
 		StatusText: http.StatusText(code),
@@ -96,7 +96,7 @@ func NotFoundResponse(w http.ResponseWriter, r *http.Request) {
 	tmpl := page.NewError()
 	code := http.StatusNotFound
 	data := page.ErrorData{
-		BaseData: TemplateBaseData(r, w),
+		BaseData: GetTemplateBaseData(r, w),
 
 		StatusCode: code,
 		StatusText: http.StatusText(code),
@@ -118,7 +118,7 @@ func InternalServerErrorResponse(w http.ResponseWriter, r *http.Request, err err
 	tmpl := page.NewError()
 	code := http.StatusInternalServerError
 	data := page.ErrorData{
-		BaseData: TemplateBaseData(r, w),
+		BaseData: GetTemplateBaseData(r, w),
 
 		StatusCode: code,
 		StatusText: http.StatusText(code),