feat: Phase 0 walking skeleton — auth, Todoist integration, tip page

- Google OAuth2/PKCE flow via openid-client v6; session cookie (30-day)
- Next.js middleware auth guard — redirects before any client render
- Todoist OAuth2 connect/disconnect; REST v1 task fetch (today|overdue)
- RandomPolicy recommender behind stable POST /recommend contract
- Feedback endpoint (done/dismiss/snooze); marks task complete in Todoist
- 30s in-memory task cache per user (~1ms recommend on cache hit)
- Tip page: pure opacity fade-in (3.5s), fast fade-out (0.3s), no motion
- "reading you…" loading text with breathe animation
- PWA icons + manifest
- Ports pinned: API=3078, web=3079; Caddy at o.alogins.net

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
2026-04-15 08:53:38 +00:00
parent 65218762be
commit 3123cb73fb
14 changed files with 276 additions and 177 deletions

View File

@@ -2,10 +2,11 @@
# API # API
SESSION_SECRET=change-me-to-a-random-32-char-string SESSION_SECRET=change-me-to-a-random-32-char-string
PORT=3001 PORT=3078
NODE_ENV=development NODE_ENV=development
DATABASE_PATH=./data/oo.db DATABASE_PATH=./data/oo.db
API_BASE_URL=http://localhost:3001 # API_BASE_URL = public origin only, no path suffix (used to build OAuth redirect URIs)
API_BASE_URL=http://localhost:3078
WEB_BASE_URL=http://localhost:3000 WEB_BASE_URL=http://localhost:3000
ML_SERVING_URL=http://localhost:8000 ML_SERVING_URL=http://localhost:8000

6
apps/web/next-env.d.ts vendored Normal file
View File

@@ -0,0 +1,6 @@
/// <reference types="next" />
/// <reference types="next/image-types/global" />
/// <reference path="./.next/types/routes.d.ts" />
// NOTE: This file should not be edited
// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.

View File

@@ -5,7 +5,8 @@ const nextConfig: NextConfig = {
return [ return [
{ {
source: '/api/:path*', source: '/api/:path*',
destination: `${process.env.NEXT_PUBLIC_API_URL ?? 'http://localhost:3001'}/api/:path*`, destination: `${process.env.NEXT_PUBLIC_API_URL ?? 'http://localhost:3078'}/api/:path*`,
// In production, Caddy routes /api/* directly to the API — this rewrite only fires in dev
}, },
]; ];
}, },

View File

@@ -3,9 +3,9 @@
"version": "0.0.0", "version": "0.0.0",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "next dev", "dev": "next dev -p 3079",
"build": "next build", "build": "next build",
"start": "next start", "start": "next start -p 3079",
"lint": "next lint", "lint": "next lint",
"type-check": "tsc --noEmit", "type-check": "tsc --noEmit",
"clean": "rm -rf .next" "clean": "rm -rf .next"

BIN
apps/web/public/favicon.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 82 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 187 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 842 B

View File

