Compare commits

...
5 Commits
Author SHA1 Message Date
Amirmahdi 90e00bc08c feat: add is_premium 2026-06-16 17:19:46 +03:30
Amirmahdi cfcddb55bb feat: add theme 2026-06-14 15:15:03 +03:30
Amirmahdi 034a345521 fix: deploy fixed 2026-06-13 21:06:31 +03:30
Amirmahdi 504b1e2c8e feat: musci category image 2026-06-13 19:21:23 +03:30
Amirmahdi 60a054710a feat: add pagination music 2026-06-12 15:34:19 +03:30
6 changed files with 242 additions and 22 deletions
+34 -16
View File
@@ -17,6 +17,9 @@ 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 {
@@ -25,6 +28,8 @@ interface MusicCategory {
description?: string;
order?: number;
is_active?: boolean;
image_id?: number | null;
image?: unknown;
}
export default function MusicCategoriesPage() {
@@ -39,7 +44,8 @@ export default function MusicCategoriesPage() {
const [name, setName] = useState("");
const [description, setDescription] = useState("");
const [order, setOrder] = useState("");
const [imageId, setImageId] = useState("");
const [imageId, setImageId] = useState<number | null>(null);
const [imageFile, setImageFile] = useState<File | null>(null);
const [isActive, setIsActive] = useState(true);
const [deleting, setDeleting] = useState<MusicCategory | null>(null);
@@ -50,7 +56,8 @@ export default function MusicCategoriesPage() {
setName("");
setDescription("");
setOrder("");
setImageId("");
setImageId(null);
setImageFile(null);
setIsActive(true);
setOpen(true);
}
@@ -59,7 +66,8 @@ export default function MusicCategoriesPage() {
setName(row.name ?? "");
setDescription(row.description ?? "");
setOrder(row.order != null ? String(row.order) : "");
setImageId("");
setImageId(row.image_id ?? null);
setImageFile(null);
setIsActive(row.is_active ?? true);
setOpen(true);
}
@@ -69,15 +77,17 @@ export default function MusicCategoriesPage() {
setSaving(true);
try {
if (editing) {
// Update is JSON on /music-categories/:id
// Update is multipart (POST) so an image file can be uploaded.
await apiFetch(`/music-categories/${editing.id}`, {
method: "PUT",
body: {
method: "POST",
body: toFormData({
name,
description,
order: order === "" ? undefined : Number(order),
is_active: isActive,
},
image_id: imageId,
image: imageFile,
}),
});
toast.success("دسته‌بندی ویرایش شد.");
} else {
@@ -88,8 +98,9 @@ export default function MusicCategoriesPage() {
name,
description,
order,
image_id: imageId,
is_active: isActive,
image_id: imageId,
image: imageFile,
}),
});
toast.success("دسته‌بندی افزوده شد.");
@@ -120,6 +131,14 @@ 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",
@@ -223,16 +242,15 @@ export default function MusicCategoriesPage() {
dir="ltr"
/>
</Field>
{!editing && (
<Field label="شناسه تصویر">
<Input
value={imageId}
onChange={(e) => setImageId(e.target.value)}
dir="ltr"
placeholder="image_id"
<Field label="تصویر">
<ImagePicker
imageId={imageId}
onPickId={setImageId}
file={imageFile}
onPickFile={setImageFile}
existingUrl={editing ? pickUrl(editing, IMAGE_KEYS) : null}
/>
</Field>
)}
<Switch checked={isActive} onChange={setIsActive} label="فعال" />
</form>
</Modal>
+13 -2
View File
@@ -2,7 +2,7 @@
import { useState } from "react";
import { apiFetch, ApiError, toFormData } from "@/lib/api";
import { useList } from "@/lib/useResource";
import { useList, usePaginated } from "@/lib/useResource";
import { useToast } from "@/components/toast";
import { DataTable, type Column } from "@/components/DataTable";
import {
@@ -13,6 +13,7 @@ import {
Select,
Modal,
PageHeader,
Pagination,
} from "@/components/ui";
import { EditIcon, PlusIcon, TrashIcon } from "@/components/icons";
import { formatMinutes, fileNameToTitle } from "@/lib/utils";
@@ -45,7 +46,8 @@ interface Track {
}
export default function MusicTracksPage() {
const { data, loading, error, reload } = useList<Track>("/music");
const { data, meta, page, setPage, loading, error, reload } =
usePaginated<Track>("/music", { perPage: 20 });
const { data: playlists } = useList<Playlist>("/music-playlists");
const toast = useToast();
@@ -256,6 +258,15 @@ export default function MusicTracksPage() {
)}
/>
{meta && (
<Pagination
page={page}
lastPage={meta.last_page}
total={meta.total}
onChange={setPage}
/>
)}
<Modal
open={open}
onClose={() => setOpen(false)}
+83
View File
@@ -13,6 +13,7 @@ import {
Input,
Modal,
PageHeader,
Select,
Switch,
} from "@/components/ui";
import { EditIcon, PlusIcon, TrashIcon } from "@/components/icons";
@@ -20,22 +21,62 @@ 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);
@@ -48,7 +89,9 @@ export default function ScenesPage() {
setEditing(null);
setName("");
setOrder("");
setThemeId("");
setIsActive(true);
setIsPremium(false);
setImage(null);
setVideo(null);
setSound(null);
@@ -58,7 +101,9 @@ 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);
@@ -73,7 +118,9 @@ export default function ScenesPage() {
const body = toFormData({
name,
order,
theme_id: themeId,
is_active: isActive,
is_premium: isPremium,
image,
video,
sound,
@@ -112,6 +159,11 @@ 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: "تصویر",
@@ -153,6 +205,17 @@ 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 (
@@ -236,8 +299,28 @@ 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}
+39 -1
View File
@@ -8,7 +8,7 @@ import {
type TextareaHTMLAttributes,
useEffect,
} from "react";
import { cn } from "@/lib/utils";
import { cn, toFa } from "@/lib/utils";
import { CloseIcon, SpinnerIcon } from "./icons";
/* ------------------------------- Button -------------------------------- */
@@ -192,6 +192,44 @@ export function Badge({
);
}
export function Pagination({
page,
lastPage,
total,
onChange,
}: {
page: number;
lastPage: number;
total?: number;
onChange: (p: number) => void;
}) {
if (lastPage <= 1) return null;
return (
<div className="mt-4 flex items-center justify-between gap-3 text-sm">
<span className="text-muted">
{total != null && `${toFa(total)} مورد · `}
صفحه {toFa(page)} از {toFa(lastPage)}
</span>
<div className="flex items-center gap-2">
<Button
variant="secondary"
onClick={() => onChange(page - 1)}
disabled={page <= 1}
>
قبلی
</Button>
<Button
variant="secondary"
onClick={() => onChange(page + 1)}
disabled={page >= lastPage}
>
بعدی
</Button>
</div>
</div>
);
}
export function EmptyState({
title,
message,
+67
View File
@@ -51,6 +51,73 @@ export function useList<T = unknown>(
return { data, loading, error, reload };
}
export interface PageMeta {
current_page: number;
last_page: number;
per_page: number;
total: number;
}
// Paginated GET-list hook for Laravel paginator responses
// ({ data, current_page, last_page, per_page, total }).
export function usePaginated<T = unknown>(
path: string | null,
options?: { perPage?: number; query?: Query },
): {
data: T[];
meta: PageMeta | null;
page: number;
setPage: (p: number) => void;
loading: boolean;
error: string | null;
reload: () => void;
} {
const perPage = options?.perPage ?? 20;
const query = options?.query;
const [page, setPage] = useState(1);
const [data, setData] = useState<T[]>([]);
const [meta, setMeta] = useState<PageMeta | null>(null);
const [loading, setLoading] = useState(true);
const [error, setError] = useState<string | null>(null);
const queryKey = JSON.stringify(query ?? {});
const reload = useCallback(() => {
if (!path) {
setData([]);
setMeta(null);
setLoading(false);
setError(null);
return;
}
setLoading(true);
setError(null);
apiFetch(path, { query: { ...query, page, per_page: perPage } })
.then((res) => {
const r = (res ?? {}) as Record<string, unknown>;
const rows = Array.isArray(r.data) ? (r.data as T[]) : [];
setData(rows);
setMeta({
current_page: Number(r.current_page ?? page),
last_page: Number(r.last_page ?? 1),
per_page: Number(r.per_page ?? perPage),
total: Number(r.total ?? rows.length),
});
})
.catch((e: unknown) => {
setError(e instanceof ApiError ? e.message : "خطا در دریافت اطلاعات");
setData([]);
})
.finally(() => setLoading(false));
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [path, page, perPage, queryKey]);
useEffect(() => {
reload();
}, [reload]);
return { data, meta, page, setPage, loading, error, reload };
}
// Single-record GET hook.
export function useItem<T = unknown>(path: string | null): {
data: T | null;
+4 -1
View File
@@ -22,7 +22,10 @@ DEPLOY_USER="${DEPLOY_USER:-ubuntu}"
DEPLOY_PATH="${DEPLOY_PATH:-/var/www/aramland-admin}"
DEPLOY_PASSWORD="${DEPLOY_PASSWORD:-}"
echo "▸ Building locally…"
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
npm run build
if [ ! -d out ]; then