Skip to content

Stop opening the token owner on / and hide traffic UI without snapshots #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
puppe1990 merged 1 commit into from
Sep 11, 2026
Merged

Stop opening the token owner on / and hide traffic UI without snapshots #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions internal/handlers/home.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,6 @@ func NewHomeHandler(site meta.Site, i *inertia.Inertia, loader *catalog.Loader)
}

func (h *HomeHandler) Index(w http.ResponseWriter, r *http.Request) {
if h.loader != nil && h.loader.GitHub != nil && h.loader.GitHub.HasToken() {
me, err := h.loader.GitHub.Me(r.Context())
if err == nil && me.Login != "" {
http.Redirect(w, r, "/u/"+me.Login+"/all", http.StatusSeeOther)
return
}
}
h.render(w, r, catalog.Snapshot{}, "", "", false)
}

Expand Down
10 changes: 5 additions & 5 deletions internal/handlers/home_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,19 +86,19 @@ func newHomeHandler(t *testing.T, gh catalog.GitHub) *HomeHandler {
return NewHomeHandler(testSite(), setupTestInertia(t), loader)
}

func TestHomeHandler_IndexRedirectsToAuthenticatedUser(t *testing.T) {
func TestHomeHandler_IndexDoesNotOpenAuthenticatedUser(t *testing.T) {
h := newHomeHandler(t, homeGitHub{
token: true,
user: githubapi.User{Login: "puppe1990", Name: "Matheus"},
repos: []githubapi.Repo{{Name: "cais", OwnerLogin: "puppe1990"}},
})
rr := httptest.NewRecorder()
h.Index(rr, httptest.NewRequest(http.MethodGet, "/", nil))
if rr.Code != http.StatusSeeOther {
t.Fatalf("status = %d, want %d", rr.Code, http.StatusSeeOther)
if rr.Code != http.StatusOK {
t.Fatalf("status = %d, want %d", rr.Code, http.StatusOK)
}
if loc := rr.Header().Get("Location"); loc != "/u/puppe1990/all" {
t.Fatalf("Location = %q", loc)
if loc := rr.Header().Get("Location"); loc != "" {
t.Fatalf("Location = %q, want empty", loc)
}
}

Expand Down
25 changes: 14 additions & 11 deletions web/src/components/SortModal.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@
export let sortOrder = "desc";
export let sortThen = "";
export let sortThenOrder = "desc";
export let hasTraffic = false;

const catalogFields = SORT_FIELDS.filter((field) => field.group === "catalog");
const trafficFields = SORT_FIELDS.filter((field) => field.group === "traffic");
const thenFields = [{ value: "", label: "None" }, ...SORT_FIELDS];
$: thenFields = [{ value: "", label: "None" }, ...SORT_FIELDS.filter((field) => hasTraffic || field.group !== "traffic")];

function close() {
open = false;
Expand Down Expand Up @@ -45,16 +46,18 @@
</div>
</section>

<section class="sort-modal-block">
<h3>Traffic · 14 days</h3>
<div class="sort-chips">
{#each trafficFields as field}
<button type="button" class="sort-chip" class:is-active={sortBy === field.value} aria-pressed={sortBy === field.value} on:click={() => (sortBy = field.value)}>
{field.label}
</button>
{/each}
</div>
</section>
{#if hasTraffic}
<section class="sort-modal-block">
<h3>Traffic · 14 days</h3>
<div class="sort-chips">
{#each trafficFields as field}
<button type="button" class="sort-chip" class:is-active={sortBy === field.value} aria-pressed={sortBy === field.value} on:click={() => (sortBy = field.value)}>
{field.label}
</button>
{/each}
</div>
</section>
{/if}

<section class="sort-modal-block">
<h3>Order</h3>
Expand Down
36 changes: 24 additions & 12 deletions web/src/pages/Home.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,18 @@
let view = "catalog";
let page = 1;
let lastFilterKey = "";
$: if (!preferTraffic && (repos || []).some((repo) => repo.traffic?.available)) {
$: hasTraffic = (repos || []).some((repo) => repo.traffic?.available);
$: if (hasTraffic && !preferTraffic) {
sortBy = "traffic";
preferTraffic = true;
}
$: if (!hasTraffic) {
preferTraffic = false;
if (sortBy === "traffic" || sortBy === "views" || sortBy === "view_uniques" || sortBy === "clones" || sortBy === "clone_uniques") {
sortBy = "stars";
}
if (view === "charts") view = "catalog";
}

$: langs = languageOptions(repos);
$: visible = applyFilters(repos, { language, minStars, query, includeForks, hasHomepage, visibility, sortBy, sortOrder, sortThen, sortThenOrder });
Expand Down Expand Up @@ -230,10 +238,12 @@
<option value="forks">Forks</option>
<option value="updated">Updated</option>
<option value="name">Name</option>
<option value="traffic">Traffic</option>
<option value="view_uniques">Unique visitors</option>
<option value="clones">Clones</option>
<option value="clone_uniques">Unique cloners</option>
{#if hasTraffic}
<option value="traffic">Traffic</option>
<option value="view_uniques">Unique visitors</option>
<option value="clones">Clones</option>
<option value="clone_uniques">Unique cloners</option>
{/if}
</select>
<select id="sort-order" aria-label="Sort order" bind:value={sortOrder}>
<option value="desc">Desc</option>
Expand All @@ -256,12 +266,14 @@
{/if}

{#if populated && !loading}
<div class="view-tabs" role="tablist" aria-label="Catalog view">
<button type="button" class="view-tab" role="tab" id="tab-catalog" aria-controls="projects" aria-selected={view === "catalog"} on:click={() => (view = "catalog")}>Catalog</button>
<button type="button" class="view-tab" role="tab" id="tab-charts" aria-controls="panel-charts" aria-selected={view === "charts"} on:click={() => (view = "charts")}>Charts</button>
</div>
{#if view === "catalog"}
<div id="projects" role="tabpanel" aria-labelledby="tab-catalog">
{#if hasTraffic}
<div class="view-tabs" role="tablist" aria-label="Catalog view">
<button type="button" class="view-tab" role="tab" id="tab-catalog" aria-controls="projects" aria-selected={view === "catalog"} on:click={() => (view = "catalog")}>Catalog</button>
<button type="button" class="view-tab" role="tab" id="tab-charts" aria-controls="panel-charts" aria-selected={view === "charts"} on:click={() => (view = "charts")}>Charts</button>
</div>
{/if}
{#if view === "catalog" || !hasTraffic}
<div id="projects" role={hasTraffic ? "tabpanel" : undefined} aria-labelledby={hasTraffic ? "tab-catalog" : undefined}>
{#if visible.length === 0}
<div class="projects">
<div class="empty">
Expand Down Expand Up @@ -291,4 +303,4 @@
{/if}
</div>

<SortModal bind:open={sortOpen} bind:sortBy bind:sortOrder bind:sortThen bind:sortThenOrder />
<SortModal bind:open={sortOpen} bind:sortBy bind:sortOrder bind:sortThen bind:sortThenOrder {hasTraffic} />
3 changes: 3 additions & 0 deletions web/src/pages/Home.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ describe("Home", () => {
});
expect(screen.getByRole("heading", { name: "The Octocat" })).toBeInTheDocument();
expect(screen.getByRole("link", { name: "hello-world" })).toBeInTheDocument();
expect(screen.queryByRole("tab", { name: "Charts" })).not.toBeInTheDocument();
expect(within(screen.getByLabelText("Sort by")).queryByRole("option", { name: "Unique visitors" })).not.toBeInTheDocument();
});

test("offers unique sorts in the quick dropdown", () => {
Expand Down Expand Up @@ -116,6 +118,7 @@ describe("Home", () => {
error: "",
},
});
expect(screen.getByRole("tab", { name: "Charts" })).toBeInTheDocument();
expect(screen.getByRole("link", { name: "hello-world" })).toBeInTheDocument();
await fireEvent.click(screen.getByRole("tab", { name: "Charts" }));
expect(screen.getByRole("tab", { name: "Charts" })).toHaveAttribute("aria-selected", "true");
Expand Down
Loading