Compare commits

..
6 Commits
Author SHA1 Message Date
Amirmahdi ec79ea2771 feat: add ispremium 2026-07-01 13:01:19 +03:30
Amirmahdi 376e3e9473 Merge branch 'main' of http://git.approagency.ir/Amirmahdi/meditation-admin 2026-06-30 14:12:07 +03:30
Amirmahdi 01ad88adf9 fix: slider 2026-06-30 14:09:15 +03:30
Amirmahdi 638d1dad52 fix 2026-06-27 10:28:37 +03:30
Amirmahdi dec17b537e feat: add order 2026-06-27 10:21:43 +03:30
Amirmahdi 4ac190f161 fix 2026-06-17 19:33:19 +03:30
4 changed files with 78 additions and 14 deletions
+2 -1
View File
@@ -129,7 +129,8 @@ export default function BreathingPage() {
duration: numOrUndefined(form.duration),
description: form.description,
image_id: numOrUndefined(form.image_id),
breathing_color_id: breathingColorId ?? undefined,
// Send null (not undefined) so choosing "بدون رنگ" actually clears it.
breathing_color_id: breathingColorId,
};
if (editing) {
// Update is JSON on /breathing-templates/:id
+39 -3
View File
@@ -26,6 +26,7 @@ interface Category {
id: number;
name: string;
type: CategoryType;
order?: number;
description?: string | null;
icon?: string | null;
subcategories_count?: number;
@@ -56,6 +57,7 @@ export default function CategoriesPage() {
const [open, setOpen] = useState(false);
const [name, setName] = useState("");
const [type, setType] = useState<CategoryType>("media");
const [order, setOrder] = useState("0");
const [description, setDescription] = useState("");
const [icon, setIcon] = useState<File | null>(null);
const [saving, setSaving] = useState(false);
@@ -67,6 +69,7 @@ export default function CategoriesPage() {
setEditing(null);
setName("");
setType(typeFilter);
setOrder("0");
setDescription("");
setIcon(null);
setOpen(true);
@@ -75,6 +78,7 @@ export default function CategoriesPage() {
setEditing(row);
setName(row.name ?? "");
setType(row.type ?? "media");
setOrder(String(row.order ?? 0));
setDescription(row.description ?? "");
setIcon(null);
setOpen(true);
@@ -84,12 +88,25 @@ export default function CategoriesPage() {
e.preventDefault();
setSaving(true);
try {
if (editing) {
// Playlist categories live in the music_categories table, so their writes
// go to /music-categories (image is the `image` field, not `icon`).
const targetType = editing ? editing.type : type;
if (targetType === "playlist") {
const body = toFormData({ name, description, order, image: icon });
if (editing) {
await apiFetch(`/music-categories/${editing.id}`, { method: "POST", body });
toast.success("دسته‌بندی ویرایش شد.");
} else {
await apiFetch("/music-categories", { method: "POST", body });
toast.success("دسته‌بندی افزوده شد.");
}
} else if (editing) {
// Icon is a file, so update goes through POST + Laravel method spoofing.
const body = toFormData({
_method: "PUT",
name,
type,
order,
description,
icon,
});
@@ -98,7 +115,7 @@ export default function CategoriesPage() {
} else {
await apiFetch("/categories", {
method: "POST",
body: toFormData({ name, type, description, icon }),
body: toFormData({ name, type, order, description, icon }),
});
toast.success("دسته‌بندی افزوده شد.");
}
@@ -115,7 +132,11 @@ export default function CategoriesPage() {
if (!deleting) return;
setRemoving(true);
try {
await apiFetch(`/categories/${deleting.id}`, { method: "DELETE" });
const path =
deleting.type === "playlist"
? `/music-categories/${deleting.id}`
: `/categories/${deleting.id}`;
await apiFetch(path, { method: "DELETE" });
toast.success("دسته‌بندی حذف شد.");
setDeleting(null);
reload();
@@ -135,6 +156,12 @@ export default function CategoriesPage() {
<MediaPreview kind="image" src={pickUrl(r, ICON_KEYS)} label={r.name} />
),
},
{
key: "order",
header: "ترتیب",
render: (r) => toFa(r.order ?? 0),
className: "w-20",
},
{ key: "name", header: "نام دسته‌بندی" },
{
key: "type",
@@ -249,6 +276,15 @@ export default function CategoriesPage() {
/>
</Field>
<Field label="ترتیب" hint="عدد کوچک‌تر بالاتر نمایش داده می‌شود.">
<Input
type="number"
value={order}
onChange={(e) => setOrder(e.target.value)}
dir="ltr"
/>
</Field>
<Field label="توضیحات">
<Textarea
value={description}
+17
View File
@@ -6,6 +6,7 @@ import { useList } from "@/lib/useResource";
import { useToast } from "@/components/toast";
import { DataTable, type Column } from "@/components/DataTable";
import {
Badge,
Button,
ConfirmDialog,
Field,
@@ -13,6 +14,7 @@ import {
Textarea,
Modal,
PageHeader,
Switch,
} from "@/components/ui";
import { EditIcon, PlusIcon, TrashIcon } from "@/components/icons";
import { ImagePicker } from "@/components/ImagePicker";
@@ -28,6 +30,7 @@ interface Playlist {
image?: unknown;
detail_image_id?: number | null;
detail_image?: unknown;
is_premium?: boolean;
}
interface MusicCategory {
@@ -53,6 +56,7 @@ export default function MusicPlaylistsPage() {
const [imageFile, setImageFile] = useState<File | null>(null);
const [detailImageId, setDetailImageId] = useState<number | null>(null);
const [detailImageFile, setDetailImageFile] = useState<File | null>(null);
const [isPremium, setIsPremium] = useState(false);
const [deleting, setDeleting] = useState<Playlist | null>(null);
const [removing, setRemoving] = useState(false);
@@ -71,6 +75,7 @@ export default function MusicPlaylistsPage() {
setImageFile(null);
setDetailImageId(null);
setDetailImageFile(null);
setIsPremium(false);
setOpen(true);
}
function openEdit(row: Playlist) {
@@ -83,6 +88,7 @@ export default function MusicPlaylistsPage() {
setImageFile(null);
setDetailImageId(row.detail_image_id ?? null);
setDetailImageFile(null);
setIsPremium(row.is_premium ?? false);
setOpen(true);
}
@@ -101,6 +107,7 @@ export default function MusicPlaylistsPage() {
image: imageFile,
detail_image_id: detailImageId,
detail_image: detailImageFile,
is_premium: isPremium,
}),
});
toast.success("پلی‌لیست ویرایش شد.");
@@ -117,6 +124,7 @@ export default function MusicPlaylistsPage() {
image: imageFile,
detail_image_id: detailImageId,
detail_image: detailImageFile,
is_premium: isPremium,
}),
});
toast.success("پلی‌لیست افزوده شد.");
@@ -161,6 +169,13 @@ export default function MusicPlaylistsPage() {
header: "توضیحات",
render: (r) => r.description ?? "—",
},
{
key: "is_premium",
header: "ویژه",
className: "w-20",
render: (r) =>
r.is_premium ? <Badge tone="primary">ویژه</Badge> : <span className="text-muted"></span>,
},
];
return (
@@ -257,6 +272,8 @@ export default function MusicPlaylistsPage() {
/>
</Field>
<Switch checked={isPremium} onChange={setIsPremium} label="ویژه (پرمیوم)" />
{!editing && (
<>
<Field label="دسته‌بندی‌ها">
+20 -10
View File
@@ -16,10 +16,10 @@ import {
Textarea,
} from "@/components/ui";
import { EditIcon, PlusIcon, TrashIcon } from "@/components/icons";
import { toFa } from "@/lib/utils";
import { MediaPreview } from "@/components/MediaPreview";
import { ImagePicker } from "@/components/ImagePicker";
import { MediaPreview } from "@/components/MediaPreview";
import { pickUrl, IMAGE_KEYS } from "@/lib/media";
import { toFa } from "@/lib/utils";
interface SliderAction {
path?: string;
@@ -37,7 +37,7 @@ interface Slider {
}
const ACTION_TYPES = [
{ value: "screen", label: "صفحه (screen)" },
{ value: "navigation", label: "صفحه (navigation)" },
{ value: "link", label: "لینک (link)" },
];
@@ -51,7 +51,7 @@ export default function SlidersPage() {
const [description, setDescription] = useState("");
const [url, setUrl] = useState("");
const [actionPath, setActionPath] = useState("");
const [actionType, setActionType] = useState("screen");
const [actionType, setActionType] = useState("navigation");
const [imageId, setImageId] = useState<number | null>(null);
const [imageFile, setImageFile] = useState<File | null>(null);
const [saving, setSaving] = useState(false);
@@ -65,7 +65,7 @@ export default function SlidersPage() {
setDescription("");
setUrl("");
setActionPath("");
setActionType("screen");
setActionType("navigation");
setImageId(null);
setImageFile(null);
setOpen(true);
@@ -76,7 +76,7 @@ export default function SlidersPage() {
setDescription(row.description ?? "");
setUrl(row.url ?? "");
setActionPath(row.action?.path ?? "");
setActionType(row.action?.type ?? "screen");
setActionType(row.action?.type ?? "navigation");
setImageId(row.image_id ?? null);
setImageFile(null);
setOpen(true);
@@ -86,9 +86,8 @@ export default function SlidersPage() {
e.preventDefault();
setSaving(true);
try {
// Both create and edit go through multipart (the image is a file). The
// nested action uses literal bracket keys; edit posts to /slider/:id,
// which the backend also accepts as a multipart update.
// Multipart for both (so an image file can be uploaded). Bracket keys
// build the nested action object; update uses POST /slider/:id.
const body = toFormData({
title,
description,
@@ -102,6 +101,7 @@ export default function SlidersPage() {
await apiFetch(`/slider/${editing.id}`, { method: "POST", body });
toast.success("اسلایدر ویرایش شد.");
} else {
await apiFetch("/slider", { method: "POST", body });
await apiFetch("/slider", { method: "POST", body });
toast.success("اسلایدر افزوده شد.");
}
@@ -132,7 +132,7 @@ export default function SlidersPage() {
const columns: Column<Slider>[] = [
{ key: "id", header: "شناسه", render: (r) => toFa(r.id), className: "w-24" },
{
key: "thumbnail",
key: "image",
header: "تصویر",
className: "w-20",
render: (r) => (
@@ -236,6 +236,16 @@ export default function SlidersPage() {
/>
</Field>
<Field label="تصویر">
<ImagePicker
imageId={imageId}
onPickId={setImageId}
file={imageFile}
onPickFile={setImageFile}
existingUrl={editing ? pickUrl(editing, IMAGE_KEYS) : null}
/>
</Field>
<Field label="توضیحات">
<Textarea
value={description}