dengzhaofun
diff --git a/‎apps/admin/messages/en.json‎
Lines changed: 34 additions & 1 deletion b/‎apps/admin/messages/en.json‎
Lines changed: 34 additions & 1 deletion
diff --git a/‎apps/admin/messages/zh.json‎
Lines changed: 34 additions & 1 deletion b/‎apps/admin/messages/zh.json‎
Lines changed: 34 additions & 1 deletion
diff --git a/‎apps/admin/src/components/AppSidebar.tsx‎
Lines changed: 2 additions & 0 deletions b/‎apps/admin/src/components/AppSidebar.tsx‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎apps/admin/src/components/check-in/RewardForm.tsx‎
Lines changed: 13 additions & 87 deletions b/‎apps/admin/src/components/check-in/RewardForm.tsx‎
Lines changed: 13 additions & 87 deletions
diff --git a/‎apps/admin/src/components/check-in/RewardsSection.tsx‎
Lines changed: 1 addition & 6 deletions b/‎apps/admin/src/components/check-in/RewardsSection.tsx‎
Lines changed: 1 addition & 6 deletions
diff --git a/‎apps/admin/src/components/collection/MilestoneForm.tsx‎
Lines changed: 5 additions & 8 deletions b/‎apps/admin/src/components/collection/MilestoneForm.tsx‎
Lines changed: 5 additions & 8 deletions
@@ -975,5 +975,38 @@
   "media_picker_tab_library": "From library",
   "media_picker_tab_upload": "Upload new",
   "media_picker_upload_hint": "New assets upload to the default folder — you can reorganize them later in the media library.",
-  "media_folder_default_name": "Default uploads"
+  "media_folder_default_name": "Default uploads",
+  "nav_currency": "Currency",
+  "common_link_activity": "Linked Activity",
+  "common_link_activity_hint": "Binding to an activity makes this entry follow the activity's cleanup policy when it archives. Leave empty for a permanent entry.",
+  "currency_definitions": "Currencies",
+  "currency_ledger": "Ledger",
+  "currency_new_definition": "New Currency",
+  "currency_created": "Currency created",
+  "currency_updated": "Currency updated",
+  "currency_deleted": "Currency deleted",
+  "currency_failed_create": "Failed to create currency",
+  "currency_failed_update": "Failed to update currency",
+  "currency_failed_delete": "Failed to delete currency",
+  "currency_delete_confirm": "Delete this currency?",
+  "currency_delete_hint": "All user wallets and ledger entries will be removed. This cannot be undone.",
+  "currency_alias_hint": "Optional URL-friendly key. Lowercase letters, digits, hyphens, underscores. Unique per organization.",
+  "currency_sort_order": "Sort order",
+  "currency_sort_hint": "Lower values sort first — drives both admin list ordering and the in-game wallet display.",
+  "currency_permanent": "Permanent",
+  "currency_empty": "No currencies yet.",
+  "currency_ledger_empty": "No ledger entries yet.",
+  "currency_end_user_id": "End user ID",
+  "currency_currency": "Currency",
+  "currency_delta": "Delta",
+  "currency_balance_after": "Balance after",
+  "currency_source": "Source",
+  "currency_source_id": "Source ID",
+  "currency_filter_all": "All",
+  "reward_type_item": "Item",
+  "reward_type_currency": "Currency",
+  "reward_type_entity": "Entity",
+  "reward_entry_empty_hint": "No entries yet. Click below to add a reward / cost.",
+  "reward_entry_pick_target": "Select target",
+  "reward_entry_add": "Add entry"
 }
@@ -975,5 +975,38 @@
   "media_picker_tab_library": "从云盘选择",
   "media_picker_tab_upload": "上传新素材",
   "media_picker_upload_hint": "新素材会上传到云盘的默认目录，之后也可以在云盘里整理。",
-  "media_folder_default_name": "默认上传"
+  "media_folder_default_name": "默认上传",
+  "nav_currency": "货币",
+  "common_link_activity": "关联活动",
+  "common_link_activity_hint": "绑定到某个活动后，活动归档时会按活动的清理策略一起下架；留空 = 常驻。",
+  "currency_definitions": "货币定义",
+  "currency_ledger": "流水",
+  "currency_new_definition": "新建货币",
+  "currency_created": "货币创建成功",
+  "currency_updated": "货币已更新",
+  "currency_deleted": "货币已删除",
+  "currency_failed_create": "创建货币失败",
+  "currency_failed_update": "更新货币失败",
+  "currency_failed_delete": "删除货币失败",
+  "currency_delete_confirm": "确认删除该货币？",
+  "currency_delete_hint": "删除后，所有玩家的钱包余额和流水将一并移除，操作不可恢复。",
+  "currency_alias_hint": "可选的 URL 友好别名。仅小写字母、数字、连字符、下划线，且组织内唯一。",
+  "currency_sort_order": "排序",
+  "currency_sort_hint": "数值越小越靠前，用于 Admin 列表与玩家钱包的展示顺序。",
+  "currency_permanent": "常驻",
+  "currency_empty": "还没有货币定义。",
+  "currency_ledger_empty": "暂无流水记录。",
+  "currency_end_user_id": "玩家 ID",
+  "currency_currency": "货币",
+  "currency_delta": "变动",
+  "currency_balance_after": "变动后余额",
+  "currency_source": "来源",
+  "currency_source_id": "来源 ID",
+  "currency_filter_all": "全部",
+  "reward_type_item": "道具",
+  "reward_type_currency": "货币",
+  "reward_type_entity": "实体",
+  "reward_entry_empty_hint": "还没有条目。点击下方按钮添加奖励/消耗。",
+  "reward_entry_pick_target": "选择目标",
+  "reward_entry_add": "添加条目"
 }
