Skip to content

Eleino/enhancement/596 update news card and single newspage rendering logic #601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Skoivumaki merged 5 commits into from
Dec 8, 2025
Merged

Eleino/enhancement/596 update news card and single newspage rendering logic #601

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
46b7d30
Removed image placeholder from news without one, and added a static t…
eleino Nov 20, 2025
525b7a9
Removed an empty div with no class definition in the style file
eleino Nov 21, 2025
adcd13f
Changed news text to align to left, decreased the width of the text a…
eleino Nov 25, 2025
9d34d55
Increased news text width slightly on smaller screens
eleino Nov 29, 2025
87905b1
fix(seo): Restore Open Graph and metadata logic lost in merge
Rutjake Dec 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions frontend-next-migration/src/app/[lng]/(helper)/news/[id]/_getPage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { createPage } from '@/app/_helpers';
import { getRouteOneNewsPage } from '@/shared/appLinks/RoutePaths';
import { getServerTranslation } from '@/shared/i18n';
import { defaultOpenGraph } from '@/shared/seoConstants';

export async function _getPage(lng: string, id: string) {
const { t } = await getServerTranslation(lng, 'news');
return createPage({
buildPage: () => ({}),
buildSeo: () => ({
title: t('head-title'),
description: t('head-description'),
keywords: t('head-keywords'),
openGraph: {
...defaultOpenGraph,
title: t('og-title'),
description: t('og-description'),
url: `/${lng}${getRouteOneNewsPage(id)}`,
},
alternates: {
canonical: `/${lng}${getRouteOneNewsPage(id)}`,
},
}),
});
}
7 changes: 5 additions & 2 deletions frontend-next-migration/src/app/[lng]/(helper)/news/[id]/page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
// import { withMetadataGenerator } from "@/app/_helpers";
export { NewsElementPage as default } from '@/preparedPages/NewsPages';
import { withPageData, withMetadataGenerator } from '@/app/_helpers';
import { _getPage } from './_getPage';
import { NewsElementPage } from '@/preparedPages/NewsPages';

// export const generateMetadata = withMetadataGenerator(_getPage);
export const generateMetadata = withMetadataGenerator(_getPage);
export default withPageData(NewsElementPage, _getPage);
17 changes: 15 additions & 2 deletions ...t-migration/src/preparedPages/NewsPages/ui/NewsElementPage/ui/NewsElementPage.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,17 @@
justify-content: center;
}

.noImageContainer {
position: relative;
width: 100%;
height: 2vh;
overflow: hidden;
flex-shrink: 0;
display: flex;
justify-content: center;
}


.image {
z-index: 1;
width: 30vw;
Expand Down Expand Up @@ -94,15 +105,17 @@
.text {
color: var(--white);
font: var(--font-dm-m);
line-height: 28px;
padding: 10px 5em;
text-align: center;
width: 100%;
text-align: left;
width: 80%;
Copy link
Member

@Skoivumaki Skoivumaki Nov 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add breakpoint to keep width: 98% (to add very slight padding) on mobile and PR is good 👍

Copy link
Contributor Author

@eleino eleino Nov 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done!

white-space: pre-line;
}

@media (max-width: breakpoint(md)) {
.text {
padding: 10px 1em;
width: 98%;
}
}

Expand Down
42 changes: 23 additions & 19 deletions ...tend-next-migration/src/preparedPages/NewsPages/ui/NewsElementPage/ui/NewsElementPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
'use client';
import hannu from '@/shared/assets/images/heros/hannu-hodari/hannu-hodari.png';
import { Container } from '@/shared/ui/Container';
import { classNames } from '@/shared/lib/classNames/classNames';
import { useScrollToTop } from '@/shared/lib/hooks';
Expand Down Expand Up @@ -45,7 +44,7 @@ const NewsElementPage = () => {
const groupedNews = formatNews(moreNews, lngCode || 'fi-FI');
const picture = post.titlePicture?.id
? `${directusBaseUrl}/assets/${post.titlePicture.id}`
: hannu.src;
: undefined;
return (
<Container>
<div className={cls.navButtons}>
Expand Down Expand Up @@ -85,22 +84,27 @@ const NewsElementPage = () => {
</Button>
</div>
<div className={classNames(cls.NewsElementPage)}>
<div className={cls.imageContainer}>
<Image
src={picture}
alt={''}
className={cls.imageBlur}
width={100}
height={600}
/>
<Image
src={picture}
alt={''}
className={cls.image}
width={100}
height={600}
/>
</div>
{picture ? (
<div className={cls.imageContainer}>
<Image
src={picture}
alt={''}
className={cls.imageBlur}
width={100}
height={600}
/>
<Image
src={picture}
alt={''}
className={cls.image}
width={100}
height={600}
/>
</div>
) : (
<div className={cls.noImageContainer} />
)}

<h1 className={cls.title}>{post?.title}</h1>

<h3 className={cls.subtitle}>{post?.previewText}</h3>
Expand All @@ -125,7 +129,7 @@ const NewsElementPage = () => {
{groupedNews.map((news) => {
const imageSrc = news.titlePicture?.id
? `${directusBaseUrl}/assets/${news.titlePicture.id}`
: hannu.src;
: undefined;
return (
<NewsCard
key={news.id}
Expand Down
3 changes: 1 addition & 2 deletions frontend-next-migration/src/preparedPages/NewsPages/ui/NewsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import cls from './NewsPage.module.scss';
import { useGetNewsQuery, formatNews } from '@/entities/NewsV2';
import { useParams } from 'next/navigation';
import { envHelper } from '@/shared/const/envHelper';
import hannu from '@/shared/assets/images/heros/hannu-hodari/hannu-hodari.png';
import { useGetTotalNewsCountQuery } from '@/entities/NewsV2/Api/newsApi';
import { useCallback, useEffect, useRef, useState } from 'react';
import { News } from '@/entities/NewsV2/model/types/types';
Expand Down Expand Up @@ -94,7 +93,7 @@ const NewsPage = () => {
{groupedNews.map((news) => {
const imageSrc = news.titlePicture?.id
? `${directusBaseUrl}/assets/${news.titlePicture.id}`
: hannu.src;
: undefined;
return (
<NewsCard
key={news.id}
Expand Down
7 changes: 3 additions & 4 deletions frontend-next-migration/src/widgets/NewsCard/ui/NewsCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { memo } from 'react';
import { classNames } from '@/shared/lib/classNames/classNames';
import cls from './NewsCard.module.scss';
import Image from 'next/image';
import hannu from '@/shared/assets/images/heros/hannu-hodari/hannu-hodari.png';
import Link from 'next/link';

interface NewsCardProps {
Expand All @@ -16,7 +15,7 @@ interface NewsCardProps {

const NewsCard = (props: NewsCardProps) => {
const { title, date, id, previewText, titlePicture } = props;
const picture = titlePicture || hannu.src;
const picture = titlePicture;
return (
<Link
rel="id"
Expand All @@ -29,15 +28,15 @@ const NewsCard = (props: NewsCardProps) => {
<p className={cls.text}>{previewText}</p>
<span className={cls.date}>{date}</span>
<div className={cls.imageContainer}>
<div className={cls.imageWrapper}>
{picture && (
<Image
src={picture}
alt={title}
className={cls.image}
width={100}
height={600}
/>
</div>
)}
</div>
</div>
</div>
Expand Down