Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ npm-debug.log*
yarn-debug.log*
yarn-error.log*
.DS_Store
.env
webroot
dist
old_pixelary
Expand Down Expand Up @@ -36,3 +37,6 @@ src/server/dist/
# TypeScript build outputs
dist/types/
dist/*.tsbuildinfo

# Dev app playtest script
tools/devvit-playtest.mjs
1,017 changes: 650 additions & 367 deletions package-lock.json

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,14 @@
"upload": "npm run build && devvit upload"
},
"dependencies": {
"@devvit/public-api": "0.12.4",
"@devvit/web": "0.12.4",
"@devvit/public-api": "0.12.23-next-2026-05-04-20-45-11-9c6d33a22.0",
"@devvit/start": "0.12.23-next-2026-05-04-20-45-11-9c6d33a22.0",
"@devvit/web": "0.12.23-next-2026-05-04-20-45-11-9c6d33a22.0",
"@tanstack/react-query": "^5.90.10",
"@trpc/client": "^11.7.1",
"@trpc/react-query": "^11.7.1",
"@trpc/server": "^11.7.1",
"devvit": "0.12.4",
"devvit": "0.12.23-next-2026-05-04-20-45-11-9c6d33a22.0",
"express": "5.1.0",
"preact": "^10.27.2",
"zod": "^4.1.12"
Expand Down
115 changes: 115 additions & 0 deletions src/client/entries/pinned-post/_components/Menu.test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
import { beforeEach, describe, expect, it, vi } from 'vitest';
import { cleanup, fireEvent, render, screen } from '@testing-library/preact';
import { Menu } from './Menu';

const mockContext = { userId: 't2_user123' as string | null };
const mockRequestExpandedMode = vi.fn();
const mockShowLoginPrompt = vi.fn();

vi.mock('@client/hooks/useTelemetry', () => ({
useTelemetry: () => ({
track: vi.fn(async () => ({ ok: true })),
}),
}));

vi.mock('@client/trpc/client', () => {
const prefetch = vi.fn(async () => undefined);
return {
trpc: {
useUtils: () => ({
app: {
user: {
getProfile: { prefetch },
colors: { getRecent: { prefetch } },
},
rewards: {
getEffectiveBonuses: { prefetch },
},
dictionary: {
getCandidates: { prefetch },
},
},
}),
app: {
user: {
getProfile: {
useQuery: () => ({
data: { levelProgressPercentage: 42, level: 5 },
}),
},
isAdmin: {
useQuery: () => ({ data: false }),
},
getPendingNavigation: {
useMutation: () => ({
mutateAsync: vi.fn(async () => ({ url: null })),
}),
},
},
},
},
};
});

vi.mock('@devvit/web/client', () => ({
requestExpandedMode: (e: MouseEvent, mode: string) =>
mockRequestExpandedMode(e, mode),
showLoginPrompt: () => mockShowLoginPrompt(),
addWebViewModeListener: vi.fn(),
removeWebViewModeListener: vi.fn(),
navigateTo: vi.fn(),
context: mockContext,
}));

describe('Pinned menu logged-out actions', () => {
beforeEach(() => {
cleanup();
vi.clearAllMocks();
});

it('shows logged-out draw CTA and hides account buttons for logged-out users', () => {
mockContext.userId = null;

render(
<Menu
onMyDrawings={() => {}}
onLeaderboard={() => {}}
onHowToPlay={() => {}}
onLevelClick={() => {}}
/>
);

const drawButton = screen.getByRole('button', { name: /log in to draw/i });
expect(drawButton).toBeEnabled();
fireEvent.click(drawButton);
expect(mockShowLoginPrompt).toHaveBeenCalledTimes(1);
expect(mockRequestExpandedMode).not.toHaveBeenCalled();
expect(
screen.queryByRole('button', { name: /my drawings/i })
).not.toBeInTheDocument();
expect(
screen.queryByRole('button', { name: /my rewards/i })
).not.toBeInTheDocument();
});

it('shows full menu for logged-in users', () => {
mockContext.userId = 't2_user123';

render(
<Menu
onMyDrawings={() => {}}
onLeaderboard={() => {}}
onHowToPlay={() => {}}
onLevelClick={() => {}}
/>
);

expect(screen.getByRole('button', { name: /draw/i })).toBeEnabled();
expect(
screen.getByRole('button', { name: /my drawings/i })
).toBeInTheDocument();
expect(
screen.getByRole('button', { name: /my rewards/i })
).toBeInTheDocument();
});
});
48 changes: 29 additions & 19 deletions src/client/entries/pinned-post/_components/Menu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { useEffect, useRef } from 'react';
import { ActiveEffectsBadge } from '@components/ActiveEffectsBadge';
import {
requestExpandedMode,
showLoginPrompt,
addWebViewModeListener,
removeWebViewModeListener,
navigateTo,
Expand All @@ -24,6 +25,7 @@ type MenuProps = {

export function Menu(props: MenuProps) {
const { onMyDrawings, onLeaderboard, onHowToPlay, onLevelClick } = props;
const isLoggedIn = Boolean(context.userId);

// Telemetry
const { track } = useTelemetry();
Expand Down Expand Up @@ -111,32 +113,40 @@ export function Menu(props: MenuProps) {
{/* Menu */}
<nav className="flex flex-col gap-3 w-full max-w-3xs">
<Button
onClick={async (e) => {
onClick={(e) => {
if (!isLoggedIn) {
showLoginPrompt();
return;
}
void requestExpandedMode(e, 'editor');
}}
size="large"
telemetryEvent="click_draw"
telemetryEvent={isLoggedIn ? 'click_draw' : 'click_log_in'}
>
Draw
{isLoggedIn ? 'Draw' : 'Log in to draw'}
</Button>

<Button
onClick={onMyDrawings}
size="medium"
variant="secondary"
telemetryEvent="click_my_drawings"
>
My Drawings
</Button>
{isLoggedIn && (
<Button
onClick={onMyDrawings}
size="medium"
variant="secondary"
telemetryEvent="click_my_drawings"
>
My Drawings
</Button>
)}

<Button
onClick={onHowToPlay}
size="medium"
variant="secondary"
telemetryEvent="click_my_rewards"
>
My Rewards
</Button>
{isLoggedIn && (
<Button
onClick={onHowToPlay}
size="medium"
variant="secondary"
telemetryEvent="click_my_rewards"
>
My Rewards
</Button>
)}

<Button
onClick={onLeaderboard}
Expand Down
3 changes: 3 additions & 0 deletions src/server/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ export default defineConfig({
outDir: '../../dist/server',
target: 'node22',
sourcemap: true,
commonjsOptions: {
ignoreDynamicRequires: true,
},
rollupOptions: {
external: [...builtinModules],

Expand Down
1 change: 1 addition & 0 deletions src/shared/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ export type TelemetryEventType =
| 'click_undo'
| 'click_redo'
| 'click_fill'
| 'click_log_in'
// Toggle events
| 'toggle_brush_size'
| 'toggle_mirror_v'
Expand Down