@@ -4,6 +4,7 @@ import {
   ArrowLeftRight,
   BookOpen,
   CalendarCheck,
+  Coins,
   FolderOpen,
   GalleryHorizontal,
   Gift,
@@ -46,6 +47,7 @@ function getNavItems() {
     { title: m.nav_dashboard(), to: "/dashboard" as const, icon: LayoutDashboard },
     { title: m.nav_checkin(), to: "/check-in" as const, icon: CalendarCheck },
     { title: m.nav_item(), to: "/item" as const, icon: Package },
+    { title: m.nav_currency(), to: "/currency" as const, icon: Coins },
     { title: m.nav_entity(), to: "/entity" as const, icon: Sparkles },
     { title: m.nav_exchange(), to: "/exchange" as const, icon: ArrowLeftRight },
     { title: m.nav_cdkey(), to: "/cdkey" as const, icon: Ticket },
 
@@ -1,25 +1,12 @@
 import { useState } from "react"
-import { Plus, Trash2 } from "lucide-react"
 
 import * as m from "#/paraglide/messages.js"
+import { RewardEntryEditor } from "#/components/rewards/RewardEntryEditor"
 import { Button } from "#/components/ui/button"
 import { Input } from "#/components/ui/input"
 import { Label } from "#/components/ui/label"
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from "#/components/ui/select"
-import { useItemDefinitions } from "#/hooks/use-item"
 import type { CreateRewardInput } from "#/lib/types/check-in-reward"
-import type { ItemEntry } from "#/lib/types/item"
-
-interface EntryRow {
-  definitionId: string
-  quantity: number
-}
+import type { RewardEntry } from "#/lib/types/rewards"
 
 interface RewardFormProps {
   defaultValues?: Partial<CreateRewardInput>
@@ -34,14 +21,11 @@ export function RewardForm({
   isPending,
   submitLabel = m.common_create(),
 }: RewardFormProps) {
-  const { data: definitions } = useItemDefinitions()
-  const defs = (definitions ?? []).map((d) => ({ id: d.id, name: d.name }))
-
   const [dayNumber, setDayNumber] = useState(defaultValues?.dayNumber ?? 1)
-  const [entries, setEntries] = useState<EntryRow[]>(
+  const [entries, setEntries] = useState<RewardEntry[]>(
     defaultValues?.rewardItems?.length
       ? defaultValues.rewardItems.map((e) => ({ ...e }))
-      : [{ definitionId: "", quantity: 1 }],
+      : [],
   )
   const [dayError, setDayError] = useState("")
 
@@ -53,12 +37,12 @@ export function RewardForm({
     }
     setDayError("")
 
-    const validEntries = entries.filter((e) => e.definitionId && e.quantity > 0)
-    if (validEntries.length === 0) return
+    const valid = entries.filter((e) => e.id && e.count > 0)
+    if (valid.length === 0) return
 
     onSubmit({
       dayNumber,
-      rewardItems: validEntries as ItemEntry[],
+      rewardItems: valid,
     })
   }
 
@@ -73,75 +57,17 @@ export function RewardForm({
           value={dayNumber}
           onChange={(e) => setDayNumber(Number(e.target.value))}
         />
-        {dayError && (
-          <p className="text-sm text-destructive">{dayError}</p>
-        )}
+        {dayError && <p className="text-sm text-destructive">{dayError}</p>}
         <p className="text-xs text-muted-foreground">
           Which consecutive check-in day triggers this reward.
         </p>
       </div>
 
-      <div className="space-y-3">
-        <Label>Reward Items *</Label>
-        {entries.map((entry, i) => (
-          <div key={i} className="flex items-end gap-2">
-            <div className="flex-1">
-              <Select
-                value={entry.definitionId}
-                onValueChange={(v) => {
-                  const next = [...entries]
-                  next[i] = { ...entry, definitionId: v }
-                  setEntries(next)
-                }}
-              >
-                <SelectTrigger className="w-full">
-                  <SelectValue placeholder="Select item..." />
-                </SelectTrigger>
-                <SelectContent>
-                  {defs.map((def) => (
-                    <SelectItem key={def.id} value={def.id}>
-                      {def.name}
-                    </SelectItem>
-                  ))}
-                </SelectContent>
-              </Select>
-            </div>
-            <div className="w-24">
-              <Input
-                type="number"
-                min={1}
-                value={entry.quantity}
-                onChange={(e) => {
-                  const next = [...entries]
-                  next[i] = { ...entry, quantity: Number(e.target.value) || 1 }
-                  setEntries(next)
-                }}
-              />
-            </div>
-            <Button
-              type="button"
-              variant="ghost"
-              size="icon"
-              className="size-9"
-              onClick={() => {
-                const next = entries.filter((_, j) => j !== i)
-                setEntries(next.length > 0 ? next : [{ definitionId: "", quantity: 1 }])
-              }}
-            >
-              <Trash2 className="size-4" />
-            </Button>
-          </div>
-        ))}
-        <Button
-          type="button"
-          variant="outline"
-          size="sm"
-          onClick={() => setEntries([...entries, { definitionId: "", quantity: 1 }])}
-        >
-          <Plus className="size-4" />
-          Add Item
-        </Button>
-      </div>
+      <RewardEntryEditor
+        label="Reward Items *"
+        entries={entries}
+        onChange={setEntries}
+      />
 
       <Button type="submit" disabled={isPending}>
         {isPending ? "Saving..." : submitLabel}
 
@@ -108,12 +108,7 @@ export function RewardsSection({ configKey }: RewardsSectionProps) {
               <Badge variant="secondary">Day {reward.dayNumber}</Badge>
               <div className="flex flex-wrap items-center gap-x-3 gap-y-1 flex-1 text-sm">
                 {reward.rewardItems.map((item, i) => (
-                  <ItemRewardRow
-                    key={i}
-                    size="sm"
-                    definitionId={item.definitionId}
-                    quantity={item.quantity}
-                  />
+                  <ItemRewardRow key={i} size="sm" entry={item} />
                 ))}
               </div>
 
 
@@ -1,6 +1,6 @@
 import { useState } from "react"
 
-import { ItemEntryEditor } from "#/components/shop/ItemEntryEditor"
+import { RewardEntryEditor } from "#/components/rewards/RewardEntryEditor"
 import { Button } from "#/components/ui/button"
 import { Input } from "#/components/ui/input"
 import { Label } from "#/components/ui/label"
@@ -20,13 +20,12 @@ import type {
   CreateMilestoneInput,
   MilestoneScope,
 } from "#/lib/types/collection"
-import type { ItemDefinition, ItemEntry } from "#/lib/types/item"
+import type { RewardEntry } from "#/lib/types/rewards"
 
 interface MilestoneFormProps {
   initial?: CollectionMilestone
   groups: CollectionGroup[]
   entries: CollectionEntry[]
-  itemDefinitions: ItemDefinition[]
   onSubmit: (values: CreateMilestoneInput) => void | Promise<void>
   submitLabel: string
   isPending?: boolean
@@ -37,7 +36,6 @@ export function MilestoneForm({
   initial,
   groups,
   entries,
-  itemDefinitions,
   onSubmit,
   submitLabel,
   isPending,
@@ -50,7 +48,7 @@ export function MilestoneForm({
   const [entryId, setEntryId] = useState<string>(initial?.entryId ?? "")
   const [threshold, setThreshold] = useState<number>(initial?.threshold ?? 1)
   const [label, setLabel] = useState<string>(initial?.label ?? "")
-  const [rewardItems, setRewardItems] = useState<ItemEntry[]>(
+  const [rewardItems, setRewardItems] = useState<RewardEntry[]>(
     initial?.rewardItems ?? [],
   )
   const [autoClaim, setAutoClaim] = useState<boolean>(
@@ -67,7 +65,7 @@ export function MilestoneForm({
       setError(m.collection_milestone_error_no_reward())
       return
     }
-    if (rewardItems.some((r) => !r.definitionId)) {
+    if (rewardItems.some((r) => !r.id)) {
       setError(m.collection_milestone_error_reward_def())
       return
     }
@@ -213,11 +211,10 @@ export function MilestoneForm({
           placeholder={m.collection_milestone_label_placeholder()}
         />
       </div>
-      <ItemEntryEditor
+      <RewardEntryEditor
         label={m.collection_milestone_field_rewards()}
         entries={rewardItems}
         onChange={setRewardItems}
-        definitions={itemDefinitions}
       />
       <div className="grid gap-4 md:grid-cols-2">
         <div>