feat: complete scheduled publishing, security remediation and DEV_TICKETS implementation
This commit is contained in:
1 parent
d6d4158cbe
commit
efb3c473c4
35 files changed
+685
-185
No files matched your search
@@ -1,7 +1,10 @@
|
||||
import { Suspense } from 'react';
|
||||
import { Suspense, useEffect } from 'react';
|
||||
import { RouterProvider } from 'react-router-dom';
|
||||
import { Toaster } from 'react-hot-toast';
|
||||
import axios from 'axios';
|
||||
import { router } from './routes/adminRoutes';
|
||||
import { useAdminAuthStore } from './store/adminAuthStore';
|
||||
import { BASE_DOMAIN } from './services/api';
|
||||
|
||||
function SuspenseFallback() {
|
||||
return (
|
||||
@@ -15,6 +18,33 @@ function SuspenseFallback() {
|
||||
}
|
||||
|
||||
function App() {
|
||||
const isAuthenticated = useAdminAuthStore((state) => state.isAuthenticated);
|
||||
const setAuth = useAdminAuthStore((state) => state.setAuth);
|
||||
|
||||
// Proactive token refresh every 10 minutes to prevent 15-min JWT session loss during form edits (A1)
|
||||
useEffect(() => {
|
||||
if (!isAuthenticated) return;
|
||||
|
||||
const refreshSession = async () => {
|
||||
try {
|
||||
const res = await axios.post(
|
||||
`${BASE_DOMAIN}/api/auth/refresh`,
|
||||
{},
|
||||
{ withCredentials: true }
|
||||
);
|
||||
if (res.data?.success && res.data.data?.accessToken) {
|
||||
setAuth(res.data.data.accessToken, res.data.data.user);
|
||||
}
|
||||
} catch {
|
||||
// Silently catch; let api interceptor handle on next actual request if needed
|
||||
}
|
||||
};
|
||||
|
||||
// Refresh every 10 minutes (600,000 ms)
|
||||
const interval = setInterval(refreshSession, 10 * 60 * 1000);
|
||||
return () => clearInterval(interval);
|
||||
}, [isAuthenticated, setAuth]);
|
||||
|
||||
return (
|
||||
<>
|
||||
<Toaster
|
||||
|
||||
@@ -18,7 +18,9 @@ export default function Layout() {
|
||||
const next = !prev;
|
||||
try {
|
||||
localStorage.setItem('canina_admin_sidebar_collapsed', String(next));
|
||||
} catch {}
|
||||
} catch {
|
||||
// ignore localStorage access error
|
||||
}
|
||||
return next;
|
||||
});
|
||||
};
|
||||
|
||||
@@ -96,6 +96,7 @@ export interface BlogPost {
|
||||
status: 'DRAFT' | 'PUBLISHED' | 'SCHEDULED' | 'ARCHIVED';
|
||||
isPublished: boolean;
|
||||
publishedAt?: string | null;
|
||||
scheduledAt?: string | null;
|
||||
readingTime: number;
|
||||
featured: boolean;
|
||||
allowComments: boolean;
|
||||
@@ -190,6 +191,7 @@ export default function Blogs() {
|
||||
status: 'PUBLISHED' as 'DRAFT' | 'PUBLISHED' | 'SCHEDULED' | 'ARCHIVED',
|
||||
isPublished: true,
|
||||
publishedAt: '',
|
||||
scheduledAt: '',
|
||||
readingTime: 3,
|
||||
featured: false,
|
||||
allowComments: true,
|
||||
@@ -266,6 +268,7 @@ export default function Blogs() {
|
||||
status: blog.status || (blog.isPublished ? 'PUBLISHED' : 'DRAFT'),
|
||||
isPublished: blog.isPublished !== false,
|
||||
publishedAt: blog.publishedAt ? new Date(blog.publishedAt).toISOString().slice(0, 16) : '',
|
||||
scheduledAt: blog.scheduledAt ? new Date(blog.scheduledAt).toISOString().slice(0, 16) : '',
|
||||
readingTime: blog.readingTime || calculateReadingTime(blog.content || ''),
|
||||
featured: Boolean(blog.featured),
|
||||
allowComments: blog.allowComments !== false,
|
||||
@@ -301,6 +304,7 @@ export default function Blogs() {
|
||||
status: 'PUBLISHED',
|
||||
isPublished: true,
|
||||
publishedAt: new Date().toISOString().slice(0, 16),
|
||||
scheduledAt: '',
|
||||
readingTime: 3,
|
||||
featured: false,
|
||||
allowComments: true,
|
||||
@@ -477,6 +481,7 @@ export default function Blogs() {
|
||||
const payload = {
|
||||
...formData,
|
||||
isPublished: formData.status === 'PUBLISHED',
|
||||
scheduledAt: formData.scheduledAt ? new Date(formData.scheduledAt).toISOString() : null,
|
||||
};
|
||||
|
||||
if (editingBlog) {
|
||||
@@ -551,7 +556,7 @@ export default function Blogs() {
|
||||
};
|
||||
|
||||
// Helper status badge
|
||||
const renderStatusBadge = (status: string, isPublished: boolean) => {
|
||||
const renderStatusBadge = (status: string, isPublished: boolean, scheduledAt?: string | null) => {
|
||||
switch (status) {
|
||||
case 'PUBLISHED':
|
||||
return (
|
||||
@@ -560,13 +565,18 @@ export default function Blogs() {
|
||||
منتشر شده
|
||||
</span>
|
||||
);
|
||||
case 'SCHEDULED':
|
||||
case 'SCHEDULED': {
|
||||
const dateStr = scheduledAt ? new Date(scheduledAt).toLocaleDateString('fa-IR') : '';
|
||||
return (
|
||||
<span className="inline-flex items-center gap-1.5 px-2.5 py-1 bg-blue-50 text-blue-700 border border-blue-200 rounded-full text-xs font-black">
|
||||
<span
|
||||
className="inline-flex items-center gap-1.5 px-2.5 py-1 bg-blue-50 text-blue-700 border border-blue-200 rounded-full text-xs font-black"
|
||||
title={scheduledAt ? `موعد انتشار: ${new Date(scheduledAt).toLocaleString('fa-IR')}` : undefined}
|
||||
>
|
||||
<Clock className="w-3.5 h-3.5" />
|
||||
زمانبندی شده
|
||||
{dateStr ? `در صف: ${dateStr}` : 'زمانبندی شده'}
|
||||
</span>
|
||||
);
|
||||
}
|
||||
case 'ARCHIVED':
|
||||
return (
|
||||
<span className="inline-flex items-center gap-1.5 px-2.5 py-1 bg-gray-100 text-gray-700 border border-gray-200 rounded-full text-xs font-black">
|
||||
@@ -764,7 +774,7 @@ export default function Blogs() {
|
||||
<span>{(blog.viewCount || 0).toLocaleString('fa-IR')} بازدید</span>
|
||||
</div>
|
||||
</td>
|
||||
<td className="py-4 px-6">{renderStatusBadge(blog.status, blog.isPublished)}</td>
|
||||
<td className="py-4 px-6">{renderStatusBadge(blog.status, blog.isPublished, blog.scheduledAt)}</td>
|
||||
<td className="py-4 px-6">
|
||||
<div className="flex items-center gap-1.5">
|
||||
<Button
|
||||
@@ -1133,17 +1143,24 @@ export default function Blogs() {
|
||||
|
||||
<div className="space-y-2 p-4 bg-gray-50 border border-gray-200 rounded-3xl">
|
||||
<label className="text-xs font-black text-gray-700 block">
|
||||
تاریخ و ساعت انتشار زمانبندی شده (Publish Date/Time)
|
||||
انتشار در تاریخ (خالی = انتشار فوری)
|
||||
</label>
|
||||
<input
|
||||
type="datetime-local"
|
||||
value={formData.publishedAt}
|
||||
onChange={(e) => setFormData({ ...formData, publishedAt: e.target.value })}
|
||||
value={formData.scheduledAt}
|
||||
onChange={(e) => {
|
||||
const val = e.target.value;
|
||||
setFormData((prev) => ({
|
||||
...prev,
|
||||
scheduledAt: val,
|
||||
status: val && new Date(val).getTime() > Date.now() ? 'SCHEDULED' : prev.status,
|
||||
}));
|
||||
}}
|
||||
className="w-full px-3.5 py-2 rounded-2xl border border-gray-200 text-xs font-bold outline-none bg-white font-sans"
|
||||
dir="ltr"
|
||||
/>
|
||||
<p className="text-[11px] text-gray-400 font-medium">
|
||||
در صورت تنظیم وضعیت روی "زمانبندی شده"، این مقاله تا رسیدن این تاریخ نمایش داده نخواهد شد.
|
||||
در صورت تعیین تاریخ آینده، مقاله در صف انتشار زمانبندیشده قرار گرفته و در موعد مقرر خودکار منتشر میشود.
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -507,7 +507,9 @@ export default function Products() {
|
||||
scientificTagline: product.scientificTagline || '',
|
||||
description: product.description || '',
|
||||
shortDescription: product.shortDescription || '',
|
||||
categoryId: typeof product.category === 'object' && product.category !== null ? product.category.id : (product.categoryId || ''),
|
||||
categoryId: typeof product.category === 'object' && product.category !== null
|
||||
? product.category.id
|
||||
: (product.categoryId || categories.find(c => c.slug === (product as any).categorySlug)?.id || ''),
|
||||
buyPrice: bPrice,
|
||||
priceValue: pPrice,
|
||||
wholesalePrice: wPrice,
|
||||
|
||||
Reference in new issue
Block a user