Route signed-in users to Explore

Status	File	+	-
M	`internal/web/handlers/auth/auth.go`	3	1
M	`internal/web/handlers/auth/auth_test.go`	4	4
M	`internal/web/handlers/auth/twofactor.go`	1	1
M	`internal/web/handlers/auth/twofactor_test.go`	2	2
M	`internal/web/handlers/handlers.go`	1	1
M	`internal/web/handlers/hello.go`	0	44
M	`internal/web/templates/_nav_offcanvas.html`	4	0
D	`internal/web/templates/dashboard.html`	0	80
M	`internal/web/templates/hello.html`	9	19

internal/web/handlers/auth/auth.gomodified

  	Username string
  }
++const defaultPostLoginPath = "/explore"
++
  func (h *Handlers) loginUser(ctx context.Context, identifier string) (usersdb.User, error) {
  	if strings.Contains(identifier, "@") {
  		em, err := h.q.GetUserEmailByAddress(ctx, h.d.Pool, identifier)
  		return
  	}
--	dest := "/"
++	dest := defaultPostLoginPath
  	if next != "" && strings.HasPrefix(next, "/") && !strings.HasPrefix(next, "//") {
  		// dest is constrained to single-leading-slash relative paths above,
  		// which prevents the protocol-relative ("//evil.com") form gosec warns about.

internal/web/handlers/auth/auth_test.gomodified


 		body, _ := io.ReadAll(resp.Body)
 		t.Fatalf("verified login: status %d body=%s", resp.StatusCode, body)
 	}
+	if loc := resp.Header.Get("Location"); loc != "/explore" {
+		t.Fatalf("login redirect: %q, want /explore", loc)
 	}
 	_ = resp.Body.Close()
 

 		body, _ := io.ReadAll(resp.Body)
 		t.Fatalf("email login: status %d body=%s", resp.StatusCode, body)
 	}
+	if loc := resp.Header.Get("Location"); loc != "/explore" {
+		t.Fatalf("email login redirect: %q, want /explore", loc)
 	}
 	_ = resp.Body.Close()
 }

internal/web/handlers/auth/twofactor.gomodified


 		return
 	}
 
+	dest := defaultPostLoginPath
 	if next != "" && strings.HasPrefix(next, "/") && !strings.HasPrefix(next, "//") {
 		dest = next
 	}

internal/web/handlers/auth/twofactor_test.gomodified


 		body, _ := io.ReadAll(resp.Body)
 		t.Fatalf("2fa challenge: %d body=%s", resp.StatusCode, body)
 	}
+	if loc := resp.Header.Get("Location"); loc != "/explore" {
+		t.Fatalf("expected /explore after challenge, got %q", loc)
 	}
 	_ = resp.Body.Close()
 }

internal/web/handlers/handlers.gomodified


 		r.Use(middleware.Compress)
 		r.Use(middleware.Timeout(30 * time.Second))
 		r.Use(csrf)
+		r.Get("/", helloHandler{render: rr, logoSVG: deps.LogoSVG, logger: deps.Logger}.ServeHTTP)
 		r.Get("/explore", exploreHandler{render: rr, logger: deps.Logger, pool: deps.Pool}.ServeExplore)
 		r.Get("/trending", exploreHandler{render: rr, logger: deps.Logger, pool: deps.Pool}.ServeTrending)
 		// /internal/panic is a dev affordance: GET it to trigger the

internal/web/handlers/hello.gomodified

  	"log/slog"
  	"net/http"
--	"github.com/jackc/pgx/v5/pgxpool"
--
--	"github.com/tenseleyFlow/shithub/internal/social"
  	"github.com/tenseleyFlow/shithub/internal/version"
  	"github.com/tenseleyFlow/shithub/internal/web/middleware"
  	"github.com/tenseleyFlow/shithub/internal/web/render"
  	render  *render.Renderer
  	logoSVG string
  	logger  *slog.Logger
