Aktuelles: vrstici rubrik kot na ONE (brez Alle, brez horoskopa in Auf diesen Tag), dodani Wetter in Finanzen
This commit is contained in:
parent
32f7738ee8
commit
78ef1848dc
@ -21,7 +21,8 @@ interface Res {
|
|||||||
rubriken: string[];
|
rubriken: string[];
|
||||||
}
|
}
|
||||||
|
|
||||||
const RUBRIKEN = ["Politik", "Promis", "Sport", "Musik & Film"];
|
const ROW1 = ["Politik", "Promis", "Sport", "Musik & Film"];
|
||||||
|
const ROW2 = ["Wetter", "Finanzen"];
|
||||||
|
|
||||||
export default function AktuellesPage() {
|
export default function AktuellesPage() {
|
||||||
const search = useSearch();
|
const search = useSearch();
|
||||||
@ -64,19 +65,10 @@ export default function AktuellesPage() {
|
|||||||
<Header />
|
<Header />
|
||||||
<PageSideAds />
|
<PageSideAds />
|
||||||
|
|
||||||
{/* Vrstica rubrik kot na ONE — brez horoskopa, ta ima na folx.tv svojo stran */}
|
{/* Vrstici rubrik kot na ONE - brez horoskopa in brez Auf diesen Tag */}
|
||||||
<nav className="border-y border-card-border bg-card" data-testid="nav-aktuelles-rubriken">
|
<nav className="border-t border-card-border bg-card" data-testid="nav-aktuelles-rubriken">
|
||||||
<div className="max-w-7xl mx-auto grid grid-cols-3 sm:grid-cols-5">
|
<div className="max-w-7xl mx-auto grid grid-cols-2 sm:grid-cols-4">
|
||||||
<button
|
{ROW1.map((r) => (
|
||||||
onClick={() => go("")}
|
|
||||||
className={`px-3 py-3 text-[13px] sm:text-sm font-bold uppercase tracking-wide text-center border-r border-b border-card-border transition-colors ${
|
|
||||||
!rubrik ? "bg-primary text-primary-foreground" : "text-foreground/80 hover:text-primary"
|
|
||||||
}`}
|
|
||||||
data-testid="link-rubrik-alle"
|
|
||||||
>
|
|
||||||
Alle
|
|
||||||
</button>
|
|
||||||
{RUBRIKEN.map((r) => (
|
|
||||||
<button
|
<button
|
||||||
key={r}
|
key={r}
|
||||||
onClick={() => go(r)}
|
onClick={() => go(r)}
|
||||||
@ -90,6 +82,30 @@ export default function AktuellesPage() {
|
|||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
</nav>
|
</nav>
|
||||||
|
<nav className="border-b border-card-border bg-card" data-testid="nav-aktuelles-rubriken-2">
|
||||||
|
<div className="max-w-7xl mx-auto grid grid-cols-3">
|
||||||
|
{ROW2.map((r) => (
|
||||||
|
<button
|
||||||
|
key={r}
|
||||||
|
onClick={() => go(r)}
|
||||||
|
className={`px-3 py-3 text-[13px] sm:text-sm font-bold uppercase tracking-wide text-center border-r border-card-border transition-colors ${
|
||||||
|
rubrik === r ? "bg-primary text-primary-foreground" : "text-foreground/80 hover:text-primary"
|
||||||
|
}`}
|
||||||
|
data-testid={`link-rubrik-${r.toLowerCase()}`}
|
||||||
|
>
|
||||||
|
{r}
|
||||||
|
</button>
|
||||||
|
))}
|
||||||
|
<Link href="/ueber-uns">
|
||||||
|
<span
|
||||||
|
className="block px-3 py-3 text-[13px] sm:text-sm font-bold uppercase tracking-wide text-center text-foreground/80 hover:text-primary transition-colors cursor-pointer"
|
||||||
|
data-testid="link-rubrik-ueber-uns"
|
||||||
|
>
|
||||||
|
Über uns
|
||||||
|
</span>
|
||||||
|
</Link>
|
||||||
|
</div>
|
||||||
|
</nav>
|
||||||
|
|
||||||
<main className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-4">
|
<main className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-4">
|
||||||
<TopBannerAd />
|
<TopBannerAd />
|
||||||
|
|||||||
@ -720,7 +720,7 @@ export default function Home() {
|
|||||||
const articles = useMemo(
|
const articles = useMemo(
|
||||||
() =>
|
() =>
|
||||||
(allArticles || []).filter(
|
(allArticles || []).filter(
|
||||||
(a) => !["Aktuelles", "Politik", "Promis", "Sport", "Musik & Film"].includes(a.category)
|
(a) => !["Aktuelles", "Politik", "Promis", "Sport", "Musik & Film", "Wetter", "Finanzen"].includes(a.category)
|
||||||
),
|
),
|
||||||
[allArticles]
|
[allArticles]
|
||||||
);
|
);
|
||||||
|
|||||||
@ -182,7 +182,7 @@ export async function registerRoutes(
|
|||||||
|
|
||||||
// Rubrike, ki skupaj sestavljajo /aktuelles. Horoskop, recepti in vreme so
|
// Rubrike, ki skupaj sestavljajo /aktuelles. Horoskop, recepti in vreme so
|
||||||
// na folx.tv svoje strani, zato jih tu ni.
|
// na folx.tv svoje strani, zato jih tu ni.
|
||||||
const AKTUELLES_RUBRIKEN = ["Politik", "Promis", "Sport", "Musik & Film"];
|
const AKTUELLES_RUBRIKEN = ["Politik", "Promis", "Sport", "Musik & Film", "Wetter", "Finanzen"];
|
||||||
|
|
||||||
app.get("/api/articles/aktuelles", async (req, res) => {
|
app.get("/api/articles/aktuelles", async (req, res) => {
|
||||||
try {
|
try {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user