Some fixes
This commit is contained in:
@ -102,11 +102,26 @@ function App() {
|
||||
const [approvalNotes, setApprovalNotes] = useState<{ [key: string]: string }>(
|
||||
{},
|
||||
);
|
||||
const [editingSettings, setEditingSettings] = useState<{ [key: string]: string }>({});
|
||||
const [categories, setCategories] = useState<CategoryData>({ feedCategories: [], episodeCategories: [], allCategories: [] });
|
||||
const [categoryCounts, setCategoryCounts] = useState<{ [category: string]: CategoryCounts }>({});
|
||||
const [editingSettings, setEditingSettings] = useState<{
|
||||
[key: string]: string;
|
||||
}>({});
|
||||
const [categories, setCategories] = useState<CategoryData>({
|
||||
feedCategories: [],
|
||||
episodeCategories: [],
|
||||
allCategories: [],
|
||||
});
|
||||
const [categoryCounts, setCategoryCounts] = useState<{
|
||||
[category: string]: CategoryCounts;
|
||||
}>({});
|
||||
const [activeTab, setActiveTab] = useState<
|
||||
"dashboard" | "feeds" | "episodes" | "env" | "settings" | "batch" | "requests" | "categories"
|
||||
| "dashboard"
|
||||
| "feeds"
|
||||
| "episodes"
|
||||
| "env"
|
||||
| "settings"
|
||||
| "batch"
|
||||
| "requests"
|
||||
| "categories"
|
||||
>("dashboard");
|
||||
|
||||
useEffect(() => {
|
||||
@ -116,16 +131,23 @@ function App() {
|
||||
const loadData = async () => {
|
||||
setLoading(true);
|
||||
try {
|
||||
const [feedsRes, statsRes, envRes, settingsRes, requestsRes, episodesRes, categoriesRes] =
|
||||
await Promise.all([
|
||||
fetch("/api/admin/feeds"),
|
||||
fetch("/api/admin/stats"),
|
||||
fetch("/api/admin/env"),
|
||||
fetch("/api/admin/settings"),
|
||||
fetch("/api/admin/feed-requests"),
|
||||
fetch("/api/admin/episodes"),
|
||||
fetch("/api/admin/categories/all"),
|
||||
]);
|
||||
const [
|
||||
feedsRes,
|
||||
statsRes,
|
||||
envRes,
|
||||
settingsRes,
|
||||
requestsRes,
|
||||
episodesRes,
|
||||
categoriesRes,
|
||||
] = await Promise.all([
|
||||
fetch("/api/admin/feeds"),
|
||||
fetch("/api/admin/stats"),
|
||||
fetch("/api/admin/env"),
|
||||
fetch("/api/admin/settings"),
|
||||
fetch("/api/admin/feed-requests"),
|
||||
fetch("/api/admin/episodes"),
|
||||
fetch("/api/admin/categories/all"),
|
||||
]);
|
||||
|
||||
if (
|
||||
!feedsRes.ok ||
|
||||
@ -139,16 +161,23 @@ function App() {
|
||||
throw new Error("Failed to load data");
|
||||
}
|
||||
|
||||
const [feedsData, statsData, envData, settingsData, requestsData, episodesData, categoriesData] =
|
||||
await Promise.all([
|
||||
feedsRes.json(),
|
||||
statsRes.json(),
|
||||
envRes.json(),
|
||||
settingsRes.json(),
|
||||
requestsRes.json(),
|
||||
episodesRes.json(),
|
||||
categoriesRes.json(),
|
||||
]);
|
||||
const [
|
||||
feedsData,
|
||||
statsData,
|
||||
envData,
|
||||
settingsData,
|
||||
requestsData,
|
||||
episodesData,
|
||||
categoriesData,
|
||||
] = await Promise.all([
|
||||
feedsRes.json(),
|
||||
statsRes.json(),
|
||||
envRes.json(),
|
||||
settingsRes.json(),
|
||||
requestsRes.json(),
|
||||
episodesRes.json(),
|
||||
categoriesRes.json(),
|
||||
]);
|
||||
|
||||
setFeeds(feedsData);
|
||||
setStats(statsData);
|
||||
@ -157,24 +186,28 @@ function App() {
|
||||
setFeedRequests(requestsData);
|
||||
setEpisodes(episodesData);
|
||||
setCategories(categoriesData);
|
||||
|
||||
|
||||
// Load category counts for all categories
|
||||
const countsPromises = categoriesData.allCategories.map(async (category: string) => {
|
||||
const res = await fetch(`/api/admin/categories/${encodeURIComponent(category)}/counts`);
|
||||
if (res.ok) {
|
||||
const counts = await res.json();
|
||||
return { category, counts };
|
||||
}
|
||||
return { category, counts: { feedCount: 0, episodeCount: 0 } };
|
||||
});
|
||||
|
||||
const countsPromises = categoriesData.allCategories.map(
|
||||
async (category: string) => {
|
||||
const res = await fetch(
|
||||
`/api/admin/categories/${encodeURIComponent(category)}/counts`,
|
||||
);
|
||||
if (res.ok) {
|
||||
const counts = await res.json();
|
||||
return { category, counts };
|
||||
}
|
||||
return { category, counts: { feedCount: 0, episodeCount: 0 } };
|
||||
},
|
||||
);
|
||||
|
||||
const countsResults = await Promise.all(countsPromises);
|
||||
const countsMap: { [category: string]: CategoryCounts } = {};
|
||||
countsResults.forEach(({ category, counts }) => {
|
||||
countsMap[category] = counts;
|
||||
});
|
||||
setCategoryCounts(countsMap);
|
||||
|
||||
|
||||
setError(null);
|
||||
} catch (err) {
|
||||
setError("データの読み込みに失敗しました");
|
||||
@ -426,26 +459,44 @@ function App() {
|
||||
setEditingSettings({ ...editingSettings, [key]: value });
|
||||
};
|
||||
|
||||
const deleteCategory = async (category: string, target: "feeds" | "episodes" | "both") => {
|
||||
const targetText = target === "both" ? "フィードとエピソード" : target === "feeds" ? "フィード" : "エピソード";
|
||||
const counts = categoryCounts[category] || { feedCount: 0, episodeCount: 0 };
|
||||
const totalCount = target === "both" ? counts.feedCount + counts.episodeCount :
|
||||
target === "feeds" ? counts.feedCount : counts.episodeCount;
|
||||
const deleteCategory = async (
|
||||
category: string,
|
||||
target: "feeds" | "episodes" | "both",
|
||||
) => {
|
||||
const targetText =
|
||||
target === "both"
|
||||
? "フィードとエピソード"
|
||||
: target === "feeds"
|
||||
? "フィード"
|
||||
: "エピソード";
|
||||
const counts = categoryCounts[category] || {
|
||||
feedCount: 0,
|
||||
episodeCount: 0,
|
||||
};
|
||||
const totalCount =
|
||||
target === "both"
|
||||
? counts.feedCount + counts.episodeCount
|
||||
: target === "feeds"
|
||||
? counts.feedCount
|
||||
: counts.episodeCount;
|
||||
|
||||
if (
|
||||
!confirm(
|
||||
`本当にカテゴリ「${category}」を${targetText}から削除しますか？\n\n${totalCount}件のアイテムが影響を受けます。この操作は取り消せません。`
|
||||
`本当にカテゴリ「${category}」を${targetText}から削除しますか？\n\n${totalCount}件のアイテムが影響を受けます。この操作は取り消せません。`,
|
||||
)
|
||||
) {
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
const res = await fetch(`/api/admin/categories/${encodeURIComponent(category)}`, {
|
||||
method: "DELETE",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
body: JSON.stringify({ target }),
|
||||
});
|
||||
const res = await fetch(
|
||||
`/api/admin/categories/${encodeURIComponent(category)}`,
|
||||
{
|
||||
method: "DELETE",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
body: JSON.stringify({ target }),
|
||||
},
|
||||
);
|
||||
|
||||
const data = await res.json();
|
||||
|
||||
@ -1230,26 +1281,33 @@ function App() {
|
||||
</p>
|
||||
|
||||
<div style={{ marginBottom: "20px" }}>
|
||||
<div className="stats-grid" style={{ gridTemplateColumns: "repeat(4, 1fr)" }}>
|
||||
<div
|
||||
className="stats-grid"
|
||||
style={{ gridTemplateColumns: "repeat(4, 1fr)" }}
|
||||
>
|
||||
<div className="stat-card">
|
||||
<div className="value">{settings.length}</div>
|
||||
<div className="label">総設定数</div>
|
||||
</div>
|
||||
<div className="stat-card">
|
||||
<div className="value">
|
||||
{settings.filter(s => s.value !== null && s.value !== "").length}
|
||||
{
|
||||
settings.filter(
|
||||
(s) => s.value !== null && s.value !== "",
|
||||
).length
|
||||
}
|
||||
</div>
|
||||
<div className="label">設定済み</div>
|
||||
</div>
|
||||
<div className="stat-card">
|
||||
<div className="value">
|
||||
{settings.filter(s => s.required).length}
|
||||
{settings.filter((s) => s.required).length}
|
||||
</div>
|
||||
<div className="label">必須設定</div>
|
||||
</div>
|
||||
<div className="stat-card">
|
||||
<div className="value">
|
||||
{settings.filter(s => s.isCredential).length}
|
||||
{settings.filter((s) => s.isCredential).length}
|
||||
</div>
|
||||
<div className="label">認証情報</div>
|
||||
</div>
|
||||
@ -1258,63 +1316,109 @@ function App() {
|
||||
|
||||
<div className="settings-list">
|
||||
{settings.map((setting) => (
|
||||
<div key={setting.key} className="setting-item" style={{
|
||||
display: "flex",
|
||||
alignItems: "center",
|
||||
padding: "16px",
|
||||
border: "1px solid #ddd",
|
||||
borderRadius: "4px",
|
||||
marginBottom: "12px",
|
||||
backgroundColor: setting.required && (!setting.value || setting.value === "") ? "#fff5f5" : "#fff"
|
||||
}}>
|
||||
<div
|
||||
key={setting.key}
|
||||
className="setting-item"
|
||||
style={{
|
||||
display: "flex",
|
||||
alignItems: "center",
|
||||
padding: "16px",
|
||||
border: "1px solid #ddd",
|
||||
borderRadius: "4px",
|
||||
marginBottom: "12px",
|
||||
backgroundColor:
|
||||
setting.required &&
|
||||
(!setting.value || setting.value === "")
|
||||
? "#fff5f5"
|
||||
: "#fff",
|
||||
}}
|
||||
>
|
||||
<div style={{ flex: 1 }}>
|
||||
<div style={{ display: "flex", alignItems: "center", gap: "8px", marginBottom: "4px" }}>
|
||||
<h4 style={{ margin: 0, fontSize: "16px" }}>{setting.key}</h4>
|
||||
<div
|
||||
style={{
|
||||
display: "flex",
|
||||
alignItems: "center",
|
||||
gap: "8px",
|
||||
marginBottom: "4px",
|
||||
}}
|
||||
>
|
||||
<h4 style={{ margin: 0, fontSize: "16px" }}>
|
||||
{setting.key}
|
||||
</h4>
|
||||
{setting.required && (
|
||||
<span style={{
|
||||
padding: "2px 6px",
|
||||
background: "#dc3545",
|
||||
color: "white",
|
||||
borderRadius: "4px",
|
||||
fontSize: "10px"
|
||||
}}>必須</span>
|
||||
<span
|
||||
style={{
|
||||
padding: "2px 6px",
|
||||
background: "#dc3545",
|
||||
color: "white",
|
||||
borderRadius: "4px",
|
||||
fontSize: "10px",
|
||||
}}
|
||||
>
|
||||
必須
|
||||
</span>
|
||||
)}
|
||||
{setting.isCredential && (
|
||||
<span style={{
|
||||
padding: "2px 6px",
|
||||
background: "#ffc107",
|
||||
color: "black",
|
||||
borderRadius: "4px",
|
||||
fontSize: "10px"
|
||||
}}>認証情報</span>
|
||||
<span
|
||||
style={{
|
||||
padding: "2px 6px",
|
||||
background: "#ffc107",
|
||||
color: "black",
|
||||
borderRadius: "4px",
|
||||
fontSize: "10px",
|
||||
}}
|
||||
>
|
||||
認証情報
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
<p style={{ margin: "0 0 8px 0", fontSize: "14px", color: "#666" }}>
|
||||
<p
|
||||
style={{
|
||||
margin: "0 0 8px 0",
|
||||
fontSize: "14px",
|
||||
color: "#666",
|
||||
}}
|
||||
>
|
||||
{setting.description}
|
||||
</p>
|
||||
<div style={{ fontSize: "12px", color: "#999" }}>
|
||||
デフォルト値: {setting.defaultValue || "なし"} |
|
||||
最終更新: {new Date(setting.updatedAt).toLocaleString("ja-JP")}
|
||||
デフォルト値: {setting.defaultValue || "なし"} |
|
||||
最終更新:{" "}
|
||||
{new Date(setting.updatedAt).toLocaleString("ja-JP")}
|
||||
</div>
|
||||
|
||||
|
||||
{editingSettings[setting.key] !== undefined ? (
|
||||
<div style={{ marginTop: "8px", display: "flex", gap: "8px", alignItems: "center" }}>
|
||||
<div
|
||||
style={{
|
||||
marginTop: "8px",
|
||||
display: "flex",
|
||||
gap: "8px",
|
||||
alignItems: "center",
|
||||
}}
|
||||
>
|
||||
<input
|
||||
type={setting.isCredential ? "password" : "text"}
|
||||
value={editingSettings[setting.key]}
|
||||
onChange={(e) => updateEditingValue(setting.key, e.target.value)}
|
||||
onChange={(e) =>
|
||||
updateEditingValue(setting.key, e.target.value)
|
||||
}
|
||||
placeholder={setting.defaultValue || "値を入力..."}
|
||||
style={{
|
||||
flex: 1,
|
||||
padding: "6px 10px",
|
||||
border: "1px solid #ddd",
|
||||
borderRadius: "4px",
|
||||
fontSize: "14px"
|
||||
fontSize: "14px",
|
||||
}}
|
||||
/>
|
||||
<button
|
||||
className="btn btn-success"
|
||||
onClick={() => updateSetting(setting.key, editingSettings[setting.key])}
|
||||
onClick={() =>
|
||||
updateSetting(
|
||||
setting.key,
|
||||
editingSettings[setting.key],
|
||||
)
|
||||
}
|
||||
style={{ fontSize: "12px", padding: "6px 12px" }}
|
||||
>
|
||||
保存
|
||||
@ -1328,20 +1432,36 @@ function App() {
|
||||
</button>
|
||||
</div>
|
||||
) : (
|
||||
<div style={{ marginTop: "8px", display: "flex", alignItems: "center", gap: "12px" }}>
|
||||
<div style={{
|
||||
flex: 1,
|
||||
padding: "6px 10px",
|
||||
background: "#f8f9fa",
|
||||
border: "1px solid #e9ecef",
|
||||
borderRadius: "4px",
|
||||
fontSize: "14px",
|
||||
minHeight: "32px",
|
||||
<div
|
||||
style={{
|
||||
marginTop: "8px",
|
||||
display: "flex",
|
||||
alignItems: "center"
|
||||
}}>
|
||||
alignItems: "center",
|
||||
gap: "12px",
|
||||
}}
|
||||
>
|
||||
<div
|
||||
style={{
|
||||
flex: 1,
|
||||
padding: "6px 10px",
|
||||
background: "#f8f9fa",
|
||||
border: "1px solid #e9ecef",
|
||||
borderRadius: "4px",
|
||||
fontSize: "14px",
|
||||
minHeight: "32px",
|
||||
display: "flex",
|
||||
alignItems: "center",
|
||||
}}
|
||||
>
|
||||
{setting.value === null || setting.value === "" ? (
|
||||
<span style={{ color: "#dc3545", fontStyle: "italic" }}>未設定</span>
|
||||
<span
|
||||
style={{
|
||||
color: "#dc3545",
|
||||
fontStyle: "italic",
|
||||
}}
|
||||
>
|
||||
未設定
|
||||
</span>
|
||||
) : setting.isCredential ? (
|
||||
<span style={{ color: "#666" }}>••••••••</span>
|
||||
) : (
|
||||
@ -1350,7 +1470,9 @@ function App() {
|
||||
</div>
|
||||
<button
|
||||
className="btn btn-primary"
|
||||
onClick={() => startEditingSetting(setting.key, setting.value)}
|
||||
onClick={() =>
|
||||
startEditingSetting(setting.key, setting.value)
|
||||
}
|
||||
style={{ fontSize: "12px", padding: "6px 12px" }}
|
||||
>
|
||||
編集
|
||||
@ -1379,10 +1501,18 @@ function App() {
|
||||
paddingLeft: "20px",
|
||||
}}
|
||||
>
|
||||
<li><strong>必須設定:</strong> アプリケーションの動作に必要な設定です</li>
|
||||
<li><strong>認証情報:</strong> セキュリティ上重要な情報で、表示時にマスクされます</li>
|
||||
<li>
|
||||
<strong>必須設定:</strong>{" "}
|
||||
アプリケーションの動作に必要な設定です
|
||||
</li>
|
||||
<li>
|
||||
<strong>認証情報:</strong>{" "}
|
||||
セキュリティ上重要な情報で、表示時にマスクされます
|
||||
</li>
|
||||
<li>設定の変更は即座にアプリケーションに反映されます</li>
|
||||
<li>デフォルト値が設定されている項目は、空にするとデフォルト値が使用されます</li>
|
||||
<li>
|
||||
デフォルト値が設定されている項目は、空にするとデフォルト値が使用されます
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</>
|
||||
@ -1396,17 +1526,26 @@ function App() {
|
||||
</p>
|
||||
|
||||
<div style={{ marginBottom: "20px" }}>
|
||||
<div className="stats-grid" style={{ gridTemplateColumns: "repeat(3, 1fr)" }}>
|
||||
<div
|
||||
className="stats-grid"
|
||||
style={{ gridTemplateColumns: "repeat(3, 1fr)" }}
|
||||
>
|
||||
<div className="stat-card">
|
||||
<div className="value">{categories.allCategories.length}</div>
|
||||
<div className="value">
|
||||
{categories.allCategories.length}
|
||||
</div>
|
||||
<div className="label">総カテゴリ数</div>
|
||||
</div>
|
||||
<div className="stat-card">
|
||||
<div className="value">{categories.feedCategories.length}</div>
|
||||
<div className="value">
|
||||
{categories.feedCategories.length}
|
||||
</div>
|
||||
<div className="label">フィードカテゴリ</div>
|
||||
</div>
|
||||
<div className="stat-card">
|
||||
<div className="value">{categories.episodeCategories.length}</div>
|
||||
<div className="value">
|
||||
{categories.episodeCategories.length}
|
||||
</div>
|
||||
<div className="label">エピソードカテゴリ</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -1425,16 +1564,27 @@ function App() {
|
||||
) : (
|
||||
<div style={{ marginTop: "24px" }}>
|
||||
<h4>カテゴリ一覧 ({categories.allCategories.length}件)</h4>
|
||||
<div style={{ marginBottom: "16px", fontSize: "14px", color: "#666" }}>
|
||||
<div
|
||||
style={{
|
||||
marginBottom: "16px",
|
||||
fontSize: "14px",
|
||||
color: "#666",
|
||||
}}
|
||||
>
|
||||
削除対象を選択してから削除ボタンをクリックしてください。
|
||||
</div>
|
||||
|
||||
|
||||
<div className="category-list">
|
||||
{categories.allCategories.map((category) => {
|
||||
const counts = categoryCounts[category] || { feedCount: 0, episodeCount: 0 };
|
||||
const isInFeeds = categories.feedCategories.includes(category);
|
||||
const isInEpisodes = categories.episodeCategories.includes(category);
|
||||
|
||||
const counts = categoryCounts[category] || {
|
||||
feedCount: 0,
|
||||
episodeCount: 0,
|
||||
};
|
||||
const isInFeeds =
|
||||
categories.feedCategories.includes(category);
|
||||
const isInEpisodes =
|
||||
categories.episodeCategories.includes(category);
|
||||
|
||||
return (
|
||||
<div
|
||||
key={category}
|
||||
@ -1442,42 +1592,70 @@ function App() {
|
||||
style={{ marginBottom: "16px" }}
|
||||
>
|
||||
<div className="feed-info">
|
||||
<h4 style={{ margin: "0 0 8px 0", fontSize: "16px" }}>
|
||||
<h4
|
||||
style={{ margin: "0 0 8px 0", fontSize: "16px" }}
|
||||
>
|
||||
{category}
|
||||
</h4>
|
||||
<div style={{ fontSize: "14px", color: "#666", marginBottom: "8px" }}>
|
||||
<div
|
||||
style={{
|
||||
fontSize: "14px",
|
||||
color: "#666",
|
||||
marginBottom: "8px",
|
||||
}}
|
||||
>
|
||||
<span>フィード: {counts.feedCount}件</span>
|
||||
<span style={{ margin: "0 12px" }}>|</span>
|
||||
<span>エピソード: {counts.episodeCount}件</span>
|
||||
<span style={{ margin: "0 12px" }}>|</span>
|
||||
<span>合計: {counts.feedCount + counts.episodeCount}件</span>
|
||||
<span>
|
||||
合計: {counts.feedCount + counts.episodeCount}件
|
||||
</span>
|
||||
</div>
|
||||
<div style={{ fontSize: "12px", color: "#999" }}>
|
||||
<span style={{
|
||||
padding: "2px 6px",
|
||||
background: isInFeeds ? "#e3f2fd" : "#f5f5f5",
|
||||
color: isInFeeds ? "#1976d2" : "#999",
|
||||
borderRadius: "4px",
|
||||
marginRight: "8px"
|
||||
}}>
|
||||
<span
|
||||
style={{
|
||||
padding: "2px 6px",
|
||||
background: isInFeeds ? "#e3f2fd" : "#f5f5f5",
|
||||
color: isInFeeds ? "#1976d2" : "#999",
|
||||
borderRadius: "4px",
|
||||
marginRight: "8px",
|
||||
}}
|
||||
>
|
||||
フィード: {isInFeeds ? "使用中" : "未使用"}
|
||||
</span>
|
||||
<span style={{
|
||||
padding: "2px 6px",
|
||||
background: isInEpisodes ? "#e8f5e8" : "#f5f5f5",
|
||||
color: isInEpisodes ? "#388e3c" : "#999",
|
||||
borderRadius: "4px"
|
||||
}}>
|
||||
<span
|
||||
style={{
|
||||
padding: "2px 6px",
|
||||
background: isInEpisodes
|
||||
? "#e8f5e8"
|
||||
: "#f5f5f5",
|
||||
color: isInEpisodes ? "#388e3c" : "#999",
|
||||
borderRadius: "4px",
|
||||
}}
|
||||
>
|
||||
エピソード: {isInEpisodes ? "使用中" : "未使用"}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
<div className="feed-actions" style={{ flexDirection: "column", gap: "8px", minWidth: "160px" }}>
|
||||
<div
|
||||
className="feed-actions"
|
||||
style={{
|
||||
flexDirection: "column",
|
||||
gap: "8px",
|
||||
minWidth: "160px",
|
||||
}}
|
||||
>
|
||||
{isInFeeds && (
|
||||
<button
|
||||
className="btn btn-warning"
|
||||
onClick={() => deleteCategory(category, "feeds")}
|
||||
style={{ fontSize: "12px", padding: "6px 12px" }}
|
||||
onClick={() =>
|
||||
deleteCategory(category, "feeds")
|
||||
}
|
||||
style={{
|
||||
fontSize: "12px",
|
||||
padding: "6px 12px",
|
||||
}}
|
||||
>
|
||||
フィードから削除
|
||||
</button>
|
||||
@ -1485,8 +1663,13 @@ function App() {
|
||||
{isInEpisodes && (
|
||||
<button
|
||||
className="btn btn-warning"
|
||||
onClick={() => deleteCategory(category, "episodes")}
|
||||
style={{ fontSize: "12px", padding: "6px 12px" }}
|
||||
onClick={() =>
|
||||
deleteCategory(category, "episodes")
|
||||
}
|
||||
style={{
|
||||
fontSize: "12px",
|
||||
padding: "6px 12px",
|
||||
}}
|
||||
>
|
||||
エピソードから削除
|
||||
</button>
|
||||
@ -1495,7 +1678,10 @@ function App() {
|
||||
<button
|
||||
className="btn btn-danger"
|
||||
onClick={() => deleteCategory(category, "both")}
|
||||
style={{ fontSize: "12px", padding: "6px 12px" }}
|
||||
style={{
|
||||
fontSize: "12px",
|
||||
padding: "6px 12px",
|
||||
}}
|
||||
>
|
||||
すべてから削除
|
||||
</button>
|
||||
@ -1525,10 +1711,21 @@ function App() {
|
||||
paddingLeft: "20px",
|
||||
}}
|
||||
>
|
||||
<li><strong>フィードから削除:</strong> フィードのカテゴリのみを削除します</li>
|
||||
<li><strong>エピソードから削除:</strong> エピソードのカテゴリのみを削除します</li>
|
||||
<li><strong>すべてから削除:</strong> フィードとエピソード両方からカテゴリを削除します</li>
|
||||
<li>削除されたカテゴリは NULL に設定され、分類が解除されます</li>
|
||||
<li>
|
||||
<strong>フィードから削除:</strong>{" "}
|
||||
フィードのカテゴリのみを削除します
|
||||
</li>
|
||||
<li>
|
||||
<strong>エピソードから削除:</strong>{" "}
|
||||
エピソードのカテゴリのみを削除します
|
||||
</li>
|
||||
<li>
|
||||
<strong>すべてから削除:</strong>{" "}
|
||||
フィードとエピソード両方からカテゴリを削除します
|
||||
</li>
|
||||
<li>
|
||||
削除されたカテゴリは NULL に設定され、分類が解除されます
|
||||
</li>
|
||||
<li>この操作は元に戻すことができません</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
@ -8,17 +8,17 @@ import { batchScheduler } from "./services/batch-scheduler.js";
|
||||
import { config } from "./services/config.js";
|
||||
import { closeBrowser } from "./services/content-extractor.js";
|
||||
import {
|
||||
deleteCategoryFromBoth,
|
||||
deleteEpisode,
|
||||
deleteEpisodeCategory,
|
||||
deleteFeed,
|
||||
deleteFeedCategory,
|
||||
fetchAllEpisodes,
|
||||
fetchEpisodesWithArticles,
|
||||
getAllCategories,
|
||||
getAllFeedsIncludingInactive,
|
||||
getAllUsedCategories,
|
||||
getCategoryCounts,
|
||||
deleteCategoryFromBoth,
|
||||
deleteFeedCategory,
|
||||
deleteEpisodeCategory,
|
||||
getFeedByUrl,
|
||||
getFeedRequests,
|
||||
getFeedsByCategory,
|
||||
@ -375,14 +375,19 @@ app.get("/api/admin/categories/:category/counts", async (c) => {
|
||||
app.delete("/api/admin/categories/:category", async (c) => {
|
||||
try {
|
||||
const category = decodeURIComponent(c.req.param("category"));
|
||||
const { target } = await c.req.json<{ target: "feeds" | "episodes" | "both" }>();
|
||||
const { target } = await c.req.json<{
|
||||
target: "feeds" | "episodes" | "both";
|
||||
}>();
|
||||
|
||||
if (!category || category.trim() === "") {
|
||||
return c.json({ error: "Category name is required" }, 400);
|
||||
}
|
||||
|
||||
if (!target || !["feeds", "episodes", "both"].includes(target)) {
|
||||
return c.json({ error: "Valid target (feeds, episodes, or both) is required" }, 400);
|
||||
return c.json(
|
||||
{ error: "Valid target (feeds, episodes, or both) is required" },
|
||||
400,
|
||||
);
|
||||
}
|
||||
|
||||
console.log(`🗑️ Admin deleting category "${category}" from ${target}`);
|
||||
@ -396,7 +401,7 @@ app.delete("/api/admin/categories/:category", async (c) => {
|
||||
category,
|
||||
feedChanges: result.feedChanges,
|
||||
episodeChanges: result.episodeChanges,
|
||||
totalChanges: result.feedChanges + result.episodeChanges
|
||||
totalChanges: result.feedChanges + result.episodeChanges,
|
||||
});
|
||||
} else if (target === "feeds") {
|
||||
const changes = await deleteFeedCategory(category);
|
||||
@ -406,7 +411,7 @@ app.delete("/api/admin/categories/:category", async (c) => {
|
||||
category,
|
||||
feedChanges: changes,
|
||||
episodeChanges: 0,
|
||||
totalChanges: changes
|
||||
totalChanges: changes,
|
||||
});
|
||||
} else if (target === "episodes") {
|
||||
const changes = await deleteEpisodeCategory(category);
|
||||
@ -416,7 +421,7 @@ app.delete("/api/admin/categories/:category", async (c) => {
|
||||
category,
|
||||
feedChanges: 0,
|
||||
episodeChanges: changes,
|
||||
totalChanges: changes
|
||||
totalChanges: changes,
|
||||
});
|
||||
}
|
||||
} catch (error) {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
import { Link, Route, Routes, useLocation } from "react-router-dom";
|
||||
import { useEffect, useState } from "react";
|
||||
import { Link, Route, Routes, useLocation } from "react-router-dom";
|
||||
import EpisodeDetail from "./components/EpisodeDetail";
|
||||
import EpisodeList from "./components/EpisodeList";
|
||||
import FeedDetail from "./components/FeedDetail";
|
||||
@ -10,13 +10,16 @@ import RSSEndpoints from "./components/RSSEndpoints";
|
||||
function App() {
|
||||
const location = useLocation();
|
||||
const [isDarkMode, setIsDarkMode] = useState(() => {
|
||||
const saved = localStorage.getItem('darkMode');
|
||||
const saved = localStorage.getItem("darkMode");
|
||||
return saved ? JSON.parse(saved) : false;
|
||||
});
|
||||
|
||||
useEffect(() => {
|
||||
document.documentElement.setAttribute('data-theme', isDarkMode ? 'dark' : 'light');
|
||||
localStorage.setItem('darkMode', JSON.stringify(isDarkMode));
|
||||
document.documentElement.setAttribute(
|
||||
"data-theme",
|
||||
isDarkMode ? "dark" : "light",
|
||||
);
|
||||
localStorage.setItem("darkMode", JSON.stringify(isDarkMode));
|
||||
}, [isDarkMode]);
|
||||
|
||||
const toggleDarkMode = () => {
|
||||
@ -41,12 +44,12 @@ function App() {
|
||||
RSS フィードから自動生成された音声ポッドキャスト
|
||||
</div>
|
||||
</div>
|
||||
<button
|
||||
<button
|
||||
className="theme-toggle"
|
||||
onClick={toggleDarkMode}
|
||||
aria-label="テーマを切り替え"
|
||||
>
|
||||
{isDarkMode ? '☀️' : '🌙'}
|
||||
{isDarkMode ? "☀️" : "🌙"}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -63,7 +63,7 @@ function EpisodeList() {
|
||||
filterEpisodesByCategory();
|
||||
}
|
||||
}, [episodes, selectedCategory, searchQuery]);
|
||||
|
||||
|
||||
// Reset to page 1 when category changes (but don't trigger if already on page 1)
|
||||
useEffect(() => {
|
||||
if (currentPage !== 1) {
|
||||
@ -85,28 +85,30 @@ function EpisodeList() {
|
||||
page: currentPage.toString(),
|
||||
limit: pageSize.toString(),
|
||||
});
|
||||
|
||||
|
||||
if (selectedCategory) {
|
||||
searchParams.append("category", selectedCategory);
|
||||
}
|
||||
|
||||
const response = await fetch(`/api/episodes-with-feed-info?${searchParams}`);
|
||||
|
||||
const response = await fetch(
|
||||
`/api/episodes-with-feed-info?${searchParams}`,
|
||||
);
|
||||
if (!response.ok) {
|
||||
throw new Error("データベースからの取得に失敗しました");
|
||||
}
|
||||
const data = await response.json();
|
||||
|
||||
|
||||
// Handle paginated response
|
||||
if (data.episodes !== undefined) {
|
||||
const dbEpisodes = data.episodes || [];
|
||||
|
||||
|
||||
if (dbEpisodes.length === 0 && data.total === 0) {
|
||||
// Database is empty, fallback to XML
|
||||
console.log("Database is empty, falling back to XML parsing...");
|
||||
setUseDatabase(false);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
setEpisodes(dbEpisodes);
|
||||
setTotalEpisodes(data.total || 0);
|
||||
setTotalPages(data.totalPages || 1);
|
||||
@ -402,9 +404,7 @@ function EpisodeList() {
|
||||
))}
|
||||
</select>
|
||||
)}
|
||||
{isSearching && (
|
||||
<span className="episode-meta-text">検索中...</span>
|
||||
)}
|
||||
{isSearching && <span className="episode-meta-text">検索中...</span>}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -527,7 +527,7 @@ function EpisodeList() {
|
||||
))}
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
|
||||
{/* Pagination Controls - only show for database mode */}
|
||||
{useDatabase && totalPages > 1 && (
|
||||
<div className="pagination-container">
|
||||
@ -538,7 +538,7 @@ function EpisodeList() {
|
||||
>
|
||||
前へ
|
||||
</button>
|
||||
|
||||
|
||||
{/* Page numbers */}
|
||||
<div className="pagination-pages">
|
||||
{/* First page */}
|
||||
@ -553,13 +553,13 @@ function EpisodeList() {
|
||||
{currentPage > 4 && <span>...</span>}
|
||||
</>
|
||||
)}
|
||||
|
||||
|
||||
{/* Current page and nearby pages */}
|
||||
{Array.from({ length: Math.min(5, totalPages) }, (_, i) => {
|
||||
const pageNum = Math.max(1, currentPage - 2) + i;
|
||||
if (pageNum > totalPages) return null;
|
||||
if (pageNum < Math.max(1, currentPage - 2)) return null;
|
||||
|
||||
|
||||
return (
|
||||
<button
|
||||
key={pageNum}
|
||||
@ -570,7 +570,7 @@ function EpisodeList() {
|
||||
</button>
|
||||
);
|
||||
})}
|
||||
|
||||
|
||||
{/* Last page */}
|
||||
{currentPage < totalPages - 2 && (
|
||||
<>
|
||||
@ -584,15 +584,17 @@ function EpisodeList() {
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
|
||||
|
||||
<button
|
||||
className="btn btn-secondary"
|
||||
onClick={() => setCurrentPage(Math.min(totalPages, currentPage + 1))}
|
||||
onClick={() =>
|
||||
setCurrentPage(Math.min(totalPages, currentPage + 1))
|
||||
}
|
||||
disabled={currentPage === totalPages}
|
||||
>
|
||||
次へ
|
||||
</button>
|
||||
|
||||
|
||||
{/* Page size selector */}
|
||||
<div className="pagination-size-selector">
|
||||
<span style={{ fontSize: "14px" }}>表示件数:</span>
|
||||
|
||||
@ -222,7 +222,10 @@ function FeedDetail() {
|
||||
<strong>
|
||||
<Link
|
||||
to={`/episode/${episode.id}`}
|
||||
style={{ textDecoration: "none", color: "var(--accent-primary)" }}
|
||||
style={{
|
||||
textDecoration: "none",
|
||||
color: "var(--accent-primary)",
|
||||
}}
|
||||
>
|
||||
{episode.title}
|
||||
</Link>
|
||||
@ -242,7 +245,10 @@ function FeedDetail() {
|
||||
href={episode.articleLink}
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
style={{ fontSize: "12px", color: "var(--text-secondary)" }}
|
||||
style={{
|
||||
fontSize: "12px",
|
||||
color: "var(--text-secondary)",
|
||||
}}
|
||||
>
|
||||
元記事を見る
|
||||
</a>
|
||||
|
||||
@ -19,7 +19,7 @@ function FeedList() {
|
||||
const [selectedCategory, setSelectedCategory] = useState<string>("");
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
|
||||
|
||||
// Pagination state
|
||||
const [currentPage, setCurrentPage] = useState(1);
|
||||
const [pageSize, setPageSize] = useState(15);
|
||||
@ -46,7 +46,7 @@ function FeedList() {
|
||||
try {
|
||||
setLoading(true);
|
||||
setError(null);
|
||||
|
||||
|
||||
// Build query parameters
|
||||
const params = new URLSearchParams();
|
||||
params.append("page", currentPage.toString());
|
||||
@ -54,17 +54,17 @@ function FeedList() {
|
||||
if (selectedCategory) {
|
||||
params.append("category", selectedCategory);
|
||||
}
|
||||
|
||||
|
||||
const response = await fetch(`/api/feeds?${params.toString()}`);
|
||||
if (!response.ok) {
|
||||
const errorData = await response.json();
|
||||
throw new Error(errorData.error || "フィードの取得に失敗しました");
|
||||
}
|
||||
|
||||
|
||||
const data = await response.json();
|
||||
|
||||
|
||||
// Handle paginated response
|
||||
if (data.feeds && typeof data.total !== 'undefined') {
|
||||
if (data.feeds && typeof data.total !== "undefined") {
|
||||
setFeeds(data.feeds);
|
||||
setFilteredFeeds(data.feeds);
|
||||
setTotalFeeds(data.total);
|
||||
@ -96,7 +96,6 @@ function FeedList() {
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
const formatDate = (dateString: string) => {
|
||||
return new Date(dateString).toLocaleString("ja-JP");
|
||||
};
|
||||
@ -197,7 +196,11 @@ function FeedList() {
|
||||
<option value={45}>45件表示</option>
|
||||
<option value={60}>60件表示</option>
|
||||
</select>
|
||||
<button type="button" className="btn btn-secondary" onClick={fetchFeeds}>
|
||||
<button
|
||||
type="button"
|
||||
className="btn btn-secondary"
|
||||
onClick={fetchFeeds}
|
||||
>
|
||||
更新
|
||||
</button>
|
||||
</div>
|
||||
@ -268,7 +271,7 @@ function FeedList() {
|
||||
>
|
||||
前へ
|
||||
</button>
|
||||
|
||||
|
||||
{/* Page numbers */}
|
||||
<div className="page-numbers">
|
||||
{Array.from({ length: Math.min(5, totalPages) }, (_, i) => {
|
||||
@ -282,12 +285,12 @@ function FeedList() {
|
||||
} else {
|
||||
pageNum = currentPage - 2 + i;
|
||||
}
|
||||
|
||||
|
||||
return (
|
||||
<button
|
||||
type="button"
|
||||
key={pageNum}
|
||||
className={`btn ${currentPage === pageNum ? 'btn-primary' : 'btn-secondary'}`}
|
||||
className={`btn ${currentPage === pageNum ? "btn-primary" : "btn-secondary"}`}
|
||||
onClick={() => setCurrentPage(pageNum)}
|
||||
>
|
||||
{pageNum}
|
||||
@ -295,7 +298,7 @@ function FeedList() {
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
|
||||
|
||||
<button
|
||||
type="button"
|
||||
className="btn btn-secondary"
|
||||
|
||||
36
server.ts
36
server.ts
@ -512,13 +512,15 @@ app.get("/api/feeds", async (c) => {
|
||||
const page = c.req.query("page");
|
||||
const limit = c.req.query("limit");
|
||||
const category = c.req.query("category");
|
||||
|
||||
|
||||
// If pagination parameters are provided, use paginated endpoint
|
||||
if (page || limit) {
|
||||
const { fetchActiveFeedsPaginated } = await import("./services/database.js");
|
||||
const { fetchActiveFeedsPaginated } = await import(
|
||||
"./services/database.js"
|
||||
);
|
||||
const pageNum = page ? Number.parseInt(page, 10) : 1;
|
||||
const limitNum = limit ? Number.parseInt(limit, 10) : 10;
|
||||
|
||||
|
||||
// Validate pagination parameters
|
||||
if (Number.isNaN(pageNum) || pageNum < 1) {
|
||||
return c.json({ error: "Invalid page number" }, 400);
|
||||
@ -526,8 +528,12 @@ app.get("/api/feeds", async (c) => {
|
||||
if (Number.isNaN(limitNum) || limitNum < 1 || limitNum > 100) {
|
||||
return c.json({ error: "Invalid limit (must be between 1-100)" }, 400);
|
||||
}
|
||||
|
||||
const result = await fetchActiveFeedsPaginated(pageNum, limitNum, category || undefined);
|
||||
|
||||
const result = await fetchActiveFeedsPaginated(
|
||||
pageNum,
|
||||
limitNum,
|
||||
category || undefined,
|
||||
);
|
||||
return c.json(result);
|
||||
} else {
|
||||
// Original behavior for backward compatibility
|
||||
@ -630,13 +636,15 @@ app.get("/api/episodes-with-feed-info", async (c) => {
|
||||
const page = c.req.query("page");
|
||||
const limit = c.req.query("limit");
|
||||
const category = c.req.query("category");
|
||||
|
||||
|
||||
// If pagination parameters are provided, use paginated endpoint
|
||||
if (page || limit) {
|
||||
const { fetchEpisodesWithFeedInfoPaginated } = await import("./services/database.js");
|
||||
const { fetchEpisodesWithFeedInfoPaginated } = await import(
|
||||
"./services/database.js"
|
||||
);
|
||||
const pageNum = page ? Number.parseInt(page, 10) : 1;
|
||||
const limitNum = limit ? Number.parseInt(limit, 10) : 20;
|
||||
|
||||
|
||||
// Validate pagination parameters
|
||||
if (Number.isNaN(pageNum) || pageNum < 1) {
|
||||
return c.json({ error: "Invalid page number" }, 400);
|
||||
@ -644,12 +652,18 @@ app.get("/api/episodes-with-feed-info", async (c) => {
|
||||
if (Number.isNaN(limitNum) || limitNum < 1 || limitNum > 100) {
|
||||
return c.json({ error: "Invalid limit (must be between 1-100)" }, 400);
|
||||
}
|
||||
|
||||
const result = await fetchEpisodesWithFeedInfoPaginated(pageNum, limitNum, category || undefined);
|
||||
|
||||
const result = await fetchEpisodesWithFeedInfoPaginated(
|
||||
pageNum,
|
||||
limitNum,
|
||||
category || undefined,
|
||||
);
|
||||
return c.json(result);
|
||||
} else {
|
||||
// Original behavior for backward compatibility
|
||||
const { fetchEpisodesWithFeedInfo } = await import("./services/database.js");
|
||||
const { fetchEpisodesWithFeedInfo } = await import(
|
||||
"./services/database.js"
|
||||
);
|
||||
const episodes = await fetchEpisodesWithFeedInfo();
|
||||
return c.json({ episodes });
|
||||
}
|
||||
|
||||
2
types/kuroshiro.d.ts
vendored
2
types/kuroshiro.d.ts
vendored
@ -22,4 +22,4 @@ declare module "kuroshiro-analyzer-mecab" {
|
||||
}
|
||||
|
||||
export = KuroshiroAnalyzerMecab;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user