Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
04c9ff5fac |
@@ -34,6 +34,8 @@ interface Media {
|
|||||||
caption?: string;
|
caption?: string;
|
||||||
// The API returns a `categories` array (many-to-many).
|
// The API returns a `categories` array (many-to-many).
|
||||||
categories?: Category[];
|
categories?: Category[];
|
||||||
|
// The API returns `sub_categories` (snake_case); keep the other casings as fallbacks.
|
||||||
|
sub_categories?: Category[];
|
||||||
subcategories?: Category[];
|
subcategories?: Category[];
|
||||||
subCategories?: Category[];
|
subCategories?: Category[];
|
||||||
type?: string;
|
type?: string;
|
||||||
@@ -142,7 +144,9 @@ export default function MediaPage() {
|
|||||||
setCaption(row.caption ?? "");
|
setCaption(row.caption ?? "");
|
||||||
setCategoryIds((row.categories ?? []).map((c) => c.id));
|
setCategoryIds((row.categories ?? []).map((c) => c.id));
|
||||||
setSubcategoryIds(
|
setSubcategoryIds(
|
||||||
(row.subcategories ?? row.subCategories ?? []).map((c) => c.id),
|
(row.sub_categories ?? row.subcategories ?? row.subCategories ?? []).map(
|
||||||
|
(c) => c.id,
|
||||||
|
),
|
||||||
);
|
);
|
||||||
setType(row.type ?? "audio");
|
setType(row.type ?? "audio");
|
||||||
setDuration(row.duration != null ? String(row.duration) : "");
|
setDuration(row.duration != null ? String(row.duration) : "");
|
||||||
|
|||||||
@@ -17,9 +17,6 @@ import {
|
|||||||
PageHeader,
|
PageHeader,
|
||||||
} from "@/components/ui";
|
} from "@/components/ui";
|
||||||
import { EditIcon, PlusIcon, TrashIcon } from "@/components/icons";
|
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";
|
import { toFa } from "@/lib/utils";
|
||||||
|
|
||||||
interface MusicCategory {
|
interface MusicCategory {
|
||||||
@@ -28,8 +25,6 @@ interface MusicCategory {
|
|||||||
description?: string;
|
description?: string;
|
||||||
order?: number;
|
order?: number;
|
||||||
is_active?: boolean;
|
is_active?: boolean;
|
||||||
image_id?: number | null;
|
|
||||||
image?: unknown;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export default function MusicCategoriesPage() {
|
export default function MusicCategoriesPage() {
|
||||||
@@ -44,8 +39,7 @@ export default function MusicCategoriesPage() {
|
|||||||
const [name, setName] = useState("");
|
const [name, setName] = useState("");
|
||||||
const [description, setDescription] = useState("");
|
const [description, setDescription] = useState("");
|
||||||
const [order, setOrder] = useState("");
|
const [order, setOrder] = useState("");
|
||||||
const [imageId, setImageId] = useState<number | null>(null);
|
const [imageId, setImageId] = useState("");
|
||||||
const [imageFile, setImageFile] = useState<File | null>(null);
|
|
||||||
const [isActive, setIsActive] = useState(true);
|
const [isActive, setIsActive] = useState(true);
|
||||||
|
|
||||||
const [deleting, setDeleting] = useState<MusicCategory | null>(null);
|
const [deleting, setDeleting] = useState<MusicCategory | null>(null);
|
||||||
@@ -56,8 +50,7 @@ export default function MusicCategoriesPage() {
|
|||||||
setName("");
|
setName("");
|
||||||
setDescription("");
|
setDescription("");
|
||||||
setOrder("");
|
setOrder("");
|
||||||
setImageId(null);
|
setImageId("");
|
||||||
setImageFile(null);
|
|
||||||
setIsActive(true);
|
setIsActive(true);
|
||||||
setOpen(true);
|
setOpen(true);
|
||||||
}
|
}
|
||||||
@@ -66,8 +59,7 @@ export default function MusicCategoriesPage() {
|
|||||||
setName(row.name ?? "");
|
setName(row.name ?? "");
|
||||||
setDescription(row.description ?? "");
|
setDescription(row.description ?? "");
|
||||||
setOrder(row.order != null ? String(row.order) : "");
|
setOrder(row.order != null ? String(row.order) : "");
|
||||||
setImageId(row.image_id ?? null);
|
setImageId("");
|
||||||
setImageFile(null);
|
|
||||||
setIsActive(row.is_active ?? true);
|
setIsActive(row.is_active ?? true);
|
||||||
setOpen(true);
|
setOpen(true);
|
||||||
}
|
}
|
||||||
@@ -77,17 +69,15 @@ export default function MusicCategoriesPage() {
|
|||||||
setSaving(true);
|
setSaving(true);
|
||||||
try {
|
try {
|
||||||
if (editing) {
|
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}`, {
|
await apiFetch(`/music-categories/${editing.id}`, {
|
||||||
method: "POST",
|
method: "PUT",
|
||||||
body: toFormData({
|
body: {
|
||||||
name,
|
name,
|
||||||
description,
|
description,
|
||||||
order: order === "" ? undefined : Number(order),
|
order: order === "" ? undefined : Number(order),
|
||||||
is_active: isActive,
|
is_active: isActive,
|
||||||
image_id: imageId,
|
},
|
||||||
image: imageFile,
|
|
||||||
}),
|
|
||||||
});
|
});
|
||||||
toast.success("دستهبندی ویرایش شد.");
|
toast.success("دستهبندی ویرایش شد.");
|
||||||
} else {
|
} else {
|
||||||
@@ -98,9 +88,8 @@ export default function MusicCategoriesPage() {
|
|||||||
name,
|
name,
|
||||||
description,
|
description,
|
||||||
order,
|
order,
|
||||||
is_active: isActive,
|
|
||||||
image_id: imageId,
|
image_id: imageId,
|
||||||
image: imageFile,
|
is_active: isActive,
|
||||||
}),
|
}),
|
||||||
});
|
});
|
||||||
toast.success("دستهبندی افزوده شد.");
|
toast.success("دستهبندی افزوده شد.");
|
||||||
@@ -131,14 +120,6 @@ export default function MusicCategoriesPage() {
|
|||||||
|
|
||||||
const columns: Column<MusicCategory>[] = [
|
const columns: Column<MusicCategory>[] = [
|
||||||
{ key: "id", header: "شناسه", render: (r) => toFa(r.id), className: "w-24" },
|
{ 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: "name", header: "نام" },
|
||||||
{
|
{
|
||||||
key: "description",
|
key: "description",
|
||||||
@@ -242,15 +223,16 @@ export default function MusicCategoriesPage() {
|
|||||||
dir="ltr"
|
dir="ltr"
|
||||||
/>
|
/>
|
||||||
</Field>
|
</Field>
|
||||||
<Field label="تصویر">
|
{!editing && (
|
||||||
<ImagePicker
|
<Field label="شناسه تصویر">
|
||||||
imageId={imageId}
|
<Input
|
||||||
onPickId={setImageId}
|
value={imageId}
|
||||||
file={imageFile}
|
onChange={(e) => setImageId(e.target.value)}
|
||||||
onPickFile={setImageFile}
|
dir="ltr"
|
||||||
existingUrl={editing ? pickUrl(editing, IMAGE_KEYS) : null}
|
placeholder="image_id"
|
||||||
/>
|
/>
|
||||||
</Field>
|
</Field>
|
||||||
|
)}
|
||||||
<Switch checked={isActive} onChange={setIsActive} label="فعال" />
|
<Switch checked={isActive} onChange={setIsActive} label="فعال" />
|
||||||
</form>
|
</form>
|
||||||
</Modal>
|
</Modal>
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ import {
|
|||||||
Input,
|
Input,
|
||||||
Modal,
|
Modal,
|
||||||
PageHeader,
|
PageHeader,
|
||||||
Select,
|
|
||||||
Switch,
|
Switch,
|
||||||
} from "@/components/ui";
|
} from "@/components/ui";
|
||||||
import { EditIcon, PlusIcon, TrashIcon } from "@/components/icons";
|
import { EditIcon, PlusIcon, TrashIcon } from "@/components/icons";
|
||||||
@@ -21,59 +20,21 @@ import { toFa } from "@/lib/utils";
|
|||||||
import { MediaPreview } from "@/components/MediaPreview";
|
import { MediaPreview } from "@/components/MediaPreview";
|
||||||
import { pickUrl, SOUND_KEYS, VIDEO_KEYS, IMAGE_KEYS } from "@/lib/media";
|
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 {
|
interface Scene {
|
||||||
id: number;
|
id: number;
|
||||||
name: string;
|
name: string;
|
||||||
order?: number;
|
order?: number;
|
||||||
is_active?: boolean;
|
is_active?: 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() {
|
export default function ScenesPage() {
|
||||||
const { data, loading, error, reload } = useList<Scene>("/scenes");
|
const { data, loading, error, reload } = useList<Scene>("/scenes");
|
||||||
const { data: themes } = useList<Theme>("/themes");
|
|
||||||
const toast = useToast();
|
const toast = useToast();
|
||||||
|
|
||||||
const [editing, setEditing] = useState<Scene | null>(null);
|
const [editing, setEditing] = useState<Scene | null>(null);
|
||||||
const [open, setOpen] = useState(false);
|
const [open, setOpen] = useState(false);
|
||||||
const [name, setName] = useState("");
|
const [name, setName] = useState("");
|
||||||
const [order, setOrder] = useState("");
|
const [order, setOrder] = useState("");
|
||||||
const [themeId, setThemeId] = useState("");
|
|
||||||
const [isActive, setIsActive] = useState(true);
|
const [isActive, setIsActive] = useState(true);
|
||||||
const [image, setImage] = useState<File | null>(null);
|
const [image, setImage] = useState<File | null>(null);
|
||||||
const [video, setVideo] = useState<File | null>(null);
|
const [video, setVideo] = useState<File | null>(null);
|
||||||
@@ -87,7 +48,6 @@ export default function ScenesPage() {
|
|||||||
setEditing(null);
|
setEditing(null);
|
||||||
setName("");
|
setName("");
|
||||||
setOrder("");
|
setOrder("");
|
||||||
setThemeId("");
|
|
||||||
setIsActive(true);
|
setIsActive(true);
|
||||||
setImage(null);
|
setImage(null);
|
||||||
setVideo(null);
|
setVideo(null);
|
||||||
@@ -98,7 +58,6 @@ export default function ScenesPage() {
|
|||||||
setEditing(row);
|
setEditing(row);
|
||||||
setName(row.name ?? "");
|
setName(row.name ?? "");
|
||||||
setOrder(row.order != null ? String(row.order) : "");
|
setOrder(row.order != null ? String(row.order) : "");
|
||||||
setThemeId(row.theme_id != null ? String(row.theme_id) : "");
|
|
||||||
setIsActive(!!row.is_active);
|
setIsActive(!!row.is_active);
|
||||||
setImage(null);
|
setImage(null);
|
||||||
setVideo(null);
|
setVideo(null);
|
||||||
@@ -114,7 +73,6 @@ export default function ScenesPage() {
|
|||||||
const body = toFormData({
|
const body = toFormData({
|
||||||
name,
|
name,
|
||||||
order,
|
order,
|
||||||
theme_id: themeId,
|
|
||||||
is_active: isActive,
|
is_active: isActive,
|
||||||
image,
|
image,
|
||||||
video,
|
video,
|
||||||
@@ -154,11 +112,6 @@ export default function ScenesPage() {
|
|||||||
const columns: Column<Scene>[] = [
|
const columns: Column<Scene>[] = [
|
||||||
{ key: "id", header: "شناسه", render: (r) => toFa(r.id), className: "w-24" },
|
{ key: "id", header: "شناسه", render: (r) => toFa(r.id), className: "w-24" },
|
||||||
{ key: "name", header: "نام صحنه" },
|
{ key: "name", header: "نام صحنه" },
|
||||||
{
|
|
||||||
key: "theme",
|
|
||||||
header: "قالب رنگی",
|
|
||||||
render: (r) => <ThemeSwatch theme={r.theme} />,
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
key: "image",
|
key: "image",
|
||||||
header: "تصویر",
|
header: "تصویر",
|
||||||
@@ -283,24 +236,6 @@ export default function ScenesPage() {
|
|||||||
/>
|
/>
|
||||||
</Field>
|
</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={isActive} onChange={setIsActive} label="فعال" />
|
||||||
|
|
||||||
<Field
|
<Field
|
||||||
|
|||||||
+1
-4
@@ -22,10 +22,7 @@ DEPLOY_USER="${DEPLOY_USER:-ubuntu}"
|
|||||||
DEPLOY_PATH="${DEPLOY_PATH:-/var/www/aramland-admin}"
|
DEPLOY_PATH="${DEPLOY_PATH:-/var/www/aramland-admin}"
|
||||||
DEPLOY_PASSWORD="${DEPLOY_PASSWORD:-}"
|
DEPLOY_PASSWORD="${DEPLOY_PASSWORD:-}"
|
||||||
|
|
||||||
echo "▸ Building locally (clean)…"
|
echo "▸ Building locally…"
|
||||||
# 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
|
|
||||||
npm run build
|
npm run build
|
||||||
|
|
||||||
if [ ! -d out ]; then
|
if [ ! -d out ]; then
|
||||||
|
|||||||
Reference in New Issue
Block a user