diff --git a/README.md b/README.md index 6189f77..688cd64 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # PK 研究所（综合版） -原生小红书小程序源码，同时提供由 Next.js 常驻托管的公网功能预览。综合版包含瀑布流测试广场、二选一淘汰赛、我的历史、跨小程序绑定码与可编辑、可保存的晋级图分享海报。 +原生小红书小程序源码，同时提供由 Next.js、React 与严格 TypeScript 构建的公网功能预览。综合版包含瀑布流测试广场、二选一淘汰赛、我的历史、跨小程序绑定码与可编辑、可保存的完整晋级图分享海报。 ## 接入 diff --git a/scripts/check.mjs b/scripts/check.mjs index 37ff24a..074e1eb 100644 --- a/scripts/check.mjs +++ b/scripts/check.mjs @@ -1,5 +1,5 @@ import { readFileSync, existsSync } from 'node:fs'; -const required = ['app.js','app.json','pages/index/index.xhsml','pages/discover/discover.xhsml','pages/test/test.js','pages/result/result.js','assets/test-covers/rice.jpg','vendor/poster-editor.cjs','web/package.json','web/next.config.mjs','web/app/page.jsx','web/app/api/[...path]/route.js','web/components/TestArena.jsx','web/components/PosterEditor.jsx']; +const required = ['app.js','app.json','pages/index/index.xhsml','pages/discover/discover.xhsml','pages/test/test.js','pages/result/result.js','assets/test-covers/rice.jpg','vendor/poster-editor.cjs','web/package.json','web/tsconfig.json','web/next.config.mjs','web/app/page.tsx','web/app/api/[...path]/route.ts','web/components/TestArena.tsx','web/components/PosterEditor.tsx']; for (const file of required) if (!existsSync(file)) throw new Error(`Missing ${file}`); JSON.parse(readFileSync('app.json','utf8')); const nextConfig = readFileSync('web/next.config.mjs','utf8'); diff --git a/scripts/check.py b/scripts/check.py index 96a875b..b5ebb61 100644 --- a/scripts/check.py +++ b/scripts/check.py @@ -11,11 +11,12 @@ required = [ "assets/test-covers/rice.jpg", "vendor/poster-editor.cjs", "web/package.json", + "web/tsconfig.json", "web/next.config.mjs", - "web/app/page.jsx", - "web/app/api/[...path]/route.js", - "web/components/TestArena.jsx", - "web/components/PosterEditor.jsx", + "web/app/page.tsx", + "web/app/api/[...path]/route.ts", + "web/components/TestArena.tsx", + "web/components/PosterEditor.tsx", ] missing = [name for name in required if not Path(name).is_file()] if missing: diff --git a/web/app/api/[...path]/route.js b/web/app/api/[...path]/route.ts similarity index 89% rename from web/app/api/[...path]/route.js rename to web/app/api/[...path]/route.ts index 3969836..d467380 100644 --- a/web/app/api/[...path]/route.js +++ b/web/app/api/[...path]/route.ts @@ -1,6 +1,6 @@ const API_BASE = process.env.API_INTERNAL_URL || 'http://pk-lab-api:8000'; -async function forward(request, context) { +async function forward(request: Request, context: { params: Promise<{ path: string[] }> }): Promise { const { path } = await context.params; const incoming = new URL(request.url); const target = new URL(`/api/${path.join('/')}${incoming.search}`, API_BASE); diff --git a/web/app/discover/page.jsx b/web/app/discover/page.tsx similarity index 59% rename from web/app/discover/page.jsx rename to web/app/discover/page.tsx index d6dc1b6..c5a191c 100644 --- a/web/app/discover/page.jsx +++ b/web/app/discover/page.tsx @@ -1,5 +1,5 @@ import DiscoverFeed from '../../components/DiscoverFeed'; -export default function DiscoverPage() { +export default function DiscoverPage(): React.ReactElement { return ; } diff --git a/web/app/globals.css b/web/app/globals.css index 03f8a9b..4c4ba5b 100644 --- a/web/app/globals.css +++ b/web/app/globals.css @@ -1,2 +1,6 @@ :root{--paper:#fffaf6;--ink:#171513;--muted:#817872;--line:#e9e2dc;--pink:#ff3156}*{box-sizing:border-box}html,body{margin:0;min-height:100%;background:var(--paper);color:var(--ink);font-family:Inter,ui-sans-serif,system-ui,-apple-system,"PingFang SC",sans-serif}button,input{font:inherit}button,a{color:inherit}button{border:0;cursor:pointer}a{text-decoration:none}.pageShell{width:min(920px,calc(100% - 18px));margin:0 auto;padding:24px 0 130px}.masthead{display:flex;align-items:center;gap:14px;margin-bottom:20px;font-size:24px}.logoMark{display:grid;width:54px;height:42px;place-items:center;background:#111;color:#fff;font-weight:950;letter-spacing:-2px}.searchBox{display:flex;align-items:center;gap:10px;margin-bottom:18px;padding:13px 16px;border-radius:5px;background:#f0f0f0}.searchBox input{width:100%;border:0;outline:0;background:transparent}.waterfall{columns:2;column-gap:10px}.testCard{display:inline-block;width:100%;margin:0 0 14px;overflow:hidden;break-inside:avoid;background:#fff}.testCard img{display:block;width:100%;height:auto;aspect-ratio:3/4;object-fit:cover}.testCard:nth-child(3n+2) img{aspect-ratio:4/5}.cardCopy{padding:13px 5px 18px}.cardCopy h2{margin:0;font-size:21px}.cardCopy p{margin:9px 0;color:#5f5853;line-height:1.45}.cardMeta{display:flex;justify-content:space-between;color:#999;font-size:12px}.emptyState{padding:90px 20px;text-align:center;color:var(--muted)}.pageLead{margin:-10px 0 26px;color:var(--muted)}.bottomNav{position:fixed;z-index:40;left:50%;bottom:22px;display:flex;width:min(360px,calc(100% - 36px));height:72px;padding:0 12px;transform:translateX(-50%);border-radius:16px;background:#080808;box-shadow:0 16px 44px #0004}.navItem{position:relative;flex:1;display:flex;flex-direction:column;align-items:center;justify-content:center;color:#888;font-size:12px}.navItem.active{color:#fff}.navItem.active:before{content:"";position:absolute;top:-17px;width:62px;height:62px;border:9px solid var(--paper);border-radius:50%;background:#080808}.navGlyph{z-index:1;width:18px;height:18px;margin-bottom:5px;border:3px solid currentColor;border-radius:50%}.navGlyph.home{border-radius:4px;transform:rotate(45deg)}.navGlyph.discover{border-width:4px 2px}.navItem span{z-index:1}.linkPanel{padding:28px;border-radius:16px;background:#f4e8ff}.linkPanel h2{margin-top:0}.linkPanel p{color:var(--muted)}.linkPanel button,.arenaState button{padding:13px 18px;border-radius:99px;background:#111;color:#fff;font-weight:800}.linkPanel output{display:block;margin-top:18px;font-size:40px;font-weight:950;letter-spacing:8px}.sectionTitle{margin-top:42px}.resultRow{display:flex;align-items:center;gap:16px;margin:10px 0;padding:18px;background:#fff}.resultRow>span:nth-child(2){display:flex;flex:1;flex-direction:column}.resultRow small{color:var(--muted)}.resultRow strong{margin-top:4px;font-size:23px}.rankBadge{display:grid;width:56px;height:56px;place-items:center;border-radius:14px;background:#ff6038;color:#fff;font-weight:900}.arenaState{display:grid;min-height:100vh;place-content:center;text-align:center}.arenaPage{height:100dvh;overflow:hidden;padding:20px 28px;background:#fff}.arenaHeader{display:grid;grid-template-columns:1fr auto 1fr;align-items:center}.arenaHeader button{justify-self:start;background:transparent;font-size:28px}.arenaHeader small{justify-self:end;color:var(--muted)}.progressTrack{height:7px;margin-top:12px;overflow:hidden;background:#e9e9e9}.progressTrack i{display:block;height:100%;background:#111;transition:width .25s}.modeTabs{display:flex;width:min(430px,80vw);margin:20px auto;padding:5px;border-radius:9px;background:#eee}.modeTabs button{flex:1;padding:10px;border-radius:7px;background:transparent;color:#777}.modeTabs button.active{background:#111;color:#fff}.singleArena{position:relative;display:grid;grid-template-columns:1fr 1fr;gap:16px;height:calc(100dvh - 155px);max-height:850px;touch-action:none}.choiceCard{position:relative;display:flex;flex-direction:column;justify-content:center;min-width:0;padding:28px;text-align:left;color:#fff}.choiceCard.warm{background:#f34b30}.choiceCard.cool{background:#3564dd}.choiceCard small{position:absolute;top:24px;left:24px;display:grid;width:48px;height:48px;place-items:center;border:2px solid #fff9;border-radius:50%}.choiceCard strong{font-size:clamp(34px,6vw,66px);line-height:1.08}.choiceCard span{position:absolute;bottom:28px;left:28px;opacity:.75}.singleArena.swipe .warm{transform:rotate(-1.5deg);transform-origin:bottom right}.singleArena.swipe .cool{transform:rotate(1.5deg);transform-origin:bottom left}.versus{position:absolute;z-index:3;left:50%;top:50%;display:grid;width:66px;height:66px;place-items:center;transform:translate(-50%,-50%);border:5px solid #111;border-radius:50%;background:#fff}.multiArena{display:grid;grid-template-columns:1fr 1fr;grid-template-rows:1fr 1fr;gap:10px;height:calc(100dvh - 155px);max-height:850px}.miniMatch{display:grid;grid-template-columns:1fr 40px 1fr;min-height:0;overflow:hidden;border:2px solid #111}.miniMatch button{padding:14px;background:#fff;font-weight:850}.miniMatch span{display:grid;place-items:center;background:#111;color:#fff;font-size:12px}.miniMatch.resolved{display:grid;place-items:center;text-align:center;background:#111;color:#fff}.savingToast{position:fixed;left:50%;bottom:30px;padding:14px 22px;transform:translateX(-50%);border-radius:99px;background:#111;color:#fff}.editorPage{min-height:100vh;padding:20px;background:#151515;color:#fff}.editorHeader{display:grid;grid-template-columns:50px 1fr auto;align-items:center;gap:12px;max-width:1100px;margin:0 auto 18px}.editorHeader>button:first-child{background:transparent;color:#fff;font-size:26px}.editorHeader div{display:flex;min-width:0;flex-direction:column}.editorHeader small{overflow:hidden;color:#888;text-overflow:ellipsis;white-space:nowrap}.exportButton{padding:11px 20px;border-radius:99px;background:var(--pink);color:#fff;font-weight:800}.editorWorkspace{display:grid;grid-template-columns:minmax(0,750px) 330px;gap:24px;max-width:1100px;margin:auto}.editorWorkspace canvas{width:100%;height:auto;background:#222}.editorControls{min-width:0}.scrollRow{display:flex;gap:7px;overflow-x:auto;padding-bottom:5px}.scrollRow button,.toolPanel button{flex:none;padding:10px 14px;border-radius:6px;background:#292929;color:#aaa}.scrollRow button.active{background:#fff;color:#111}.mediaRow{display:flex;gap:10px;margin-top:18px}.bracketThumb,.addMedia{display:flex;width:96px;height:96px;flex-direction:column;align-items:center;justify-content:center;border:2px solid #555;border-radius:8px}.bracketThumb{border-color:#fff;background:#f3eadf;color:#111;font-weight:800}.addMedia{background:#222;cursor:pointer}.addMedia small{margin-top:5px;color:#999}.addMedia input{display:none}.toolRow{display:flex;justify-content:space-between;margin-top:22px;overflow-x:auto}.toolRow button{display:flex;min-width:58px;flex-direction:column;align-items:center;background:transparent;color:#888}.toolRow button.active{color:#fff}.toolRow i{display:grid;width:42px;height:42px;place-items:center;margin-bottom:7px;border:2px solid currentColor;border-radius:9px;font-style:normal}.toolPanel{display:flex;gap:7px;margin-top:18px;padding:14px;background:#222}.toolPanel input[type=text],.toolPanel>input{width:100%;padding:12px;border:0;border-radius:5px}.toolPanel p{margin:0;color:#aaa;font-size:13px;line-height:1.5}.adjustControls{width:100%}.adjustControls label{display:grid;grid-template-columns:80px 1fr;align-items:center;margin:5px 0;color:#aaa;font-size:12px} @media(max-width:720px){.pageShell{padding-top:16px}.cardCopy h2{font-size:18px}.cardCopy p{font-size:13px}.arenaPage{padding:16px 10px}.singleArena,.multiArena{height:calc(100dvh - 145px)}.choiceCard{padding:18px}.choiceCard span{left:18px;bottom:20px}.choiceCard strong{font-size:clamp(27px,8vw,48px)}.multiArena{gap:6px}.miniMatch{grid-template-columns:1fr 28px 1fr}.miniMatch button{padding:7px;font-size:13px}.editorPage{padding:12px}.editorWorkspace{grid-template-columns:1fr}.editorHeader{grid-template-columns:36px 1fr auto}.editorControls{padding-bottom:20px}.toolPanel{min-height:62px}} + +/* Xiaohongshu-inspired editor: the canvas stays quiet while controls sit in one compact bottom surface. */ +.editorPage{min-height:100dvh;padding:0 18px 24px;background:#17171b;color:#f7f7f8}.editorHeader{position:sticky;top:0;z-index:5;display:grid;grid-template-columns:44px 1fr auto;max-width:1180px;height:68px;margin:auto;padding:8px 0;background:#17171bf2;backdrop-filter:blur(18px)}.editorHeader .backButton{display:grid;width:40px;height:40px;place-items:center;align-self:center;border-radius:50%;background:transparent;color:#fff;font-size:38px;font-weight:200}.editorHeader strong{font-size:15px}.editorHeader small{margin-top:3px;color:#7f7f88;font-size:11px}.exportButton{padding:0 23px;height:42px;border-radius:23px;background:#ff2442;font-size:14px}.editorWorkspace{grid-template-columns:minmax(0,760px) 360px;gap:22px;max-width:1180px;align-items:start}.canvasStage{display:grid;min-height:calc(100dvh - 94px);place-items:center;padding:18px;background:#101013}.editorWorkspace canvas{display:block;width:auto;max-width:100%;height:auto;max-height:calc(100dvh - 130px);box-shadow:0 16px 60px #0008}.editorControls{position:sticky;top:86px;padding:16px;border:1px solid #2b2b31;border-radius:18px;background:#202025}.viewTabs{padding-bottom:12px;border-bottom:1px solid #303036}.scrollRow button{padding:8px 12px;border-radius:16px;background:transparent;color:#888891;font-size:12px}.scrollRow button.active{background:#f4f4f5;color:#151515}.mediaRow{margin-top:14px}.bracketThumb,.addMedia{width:78px;height:78px;border-radius:9px}.bracketThumb{border-color:#fff;background:#fff;color:#17171b}.bracketThumb b,.addMedia b{font-size:22px}.bracketThumb small,.addMedia small{font-size:10px}.toolRow{gap:4px;margin-top:18px}.toolRow button{min-width:44px;font-size:10px}.toolRow i{width:34px;height:34px;margin-bottom:5px;border:0;border-radius:50%;background:#29292f;font-size:18px}.toolRow button.active i{background:#f4f4f5;color:#17171b}.toolPanel{min-height:72px;margin-top:14px;padding:12px;border-radius:12px;background:#19191d}.presetRow{display:flex;gap:8px;width:100%}.presetRow button{display:flex;flex:1;align-items:center;gap:7px;padding:8px;border:1px solid transparent;border-radius:9px;background:#25252a;color:#aaa}.presetRow button.selected{border-color:#eee;color:#fff}.swatch{width:22px;height:22px;border:1px solid #777;border-radius:50%}.swatch.clean{background:#f4f4f4}.swatch.cream{background:#eee9df}.swatch.night{background:#111114}.settingButton{display:flex!important;width:100%;justify-content:space-between}.toolPanel input{background:#2a2a30;color:#fff}.toolPanel p{color:#787881}.adjustControls label{grid-template-columns:72px 1fr}.adjustControls span{color:#aaa} +@media(max-width:820px){.editorPage{height:100dvh;overflow:hidden;padding:0}.editorHeader{height:58px;padding:6px 12px}.editorWorkspace{display:flex;height:calc(100dvh - 58px);flex-direction:column;gap:0}.canvasStage{min-height:0;height:58%;padding:10px}.editorWorkspace canvas{max-height:100%;max-width:100%}.editorControls{position:static;width:100%;height:42%;padding:10px 12px calc(10px + env(safe-area-inset-bottom));overflow:hidden;border:0;border-top:1px solid #2b2b31;border-radius:0;background:#1d1d21}.viewTabs{padding-bottom:7px}.mediaRow{margin-top:8px}.bracketThumb,.addMedia{width:58px;height:58px}.toolRow{margin-top:9px}.toolPanel{min-height:54px;margin-top:8px;padding:9px}.toolRow i{width:30px;height:30px}.exportButton{height:38px}.presetRow button{padding:6px;font-size:11px}} diff --git a/web/app/health/route.js b/web/app/health/route.ts similarity index 56% rename from web/app/health/route.js rename to web/app/health/route.ts index 8b12426..35ec4e3 100644 --- a/web/app/health/route.js +++ b/web/app/health/route.ts @@ -1,3 +1,3 @@ -export function GET() { +export function GET(): Response { return Response.json({ status: 'ok' }); } diff --git a/web/app/layout.jsx b/web/app/layout.tsx similarity index 52% rename from web/app/layout.jsx rename to web/app/layout.tsx index 9b30d12..972f758 100644 --- a/web/app/layout.jsx +++ b/web/app/layout.tsx @@ -1,17 +1,19 @@ import './globals.css'; +import type { Metadata, Viewport } from 'next'; +import type { ReactNode } from 'react'; -export const metadata = { +export const metadata: Metadata = { title: '偏爱研究所', description: '每轮二选一，让偏爱一路赢到底。' }; -export const viewport = { +export const viewport: Viewport = { width: 'device-width', initialScale: 1, themeColor: '#fffaf6' }; -export default function RootLayout({ children }) { +export default function RootLayout({ children }: Readonly<{ children: ReactNode }>) { return ( {children} diff --git a/web/app/me/page.jsx b/web/app/me/page.tsx similarity index 57% rename from web/app/me/page.jsx rename to web/app/me/page.tsx index 6e2d140..7f09400 100644 --- a/web/app/me/page.jsx +++ b/web/app/me/page.tsx @@ -1,5 +1,5 @@ import Profile from '../../components/Profile'; -export default function MePage() { +export default function MePage(): React.ReactElement { return ; } diff --git a/web/app/page.jsx b/web/app/page.tsx similarity index 56% rename from web/app/page.jsx rename to web/app/page.tsx index 81920d3..5e87075 100644 --- a/web/app/page.jsx +++ b/web/app/page.tsx @@ -1,5 +1,5 @@ import HomeFeed from '../components/HomeFeed'; -export default function HomePage() { +export default function HomePage(): React.ReactElement { return ; } diff --git a/web/app/results/[id]/page.jsx b/web/app/results/[id]/page.tsx similarity index 59% rename from web/app/results/[id]/page.jsx rename to web/app/results/[id]/page.tsx index 319cab8..378533f 100644 --- a/web/app/results/[id]/page.jsx +++ b/web/app/results/[id]/page.tsx @@ -1,6 +1,6 @@ import PosterEditor from '../../../components/PosterEditor'; -export default async function ResultPage({ params }) { +export default async function ResultPage({ params }: { params: Promise<{ id: string }> }) { const { id } = await params; return ; } diff --git a/web/app/tests/[slug]/page.jsx b/web/app/tests/[slug]/page.tsx similarity index 57% rename from web/app/tests/[slug]/page.jsx rename to web/app/tests/[slug]/page.tsx index 6465831..ffe2e19 100644 --- a/web/app/tests/[slug]/page.jsx +++ b/web/app/tests/[slug]/page.tsx @@ -1,6 +1,6 @@ import TestArena from '../../../components/TestArena'; -export default async function TestPage({ params }) { +export default async function TestPage({ params }: { params: Promise<{ slug: string }> }) { const { slug } = await params; return ; } diff --git a/web/components/AppLogo.jsx b/web/components/AppLogo.tsx similarity index 62% rename from web/components/AppLogo.jsx rename to web/components/AppLogo.tsx index 4db8b8d..95e4d76 100644 --- a/web/components/AppLogo.jsx +++ b/web/components/AppLogo.tsx @@ -1,4 +1,4 @@ -export default function AppLogo({ title = '偏爱研究所' }) { +export default function AppLogo({ title = '偏爱研究所' }: { title?: string }) { return (
PK diff --git a/web/components/BottomNav.jsx b/web/components/BottomNav.tsx similarity index 92% rename from web/components/BottomNav.jsx rename to web/components/BottomNav.tsx index 435c0e3..5f622e9 100644 --- a/web/components/BottomNav.jsx +++ b/web/components/BottomNav.tsx @@ -9,7 +9,7 @@ const ITEMS = [ { href: '/me', label: '我的', icon: 'me' } ]; -export default function BottomNav() { +export default function BottomNav(): React.ReactElement { const pathname = usePathname(); return (