From 1071a85ffbf98196cf8aff1a33c07bed628517a4 Mon Sep 17 00:00:00 2001 From: Ryan Yeske Date: Sat, 2 Aug 2025 13:54:43 -0700 Subject: [PATCH] Remove pages --- handlers/family/page.go | 48 ------------------------------- handlers/family/page.gohtml | 52 --------------------------------- handlers/friends/page.go | 49 ------------------------------- handlers/friends/page.gohtml | 53 ---------------------------------- handlers/humans/page.go | 49 ------------------------------- handlers/humans/page.gohtml | 54 ----------------------------------- handlers/layout/gom.layout.go | 4 --- handlers/layout/layout.gohtml | 1 - handlers/me/page.go | 12 ++++++++ internal/app/app.go | 15 ---------- 10 files changed, 12 insertions(+), 325 deletions(-) delete mode 100644 handlers/family/page.go delete mode 100644 handlers/family/page.gohtml delete mode 100644 handlers/friends/page.go delete mode 100644 handlers/friends/page.gohtml delete mode 100644 handlers/humans/page.go delete mode 100644 handlers/humans/page.gohtml diff --git a/handlers/family/page.go b/handlers/family/page.go deleted file mode 100644 index dafbb8cd..00000000 --- a/handlers/family/page.go +++ /dev/null @@ -1,48 +0,0 @@ -package family - -import ( - _ "embed" - "fmt" - "net/http" - "oj/api" - "oj/handlers/layout" - "oj/handlers/me" - "oj/handlers/render" -) - -type service struct { - Queries *api.Queries -} - -func NewService(q *api.Queries) *service { - return &service{Queries: q} -} - -var ( - //go:embed "page.gohtml" - pageContent string - MyPageTemplate = layout.MustParse(pageContent, me.CardContent) -) - -func (s *service) Page(w http.ResponseWriter, r *http.Request) { - ctx := r.Context() - l := layout.FromContext(r.Context()) - - family, err := s.Queries.GetFamily(ctx, l.User.ID) - if err != nil { - render.Error(w, fmt.Errorf("GetFamilyWithGradient: %w", err), http.StatusInternalServerError) - return - } - - d := struct { - Layout layout.Data - User api.User - Family []api.User - }{ - Layout: l, - User: l.User, - Family: family, - } - - render.Execute(w, MyPageTemplate, d) -} diff --git a/handlers/family/page.gohtml b/handlers/family/page.gohtml deleted file mode 100644 index 382e00a3..00000000 --- a/handlers/family/page.gohtml +++ /dev/null @@ -1,52 +0,0 @@ -{{define "head"}} - {{.User.Username}} -{{end}} - -{{define "main"}} -
-
- {{template "myFamily" .}} -
- -
-
-{{end}} - -{{define "myFamily"}} -
-
-

My Family

- {{if .User.IsParent}} -
- Manage Family -
- {{end}} -
- {{template "friends" .Family}} -
-{{end}} - -{{define "friends"}} -
- {{range .}} - {{template "friend" .}} - {{end}} -
-{{end}} - -{{define "friend"}} -
-
- - -
-

- {{.Username}} -

-
- -
-
-{{end}} - diff --git a/handlers/friends/page.go b/handlers/friends/page.go deleted file mode 100644 index e7f52f8b..00000000 --- a/handlers/friends/page.go +++ /dev/null @@ -1,49 +0,0 @@ -package friends - -import ( - _ "embed" - "fmt" - "net/http" - "oj/api" - "oj/handlers/layout" - "oj/handlers/me" - "oj/handlers/render" -) - -type service struct { - Queries *api.Queries -} - -func NewService(q *api.Queries) *service { - return &service{Queries: q} -} - -var ( - //go:embed "page.gohtml" - pageContent string - - MyPageTemplate = layout.MustParse(pageContent, me.CardContent) -) - -func (s *service) Page(w http.ResponseWriter, r *http.Request) { - ctx := r.Context() - l := layout.FromContext(r.Context()) - - friends, err := s.Queries.GetFriends(ctx, l.User.ID) - if err != nil { - render.Error(w, fmt.Errorf("GetFriendsWithGradient: %w", err), http.StatusInternalServerError) - return - } - - d := struct { - Layout layout.Data - User api.User - Friends []api.User - }{ - Layout: l, - User: l.User, - Friends: friends, - } - - render.Execute(w, MyPageTemplate, d) -} diff --git a/handlers/friends/page.gohtml b/handlers/friends/page.gohtml deleted file mode 100644 index 72162bca..00000000 --- a/handlers/friends/page.gohtml +++ /dev/null @@ -1,53 +0,0 @@ -{{define "head"}} - {{.User.Username}} -{{end}} - -{{define "main"}} -
-
- {{template "myFriends" .}} -
- -
-
-{{end}} - -{{define "myFriends"}} -
-
-

My Friends

-
- {{if .Layout.User.IsParent}} - Find Friends - {{else}} - Find Friends - {{end}} -
-
- {{template "friends" .Friends}} -
-{{end}} - -{{define "friends"}} -
- {{range .}} - {{template "friend" .}} - {{end}} -
-{{end}} - -{{define "friend"}} -
-
- - -
-

- {{.Username}} -

-
- -
-
-{{end}} diff --git a/handlers/humans/page.go b/handlers/humans/page.go deleted file mode 100644 index 6d24feb8..00000000 --- a/handlers/humans/page.go +++ /dev/null @@ -1,49 +0,0 @@ -package humans - -import ( - _ "embed" - "fmt" - "net/http" - "oj/api" - "oj/handlers/layout" - "oj/handlers/me" - "oj/handlers/render" -) - -type service struct { - Queries *api.Queries -} - -func NewService(q *api.Queries) *service { - return &service{Queries: q} -} - -var ( - //go:embed "page.gohtml" - pageContent string - - pageTemplate = layout.MustParse(pageContent, me.CardContent) -) - -func (s *service) Page(w http.ResponseWriter, r *http.Request) { - ctx := r.Context() - l := layout.FromContext(r.Context()) - - friends, err := s.Queries.GetConnections(ctx, l.User.ID) - if err != nil { - render.Error(w, fmt.Errorf("GetConnections: %w", err), http.StatusInternalServerError) - return - } - - d := struct { - Layout layout.Data - User api.User - Friends []api.User - }{ - Layout: l, - User: l.User, - Friends: friends, - } - - render.Execute(w, pageTemplate, d) -} diff --git a/handlers/humans/page.gohtml b/handlers/humans/page.gohtml deleted file mode 100644 index f729859a..00000000 --- a/handlers/humans/page.gohtml +++ /dev/null @@ -1,54 +0,0 @@ -{{define "head"}} - {{.User.Username}} -{{end}} - -{{define "main"}} -
-
- {{template "myFriends" .}} -
- -
-
-{{end}} - -{{define "myFriends"}} -
-
-

Humans

-
- {{if .Layout.User.IsParent}} - Manage Family - Find Friends - {{else}} - Find Friends - {{end}} -
-
- {{template "friends" .Friends}} -
-{{end}} - -{{define "friends"}} -
- {{range .}} - {{template "friend" .}} - {{end}} -
-{{end}} - -{{define "friend"}} -
-
- - -
-

- {{.Username}} -

-
- -
-
-{{end}} diff --git a/handlers/layout/gom.layout.go b/handlers/layout/gom.layout.go index d0950b7c..f2c244d5 100644 --- a/handlers/layout/gom.layout.go +++ b/handlers/layout/gom.layout.go @@ -120,10 +120,6 @@ func header(unreadCount int, user api.User) g.Node { h.Style("padding: 1em 0 1em"), h.Div( h.Style("display:flex;gap:4px;align-items:center;justify-content:space-between"), - h.A( - h.Href("/me/humans"), - g.Text("Humans"), - ), h.A( h.Href("/bots"), g.Text("Robots"), diff --git a/handlers/layout/layout.gohtml b/handlers/layout/layout.gohtml index f250df3d..f7a97c6e 100644 --- a/handlers/layout/layout.gohtml +++ b/handlers/layout/layout.gohtml @@ -83,7 +83,6 @@
- Humans Robots Activities