diff --git a/appview/pages/pages.go b/appview/pages/pages.go --- a/appview/pages/pages.go +++ b/appview/pages/pages.go @@ -260,6 +260,7 @@ type SignupParams struct { CloudflareSiteKey string + EmailId string } func (p *Pages) Signup(w io.Writer, params SignupParams) error { diff --git a/appview/signup/signup.go b/appview/signup/signup.go --- a/appview/signup/signup.go +++ b/appview/signup/signup.go @@ -118,8 +118,10 @@ func (s *Signup) signup(w http.ResponseWriter, r *http.Request) { switch r.Method { case http.MethodGet: + emailId := r.URL.Query().Get("id") s.pages.Signup(w, pages.SignupParams{ CloudflareSiteKey: s.config.Cloudflare.TurnstileSiteKey, + EmailId: emailId, }) case http.MethodPost: if s.cf == nil { diff --git a/appview/state/router.go b/appview/state/router.go --- a/appview/state/router.go +++ b/appview/state/router.go @@ -120,6 +120,7 @@ r.Handle("/static/*", s.pages.Static()) r.Get("/", s.HomeOrTimeline) + r.Get("/home", s.Home) r.Get("/timeline", s.Timeline) r.Get("/upgradeBanner", s.UpgradeBanner) diff --git a/appview/state/timeline.go b/appview/state/timeline.go --- a/appview/state/timeline.go +++ b/appview/state/timeline.go @@ -13,6 +13,8 @@ // TODO: set this flag based on the UI filtered := false + user := s.oauth.GetMultiAccountUser(r) + timeline, err := db.MakeTimeline(s.db, 50, "", filtered) if err != nil { s.logger.Error("failed to make timeline", "err", err) @@ -26,7 +28,7 @@ } fmt.Println(s.pages.Home(w, pages.TimelineParams{ - LoggedInUser: nil, + LoggedInUser: user, Timeline: timeline, BlueskyPosts: blueskyPosts, })) diff --git a/appview/pages/templates/user/signup.html b/appview/pages/templates/user/signup.html --- a/appview/pages/templates/user/signup.html +++ b/appview/pages/templates/user/signup.html @@ -20,6 +20,7 @@ tabindex="4" required placeholder="jason@bourne.co" + value="{{ .EmailId }}" /> diff --git a/appview/pages/templates/timeline/fragments/hero.html b/appview/pages/templates/timeline/fragments/hero.html --- a/appview/pages/templates/timeline/fragments/hero.html +++ b/appview/pages/templates/timeline/fragments/hero.html @@ -10,11 +10,11 @@ communities can freely self-govern and most importantly, coding can be social and fun again.
-