diff --git a/appview/pages/pages.go b/appview/pages/pages.go index 471f1262..cc4f8288 100644 --- a/appview/pages/pages.go +++ b/appview/pages/pages.go @@ -69,11 +69,11 @@ func (p *Pages) execute(name string, w io.Writer, params any) error { } func (p *Pages) Login(w io.Writer, params LoginParams) error { - return p.t["user/login"].ExecuteTemplate(w, "layouts/base", params) + return p.execute("user/login", w, params) } type TimelineParams struct { - User *auth.User + LoggedInUser *auth.User } func (p *Pages) Timeline(w io.Writer, params TimelineParams) error { @@ -81,8 +81,8 @@ func (p *Pages) Timeline(w io.Writer, params TimelineParams) error { } type SettingsParams struct { - User *auth.User - PubKeys []db.PublicKey + LoggedInUser *auth.User + PubKeys []db.PublicKey } func (p *Pages) Settings(w io.Writer, params SettingsParams) error { @@ -90,7 +90,7 @@ func (p *Pages) Settings(w io.Writer, params SettingsParams) error { } type KnotsParams struct { - User *auth.User + LoggedInUser *auth.User Registrations []db.Registration } @@ -99,7 +99,7 @@ func (p *Pages) Knots(w io.Writer, params KnotsParams) error { } type KnotParams struct { - User *auth.User + LoggedInUser *auth.User Registration *db.Registration Members []string IsOwner bool @@ -110,7 +110,7 @@ func (p *Pages) Knot(w io.Writer, params KnotParams) error { } type NewRepoParams struct { - User *auth.User + LoggedInUser *auth.User } func (p *Pages) NewRepo(w io.Writer, params NewRepoParams) error { @@ -153,6 +153,7 @@ type RepoIndexParams struct { } func (p *Pages) RepoIndexPage(w io.Writer, params RepoIndexParams) error { + return p.execute("repo/index", w, params) } diff --git a/appview/pages/templates/knot.html b/appview/pages/templates/knot.html index 17fa323f..e8eb5aa9 100644 --- a/appview/pages/templates/knot.html +++ b/appview/pages/templates/knot.html @@ -1,13 +1,11 @@ {{define "title"}}{{ .Registration.Domain }}{{end}} {{define "content"}} - back to timeline - back to all knots

{{.Registration.Domain}}

opened by: {{.Registration.ByDid}} - {{ if eq $.User.Did $.Registration.ByDid }} + {{ if eq $.LoggedInUser.Did $.Registration.ByDid }} (you) {{ end }}
diff --git a/appview/pages/templates/knots.html b/appview/pages/templates/knots.html index 10441735..6d8aaa67 100644 --- a/appview/pages/templates/knots.html +++ b/appview/pages/templates/knots.html @@ -1,7 +1,6 @@ {{define "title"}}knots{{end}} {{define "content"}} - back to timeline

knots

register

diff --git a/appview/pages/templates/layouts/base.html b/appview/pages/templates/layouts/base.html index d5f3bc70..c5405a83 100644 --- a/appview/pages/templates/layouts/base.html +++ b/appview/pages/templates/layouts/base.html @@ -12,6 +12,11 @@ {{block "title" .}}{{end}} +
+ {{ block "topbar" .}} + {{ template "layouts/topbar" . }} + {{end}} +
{{block "content" .}}{{end}}
diff --git a/appview/pages/templates/layouts/topbar.html b/appview/pages/templates/layouts/topbar.html new file mode 100644 index 00000000..eb6d2c3a --- /dev/null +++ b/appview/pages/templates/layouts/topbar.html @@ -0,0 +1,18 @@ +{{ define "layouts/topbar" }} + +{{ with .LoggedInUser }} + +{{ else }} + +{{ end }} + +{{ end }} diff --git a/appview/pages/templates/repo/branches.html b/appview/pages/templates/repo/branches.html index 89b880e5..545cfc6d 100644 --- a/appview/pages/templates/repo/branches.html +++ b/appview/pages/templates/repo/branches.html @@ -1,6 +1,5 @@ {{ define "title" }} - branches | {{ .RepoInfo.OwnerWithAt }} / - {{ .RepoInfo.Name }} + branches | {{ .RepoInfo.FullName }} {{ end }} {{ define "content" }} diff --git a/appview/pages/templates/repo/index.html b/appview/pages/templates/repo/index.html index 644f2ed1..22807492 100644 --- a/appview/pages/templates/repo/index.html +++ b/appview/pages/templates/repo/index.html @@ -1,4 +1,4 @@ -{{define "title"}} {{ .RepoInfo.FullName }} {{end}} +{{define "title"}} {{ .RepoInfo.FullName }} {{ end}} {{define "content"}} diff --git a/appview/pages/templates/repo/log.html b/appview/pages/templates/repo/log.html index 9698b9dc..23947eb3 100644 --- a/appview/pages/templates/repo/log.html +++ b/appview/pages/templates/repo/log.html @@ -1,9 +1,9 @@ -{{define "title"}} log | {{ .RepoInfo.OwnerWithAt }} / {{ .RepoInfo.Name }} {{end}} +{{define "title"}} log | {{ .RepoInfo.FullName }} {{end}} {{define "content"}}

-log | {{ .RepoInfo.OwnerWithAt }} / {{ .RepoInfo.Name }} +log | {{ .RepoInfo.FullName }}

diff --git a/appview/pages/templates/settings/keys.html b/appview/pages/templates/settings/keys.html index 7fe5526e..1c005800 100644 --- a/appview/pages/templates/settings/keys.html +++ b/appview/pages/templates/settings/keys.html @@ -1,13 +1,12 @@ {{define "title"}}settings{{end}} {{define "content"}} - back to timeline

settings

profile

-

handle: {{.User.Handle}}

-

did: {{.User.Did}}

-

pds: {{.User.Pds}}

+

handle: {{.LoggedInUser.Handle}}

+

did: {{.LoggedInUser.Did}}

+

pds: {{.LoggedInUser.Pds}}

ssh keys

diff --git a/appview/pages/templates/timeline.html b/appview/pages/templates/timeline.html index f41223f3..cb14bd53 100644 --- a/appview/pages/templates/timeline.html +++ b/appview/pages/templates/timeline.html @@ -2,15 +2,4 @@ {{define "content"}}

timeline

- - {{ if .User }} -

logged in as {{ .User.Handle }}

- settings - knots - add repos - my profile - {{ else }} -

not logged in

- login - {{ end }} {{end}} diff --git a/appview/pages/templates/user/login.html b/appview/pages/templates/user/login.html index cf3e2fb1..e980a353 100644 --- a/appview/pages/templates/user/login.html +++ b/appview/pages/templates/user/login.html @@ -1,4 +1,6 @@ -{{ define "title" }}login{{end}} {{define "content"}} +{{ define "title" }}login{{end}} + +{{define "content"}}

login

diff --git a/appview/pages/templates/user/profile.html b/appview/pages/templates/user/profile.html index 5043dc11..d1533a5b 100644 --- a/appview/pages/templates/user/profile.html +++ b/appview/pages/templates/user/profile.html @@ -1,7 +1,6 @@ {{define "title"}}{{ or .UserHandle .UserDid }}{{end}} {{define "content"}} - back to timeline

{{ or .UserHandle .UserDid }} profile

repos

diff --git a/appview/state/state.go b/appview/state/state.go index c92d4dd7..65a126d8 100644 --- a/appview/state/state.go +++ b/appview/state/state.go @@ -113,7 +113,7 @@ func (s *State) Login(w http.ResponseWriter, r *http.Request) { func (s *State) Timeline(w http.ResponseWriter, r *http.Request) { user := s.auth.GetUser(r) s.pages.Timeline(w, pages.TimelineParams{ - User: user, + LoggedInUser: user, }) return } @@ -163,8 +163,8 @@ func (s *State) Settings(w http.ResponseWriter, r *http.Request) { } s.pages.Settings(w, pages.SettingsParams{ - User: user, - PubKeys: pubKeys, + LoggedInUser: user, + PubKeys: pubKeys, }) } @@ -366,7 +366,7 @@ func (s *State) KnotServerInfo(w http.ResponseWriter, r *http.Request) { isOwner := err == nil && ok p := pages.KnotParams{ - User: user, + LoggedInUser: user, Registration: reg, Members: members, IsOwner: isOwner, @@ -385,7 +385,7 @@ func (s *State) Knots(w http.ResponseWriter, r *http.Request) { } s.pages.Knots(w, pages.KnotsParams{ - User: user, + LoggedInUser: user, Registrations: registrations, }) } @@ -490,7 +490,7 @@ func (s *State) AddRepo(w http.ResponseWriter, r *http.Request) { switch r.Method { case http.MethodGet: s.pages.NewRepo(w, pages.NewRepoParams{ - User: s.auth.GetUser(r), + LoggedInUser: s.auth.GetUser(r), }) case http.MethodPost: user := s.auth.GetUser(r)