--	pool    *pgxpool.Pool
+ }
  type helloData struct {
  func (h helloHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
  	viewer := middleware.CurrentUserFromContext(r.Context())
--	if viewer.ID != 0 && h.pool != nil {
--		h.serveDashboard(w, r, viewer)
--		return
--	}
--
  	data := helloData{
  		Title:     "Welcome",
  		Version:   version.Version,
  		http.Error(w, "internal server error", http.StatusInternalServerError)
+ 	}
+ }
--
--func (h helloHandler) serveDashboard(w http.ResponseWriter, r *http.Request, viewer middleware.CurrentUser) {
--	deps := social.Deps{Pool: h.pool, Logger: h.logger}
--	feed, hasNext, nextURL := feedPageFor(r, func(cursor social.FeedCursor, limit int32) ([]social.FeedItem, error) {
--		return social.DashboardFeed(r.Context(), deps, viewer.ID, cursor, limit)
--	})
--	repos, err := social.DashboardRepos(r.Context(), deps, viewer.ID, 8)
--	if err != nil && h.logger != nil {
--		h.logger.WarnContext(r.Context(), "dashboard repos", "error", err)
--	}
--	trendingRepos, err := social.CachedTrendingRepos(r.Context(), deps, social.TrendingScopeWeek, 7, 5)
--	if err != nil && h.logger != nil {
--		h.logger.WarnContext(r.Context(), "dashboard trending repos", "error", err)
--	}
--	trendingUsers, err := social.CachedTrendingUsers(r.Context(), deps, social.TrendingScopeWeek, 7, 5)
--	if err != nil && h.logger != nil {
--		h.logger.WarnContext(r.Context(), "dashboard trending users", "error", err)
--	}
--
--	data := map[string]any{
--		"Title":         "Home",
--		"TopRepos":      repos,
--		"Feed":          feed,
--		"FeedHasNext":   hasNext,
--		"FeedNextURL":   nextURL,
--		"TrendingRepos": trendingRepos,
--		"TrendingUsers": trendingUsers,
--	}
--	if err := h.render.RenderPage(w, r, "dashboard", data); err != nil {
--		if h.logger != nil {
--			h.logger.Error("render dashboard", "error", err)
--		}
--		http.Error(w, "internal server error", http.StatusInternalServerError)
--	}
--}

internal/web/templates/_nav_offcanvas.htmlmodified

      </div>
      <nav class="shithub-offcanvas-nav" aria-label="Global navigation">
++      {{ if .Viewer.ID }}
++      <a href="/explore" class="shithub-offcanvas-link">{{ octicon "home" }} <span>Home</span></a>
++      {{ else }}
        <a href="/" class="shithub-offcanvas-link">{{ octicon "home" }} <span>Home</span></a>
++      {{ end }}
        <a href="/search?type=issues" class="shithub-offcanvas-link">{{ octicon "issue-opened" }} <span>All issues</span></a>
        <a href="/search?type=pullrequests" class="shithub-offcanvas-link">{{ octicon "git-pull-request" }} <span>All pull requests</span></a>
        <a href="/search?type=repositories" class="shithub-offcanvas-link">{{ octicon "repo" }} <span>All repositories</span></a>

internal/web/templates/dashboard.htmldeleted

--{{ define "page" -}}
--<section class="shithub-dashboard-page">
--  <div class="shithub-dashboard-shell">
--    <aside class="shithub-dashboard-left" aria-label="Your repositories">
--      <div class="shithub-dashboard-sidehead">
--        <h2>Top repositories</h2>
--        <a href="/new" class="shithub-button shithub-button-primary shithub-button-small">{{ octicon "repo" }} New</a>
--      </div>
--      <label class="sr-only" for="dashboard-repo-filter">Find a repository</label>
--      <input id="dashboard-repo-filter" class="shithub-dashboard-filter" type="search" placeholder="Find a repository..." autocomplete="off">
--      {{ if .TopRepos }}
--      <ol class="shithub-dashboard-repo-list">
--        {{ range .TopRepos }}
--        <li>
--          <a href="/{{ $.Viewer.Username }}/{{ .Name }}"><img src="/avatars/{{ $.Viewer.Username }}" alt="" width="18" height="18"> {{ $.Viewer.Username }}/{{ .Name }}</a>
--        </li>
--        {{ end }}
--      </ol>
--      {{ else }}
--      <p class="shithub-dashboard-empty">No repositories yet.</p>
--      {{ end }}
--    </aside>
--
--    <main class="shithub-dashboard-main">
--      <h1>Home</h1>
--      <div class="shithub-feed-toolbar">
--        <h2>Feed</h2>
--        <a class="shithub-button shithub-button-small" href="/explore">{{ octicon "pulse" }} Explore</a>
--      </div>
--      {{ if .Feed }}
--      <ol class="shithub-feed-list">
--        {{ range .Feed }}{{ template "feed-row" . }}{{ end }}
--      </ol>
--      {{ else }}
--      <div class="shithub-feed-empty">
--        <h2>{{ octicon "people" }} Follow people and organizations to build your feed</h2>
--        <p>Stars, forks, pushes, issues, pull requests, and follows from your network will appear here.</p>
--        <a href="/explore" class="shithub-button">Explore activity</a>
--      </div>
--      {{ end }}
--      {{ if .FeedHasNext }}
--      <nav class="shithub-feed-pagination" aria-label="Feed pagination">
--        <a class="shithub-button" href="{{ .FeedNextURL }}">More</a>
--      </nav>
--      {{ end }}
--    </main>
--
--    <aside class="shithub-dashboard-right" aria-label="Discover">
--      <section class="shithub-side-panel">
--        <h2>{{ octicon "pulse" }} Trending repositories</h2>
--        {{ if .TrendingRepos }}
--        <ol class="shithub-trending-mini-list">
--          {{ range .TrendingRepos }}
--          <li>
--            <a href="/{{ .Owner }}/{{ .Name }}">{{ .Owner }}/{{ .Name }}</a>
--            {{ if .Description }}<p>{{ .Description }}</p>{{ end }}
--            <span>{{ octicon "star" }} {{ .StarCount }}</span>
--          </li>
--          {{ end }}
--        </ol>
--        {{ else }}<p class="shithub-dashboard-empty">No public activity yet.</p>{{ end }}
--      </section>
--
--      <section class="shithub-side-panel">
--        <h2>{{ octicon "people" }} Trending developers</h2>
--        {{ if .TrendingUsers }}
--        <ol class="shithub-trending-user-list">
--          {{ range .TrendingUsers }}
--          <li>
--            <a href="/{{ .Username }}"><img src="/avatars/{{ .Username }}" alt="" width="24" height="24"> {{ if .DisplayName }}{{ .DisplayName }}{{ else }}{{ .Username }}{{ end }}</a>
--            <span>@{{ .Username }}</span>
--          </li>
--          {{ end }}
--        </ol>
--        {{ else }}<p class="shithub-dashboard-empty">No developers trending yet.</p>{{ end }}
--      </section>
--    </aside>
--  </div>
--</section>
--{{- end }}

internal/web/templates/hello.htmlmodified

    <h1 class="hello-title">shithub</h1>
    <p class="hello-tagline">GitHub. Open source. Without Copilot.</p>
--  {{ if .Viewer.ID }}
++  {{/* Landing page — marketing copy for the v1 launch. Honest and
--  {{/* Authed dashboard surface — concise, points at the things you
++       concise; the heavy "what works / what doesn't" lives in the
--       most likely want when you sign in. The full activity feed is a
++       README and docs site, not on the homepage. */}}
--       post-MVP feature; until then the quicklinks ARE the dashboard. */}}
--  <div class="hello-greeting">
--    <p>Signed in as <strong>@{{ .Viewer.Username }}</strong>.</p>
--    <nav class="hello-quicklinks" aria-label="Account quick links">
--      <a href="/{{ .Viewer.Username }}">Your profile</a>
--      <a href="/new">New repository</a>
--      <a href="/notifications">Notifications</a>
--      <a href="/explore">Explore</a>
--      <a href="/settings/profile">Settings</a>
--    </nav>
--  </div>
--  {{ else }}
--  {{/* Anonymous landing — marketing copy for the v1 launch. Honest
--       and concise; the heavy "what works / what doesn't" lives in
--       the README and docs site, not on the homepage. */}}
    <section class="shithub-landing-pitch">
      <p>
        A self-hostable git forge that aims to look and feel like GitHub.
    </ul>
    <nav class="shithub-landing-cta" aria-label="Primary actions">
