Gleipnir/nidus-sync
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rename htmlpage to html

Browse source 
Because it's going to get more tools.
This commit is contained in:
Eli Ribble 2026-01-30 18:21:27 +00:00
parent 2bd848fa97
commit 9b1d75d47f
No known key found for this signature in database
44 changed files with 83 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

16
sync/dash.go
View file

@ -14,7 +14,7 @@ import (
"github.com/Gleipnir-Technology/nidus-sync/db"
"github.com/Gleipnir-Technology/nidus-sync/db/models"
"github.com/Gleipnir-Technology/nidus-sync/h3utils"
"github.com/Gleipnir-Technology/nidus-sync/htmlpage"
"github.com/Gleipnir-Technology/nidus-sync/html"
"github.com/go-chi/chi/v5"
"github.com/google/uuid"
"github.com/uber/h3-go/v4"
@ -97,7 +97,7 @@ func getDistrict(w http.ResponseWriter, r *http.Request) {
context := ContextDistrict{
MapboxToken: config.MapboxToken,
}
htmlpage.RenderOrError(w, districtT, &context)
html.RenderOrError(w, districtT, &context)
}
func getLayoutTest(w http.ResponseWriter, r *http.Request, u *models.User) {
@ -106,7 +106,7 @@ func getLayoutTest(w http.ResponseWriter, r *http.Request, u *models.User) {
respondError(w, "Failed to get user", err, http.StatusInternalServerError)
return
}
htmlpage.RenderOrError(w, layoutTestT, &ContentLayoutTest{User: userContent})
html.RenderOrError(w, layoutTestT, &ContentLayoutTest{User: userContent})
}
func getRoot(w http.ResponseWriter, r *http.Request) {
@ -241,7 +241,7 @@ func cell(ctx context.Context, w http.ResponseWriter, user *models.User, c int64
Treatments: treatments,
User: userContent,
}
htmlpage.RenderOrError(w, cellT, &data)
html.RenderOrError(w, cellT, &data)
}
func dashboard(ctx context.Context, w http.ResponseWriter, user *models.User) {
@ -310,7 +310,7 @@ func dashboard(ctx context.Context, w http.ResponseWriter, user *models.User) {
RecentRequests: requests,
User: userContent,
}
htmlpage.RenderOrError(w, dashboardT, data)
html.RenderOrError(w, dashboardT, data)
}
func settings(w http.ResponseWriter, r *http.Request, user *models.User) {
@ -322,7 +322,7 @@ func settings(w http.ResponseWriter, r *http.Request, user *models.User) {
data := ContentAuthenticatedPlaceholder{
User: userContent,
}
htmlpage.RenderOrError(w, settingsT, data)
html.RenderOrError(w, settingsT, data)
}
func source(w http.ResponseWriter, r *http.Request, user *models.User, id uuid.UUID) {
@ -383,7 +383,7 @@ func source(w http.ResponseWriter, r *http.Request, user *models.User, id uuid.U
User: userContent,
}
htmlpage.RenderOrError(w, sourceT, data)
html.RenderOrError(w, sourceT, data)
}
func trap(w http.ResponseWriter, r *http.Request, user *models.User, id uuid.UUID) {
@ -423,5 +423,5 @@ func trap(w http.ResponseWriter, r *http.Request, user *models.User, id uuid.UUI
User: userContent,
}
htmlpage.RenderOrError(w, trapT, data)
html.RenderOrError(w, trapT, data)
}

6
sync/mock.go
View file

@ -6,7 +6,7 @@ import (
"strconv"
"github.com/Gleipnir-Technology/nidus-sync/config"
"github.com/Gleipnir-Technology/nidus-sync/htmlpage"
"github.com/Gleipnir-Technology/nidus-sync/html"
"github.com/go-chi/chi/v5"
"github.com/rs/zerolog/log"
"github.com/skip2/go-qrcode"
@ -125,13 +125,13 @@ func mock(t string, w http.ResponseWriter, code string) {
SettingUserAdd: "/mock/setting/user/add",
},
}
template, ok := htmlpage.TemplatesByFilename[t+".html"]
template, ok := html.TemplatesByFilename[t+".html"]
if !ok {
log.Error().Str("template", t).Msg("Failed to find template")
respondError(w, "Failed to render template", nil, http.StatusInternalServerError)
return
}
htmlpage.RenderOrError(w, &template, data)
html.RenderOrError(w, &template, data)
}
func renderMock(templateName string) http.HandlerFunc {

4
sync/oauth.go
View file

@ -9,7 +9,7 @@ import (
"github.com/Gleipnir-Technology/nidus-sync/background"
"github.com/Gleipnir-Technology/nidus-sync/config"
"github.com/Gleipnir-Technology/nidus-sync/db/models"
"github.com/Gleipnir-Technology/nidus-sync/htmlpage"
"github.com/Gleipnir-Technology/nidus-sync/html"
"github.com/rs/zerolog/log"
)
@ -89,5 +89,5 @@ func oauthPrompt(w http.ResponseWriter, r *http.Request, user *models.User) {
data := ContextOauthPrompt{
User: userContent,
}
htmlpage.RenderOrError(w, oauthPromptT, data)
html.RenderOrError(w, oauthPromptT, data)
}

6
sync/page.go
View file

@ -5,7 +5,7 @@ import (
"fmt"
"net/http"
"github.com/Gleipnir-Technology/nidus-sync/htmlpage"
"github.com/Gleipnir-Technology/nidus-sync/html"
"github.com/rs/zerolog/log"
)
@ -14,7 +14,7 @@ var embeddedFiles embed.FS
var components = [...]string{"header", "icons", "map", "sidebar"}
func buildTemplate(files ...string) *htmlpage.BuiltTemplate {
func buildTemplate(files ...string) *html.BuiltTemplate {
subdir := "sync"
full_files := make([]string, 0)
for _, f := range files {
@ -23,7 +23,7 @@ func buildTemplate(files ...string) *htmlpage.BuiltTemplate {
for _, c := range components {
full_files = append(full_files, fmt.Sprintf("%s/template/components/%s.html", subdir, c))
}
return htmlpage.NewBuiltTemplate(embeddedFiles, "sync/", full_files...)
return html.NewBuiltTemplate(embeddedFiles, "sync/", full_files...)
}
// Respond with an error that is visible to the user

4
sync/privacy.go
View file

@ -4,7 +4,7 @@ import (
"net/http"
"github.com/Gleipnir-Technology/nidus-sync/config"
"github.com/Gleipnir-Technology/nidus-sync/htmlpage"
"github.com/Gleipnir-Technology/nidus-sync/html"
)
type ContentPrivacy struct {
@ -19,7 +19,7 @@ var (
)
func getPrivacy(w http.ResponseWriter, r *http.Request) {
htmlpage.RenderOrError(
html.RenderOrError(
w,
PrivacyT,
ContentPrivacy{

4
sync/routes.go
View file

@ -3,7 +3,7 @@ package sync
import (
"github.com/Gleipnir-Technology/nidus-sync/api"
"github.com/Gleipnir-Technology/nidus-sync/auth"
"github.com/Gleipnir-Technology/nidus-sync/htmlpage"
"github.com/Gleipnir-Technology/nidus-sync/html"
"github.com/go-chi/chi/v5"
)
@ -67,6 +67,6 @@ func Router() chi.Router {
r.Method("GET", "/trap/{globalid}", auth.NewEnsureAuth(getTrap))
r.Method("GET", "/text/{destination}", auth.NewEnsureAuth(getTextMessages))
htmlpage.AddStaticRoute(r, "/static")
html.AddStaticRoute(r, "/static")
return r
}

6
sync/signin.go
View file

@ -7,7 +7,7 @@ import (
"github.com/Gleipnir-Technology/nidus-sync/auth"
"github.com/Gleipnir-Technology/nidus-sync/db/models"
"github.com/Gleipnir-Technology/nidus-sync/htmlpage"
"github.com/Gleipnir-Technology/nidus-sync/html"
"github.com/rs/zerolog/log"
)
@ -92,10 +92,10 @@ func signin(w http.ResponseWriter, errorCode string) {
data := ContentSignin{
InvalidCredentials: errorCode == "invalid-credentials",
}
htmlpage.RenderOrError(w, signinT, data)
html.RenderOrError(w, signinT, data)
}
func signup(w http.ResponseWriter, path string) {
data := ContentSignup{}
htmlpage.RenderOrError(w, signupT, data)
html.RenderOrError(w, signupT, data)
}

4
sync/text.go
View file

@ -4,7 +4,7 @@ import (
"net/http"
"github.com/Gleipnir-Technology/nidus-sync/db/models"
"github.com/Gleipnir-Technology/nidus-sync/htmlpage"
"github.com/Gleipnir-Technology/nidus-sync/html"
)
type ContentTextMessages struct {
@ -24,5 +24,5 @@ func getTextMessages(w http.ResponseWriter, r *http.Request, u *models.User) {
content := ContentTextMessages{
User: userContent,
}
htmlpage.RenderOrError(w, textMessagesT, content)
html.RenderOrError(w, textMessagesT, content)
}