Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
04c9ff5fac |
@@ -34,6 +34,8 @@ interface Media {
|
||||
caption?: string;
|
||||
// The API returns a `categories` array (many-to-many).
|
||||
categories?: Category[];
|
||||
// The API returns `sub_categories` (snake_case); keep the other casings as fallbacks.
|
||||
sub_categories?: Category[];
|
||||
subcategories?: Category[];
|
||||
subCategories?: Category[];
|
||||
type?: string;
|
||||
@@ -142,7 +144,9 @@ export default function MediaPage() {
|
||||
setCaption(row.caption ?? "");
|
||||
setCategoryIds((row.categories ?? []).map((c) => c.id));
|
||||
setSubcategoryIds(
|
||||
(row.subcategories ?? row.subCategories ?? []).map((c) => c.id),
|
||||
(row.sub_categories ?? row.subcategories ?? row.subCategories ?? []).map(
|
||||
(c) => c.id,
|
||||
),
|
||||
);
|
||||
setType(row.type ?? "audio");
|
||||
setDuration(row.duration != null ? String(row.duration) : "");
|
||||
|
||||
@@ -17,9 +17,6 @@ import {
|
||||
PageHeader,
|
||||
} from "@/components/ui";
|
||||
import { EditIcon, PlusIcon, TrashIcon } from "@/components/icons";
|
||||
import { ImagePicker } from "@/components/ImagePicker";
|
||||
import { MediaPreview } from "@/components/MediaPreview";
|
||||
import { pickUrl, IMAGE_KEYS } from "@/lib/media";
|
||||
import { toFa } from "@/lib/utils";
|
||||
|
||||
interface MusicCategory {
|
||||
@@ -28,8 +25,6 @@ interface MusicCategory {
|
||||
description?: string;
|
||||
order?: number;
|
||||
is_active?: boolean;
|
||||
image_id?: number | null;
|
||||
image?: unknown;
|
||||
}
|
||||
|
||||
export default function MusicCategoriesPage() {
|
||||
@@ -44,8 +39,7 @@ export default function MusicCategoriesPage() {
|
||||
const [name, setName] = useState("");
|
||||
const [description, setDescription] = useState("");
|
||||
const [order, setOrder] = useState("");
|
||||
const [imageId, setImageId] = useState<number | null>(null);
|
||||
const [imageFile, setImageFile] = useState<File | null>(null);
|
||||
const [imageId, setImageId] = useState("");
|
||||
const [isActive, setIsActive] = useState(true);
|
||||
|
||||
const [deleting, setDeleting] = useState<MusicCategory | null>(null);
|
||||
@@ -56,8 +50,7 @@ export default function MusicCategoriesPage() {
|
||||
setName("");
|
||||
setDescription("");
|
||||
setOrder("");
|
||||
setImageId(null);
|
||||
setImageFile(null);
|
||||
setImageId("");
|
||||
setIsActive(true);
|
||||
setOpen(true);
|
||||
}
|
||||
@@ -66,8 +59,7 @@ export default function MusicCategoriesPage() {
|
||||
setName(row.name ?? "");
|
||||
setDescription(row.description ?? "");
|
||||
setOrder(row.order != null ? String(row.order) : "");
|
||||
setImageId(row.image_id ?? null);
|
||||
setImageFile(null);
|
||||
setImageId("");
|
||||
setIsActive(row.is_active ?? true);
|
||||
setOpen(true);
|
||||
}
|
||||
@@ -77,17 +69,15 @@ export default function MusicCategoriesPage() {
|
||||
setSaving(true);
|
||||
try {
|
||||
if (editing) {
|
||||
// Update is multipart (POST) so an image file can be uploaded.
|
||||
// Update is JSON on /music-categories/:id
|
||||
await apiFetch(`/music-categories/${editing.id}`, {
|
||||
method: "POST",
|
||||
body: toFormData({
|
||||
method: "PUT",
|
||||
body: {
|
||||
name,
|
||||
description,
|
||||
order: order === "" ? undefined : Number(order),
|
||||
is_active: isActive,
|
||||
image_id: imageId,
|
||||
image: imageFile,
|
||||
}),
|
||||
},
|
||||
});
|
||||
toast.success("دستهبندی ویرایش شد.");
|
||||
} else {
|
||||
@@ -98,9 +88,8 @@ export default function MusicCategoriesPage() {
|
||||
name,
|
||||
description,
|
||||
order,
|
||||
is_active: isActive,
|
||||
image_id: imageId,
|
||||
image: imageFile,
|
||||
is_active: isActive,
|
||||
}),
|
||||
});
|
||||
toast.success("دستهبندی افزوده شد.");
|
||||
@@ -131,14 +120,6 @@ export default function MusicCategoriesPage() {
|
||||
|
||||
const columns: Column<MusicCategory>[] = [
|
||||
{ key: "id", header: "شناسه", render: (r) => toFa(r.id), className: "w-24" },
|
||||
{
|
||||
key: "image",
|
||||
header: "تصویر",
|
||||
className: "w-20",
|
||||
render: (r) => (
|
||||
<MediaPreview kind="image" src={pickUrl(r, IMAGE_KEYS)} label={r.name} />
|
||||
),
|
||||
},
|
||||
{ key: "name", header: "نام" },
|
||||
{
|
||||
key: "description",
|
||||
@@ -242,15 +223,16 @@ export default function MusicCategoriesPage() {
|
||||
dir="ltr"
|
||||
/>
|
||||
</Field>
|
||||
<Field label="تصویر">
|
||||
<ImagePicker
|
||||
imageId={imageId}
|
||||
onPickId={setImageId}
|
||||
file={imageFile}
|
||||
onPickFile={setImageFile}
|
||||
existingUrl={editing ? pickUrl(editing, IMAGE_KEYS) : null}
|
||||
/>
|
||||
</Field>
|
||||
{!editing && (
|
||||
<Field label="شناسه تصویر">
|
||||
<Input
|
||||
value={imageId}
|
||||
onChange={(e) => setImageId(e.target.value)}
|
||||
dir="ltr"
|
||||
placeholder="image_id"
|
||||
/>
|
||||
</Field>
|
||||
)}
|
||||
<Switch checked={isActive} onChange={setIsActive} label="فعال" />
|
||||
</form>
|
||||
</Modal>
|
||||
|
||||
@@ -13,7 +13,6 @@ import {
|
||||
Input,
|
||||
Modal,
|
||||
PageHeader,
|
||||
Select,
|
||||
Switch,
|
||||
} from "@/components/ui";
|
||||
import { EditIcon, PlusIcon, TrashIcon } from "@/components/icons";
|
||||
@@ -21,62 +20,22 @@ import { toFa } from "@/lib/utils";
|
||||
import { MediaPreview } from "@/components/MediaPreview";
|
||||
import { pickUrl, SOUND_KEYS, VIDEO_KEYS, IMAGE_KEYS } from "@/lib/media";
|
||||
|
||||
interface Theme {
|
||||
id: number;
|
||||
key: string;
|
||||
name: string;
|
||||
colors: Record<string, string>;
|
||||
}
|
||||
|
||||
interface Scene {
|
||||
id: number;
|
||||
name: string;
|
||||
order?: number;
|
||||
is_active?: boolean;
|
||||
is_premium?: boolean;
|
||||
theme_id?: number | null;
|
||||
theme?: Theme | null;
|
||||
}
|
||||
|
||||
// "#FF156395" (ARGB) or "#156395" → a CSS color the browser understands.
|
||||
function cssColor(c?: string): string {
|
||||
if (!c) return "transparent";
|
||||
const hex = c.replace("#", "");
|
||||
if (hex.length === 8) return `#${hex.slice(2)}${hex.slice(0, 2)}`; // ARGB → RGBA
|
||||
return `#${hex}`;
|
||||
}
|
||||
|
||||
function ThemeSwatch({ theme }: { theme?: Theme | null }) {
|
||||
if (!theme) return <span className="text-muted">—</span>;
|
||||
const keys = ["themeUp", "themeDown", "lightColorGradient", "darkColorGradient"];
|
||||
return (
|
||||
<span className="inline-flex items-center gap-2">
|
||||
<span className="inline-flex overflow-hidden rounded-full border border-border">
|
||||
{keys.map((k) => (
|
||||
<span
|
||||
key={k}
|
||||
className="h-4 w-4"
|
||||
style={{ backgroundColor: cssColor(theme.colors?.[k]) }}
|
||||
/>
|
||||
))}
|
||||
</span>
|
||||
{theme.name}
|
||||
</span>
|
||||
);
|
||||
}
|
||||
|
||||
export default function ScenesPage() {
|
||||
const { data, loading, error, reload } = useList<Scene>("/scenes");
|
||||
const { data: themes } = useList<Theme>("/themes");
|
||||
const toast = useToast();
|
||||
|
||||
const [editing, setEditing] = useState<Scene | null>(null);
|
||||
const [open, setOpen] = useState(false);
|
||||
const [name, setName] = useState("");
|
||||
const [order, setOrder] = useState("");
|
||||
const [themeId, setThemeId] = useState("");
|
||||
const [isActive, setIsActive] = useState(true);
|
||||
const [isPremium, setIsPremium] = useState(false);
|
||||
const [image, setImage] = useState<File | null>(null);
|
||||
const [video, setVideo] = useState<File | null>(null);
|
||||
const [sound, setSound] = useState<File | null>(null);
|
||||
@@ -89,9 +48,7 @@ export default function ScenesPage() {
|
||||
setEditing(null);
|
||||
setName("");
|
||||
setOrder("");
|
||||
setThemeId("");
|
||||
setIsActive(true);
|
||||
setIsPremium(false);
|
||||
setImage(null);
|
||||
setVideo(null);
|
||||
setSound(null);
|
||||
@@ -101,9 +58,7 @@ export default function ScenesPage() {
|
||||
setEditing(row);
|
||||
setName(row.name ?? "");
|
||||
setOrder(row.order != null ? String(row.order) : "");
|
||||
setThemeId(row.theme_id != null ? String(row.theme_id) : "");
|
||||
setIsActive(!!row.is_active);
|
||||
setIsPremium(!!row.is_premium);
|
||||
setImage(null);
|
||||
setVideo(null);
|
||||
setSound(null);
|
||||
@@ -118,9 +73,7 @@ export default function ScenesPage() {
|
||||
const body = toFormData({
|
||||
name,
|
||||
order,
|
||||
theme_id: themeId,
|
||||
is_active: isActive,
|
||||
is_premium: isPremium,
|
||||
image,
|
||||
video,
|
||||
sound,
|
||||
@@ -159,11 +112,6 @@ export default function ScenesPage() {
|
||||
const columns: Column<Scene>[] = [
|
||||
{ key: "id", header: "شناسه", render: (r) => toFa(r.id), className: "w-24" },
|
||||
{ key: "name", header: "نام صحنه" },
|
||||
{
|
||||
key: "theme",
|
||||
header: "قالب رنگی",
|
||||
render: (r) => <ThemeSwatch theme={r.theme} />,
|
||||
},
|
||||
{
|
||||
key: "image",
|
||||
header: "تصویر",
|
||||
@@ -205,17 +153,6 @@ export default function ScenesPage() {
|
||||
),
|
||||
className: "w-28",
|
||||
},
|
||||
{
|
||||
key: "is_premium",
|
||||
header: "نوع",
|
||||
render: (r) =>
|
||||
r.is_premium ? (
|
||||
<Badge tone="primary">ویژه</Badge>
|
||||
) : (
|
||||
<Badge tone="neutral">رایگان</Badge>
|
||||
),
|
||||
className: "w-24",
|
||||
},
|
||||
];
|
||||
|
||||
return (
|
||||
@@ -299,28 +236,8 @@ export default function ScenesPage() {
|
||||
/>
|
||||
</Field>
|
||||
|
||||
<Field label="قالب رنگی">
|
||||
<Select value={themeId} onChange={(e) => setThemeId(e.target.value)}>
|
||||
<option value="">— بدون قالب —</option>
|
||||
{themes.map((t) => (
|
||||
<option key={t.id} value={t.id}>
|
||||
{t.name}
|
||||
</option>
|
||||
))}
|
||||
</Select>
|
||||
{themeId && (
|
||||
<div className="mt-2">
|
||||
<ThemeSwatch
|
||||
theme={themes.find((t) => String(t.id) === themeId) ?? null}
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
</Field>
|
||||
|
||||
<Switch checked={isActive} onChange={setIsActive} label="فعال" />
|
||||
|
||||
<Switch checked={isPremium} onChange={setIsPremium} label="ویژه (پولی)" />
|
||||
|
||||
<Field
|
||||
label="تصویر"
|
||||
hint={editing ? "در صورت عدم انتخاب، تصویر قبلی حفظ میشود." : undefined}
|
||||
|
||||
+1
-4
@@ -22,10 +22,7 @@ DEPLOY_USER="${DEPLOY_USER:-ubuntu}"
|
||||
DEPLOY_PATH="${DEPLOY_PATH:-/var/www/aramland-admin}"
|
||||
DEPLOY_PASSWORD="${DEPLOY_PASSWORD:-}"
|
||||
|
||||
echo "▸ Building locally (clean)…"
|
||||
# Remove caches so the production build never type-checks a stale `.next/dev`
|
||||
# validator (tsconfig includes .next/dev/types) and never ships stale out/ files.
|
||||
rm -rf .next out
|
||||
echo "▸ Building locally…"
|
||||
npm run build
|
||||
|
||||
if [ ! -d out ]; then
|
||||
|
||||
Reference in New Issue
Block a user