++    {{ if .Viewer.ID }}
++    <a class="shithub-landing-cta-primary" href="/explore">Go to Explore</a>
++    <a class="shithub-landing-cta-secondary" href="/new">New repository</a>
++    <a class="shithub-landing-cta-secondary" href="/{{ .Viewer.Username }}">Your profile</a>
++    {{ else }}
      <a class="shithub-landing-cta-primary" href="/signup">Create an account</a>
      <a class="shithub-landing-cta-secondary" href="/login">Sign in</a>
++    {{ end }}
      <a class="shithub-landing-cta-secondary" href="https://docs.shithub.sh/">Read the docs</a>
      <a class="shithub-landing-cta-secondary" href="/shithub/shithub">Read the source</a>
    </nav>
      <a href="https://docs.shithub.sh/">docs</a> are honest about
      what works and what's still in flight.
    </p>
--  {{ end }}
    <dl class="hello-meta">
      <dt>Version</dt><dd>{{ .Version }}</dd>

`@@ -391,8 +391,8 @@` func TestSignup_Verify_Login_Logout(t *testing.T) {
391	body, _ := io.ReadAll(resp.Body)	391	body, _ := io.ReadAll(resp.Body)
392	t.Fatalf("verified login: status %d body=%s", resp.StatusCode, body)	392	t.Fatalf("verified login: status %d body=%s", resp.StatusCode, body)
393	}	393	}
394	- if loc := resp.Header.Get("Location"); loc != "/" {	394	+ if loc := resp.Header.Get("Location"); loc != "/explore" {
395	- t.Fatalf("login redirect: %q, want /", loc)	395	+ t.Fatalf("login redirect: %q, want /explore", loc)
396	}	396	}
397	_ = resp.Body.Close()	397	_ = resp.Body.Close()
398		398
`@@ -425,8 +425,8 @@` func TestLogin_AcceptsEmailAddress(t *testing.T) {
425	body, _ := io.ReadAll(resp.Body)	425	body, _ := io.ReadAll(resp.Body)
426	t.Fatalf("email login: status %d body=%s", resp.StatusCode, body)	426	t.Fatalf("email login: status %d body=%s", resp.StatusCode, body)
427	}	427	}
428	- if loc := resp.Header.Get("Location"); loc != "/" {	428	+ if loc := resp.Header.Get("Location"); loc != "/explore" {
429	- t.Fatalf("email login redirect: %q, want /", loc)	429	+ t.Fatalf("email login redirect: %q, want /explore", loc)
430	}	430	}
431	_ = resp.Body.Close()	431	_ = resp.Body.Close()
432	}	432	}

