diff --git a/apps/business/src/components/InstructionCard.tsx b/apps/business/src/components/InstructionCard.tsx index 2a1131a..3b6ace8 100644 --- a/apps/business/src/components/InstructionCard.tsx +++ b/apps/business/src/components/InstructionCard.tsx @@ -1,7 +1,7 @@ import { Link } from 'react-router-dom' import { Pencil, MessageSquare, Trash2, Play } from 'lucide-react' import { useLocale } from '@meshkee/dashboard-ui' -import type { Video } from '../types/instruction' +import type { Instruction } from '../types/instruction' import { formatInstructionAuthor, formatInstructionCardDate, @@ -14,7 +14,7 @@ import cardStyles from './BlogCard.module.css' import controlStyles from './ProductCard.module.css' interface InstructionCardProps { - video: Video + video: Instruction commentCount: number onEdit: (id: string) => void onComments: (id: string) => void diff --git a/apps/business/src/components/Sidebar.tsx b/apps/business/src/components/Sidebar.tsx index d56752a..3df9385 100644 --- a/apps/business/src/components/Sidebar.tsx +++ b/apps/business/src/components/Sidebar.tsx @@ -6,7 +6,6 @@ import { Store, Users, Settings, - FileText, Briefcase, Globe, Layers, diff --git a/apps/business/src/i18n/messages.ts b/apps/business/src/i18n/messages.ts index 494333a..50f5262 100644 --- a/apps/business/src/i18n/messages.ts +++ b/apps/business/src/i18n/messages.ts @@ -67,12 +67,6 @@ const en = { 'nav.instructions.new': 'Add New Instruction', 'nav.instructions.categories': 'Categories', 'nav.instructions.settings': 'Settings', - 'nav.instructions': 'Instructions', - 'nav.instructions.overview': 'Overview', - 'nav.instructions.list': 'My Instructions', - 'nav.instructions.new': 'Add New Instruction', - 'nav.instructions.categories': 'Categories', - 'nav.instructions.settings': 'Settings', 'nav.website': 'Website', 'nav.website.overview': 'Overview', 'nav.website.sliders': 'Sliders', diff --git a/apps/business/src/pages/ContentPage.tsx b/apps/business/src/pages/ContentPage.tsx index ed6aac8..aa0bc22 100644 --- a/apps/business/src/pages/ContentPage.tsx +++ b/apps/business/src/pages/ContentPage.tsx @@ -1,4 +1,4 @@ -import { FileText, Play, GraduationCap } from 'lucide-react' +import { FileText, GraduationCap } from 'lucide-react' import { SectionCard } from '../components/SectionCard' import { Breadcrumbs } from '../components/Breadcrumbs' import { PageTitle } from '../components/PageTitle' diff --git a/apps/business/src/pages/InstructionListPage.tsx b/apps/business/src/pages/InstructionListPage.tsx index 5230636..a4f57cc 100644 --- a/apps/business/src/pages/InstructionListPage.tsx +++ b/apps/business/src/pages/InstructionListPage.tsx @@ -17,7 +17,7 @@ import { listInstructions, resolveInstructionTitle, } from '../services/instructionService' -import type { Video } from '../types/instruction' +import type { Instruction } from '../types/instruction' import pageStyles from '../components/PageContent.module.css' import styles from './BlogPage.module.css' @@ -26,7 +26,7 @@ export function InstructionListPage() { const { showToast } = useToast() const t = useT() const { locale } = useLocale() - const [videos, setInstructions] = useState([]) + const [videos, setInstructions] = useState([]) const [totalInstructions, setTotalVideos] = useState(0) const [currentPage, setCurrentPage] = useState(1) const [isLoading, setIsLoading] = useState(true) diff --git a/apps/business/src/pages/WebsiteEPaymentPage.tsx b/apps/business/src/pages/WebsiteEPaymentPage.tsx index d3da267..3e690b7 100644 --- a/apps/business/src/pages/WebsiteEPaymentPage.tsx +++ b/apps/business/src/pages/WebsiteEPaymentPage.tsx @@ -5,6 +5,7 @@ import { Switch } from '../components/Switch' import { Tooltip } from '../components/Tooltip' import { useToast } from '../context/ToastContext' import { useT } from '../i18n/useT' +import type { BusinessMessageKey } from '../i18n/messages' import { ApiError } from '../lib/api' import { DEFAULT_EPAYMENT_SETTINGS, @@ -19,8 +20,8 @@ import styles from './WebsiteEPaymentPage.module.css' const COMING_SOON_GATEWAYS: { id: Exclude - nameKey: string - descKey: string + nameKey: BusinessMessageKey + descKey: BusinessMessageKey }[] = [ { id: 'sep', @@ -199,7 +200,7 @@ export function WebsiteEPaymentPage() { id="epayment-master" checked={ePayment.enabled} disabled={savingKey !== null} - onCheckedChange={(checked) => void handleMasterToggle(checked)} + onChange={(checked) => void handleMasterToggle(checked)} /> @@ -218,7 +219,7 @@ export function WebsiteEPaymentPage() { id="epayment-mellat" checked={ePayment.gateways.mellat.enabled} disabled={savingKey !== null || !ePayment.enabled} - onCheckedChange={(checked) => void handleMellatToggle(checked)} + onChange={(checked) => void handleMellatToggle(checked)} /> diff --git a/apps/customer/src/pages/checkout/CheckoutResultStep.tsx b/apps/customer/src/pages/checkout/CheckoutResultStep.tsx index b5c8414..b488f39 100644 --- a/apps/customer/src/pages/checkout/CheckoutResultStep.tsx +++ b/apps/customer/src/pages/checkout/CheckoutResultStep.tsx @@ -41,6 +41,7 @@ export function CheckoutResultStep() { return } + const paymentStatus = status const controller = new AbortController() async function load() { @@ -53,7 +54,7 @@ export function CheckoutResultStep() { setPlacedOrder(data.order) setPayment( buildPaymentInfoFromOrder(data.order, { - status, + status: paymentStatus, transactionId, trackId, message, @@ -63,7 +64,7 @@ export function CheckoutResultStep() { if (isAbortError(err)) return // Still show result shell with query payment data if order fetch fails setPayment({ - status: status!, + status: paymentStatus, transactionId, trackId, message: diff --git a/apps/super-admin/src/pages/BusinessesPage.tsx b/apps/super-admin/src/pages/BusinessesPage.tsx index 68596b1..9ebf11a 100644 --- a/apps/super-admin/src/pages/BusinessesPage.tsx +++ b/apps/super-admin/src/pages/BusinessesPage.tsx @@ -79,7 +79,7 @@ import { Pagination } from '@meshkee/dashboard-ui' import pageStyles from '../components/PageContent.module.css' import styles from './BusinessesPage.module.css' -const DEFAULT_PAGE_SIZE = 10 +const DEFAULT_PAGE_SIZE = 24 const DEFAULT_LOCALE: DashboardLocale = 'fa' const DEFAULT_THEME_MODE: DashboardThemeMode = 'light' diff --git a/apps/super-admin/src/pages/WebsitesPage.tsx b/apps/super-admin/src/pages/WebsitesPage.tsx index 030bdb1..42f2da6 100644 --- a/apps/super-admin/src/pages/WebsitesPage.tsx +++ b/apps/super-admin/src/pages/WebsitesPage.tsx @@ -34,7 +34,7 @@ import pageStyles from '../components/PageContent.module.css' import tableStyles from './BusinessesPage.module.css' import styles from './WebsitesPage.module.css' -const PAGE_SIZE = 10 +const PAGE_SIZE = 24 function daysUntilExpiry(expiresAt: string | null) { if (!expiresAt) return null