@@ -1,25 +1,22 @@
'use client'; 'use client';
import { useEffect, useState, useCallback } from 'react'; import { useEffect, useState, useCallback } from 'react';
import { useRouter, useSearchParams } from 'next/navigation'; import { useSearchParams } from 'next/navigation';
import { getSession, getIntegrations, disconnectIntegration } from '@/lib/api'; import { getIntegrations, disconnectIntegration } from '@/lib/api';
import type { Integration } from '@oo/shared-types'; import type { Integration } from '@oo/shared-types';
import { Suspense } from 'react'; import { Suspense } from 'react';
function ConnectPageInner() { function ConnectPageInner() {
const router = useRouter();
const searchParams = useSearchParams(); const searchParams = useSearchParams();
const [integrations, setIntegrations] = useState<Integration[]>([]); const [integrations, setIntegrations] = useState<Integration[]>([]);
const [loading, setLoading] = useState(true); const [loading, setLoading] = useState(true);
const [disconnecting, setDisconnecting] = useState<string | null>(null); const [disconnecting, setDisconnecting] = useState<string | null>(null);
const load = useCallback(async () => { const load = useCallback(async () => {
const { user } = await getSession();
if (!user) { router.replace('/sign-in'); return; }
const { integrations: list } = await getIntegrations(); const { integrations: list } = await getIntegrations();
setIntegrations(list); setIntegrations(list);
setLoading(false); setLoading(false);
}, [router]); }, []);
useEffect(() => { load(); }, [load]); useEffect(() => { load(); }, [load]);

View File

@@ -1,17 +1,7 @@
'use client'; 'use client';
import { useEffect } from 'react'; // Auth redirect is handled by middleware — no client-side session check needed here.
import { useRouter } from 'next/navigation';
import { getSession } from '@/lib/api';
export default function SignIn() { export default function SignIn() {
const router = useRouter();
useEffect(() => {
getSession().then(({ user }) => {
if (user) router.replace('/connect');
});
}, [router]);
return ( return (
<main style={{ <main style={{

View File

@@ -1,24 +1,50 @@
'use client'; 'use client';
import { useEffect, useState, useRef, useCallback } from 'react'; import { useEffect, useState, useRef, useCallback } from 'react';
import { useRouter } from 'next/navigation'; import { getRecommendation, sendFeedback } from '@/lib/api';
import { getSession, getRecommendation, sendFeedback } from '@/lib/api';
import type { Tip } from '@oo/shared-types'; import type { Tip } from '@oo/shared-types';
type State = 'loading' | 'tip' | 'empty' | 'actions' | 'done'; type State = 'loading' | 'tip' | 'empty' | 'actions' | 'done';
// Fade wrapper — children fade in when `visible`, fade out when not
function Fade({ visible, children, style }: {
visible: boolean;
children: React.ReactNode;
style?: React.CSSProperties;
}) {
return (
<div style={{
opacity: visible ? 1 : 0,
transition: visible ? 'opacity 3.5s ease' : 'opacity 0.3s ease',
pointerEvents: visible ? 'auto' : 'none',
...style,
}}>
{children}
</div>
);
}
export default function TipPage() { export default function TipPage() {
const router = useRouter();
const [tip, setTip] = useState<Tip | null>(null); const [tip, setTip] = useState<Tip | null>(null);
const [state, setState] = useState<State>('loading'); const [state, setState] = useState<State>('loading');
const [visible, setVisible] = useState(false);
const holdTimer = useRef<ReturnType<typeof setTimeout> | null>(null); const holdTimer = useRef<ReturnType<typeof setTimeout> | null>(null);
const [pressed, setPressed] = useState(false); const [pressed, setPressed] = useState(false);
const loadTip = useCallback(async () => { // Fade in after state change settles
setState('loading'); useEffect(() => {
const { user } = await getSession(); if (state === 'loading' || state === 'done') {
if (!user) { router.replace('/sign-in'); return; } setVisible(false);
} else {
const t = setTimeout(() => setVisible(true), 30);
return () => clearTimeout(t);
}
}, [state]);
const loadTip = useCallback(async () => {
setVisible(false);
setState('loading');
try {
const rec = await getRecommendation(); const rec = await getRecommendation();
if (!rec) { if (!rec) {
setState('empty'); setState('empty');
@@ -26,15 +52,20 @@ export default function TipPage() {
} }
setTip(rec.tip); setTip(rec.tip);
setState('tip'); setState('tip');
}, [router]); } catch (err: any) {
console.error('[tip] loadTip error', err?.status, err?.message);
setState('empty');
}
}, []);
useEffect(() => { loadTip(); }, [loadTip]); useEffect(() => { loadTip(); }, [loadTip]);
const react = async (action: 'done' | 'dismiss' | 'snooze') => { const react = async (action: 'done' | 'dismiss' | 'snooze') => {
if (!tip) return; if (!tip) return;
setVisible(false);
setState('done'); setState('done');
await sendFeedback(tip.id, { action }); await sendFeedback(tip.id, { action });
setTimeout(() => loadTip(), 600); setTimeout(() => loadTip(), 700);
}; };
const onPointerDown = () => { const onPointerDown = () => {
@@ -42,6 +73,7 @@ export default function TipPage() {
setPressed(true); setPressed(true);
holdTimer.current = setTimeout(() => { holdTimer.current = setTimeout(() => {
setState('actions'); setState('actions');
setVisible(true);
setPressed(false); setPressed(false);
}, 600); }, 600);
}; };
@@ -55,6 +87,14 @@ export default function TipPage() {
}; };
return ( return (
<>
<style>{`
@keyframes breathe {
0%, 100% { opacity: 0.3; }
50% { opacity: 1; }
}
`}</style>
<main <main
onPointerDown={onPointerDown} onPointerDown={onPointerDown}
onPointerUp={onPointerUp} onPointerUp={onPointerUp}
@@ -68,87 +108,96 @@ export default function TipPage() {
padding: '3rem 2rem', padding: '3rem 2rem',
userSelect: 'none', userSelect: 'none',
WebkitUserSelect: 'none', WebkitUserSelect: 'none',
cursor: state === 'tip' ? 'default' : 'pointer', cursor: state === 'tip' ? 'default' : 'auto',
position: 'relative', position: 'relative',
overflow: 'hidden', overflow: 'hidden',
}} }}
> >
{/* Radial glow when pressed */} {/* Ambient glow — breathes while loading */}
<div style={{ <div style={{
position: 'absolute', position: 'absolute',
inset: 0, inset: 0,
background: 'radial-gradient(ellipse at center, rgba(255,255,255,0.04) 0%, transparent 70%)', background: 'radial-gradient(ellipse at center, rgba(255,255,255,0.06) 0%, transparent 65%)',
opacity: pressed ? 1 : 0, animation: state === 'loading' ? 'breathe 4s ease-in-out infinite' : undefined,
transition: 'opacity 0.3s ease', opacity: state === 'loading' ? undefined : pressed ? 0.3 : 0,
transition: state !== 'loading' ? 'opacity 0.4s ease' : undefined,
pointerEvents: 'none', pointerEvents: 'none',
}} /> }} />
{state === 'loading' && ( {/* Loading label */}
<div style={{ color: 'rgba(255,255,255,0.2)', fontSize: '0.75rem', letterSpacing: '0.15em' }}> {(state === 'loading' || state === 'done') && (
··· <p style={{
</div> marginTop: '1.25rem',
color: 'rgba(255,255,255,0.55)',
fontSize: '0.7rem',
letterSpacing: '0.18em',
textTransform: 'uppercase',
animation: 'breathe 4s ease-in-out infinite',
}}>
reading you
</p>
)} )}
{state === 'tip' && tip && ( {/* Tip */}
<div style={{ textAlign: 'center', maxWidth: '420px' }}> {(state === 'tip' || state === 'actions') && tip && (
<Fade visible={visible && state !== 'actions'} style={{ textAlign: 'center', maxWidth: '420px' }}>
<p style={{ <p style={{
fontSize: 'clamp(1.25rem, 4vw, 1.75rem)', fontSize: 'clamp(1.25rem, 4vw, 1.75rem)',
fontWeight: 300, fontWeight: 300,
lineHeight: 1.45, lineHeight: 1.45,
letterSpacing: '-0.01em', letterSpacing: '-0.01em',
color: 'var(--white)', color: 'rgba(255,255,255,1)',
transition: 'opacity 0.2s ease', transition: 'opacity 0.2s ease',
opacity: pressed ? 0.6 : 1, opacity: pressed ? 0.5 : 1,
}}> }}>
{tip.content} {tip.content}
</p> </p>
<p style={{ <p style={{
marginTop: '2rem', marginTop: '2rem',
color: 'rgba(255,255,255,0.2)', color: 'rgba(255,255,255,0.18)',
fontSize: '0.65rem', fontSize: '0.65rem',
letterSpacing: '0.12em', letterSpacing: '0.12em',
textTransform: 'uppercase', textTransform: 'uppercase',
}}> }}>
hold to act hold to act
</p> </p>
</div> </Fade>
)} )}
{/* Empty */}
{state === 'empty' && ( {state === 'empty' && (
<div style={{ textAlign: 'center', color: 'rgba(255,255,255,0.3)' }}> <Fade visible={visible} style={{ textAlign: 'center' }}>
<p style={{ fontSize: '1.1rem', fontWeight: 300 }}>All clear.</p> <p style={{ fontSize: '1.1rem', fontWeight: 300, color: 'rgba(255,255,255,0.35)' }}>
All clear.
</p>
<button <button
onClick={loadTip} onClick={loadTip}
style={{ style={{
marginTop: '2rem', marginTop: '2rem',
background: 'transparent', background: 'transparent',
border: '1px solid rgba(255,255,255,0.1)', border: '1px solid rgba(255,255,255,0.1)',
color: 'rgba(255,255,255,0.4)', color: 'rgba(255,255,255,0.35)',
borderRadius: '0.375rem', borderRadius: '0.375rem',
padding: '0.5rem 1rem', padding: '0.5rem 1rem',
fontSize: '0.8rem', fontSize: '0.8rem',
cursor: 'pointer',
}} }}
> >
Check again Check again
</button> </button>
</div> </Fade>
)}
{state === 'done' && (
<div style={{ color: 'rgba(255,255,255,0.15)', fontSize: '0.75rem', letterSpacing: '0.15em' }}>
···
</div>
)} )}
{/* Action sheet */} {/* Action sheet */}
{state === 'actions' && ( {state === 'actions' && (
<> <>
<div <div
onClick={() => setState('tip')} onClick={() => { setState('tip'); }}
style={{ style={{
position: 'fixed', position: 'fixed',
inset: 0, inset: 0,
background: 'rgba(0,0,0,0.5)', background: 'rgba(0,0,0,0.5)',
animation: 'none',
}} }}
/> />
<div style={{ <div style={{
@@ -162,10 +211,12 @@ export default function TipPage() {
display: 'flex', display: 'flex',
flexDirection: 'column', flexDirection: 'column',
gap: '0.75rem', gap: '0.75rem',
transform: 'translateY(0)',
transition: 'transform 0.3s ease',
}}> }}>
{tip && ( {tip && (
<p style={{ <p style={{
color: 'rgba(255,255,255,0.4)', color: 'rgba(255,255,255,0.35)',
fontSize: '0.8rem', fontSize: '0.8rem',
marginBottom: '0.5rem', marginBottom: '0.5rem',
lineHeight: 1.4, lineHeight: 1.4,
@@ -184,6 +235,7 @@ export default function TipPage() {
color: 'rgba(255,255,255,0.25)', color: 'rgba(255,255,255,0.25)',
padding: '0.5rem', padding: '0.5rem',
fontSize: '0.8rem', fontSize: '0.8rem',
cursor: 'pointer',
marginTop: '0.25rem', marginTop: '0.25rem',
}} }}
> >
@@ -193,6 +245,7 @@ export default function TipPage() {
</> </>
)} )}
</main> </main>
</>
); );
} }
@@ -210,6 +263,7 @@ function ActionButton({ label, onClick, primary }: { label: string; onClick: ()
fontWeight: primary ? 500 : 400, fontWeight: primary ? 500 : 400,
width: '100%', width: '100%',
textAlign: 'center', textAlign: 'center',
cursor: 'pointer',
}} }}
> >
{label} {label}

View File

@@ -0,0 +1,34 @@
import { NextResponse } from 'next/server';
import type { NextRequest } from 'next/server';
const PUBLIC = ['/sign-in', '/legal'];
export function middleware(req: NextRequest) {
const { pathname } = req.nextUrl;
const hasCookie = req.cookies.has('sid');
// Already on a public page with no session — allow through
if (!hasCookie && PUBLIC.some((p) => pathname.startsWith(p))) {
return NextResponse.next();
}
// No session — redirect to sign-in
if (!hasCookie) {
const url = req.nextUrl.clone();
url.pathname = '/sign-in';
return NextResponse.redirect(url);
}
// Has session but hitting sign-in — send to tip
if (hasCookie && pathname.startsWith('/sign-in')) {
const url = req.nextUrl.clone();
url.pathname = '/tip';
return NextResponse.redirect(url);
}
return NextResponse.next();
}
export const config = {
matcher: ['/((?!api|_next/static|_next/image|favicon.ico|icon-.*\\.png|manifest\\.json).*)'],
};

View File

@@ -1,4 +1,7 @@
import 'dotenv/config'; import { config as dotenvConfig } from 'dotenv';
// Load .env.local first (takes precedence), then .env as fallback
dotenvConfig({ path: '../../.env.local', override: false });
dotenvConfig({ path: '../../.env', override: false });
function require(name: string): string { function require(name: string): string {
const val = process.env[name]; const val = process.env[name];
@@ -11,7 +14,7 @@ function optional(name: string, fallback: string): string {
} }
export const config = { export const config = {
PORT: parseInt(optional('PORT', '3001'), 10), PORT: parseInt(optional('PORT', '3078'), 10),
NODE_ENV: optional('NODE_ENV', 'development'), NODE_ENV: optional('NODE_ENV', 'development'),
DATABASE_PATH: optional('DATABASE_PATH', './data/oo.db'), DATABASE_PATH: optional('DATABASE_PATH', './data/oo.db'),

View File

@@ -36,6 +36,7 @@ router.get('/login', async (req: Request, res: Response) => {
setTimeout(() => pendingStates.delete(state), 10 * 60 * 1000); setTimeout(() => pendingStates.delete(state), 10 * 60 * 1000);
const redirectUri = `${config.API_BASE_URL}/api/auth/callback`; const redirectUri = `${config.API_BASE_URL}/api/auth/callback`;
console.log('[auth] redirect_uri sent to Google:', redirectUri);
const authUrl = client.buildAuthorizationUrl(cfg, { const authUrl = client.buildAuthorizationUrl(cfg, {
redirect_uri: redirectUri, redirect_uri: redirectUri,
scope: 'openid email profile', scope: 'openid email profile',
@@ -59,7 +60,10 @@ router.get('/callback', async (req: Request, res: Response) => {
pendingStates.delete(state); pendingStates.delete(state);
const redirectUri = `${config.API_BASE_URL}/api/auth/callback`; const redirectUri = `${config.API_BASE_URL}/api/auth/callback`;
const currentUrl = new URL(req.url, config.API_BASE_URL); // req.url is router-relative (/callback?...), so reconstruct the full callback URL
// using the known redirectUri base + the query string from the incoming request.
const incomingSearch = new URL(req.url, 'http://localhost').search;
const currentUrl = new URL(redirectUri + incomingSearch);
let tokens: client.TokenEndpointResponse; let tokens: client.TokenEndpointResponse;
try { try {

View File

@@ -8,27 +8,33 @@ import type { Tip } from '@oo/shared-types';
const router: ExpressRouter = Router(); const router: ExpressRouter = Router();
/** Fetch active Todoist tasks for a user via their stored token */ const CACHE_TTL_MS = 30_000; // 30 seconds
async function fetchTodoistTasks(accessToken: string): Promise<Tip[]> { const taskCache = new Map<string, { tips: Tip[]; fetchedAt: number }>();
const res = await fetch('https://api.todoist.com/rest/v2/tasks?filter=today|overdue', {
/** Fetch active Todoist tasks, with a 30s in-memory cache per user */
async function fetchTodoistTasks(userId: string, accessToken: string): Promise<Tip[]> {
const cached = taskCache.get(userId);
if (cached && Date.now() - cached.fetchedAt < CACHE_TTL_MS) {
return cached.tips;
}
const res = await fetch('https://api.todoist.com/api/v1/tasks?filter=today%7Coverdue', {
headers: { Authorization: `Bearer ${accessToken}` }, headers: { Authorization: `Bearer ${accessToken}` },
}); });
if (!res.ok) return []; if (!res.ok) return cached?.tips ?? [];
const tasks = (await res.json()) as Array<{ const body = (await res.json()) as { results: Array<{ id: string; content: string }> };
id: string; const tips: Tip[] = (body.results ?? []).map((t) => ({
content: string;
due?: { string: string };
}>;
return tasks.map((t) => ({
id: `todoist:${t.id}`, id: `todoist:${t.id}`,
content: t.content, content: t.content,
source: 'todoist' as const, source: 'todoist' as const,
sourceId: t.id, sourceId: t.id,
createdAt: new Date().toISOString(), createdAt: new Date().toISOString(),
})); }));
taskCache.set(userId, { tips, fetchedAt: Date.now() });
return tips;
} }
/** /**
@@ -41,7 +47,7 @@ function randomPolicy(candidates: Tip[]): Tip | null {
} }
/** POST /api/recommend */ /** POST /api/recommend */
router.post('/', requireAuth, async (req: AuthenticatedRequest, res: Response) => { router.post('/recommend', requireAuth, async (req: AuthenticatedRequest, res: Response) => {
const [token] = await db const [token] = await db
.select() .select()
.from(integrationTokens) .from(integrationTokens)
@@ -58,7 +64,7 @@ router.post('/', requireAuth, async (req: AuthenticatedRequest, res: Response) =
return; return;
} }
const candidates = await fetchTodoistTasks(token.accessToken); const candidates = await fetchTodoistTasks(req.userId!, token.accessToken);
const tip = randomPolicy(candidates); const tip = randomPolicy(candidates);
if (!tip) { if (!tip) {
@@ -88,6 +94,9 @@ router.post('/tip/:id/feedback', requireAuth, async (req: AuthenticatedRequest,
createdAt: new Date().toISOString(), createdAt: new Date().toISOString(),
}); });
// Invalidate cache so next recommend fetches fresh tasks
taskCache.delete(req.userId!);
// If done, mark complete in Todoist // If done, mark complete in Todoist
if (action === 'done' && tipId.startsWith('todoist:')) { if (action === 'done' && tipId.startsWith('todoist:')) {
const todoistId = tipId.slice(8); const todoistId = tipId.slice(8);
@@ -103,7 +112,7 @@ router.post('/tip/:id/feedback', requireAuth, async (req: AuthenticatedRequest,
.limit(1); .limit(1);
if (token) { if (token) {
await fetch(`https://api.todoist.com/rest/v2/tasks/${todoistId}/close`, { await fetch(`https://api.todoist.com/api/v1/tasks/${todoistId}/close`, {
method: 'POST', method: 'POST',
headers: { Authorization: `Bearer ${token.accessToken}` }, headers: { Authorization: `Bearer ${token.accessToken}` },
}).catch(() => {}); }).catch(() => {});