`@@ -137,7 +137,7 @@` func (h Handlers) twoFactorChallengeSubmit(w http.ResponseWriter, r http.Reque
137	return	137	return
138	}	138	}
139		139
140	- dest := "/"	140	+ dest := defaultPostLoginPath
141	if next != "" && strings.HasPrefix(next, "/") && !strings.HasPrefix(next, "//") {	141	if next != "" && strings.HasPrefix(next, "/") && !strings.HasPrefix(next, "//") {
142	dest = next	142	dest = next
143	}	143	}

`@@ -160,8 +160,8 @@` func TestTwoFactor_Enroll_Logout_Login_Challenge_FullSession(t *testing.T) {
160	body, _ := io.ReadAll(resp.Body)	160	body, _ := io.ReadAll(resp.Body)
161	t.Fatalf("2fa challenge: %d body=%s", resp.StatusCode, body)	161	t.Fatalf("2fa challenge: %d body=%s", resp.StatusCode, body)
162	}	162	}
163	- if loc := resp.Header.Get("Location"); loc != "/" {	163	+ if loc := resp.Header.Get("Location"); loc != "/explore" {
164	- t.Fatalf("expected / after challenge, got %q", loc)	164	+ t.Fatalf("expected /explore after challenge, got %q", loc)
165	}	165	}
166	_ = resp.Body.Close()	166	_ = resp.Body.Close()
167	}	167	}

`@@ -255,7 +255,7 @@` func RegisterChi(r chi.Mux, deps Deps) (chi.Mux, middleware.PanicHandler, http
255	r.Use(middleware.Compress)	255	r.Use(middleware.Compress)
256	r.Use(middleware.Timeout(30 * time.Second))	256	r.Use(middleware.Timeout(30 * time.Second))
257	r.Use(csrf)	257	r.Use(csrf)
258	- r.Get("/", helloHandler{render: rr, logoSVG: deps.LogoSVG, logger: deps.Logger, pool: deps.Pool}.ServeHTTP)	258	+ r.Get("/", helloHandler{render: rr, logoSVG: deps.LogoSVG, logger: deps.Logger}.ServeHTTP)
259	r.Get("/explore", exploreHandler{render: rr, logger: deps.Logger, pool: deps.Pool}.ServeExplore)	259	r.Get("/explore", exploreHandler{render: rr, logger: deps.Logger, pool: deps.Pool}.ServeExplore)
260	r.Get("/trending", exploreHandler{render: rr, logger: deps.Logger, pool: deps.Pool}.ServeTrending)	260	r.Get("/trending", exploreHandler{render: rr, logger: deps.Logger, pool: deps.Pool}.ServeTrending)
261	// /internal/panic is a dev affordance: GET it to trigger the	261	// /internal/panic is a dev affordance: GET it to trigger the

tenseleyflow/shithub / `fa20687`

9 changed files