diff --git "a/#[cfg(feature = \"server\")]\npub mod pool;\n\n#[cfg(not(feature = \"server\"))]\npub mod pool {\n pub static DB_POOL: () = ();\n}" "b/#[cfg(feature = \"server\")]\npub mod pool;\n\n#[cfg(not(feature = \"server\"))]\npub mod pool {\n pub static DB_POOL: () = ();\n}" deleted file mode 100644 index 9024c08..0000000 --- "a/#[cfg(feature = \"server\")]\npub mod pool;\n\n#[cfg(not(feature = \"server\"))]\npub mod pool {\n pub static DB_POOL: () = ();\n}" +++ /dev/null @@ -1 +0,0 @@ -/home/xfy/Developer/yggdrasil/src/db/mod.rs \ No newline at end of file diff --git a/.gitignore b/.gitignore index fc8c198..892047d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ /dist /.dioxus /.omc +/node_modules +/package-lock.json diff --git a/Dioxus.toml b/Dioxus.toml index 514d358..b876387 100644 --- a/Dioxus.toml +++ b/Dioxus.toml @@ -10,9 +10,9 @@ title = "Yggdrasil - Dioxus SSR" watch_path = ["src", "Cargo.toml"] [web.resource] -style = [] +style = ["style.css"] script = [] [web.resource.dev] -style = [] +style = ["style.css"] script = [] diff --git a/input.css b/input.css new file mode 100644 index 0000000..b5c61c9 --- /dev/null +++ b/input.css @@ -0,0 +1,3 @@ +@tailwind base; +@tailwind components; +@tailwind utilities; diff --git a/package.json b/package.json new file mode 100644 index 0000000..6af9283 --- /dev/null +++ b/package.json @@ -0,0 +1,18 @@ +{ + "name": "yggdrasil", + "version": "1.0.0", + "description": "", + "main": "index.js", + "scripts": { + "build:css": "tailwindcss -i input.css -o public/style.css --minify", + "watch:css": "tailwindcss -i input.css -o public/style.css --watch", + "test": "echo \"Error: no test specified\" && exit 1" + }, + "keywords": [], + "author": "", + "license": "ISC", + "type": "commonjs", + "devDependencies": { + "tailwindcss": "^3.4.19" + } +} diff --git a/prd.json b/prd.json deleted file mode 100644 index d1e7bd0..0000000 --- a/prd.json +++ /dev/null @@ -1,119 +0,0 @@ -{ - "project": "Blog Auth System", - "source": "consensus plan from deep-interview + omc-plan", - "planPath": ".omc/plans/blog-auth-consensus.md", - "stories": [ - { - "id": "US-001", - "title": "数据库配置与建表", - "description": "添加依赖、配置 deadpool 连接池、创建 PostgreSQL 用户表和 session 表", - "acceptanceCriteria": [ - "Cargo.toml 包含所有必要依赖", - "src/db/mod.rs 和 src/db/pool.rs 存在,使用 std::sync::LazyLock 全局初始化 deadpool", - "migrations/001_init.sql 存在,包含 users 表、sessions 表、idx_one_admin 部分唯一索引", - "SQL 文件可成功在 PostgreSQL 中执行" - ], - "filesExpected": [ - "Cargo.toml", - ".env", - "src/db/mod.rs", - "src/db/pool.rs", - "migrations/001_init.sql" - ], - "passes": true - }, - { - "id": "US-002", - "title": "用户模型与认证模块", - "description": "创建 User/Session 模型和认证工具函数(密码哈希、session 管理)", - "acceptanceCriteria": [ - "src/models/user.rs 定义 User 结构体和 UserRole 枚举", - "src/models/session.rs 定义 Session 结构体", - "src/auth/password.rs 实现 argon2 密码哈希和验证", - "src/auth/session.rs 实现 UUID v4 token 生成和过期检查", - "cargo check 在此阶段无编译错误" - ], - "filesExpected": [ - "src/models/mod.rs", - "src/models/user.rs", - "src/models/session.rs", - "src/auth/mod.rs", - "src/auth/password.rs", - "src/auth/session.rs" - ], - "passes": true - }, - { - "id": "US-003", - "title": "认证 API (Server Functions)", - "description": "实现 register, login, logout, get_current_user 四个 Dioxus server function", - "acceptanceCriteria": [ - "register(): 输入验证 + 首个用户 admin + 后续关闭注册", - "login(): 验证密码 + session 创建 + token 返回", - "logout(): session 清理", - "get_current_user(): 查询有效 session 返回 Option", - "所有函数处理 pool.get().await 超时错误" - ], - "filesExpected": [ - "src/api/mod.rs", - "src/api/auth.rs" - ], - "passes": true - }, - { - "id": "US-004", - "title": "前端页面 - 注册与登录", - "description": "使用 Tailwind CSS 实现注册页和登录页,支持暗色/亮色主题", - "acceptanceCriteria": [ - "src/pages/register.rs: 注册表单 + 前端验证 + 错误提示", - "src/pages/login.rs: 登录表单 + cookie 设置 + 跳转", - "src/pages/admin.rs: 认证检查 + 欢迎信息 + 登出", - "src/theme.rs: 暗色/亮色主题切换 + localStorage 持久化", - "Tailwind CSS CDN + dark: modifier 实现主题" - ], - "filesExpected": [ - "src/pages/mod.rs", - "src/pages/register.rs", - "src/pages/login.rs", - "src/pages/admin.rs", - "src/theme.rs" - ], - "passes": true - }, - { - "id": "US-005", - "title": "后台页面与路由整合", - "description": "Admin页面、路由定义、session清理任务、main.rs整合", - "acceptanceCriteria": [ - "src/router.rs: Dioxus 路由定义 (/login, /register, /admin, /)", - "src/main.rs: 整合所有模块 + server block 启动 dotenvy + session 清理任务", - "src/tasks/session_cleanup.rs: 每小时清理过期 session", - "cargo check --features server 无错误", - "cargo check --target wasm32-unknown-unknown 无错误" - ], - "filesExpected": [ - "src/router.rs", - "src/main.rs", - "src/tasks/session_cleanup.rs", - "src/tasks/mod.rs" - ], - "passes": true - }, - { - "id": "US-006", - "title": "验证", - "description": "端到端验证所有功能", - "acceptanceCriteria": [ - "启动 PostgreSQL,运行 migration", - "注册首个用户 -> role=admin", - "再次注册 -> 收到 'Registration is closed'", - "登录 -> 返回 token", - "get_current_user (带 cookie) -> 返回用户信息", - "错误密码 -> 显示 'Invalid credentials'", - "Server 和 WASM 目标均编译通过" - ], - "filesExpected": [], - "passes": true - } - ] -} diff --git a/progress.txt b/progress.txt deleted file mode 100644 index b79c9ad..0000000 --- a/progress.txt +++ /dev/null @@ -1,38 +0,0 @@ -# Ralph Progress Log - -## Session Start -- Date: 2026-05-25 -- Source: .omc/plans/blog-auth-consensus.md -- User requirement: 每完成一个功能,提交一次 - -## Stories -- [x] US-001: 数据库配置与建表 -- [x] US-002: 用户模型与认证模块 -- [x] US-003: 认证 API -- [x] US-004: 前端页面 - 注册与登录 -- [x] US-005: 后台页面与路由整合 -- [x] US-006: 验证 - -## Commits -1. US-001: 数据库配置与建表 -2. US-002: 用户模型与认证模块 -3. US-003: 认证 API (Server Functions) -4. US-004: 前端页面 - 注册与登录 -5. US-005: 后台页面与路由整合 -6. US-006: 验证 + 修复编译和运行时问题 -7. Fix clippy warnings - -## Implementation Details -- PostgreSQL + tokio-postgres + deadpool 连接池 -- argon2 密码哈希 -- UUID v4 session token + 30天过期 -- Dioxus 0.7.9 SSR Fullstack + `#[server]` 函数 -- Tailwind CSS CDN + darkMode class 主题切换 -- 首个注册用户自动 admin,后续注册关闭 -- wasm32 和 server 双目标编译 - -## Verification Results -- cargo check (server) ✅ -- cargo check (wasm32) ✅ -- cargo clippy ✅ (warnings only) -- API tests: register ✅, login ✅, get_current_user ✅, re-register blocked ✅, wrong password ✅ diff --git a/public/style.css b/public/style.css new file mode 100644 index 0000000..50fe3ca --- /dev/null +++ b/public/style.css @@ -0,0 +1 @@ +*,:after,:before{--tw-border-spacing-x:0;--tw-border-spacing-y:0;--tw-translate-x:0;--tw-translate-y:0;--tw-rotate:0;--tw-skew-x:0;--tw-skew-y:0;--tw-scale-x:1;--tw-scale-y:1;--tw-pan-x: ;--tw-pan-y: ;--tw-pinch-zoom: ;--tw-scroll-snap-strictness:proximity;--tw-gradient-from-position: ;--tw-gradient-via-position: ;--tw-gradient-to-position: ;--tw-ordinal: ;--tw-slashed-zero: ;--tw-numeric-figure: ;--tw-numeric-spacing: ;--tw-numeric-fraction: ;--tw-ring-inset: ;--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-color:rgba(59,130,246,.5);--tw-ring-offset-shadow:0 0 #0000;--tw-ring-shadow:0 0 #0000;--tw-shadow:0 0 #0000;--tw-shadow-colored:0 0 #0000;--tw-blur: ;--tw-brightness: ;--tw-contrast: ;--tw-grayscale: ;--tw-hue-rotate: ;--tw-invert: ;--tw-saturate: ;--tw-sepia: ;--tw-drop-shadow: ;--tw-backdrop-blur: ;--tw-backdrop-brightness: ;--tw-backdrop-contrast: ;--tw-backdrop-grayscale: ;--tw-backdrop-hue-rotate: ;--tw-backdrop-invert: ;--tw-backdrop-opacity: ;--tw-backdrop-saturate: ;--tw-backdrop-sepia: ;--tw-contain-size: ;--tw-contain-layout: ;--tw-contain-paint: ;--tw-contain-style: }::backdrop{--tw-border-spacing-x:0;--tw-border-spacing-y:0;--tw-translate-x:0;--tw-translate-y:0;--tw-rotate:0;--tw-skew-x:0;--tw-skew-y:0;--tw-scale-x:1;--tw-scale-y:1;--tw-pan-x: ;--tw-pan-y: ;--tw-pinch-zoom: ;--tw-scroll-snap-strictness:proximity;--tw-gradient-from-position: ;--tw-gradient-via-position: ;--tw-gradient-to-position: ;--tw-ordinal: ;--tw-slashed-zero: ;--tw-numeric-figure: ;--tw-numeric-spacing: ;--tw-numeric-fraction: ;--tw-ring-inset: ;--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-color:rgba(59,130,246,.5);--tw-ring-offset-shadow:0 0 #0000;--tw-ring-shadow:0 0 #0000;--tw-shadow:0 0 #0000;--tw-shadow-colored:0 0 #0000;--tw-blur: ;--tw-brightness: ;--tw-contrast: ;--tw-grayscale: ;--tw-hue-rotate: ;--tw-invert: ;--tw-saturate: ;--tw-sepia: ;--tw-drop-shadow: ;--tw-backdrop-blur: ;--tw-backdrop-brightness: ;--tw-backdrop-contrast: ;--tw-backdrop-grayscale: ;--tw-backdrop-hue-rotate: ;--tw-backdrop-invert: ;--tw-backdrop-opacity: ;--tw-backdrop-saturate: ;--tw-backdrop-sepia: ;--tw-contain-size: ;--tw-contain-layout: ;--tw-contain-paint: ;--tw-contain-style: }/*! tailwindcss v3.4.19 | MIT License | https://tailwindcss.com*/*,:after,:before{box-sizing:border-box;border:0 solid #e5e7eb}:after,:before{--tw-content:""}:host,html{line-height:1.5;-webkit-text-size-adjust:100%;-moz-tab-size:4;-o-tab-size:4;tab-size:4;font-family:ui-sans-serif,system-ui,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji;font-feature-settings:normal;font-variation-settings:normal;-webkit-tap-highlight-color:transparent}body{margin:0;line-height:inherit}hr{height:0;color:inherit;border-top-width:1px}abbr:where([title]){-webkit-text-decoration:underline dotted;text-decoration:underline dotted}h1,h2,h3,h4,h5,h6{font-size:inherit;font-weight:inherit}a{color:inherit;text-decoration:inherit}b,strong{font-weight:bolder}code,kbd,pre,samp{font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace;font-feature-settings:normal;font-variation-settings:normal;font-size:1em}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}table{text-indent:0;border-color:inherit;border-collapse:collapse}button,input,optgroup,select,textarea{font-family:inherit;font-feature-settings:inherit;font-variation-settings:inherit;font-size:100%;font-weight:inherit;line-height:inherit;letter-spacing:inherit;color:inherit;margin:0;padding:0}button,select{text-transform:none}button,input:where([type=button]),input:where([type=reset]),input:where([type=submit]){-webkit-appearance:button;background-color:transparent;background-image:none}:-moz-focusring{outline:auto}:-moz-ui-invalid{box-shadow:none}progress{vertical-align:baseline}::-webkit-inner-spin-button,::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}summary{display:list-item}blockquote,dd,dl,figure,h1,h2,h3,h4,h5,h6,hr,p,pre{margin:0}fieldset{margin:0}fieldset,legend{padding:0}menu,ol,ul{list-style:none;margin:0;padding:0}dialog{padding:0}textarea{resize:vertical}input::-moz-placeholder,textarea::-moz-placeholder{opacity:1;color:#9ca3af}input::placeholder,textarea::placeholder{opacity:1;color:#9ca3af}[role=button],button{cursor:pointer}:disabled{cursor:default}audio,canvas,embed,iframe,img,object,svg,video{display:block;vertical-align:middle}img,video{max-width:100%;height:auto}[hidden]:where(:not([hidden=until-found])){display:none}.static{position:static}.fixed{position:fixed}.right-4{right:1rem}.top-4{top:1rem}.z-50{z-index:50}.mx-auto{margin-left:auto;margin-right:auto}.mb-1{margin-bottom:.25rem}.mb-2{margin-bottom:.5rem}.mb-4{margin-bottom:1rem}.mb-6{margin-bottom:1.5rem}.mb-8{margin-bottom:2rem}.mt-2{margin-top:.5rem}.mt-4{margin-top:1rem}.block{display:block}.flex{display:flex}.min-h-screen{min-height:100vh}.w-full{width:100%}.max-w-7xl{max-width:80rem}.max-w-md{max-width:28rem}.items-center{align-items:center}.justify-center{justify-content:center}.justify-between{justify-content:space-between}.gap-4{gap:1rem}.space-x-4>:not([hidden])~:not([hidden]){--tw-space-x-reverse:0;margin-right:calc(1rem*var(--tw-space-x-reverse));margin-left:calc(1rem*(1 - var(--tw-space-x-reverse)))}.space-y-4>:not([hidden])~:not([hidden]){--tw-space-y-reverse:0;margin-top:calc(1rem*(1 - var(--tw-space-y-reverse)));margin-bottom:calc(1rem*var(--tw-space-y-reverse))}.rounded-2xl{border-radius:1rem}.rounded-full{border-radius:9999px}.rounded-lg{border-radius:.5rem}.border{border-width:1px}.border-gray-300{--tw-border-opacity:1;border-color:rgb(209 213 219/var(--tw-border-opacity,1))}.bg-blue-600{--tw-bg-opacity:1;background-color:rgb(37 99 235/var(--tw-bg-opacity,1))}.bg-gray-200{--tw-bg-opacity:1;background-color:rgb(229 231 235/var(--tw-bg-opacity,1))}.bg-gray-50{--tw-bg-opacity:1;background-color:rgb(249 250 251/var(--tw-bg-opacity,1))}.bg-green-100{--tw-bg-opacity:1;background-color:rgb(220 252 231/var(--tw-bg-opacity,1))}.bg-red-100{--tw-bg-opacity:1;background-color:rgb(254 226 226/var(--tw-bg-opacity,1))}.bg-red-600{--tw-bg-opacity:1;background-color:rgb(220 38 38/var(--tw-bg-opacity,1))}.bg-white{--tw-bg-opacity:1;background-color:rgb(255 255 255/var(--tw-bg-opacity,1))}.p-2{padding:.5rem}.p-3{padding:.75rem}.p-8{padding:2rem}.px-4{padding-left:1rem;padding-right:1rem}.px-6{padding-left:1.5rem;padding-right:1.5rem}.py-2{padding-top:.5rem;padding-bottom:.5rem}.py-4{padding-top:1rem;padding-bottom:1rem}.py-8{padding-top:2rem;padding-bottom:2rem}.text-center{text-align:center}.text-2xl{font-size:1.5rem;line-height:2rem}.text-4xl{font-size:2.25rem;line-height:2.5rem}.text-sm{font-size:.875rem;line-height:1.25rem}.text-xl{font-size:1.25rem;line-height:1.75rem}.font-bold{font-weight:700}.font-medium{font-weight:500}.text-blue-600{--tw-text-opacity:1;color:rgb(37 99 235/var(--tw-text-opacity,1))}.text-gray-500{--tw-text-opacity:1;color:rgb(107 114 128/var(--tw-text-opacity,1))}.text-gray-600{--tw-text-opacity:1;color:rgb(75 85 99/var(--tw-text-opacity,1))}.text-gray-700{--tw-text-opacity:1;color:rgb(55 65 81/var(--tw-text-opacity,1))}.text-gray-900{--tw-text-opacity:1;color:rgb(17 24 39/var(--tw-text-opacity,1))}.text-green-700{--tw-text-opacity:1;color:rgb(21 128 61/var(--tw-text-opacity,1))}.text-red-700{--tw-text-opacity:1;color:rgb(185 28 28/var(--tw-text-opacity,1))}.text-white{--tw-text-opacity:1;color:rgb(255 255 255/var(--tw-text-opacity,1))}.shadow{--tw-shadow:0 1px 3px 0 rgba(0,0,0,.1),0 1px 2px -1px rgba(0,0,0,.1);--tw-shadow-colored:0 1px 3px 0 var(--tw-shadow-color),0 1px 2px -1px var(--tw-shadow-color)}.shadow,.shadow-lg{box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)}.shadow-lg{--tw-shadow:0 10px 15px -3px rgba(0,0,0,.1),0 4px 6px -4px rgba(0,0,0,.1);--tw-shadow-colored:0 10px 15px -3px var(--tw-shadow-color),0 4px 6px -4px var(--tw-shadow-color)}.transition-colors{transition-property:color,background-color,border-color,text-decoration-color,fill,stroke;transition-timing-function:cubic-bezier(.4,0,.2,1);transition-duration:.15s}.hover\:bg-blue-700:hover{--tw-bg-opacity:1;background-color:rgb(29 78 216/var(--tw-bg-opacity,1))}.hover\:bg-gray-300:hover{--tw-bg-opacity:1;background-color:rgb(209 213 219/var(--tw-bg-opacity,1))}.hover\:bg-red-700:hover{--tw-bg-opacity:1;background-color:rgb(185 28 28/var(--tw-bg-opacity,1))}.hover\:underline:hover{text-decoration-line:underline}.focus\:outline-none:focus{outline:2px solid transparent;outline-offset:2px}.focus\:ring-2:focus{--tw-ring-offset-shadow:var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow:var(--tw-ring-inset) 0 0 0 calc(2px + var(--tw-ring-offset-width)) var(--tw-ring-color);box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow,0 0 #0000)}.focus\:ring-blue-500:focus{--tw-ring-opacity:1;--tw-ring-color:rgb(59 130 246/var(--tw-ring-opacity,1))}.dark\:border-gray-600:is(.dark *){--tw-border-opacity:1;border-color:rgb(75 85 99/var(--tw-border-opacity,1))}.dark\:bg-gray-700:is(.dark *){--tw-bg-opacity:1;background-color:rgb(55 65 81/var(--tw-bg-opacity,1))}.dark\:bg-gray-800:is(.dark *){--tw-bg-opacity:1;background-color:rgb(31 41 55/var(--tw-bg-opacity,1))}.dark\:bg-gray-900:is(.dark *){--tw-bg-opacity:1;background-color:rgb(17 24 39/var(--tw-bg-opacity,1))}.dark\:bg-green-900:is(.dark *){--tw-bg-opacity:1;background-color:rgb(20 83 45/var(--tw-bg-opacity,1))}.dark\:bg-red-900:is(.dark *){--tw-bg-opacity:1;background-color:rgb(127 29 29/var(--tw-bg-opacity,1))}.dark\:text-blue-400:is(.dark *){--tw-text-opacity:1;color:rgb(96 165 250/var(--tw-text-opacity,1))}.dark\:text-gray-300:is(.dark *){--tw-text-opacity:1;color:rgb(209 213 219/var(--tw-text-opacity,1))}.dark\:text-gray-400:is(.dark *){--tw-text-opacity:1;color:rgb(156 163 175/var(--tw-text-opacity,1))}.dark\:text-green-300:is(.dark *){--tw-text-opacity:1;color:rgb(134 239 172/var(--tw-text-opacity,1))}.dark\:text-red-300:is(.dark *){--tw-text-opacity:1;color:rgb(252 165 165/var(--tw-text-opacity,1))}.dark\:text-white:is(.dark *){--tw-text-opacity:1;color:rgb(255 255 255/var(--tw-text-opacity,1))}.dark\:hover\:bg-gray-600:hover:is(.dark *){--tw-bg-opacity:1;background-color:rgb(75 85 99/var(--tw-bg-opacity,1))} \ No newline at end of file diff --git a/src/pages/login.rs b/src/pages/login.rs index c4a6a57..fec0ea1 100644 --- a/src/pages/login.rs +++ b/src/pages/login.rs @@ -19,7 +19,7 @@ pub fn LoginPage() -> Element { spawn(async move { match login(username_val, password_val).await { - Ok(AuthResponse { success: true, token: Some(_token), .. }) => { + Ok(AuthResponse { success: true, token: Some(token), .. }) => { // 设置 cookie (client-side, not HttpOnly but works for now) #[cfg(target_arch = "wasm32")] { diff --git a/src/router.rs b/src/router.rs index 3dcd63b..e3cb48f 100644 --- a/src/router.rs +++ b/src/router.rs @@ -28,10 +28,6 @@ pub fn AppRouter() -> Element { rsx! { div { class: theme_class, - script { src: "https://cdn.tailwindcss.com" } - script { - "tailwind.config = {{ darkMode: 'class' }}" - } ThemeToggle {} Router:: {} } diff --git a/tailwind.config.js b/tailwind.config.js new file mode 100644 index 0000000..0591f8a --- /dev/null +++ b/tailwind.config.js @@ -0,0 +1,9 @@ +/** @type {import('tailwindcss').Config} */ +module.exports = { + darkMode: 'class', + content: ['./src/**/*.rs', './index.html'], + theme: { + extend: {}, + }, + plugins: [], +}