40 Commits

Author	SHA1	Message	Date
Hera Zhao	0dd2cc00d3	fix: QR移到右上角(top:20 right:16)，总成本缩小一行，日期与logo居中对齐 ... Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-09 15:50:31 +00:00
Hera Zhao	9f25da6232	fix: Logo左下角+日期靠右，手机字号自适应，精油名不换行 ... 配方卡片: - Logo: 左下角靠左对齐(flex)，opacity:0.5 - 制作日期: 靠右对齐（Logo和日期同一行，space-between） - 精油名: white-space:nowrap + text-overflow:ellipsis，不换行 - 配方名: max-width留QR空间，不换行 - 手机端(@media max-width:420px): 整体字号缩小，padding缩小 预览图: - 同样Logo左下+日期靠右布局 - 去掉了底部居中Logo水印 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-09 15:36:01 +00:00
Hera Zhao	d1723797e0	rewrite: 配方卡片和预览图完全重写，匹配initial commit样式 ... 完全删除之前的CSS class方案，改用inline style匹配原版HTML: 配方卡片 (RecipeDetailOverlay): - 背景图: absolute全覆盖, opacity:0.12 - Logo: absolute底部居中水印, bottom:60px, opacity:0.2 - QR: absolute右上角 top:36px right:24px, 品牌名在下方 - 内容区: position:relative z-index:2 (在overlay之上) - 制作日期: text-align:center (居中，匹配原版) - 所有样式用inline style，跟原版_buildBrandHtml()一致 预览图 (MyDiary): - 等比缩小版配方卡片，同样布局 - QR右上，Logo底部居中，日期居中 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-09 12:53:13 +00:00
Hera Zhao	e459a52b5b	fix: 配方卡片总成本条和底部行恢复全宽，预览与实际一致 ... - card-content padding-right:80px 给QR留空间 - card-total 和 card-bottom-row 用 margin-right:-80px 抵消padding 恢复全宽显示（总成本条和日期行不被QR挤压） - 预览图和实际卡片布局验证一致 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-09 12:35:35 +00:00
Hera Zhao	765bc0facc	fix: 配方卡片QR恢复absolute定位+padding-right避让，预览图修正 ... 配方卡片: - QR恢复absolute(top:36px right:36px)，不用float避免文字环绕 - card-content加padding-right:70px给QR留空间 - 文字不会被QR挤压 预览图: - QR+品牌名放在右上角area里(absolute定位) - 品牌名文字显示在QR图片下方 - 内容区padding-right:60px避让QR 返回配方: - openRecipe参数用String比较修复类型不匹配 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-09 12:18:03 +00:00
Hera Zhao	2417ea2525	fix: QR改为float right自然对齐文字，不再absolute定位 ... 配方卡片: - QR从.export-card的absolute定位改为.card-content内float right - QR自然跟"来自大地的礼物"文字顶端对齐 - 右侧边缘跟内容区域对齐（不再需要手动算padding偏移） Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-09 12:09:26 +00:00
Hera Zhao	4a3fadb048	fix: 预览图布局匹配实际卡片、QR对齐、返回按钮 ... 预览图(MyDiary): - QR: top-right与内容区对齐(top:16px right:16px) - 内容区右侧留出QR空间(padding-right:50px) - 总成本条: flow layout不再absolute - Logo左下 + 制作日期右下(flex space-between) - 品牌名在最底部 - 去掉fixed height，自适应内容 配方卡片(RecipeDetailOverlay): - QR: top:36px right:36px 精确对齐卡片padding 返回按钮: - 保存品牌设置右侧加"← 返回配方卡片"按钮 - 从配方卡片点📲上传QR后可返回原配方 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-09 11:48:51 +00:00
Hera Zhao	1044873336	fix: Logo放在总成本下方靠左，QR与标题顶端/日期右侧对齐 ... - Logo: 从absolute改为flow layout，放在总成本和制作日期之间 左侧显示logo，右侧显示制作日期（flex space-between） 没有logo时日期仍靠右 - QR: right改为36px（与卡片padding对齐），top微调到34px 右边缘与制作日期右侧对齐 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-09 11:01:10 +00:00
Hera Zhao	03a112c734	fix: 上传图片保持比例、QR正方形裁剪、Logo左下角、日期靠右 ... 上传图片: - object-fit: contain 保持原比例，不压扁不拉长 - QR上传检测是否正方形，非正方形提示并自动裁剪中心区域 配方卡片: - Logo位置改为左下角 (left:24px) - 制作日期靠右对齐 (text-align:right) 品牌预览: - Logo位置改为左下角 (left:16px) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-09 10:40:16 +00:00
Hera Zhao	751ef9d07d	fix: 配方卡片预览隐藏容量按钮 ... Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-09 10:16:24 +00:00
Hera Zhao	e3285f0961	fix: 未登录用户每次提示上传QR，已登录每月一次 ... Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-09 10:12:53 +00:00
Hera Zhao	1018c1db11	fix: QR上传提醒改为每月一次，按钮始终显示 ... - 用 localStorage 记录上次弹窗时间，30天内不再弹 - 📲 上传二维码按钮始终显示（只要用户没上传QR） - 弹窗取消按钮文案改为「下次再说」 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-09 10:12:30 +00:00
Hera Zhao	029071dbab	fix: 手机保存图片使用 navigator.share 直接保存到相册 ... - 新增 composables/useSaveImage.js - saveImageFromUrl: data URL → 手机分享/桌面下载 - captureAndSave: DOM元素 → html2canvas → 保存 - saveCanvasImage: canvas → 保存 - RecipeDetailOverlay: saveImage 改用 saveImageFromUrl - OilReference: saveModalImage 改用 captureAndSave - 手机端调用 navigator.share({files}) 弹出系统分享面板 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-09 08:58:53 +00:00
YoYo	0c19153156	fix: 增强存为我的调试日志和错误提示，修复空名称静默失败问题 ... - 区分「取消」(null) 和「清空名称后确认」(空字符串) 两种情况 前者静默返回，后者提示「请输入配方名称」 - 添加 console.log/error 方便在浏览器控制台定位问题 - 成功 toast 改为「已保存！可在「配方查询 → 我的配方」查看」提示去向 - 错误 toast 延长至 3s，并显示 status code - saveRecipe：loadRecipes 失败不再抛出，保证保存成功后不误报失败 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-08 20:27:03 +00:00
YoYo	66766197a4	fix: 输入框 Enter 键忽略 IME 输入法合字阶段，防止误触提交 ... 中文输入法在选字时按回车，会触发 keydown.enter 事件， 但此时 v-model 尚未更新（组合阶段未结束），导致 inputValue 仍为空字符串，造成 saveToDiary 的 if (!name) return 分支被触发，配方从未保存，「我的配方」中自然看不到。 修复方案： - 监听 compositionstart / compositionend 事件， 用 isComposing 标记组合状态 - compositionend 时手动同步 inputValue（确保值最新） - submitPrompt 检查 e.isComposing || isComposing.value， 任一为真则跳过提交，等用户真正按下独立 Enter 再确认 Co-Authored-By: YoYo <yoyo@euphon.net>	2026-04-08 20:07:13 +00:00
YoYo	31b46d59b6	feat: 配方卡片容量切换、预览/保存流程优化、精油搜索自动补全、精油英文名编辑 ... 1. 配方卡片视图加回容量切换按钮（单次/2.5ml/5ml…）， 非单次容量的滴数通过 Math.round 取整显示 2. 编辑器「预览」按钮改为展示当前未保存数据； 预览后点关闭询问是否保存； 直接点「保存」后留在配方卡片视图（不再关闭弹层） 3. 添加精油改为搜索输入框 + 下拉自动补全， 支持中文名和英文名筛选 4. 精油价目：添加/编辑表单加入英文名字段； 编辑/删除按钮改为悬停（桌面）或点击（移动端）才显示； 后端及数据库同步支持 oils.en_name	2026-04-08 20:03:14 +00:00
Hera Zhao	cc79ae1211	fix: 存为我的改写入 recipes 表，确保在「我的配方」和「管理配方」中显示 ... 之前 saveToDiary() 调用 POST /api/diary，数据写入 user_diary 表， 只在「我的配方日记」(/mydiary) 中可见。 改为调用 recipesStore.saveRecipe()，写入 recipes 表并以当前用户为 owner， GET /api/recipes 会返回该用户自己创建的配方， RecipeSearch 的「我的配方」预览和 RecipeManager 的配方列表均可显示。 Co-Authored-By: YoYo <yoyo@euphon.net>	2026-04-08 19:56:36 +00:00
YoYo	dcf516f2de	fix: 移除所有权限身份显示，QR上传布局还原为initial commit样式	2026-04-08 19:47:24 +00:00
YoYo	c8de1ad229	fix: 退出登录后跳转到配方查询页面 ... 将 handleLogout 里的 window.location.reload() 改为 router.push('/')， 确保在任何需要登录的页面退出后都能回到配方查询页面。 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-08 19:47:24 +00:00
YoYo	de74ffe638	fix: 配方卡片品牌样式与 initial commit 保持一致 ... - 背景图改用 div+background-image，opacity 从 0.06 恢复为 0.12 - 二维码位置改回 top:36px/right:24px，尺寸 54×54，加圆角和阴影 - 二维码下方新增品牌名称小字（7px） - Logo 位置改回 bottom:60px，尺寸 height:60px，opacity 0.2 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-08 07:42:47 +00:00
YoYo	4761253d73	fix: 存为我的改用自定义 showPrompt，与主分支保持一致 ... 将 saveToDiary 中的原生 prompt() 替换为项目内置的 showPrompt()，使对话框样式与主分支及全站风格保持一致。 Co-Authored-By: YoYo <yoyo@euphon.net>	2026-04-07 23:09:29 +00:00
YoYo	65239abc53	QR upload: replace inline hint with dialog, add back button in brand page ... - Replace the inline brand-upload-hint bar in RecipeDetailOverlay with a confirm dialog (「去上传」/「取消」) that pops up when the card opens - Extend useDialog/CustomDialog to support custom ok/cancel button text - Add a 「← 返回配方卡片」banner in MyDiary brand tab when navigated from a recipe card, allowing return without uploading Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-07 22:55:39 +00:00
Hera Zhao	96504ed1d7	Resume pending action after login (favorite, diary, QR upload) ... Add pendingAction callback to UI store. When user clicks favorite, save-to-diary, or upload QR while not logged in, the action is stored and automatically executed after successful login/register instead of reloading the page. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-07 22:39:59 +00:00
Hera Zhao	4d5e3c46e7	Shorten copy toast to just '已复制' ... Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-07 22:34:07 +00:00
Hera Zhao	3bbe437616	Remove volume selector from recipe card view ... Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-07 22:33:16 +00:00
Hera Zhao	b9681141af	Fix LoginModal z-index to 6000 so it appears above recipe overlay ... Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-07 22:28:17 +00:00
YoYo	dee4b1649a	fix: 卡片预览加入容量切换，非单次滴数四舍五入 ... - VOLUME_DROPS 新增「单次」(null，不缩放) - 新增 scaleIngredients() 按比例缩放成分 - 卡片预览区加入容量切换按钮，切换后实时更新滴数与成本 - priceInfo 与 coconutDrops 均基于缩放后数据 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-07 22:27:21 +00:00
YoYo	955512d344	feat: 未登录用户也显示二维码上传提示，点击时引导登录/注册	2026-04-07 22:25:10 +00:00
YoYo	81ec5987b3	feat: 配方卡片加入上传个人二维码功能 ... - RecipeDetailOverlay: 未上传二维码/背景图时，卡片上方显示提示横幅，下方出现「上传我的二维码」按钮，点击跳转到 MyDiary 品牌设置页并记录来源配方 - MyDiary: 新增二维码图片上传区域（直接上传图片文件，存为 base64 → PUT /api/brand qr_code 字段）；上传成功后若有待返回配方则自动跳回配方卡片；修复 loadBrandSettings 字段名与后端不一致的问题 - RecipeSearch: 支持 ?openRecipe= 查询参数，页面挂载时自动打开指定配方卡片，实现从 MyDiary 上传后无缝返回 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-07 22:25:10 +00:00
Hera Zhao	6804835e85	Persist recipe English name translation to database ... - Add en_name column to recipes table (migration in database.py) - Include en_name in recipe API responses and RecipeUpdate model - Save en_name when admin/senior_editor applies translation - Load en_name on overlay open, so translation persists across sessions Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-07 22:08:05 +00:00
Hera Zhao	2088019ed7	Fix overlay: always show buttons, restrict translation, fix save data ... - Always show favorite/save-to-diary buttons (login check on click) - Restrict translation editor to senior_editor/admin only (canManage) - Fix save: map ingredient oil→oil_name for API, reload recipes after - Ensures next open shows the saved data Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-07 21:59:41 +00:00
Hera Zhao	86be739667	Fix card overlay: scrollable buttons, doTERRA casing, English text ... - Move action buttons (favorite, save-to-diary) inside card view so they scroll with content instead of sticking at top - Remove text-transform:uppercase so doTERRA renders correctly - Fix English dilution text to match main branch (bottle vs single-use) - Add close button to editor view header Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-07 21:50:07 +00:00
Hera Zhao	4655040153	Fix recipe detail overlay: layout, buttons, price columns ... - Remove "卡片预览" tab text, use top bar with action buttons - Move language toggle (中文/English) to top of card view - Fix favorite button: check recipe _id before toggling - Fix save-to-diary: match API fields (name, source_recipe_id) - Use custom translations in card rendering (getCardOilName/getCardRecipeName) - Swap price columns: cost first, retail strikethrough after - Add retail strikethrough price in total cost bar Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-07 21:41:49 +00:00
Hera Zhao	d68f5b35ee	Rewrite RecipeDetailOverlay to match main branch layout ... Card view: branded recipe card image (html2canvas), language toggle, save image, copy text, favorite, save to diary, translation editor. Editor view: volume/dilution controls, ingredient table with add row, tag management with candidates, notes, total cost. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-07 21:30:34 +00:00
Hera Zhao	cd833a6232	Add confirm password field on registration ... Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-07 21:13:27 +00:00
Hera Zhao	2bec4a2d26	Revert recipe detail to modal overlay with tab switching ... Restore the original modal popup (卡片预览/编辑 tabs) instead of the inline detail panel, and bring back category carousel, personal recipes, and favorites sections on the search page. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-07 10:34:01 +00:00
Hera Zhao	f884bff452	Rewrite recipe search page to match original design ... - RecipeCard: simple card with name, tags, oil names, price (matching original .recipe-card style with hover translateY and warm shadows) - RecipeDetailOverlay: inline panel (not modal) with editable ingredients table, add ingredient row, total cost bar, and card preview section matching the original detail-panel + #recipe-card-export layout - RecipeSearch: simplified layout with search box and grid, detail panel appears inline below grid when a card is clicked - Updated Cypress tests to match new component structure Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-06 22:38:35 +00:00
Hera Zhao	a27c30ea7c	Fix CI: exclude demo/visual specs, fix oil-card→oil-chip selectors ... - Grep pattern now matches full filenames (demo-walkthrough, visual-check) - Updated all test files to use .oil-chip (new OilReference class name) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-06 22:28:17 +00:00
Hera Zhao	bc27863930	Fix UserMenu: add notifications panel + bug report form ... - Notifications show inline in dropdown (not a separate route) - Load from /api/notifications, show unread count badge - Mark all read button - Bug report form with /api/bug-report POST - Both panels toggle in the dropdown Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-06 21:48:56 +00:00
Hera Zhao	ee8ec23dc7	Refactor frontend to Vue 3 + Vite + Pinia + Cypress E2E ... - Replace single-file 8441-line HTML with Vue 3 SPA - Pinia stores: auth, oils, recipes, diary, ui - Composables: useApi, useDialog, useSmartPaste, useOilTranslation - 6 shared components: RecipeCard, RecipeDetailOverlay, TagPicker, etc. - 9 page views: RecipeSearch, RecipeManager, Inventory, OilReference, etc. - 14 Cypress E2E test specs (113 tests), all passing - Multi-stage Dockerfile (Node build + Python runtime) - Demo video generation scripts (TTS + subtitles + screen recording) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-04-06 18:35:00 +00:00