Merge Dev To Main #621

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.

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

Rutjake merged 92 commits into main from dev

Feb 3, 2026

.github/CODEOWNERS

Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		* @leolabdev @Skoivumaki @kaisahakola @Rutjake @patinen
		* @leolabdev @Skoivumaki @Rutjake @patinen

frontend-next-migration/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

frontend-next-migration/package.json

-Original file line number
+Diff line change
@@ Expand Up / @@ -37,6 +37,7 @@ @@
         "@fortawesome/react-fontawesome": "^0.2.0",
         "@hookform/resolvers": "^3.3.2",
         "@next/bundle-analyzer": "^14.0.1",
+        "@next/third-parties": "^16.0.8",
         "@reduxjs/toolkit": "^1.9.7",
         "accept-language": "^3.0.18",
         "html-react-parser": "^5.1.1",
@@ Expand Down @@

frontend-next-migration/src/app/[lng]/(helper)/clans/[id]/_getPage.ts

-Original file line number
+Diff line change
@@ Expand Up / @@ -3,14 +3,43 @@ import { getServerTranslation } from '@/shared/i18n'; @@
     import { ClanRoomSubPageProps } from '@/preparedPages/ClanPages';
     import { envHelper } from '@/shared/const/envHelper';
     import { notFound } from 'next/navigation';
+    import { getRouteOneClanPage } from '@/shared/appLinks/RoutePaths';
+    import type { IClan } from '@/entities/Clan';
+    import { baseUrl, defaultOpenGraph } from '@/shared/seoConstants';
+    const toAbsolute = (src?: string | null) =>
+        !src ? null : /^https?:\/\//i.test(src) ? src : `${baseUrl}${src}`;
+    // Use fallback only, no clan-specific logo image exists
+    function getOgImageUrl(_: Partial<IClan>) {
+        const fallback = defaultOpenGraph.images?.[0]?.url ?? null;
+        return toAbsolute(fallback);
+    }
     export async function _getPage(lng: string, id: string) {
         const { t } = await getServerTranslation(lng, 'clan');
         const response = await fetch(`${envHelper.apiLink}/clan/${id}`);
         if (!response.ok) {
-            return notFound();
+            notFound();
         }
-        const clanData = await response.json();
+        const payload = await response.json();
+        const clan = payload?.data?.Clan ?? {};
+        const name = (clan.name as string | undefined)?.trim() || id;
+        const desc = (clan.phrase as string | undefined)?.trim() || t('head-description');
+        // Routes & SEO
+        const relPath = getRouteOneClanPage(encodeURIComponent(id));
+        const path = `/${lng}${relPath}`;
+        const title = `${t('head-title')} — ${name}`;
+        const keywords = `${t('head-keywords')}${clan.tag ? `, ${clan.tag}` : ''}`;
+        const ogUrl = getOgImageUrl(clan);
+        const ogImages = ogUrl
+            ? [{ url: ogUrl, alt: `${name} — ${t('head-title')}` }]
+            : (defaultOpenGraph.images ?? []);
         return createPage<ClanRoomSubPageProps>({
             buildPage: () => ({
                 translations: {
@@ Expand Down Expand Up / @@ -40,9 +69,18 @@ export async function _getPage(lng: string, id: string) { @@
                 },
             }),
             buildSeo: () => ({
-                title: `${t('head-title')}: ${clanData.data.Clan.name}`,
-                description: `${clanData.data.Clan.phrase}`,
-                keywords: `${t('head-keywords')}, ${clanData.data.Clan.tag}`,
+                title,
+                description: desc,
+                keywords,
+                openGraph: {
+                    ...defaultOpenGraph,
+                    type: 'website',
+                    title,
+                    description: desc,
+                    url: path,
+                    images: ogImages,
+                },
+                alternates: { canonical: path },
             }),
         });
     }

...tend-next-migration/src/app/[lng]/(helper)/collections/furniture/set/[group]/_getPage.tsx

-Original file line number
+Diff line change
@@ -1,21 +1,65 @@
     import { createPage } from '@/app/_helpers';
     import { getServerTranslation } from '@/shared/i18n';
+    import { notFound } from 'next/navigation';
     import { SingleFurnitureCollectionPageProps } from '@/preparedPages/FurnitureCollectionsPages';
+    import { baseUrl, defaultOpenGraph } from '@/shared/seoConstants';
+    import { FurnitureManager } from '@/entities/Furniture';
     import React from 'react';
     type Props = React.ComponentProps<typeof SingleFurnitureCollectionPageProps>;
+    function getOgImageUrl(set: ReturnType<FurnitureManager['getFurnitureSet']>) {
+        const img = set?.coverWebp ?? set?.cover;
+        if (!img) return null;
+        const src = typeof img === 'string' ? img : img.src;
+        return /^https?:\/\//i.test(src) ? src : `${baseUrl}${src}`;
+    }
     export async function _getPage(lng: string, group: string) {
         const { t } = await getServerTranslation(lng, 'furniture');
+        const manager = new FurnitureManager();
+        const set = manager.getFurnitureSet(group);
+        if (!set) notFound();
+        // Title-casing fallback (e.g. "neuro" -> "Neuro")
+        const toTitleCase = (text: string) =>
+            text
+                .trim()
+                .replace(/[-_]+/g, ' ')
+                .replace(/\b[a-z]/gi, (ch) => ch.toLocaleUpperCase());
+        const setName = t(`sets.${group}.name`, toTitleCase(group));
+        const setDesc = t(`sets.${group}.description`, t('head-description'));
+        // Routes & SEO
+        const relPath = `/collections/furniture/set/${encodeURIComponent(group)}`;
+        const path = `/${lng}${relPath}`;
+        const title = `${setName} - ${t('head-title')}`;
+        const keywords = `${t('head-keywords')}, ${setName}`;
+        const ogImageUrl = getOgImageUrl(set);
+        const ogImage = ogImageUrl
+            ? ({ url: ogImageUrl, alt: `${setName} - ${t('furniture-collections-title')}` } as const)
+            : null;
+        const ogImages = ogImage ? [ogImage] : (defaultOpenGraph.images ?? []);
         return createPage<Props>({
             buildPage: () => ({
                 collectionId: group,
             }),
             buildSeo: () => ({
-                title: t('head-title'),
-                description: t('head-description'),
-                keywords: t('head-keywords'),
+                title,
+                description: setDesc,
+                keywords,
+                openGraph: {
+                    ...defaultOpenGraph,
+                    type: 'website',
+                    title,
+                    description: setDesc,
+                    url: path,
+                    images: ogImages,
+                },
+                alternates: { canonical: path },
             }),
         });
     }

frontend-next-migration/src/app/[lng]/(helper)/collections/loading.tsx

-Original file line number
+Diff line change
@@ -1 +1,12 @@
-    export { PageLoader as default } from '@/widgets/PageLoader';
+    export default function Loading() {
+        return (
+            <div
+                role="status"
+                aria-busy="true"
+                aria-live="polite"
+                style={{ padding: '1rem' }}
+            >
+                Loading…
+            </div>
+        );
+    }

frontend-next-migration/src/app/[lng]/(helper)/defense-gallery/[herogroup]/_getPage.ts

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,10 +1,26 @@
  
    import { createPage } from '@/app/_helpers';

    import { getServerTranslation } from '@/shared/i18n';

    import { notFound } from 'next/navigation';

    import { HeroGroup } from '@/entities/Hero';

    import { HeroGroup, GroupInfo } from '@/entities/Hero';

    import {

        initializeHeroGroups,

        initializeHeroGroupsFromDirectus,

    } from '@/entities/Hero/model/initializeHeroGroups';

    import { StaticImageData } from 'next/image';

    import { SingleDefensePageProps } from '@/preparedPages/DefenseGalleryPages';

    import { getRouteDefenseGalleryGroupPage } from '@/shared/appLinks/RoutePaths';

    import defenceGalleryImage from '@/shared/assets/images/descriptionCard/defense_gallery.png';

    import { baseUrl, defaultOpenGraph } from '@/shared/seoConstants';

    function getOgImageUrl(info?: GroupInfo) {

        const candidate =

            (info?.srcImg as string | StaticImageData | undefined) ??

            (info?.heroes?.[0]?.srcImg as string | StaticImageData | undefined) ??

            (defaultOpenGraph.images?.[0]?.url as string | undefined);

        const src = typeof candidate === 'string' ? candidate : candidate?.src;

        if (!src) return null;

        return /^https?:\/\//i.test(src) ? src : `${baseUrl}${src}`;

    }

    export async function _getPage(lng: string, heroGroup: string) {

        const { t } = await getServerTranslation(lng, 'heroes');

    @@ -13,27 +29,49 @@ export async function _getPage(lng: string, heroGroup: string) {
  
            notFound();

        }

        const group = heroGroup as HeroGroup;

        // Try to fetch from Directus first, fallback to static data

        let groups: Record<HeroGroup, GroupInfo>;

        try {

            groups = await initializeHeroGroupsFromDirectus(lng as 'en' | 'fi' | 'ru');

            // If Directus returns empty, fallback to static

            if (Object.keys(groups).length === 0) {

                groups = initializeHeroGroups(t);

            }

        } catch {

            groups = initializeHeroGroups(t);

        }

        const info = groups[group];

        const groupName = info?.name ?? group;

        const groupDesc = info?.description ?? t('defense-gallery-description');

        // Routes & SEO

        const relPath = getRouteDefenseGalleryGroupPage(encodeURIComponent(group));

        const path = `/${lng}${relPath}`;

        const title = `${t('og-title')} - ${groupName}`;

        const keywords = `${t('head-keywords')}, ${groupName}`;

        const ogImageUrl = getOgImageUrl(info);

        const ogImages = ogImageUrl

            ? [{ url: ogImageUrl, alt: `${groupName} - ${t('defense-gallery')}` }]

            : (defaultOpenGraph.images ?? []);

        return createPage<SingleDefensePageProps>({

            buildPage: () => ({

                heroGroup: heroGroup as HeroGroup,

            }),

            buildPage: () => ({ heroGroup: group }),

            buildSeo: () => ({

                title: heroGroup,

                description: heroGroup,

                keywords: `${t('head-keywords')}, ${heroGroup}`,

                title,

                description: groupDesc,

                keywords,

                openGraph: {

                    images: [

                        {

                            url: defenceGalleryImage.src,

                        },

                    ],

                    title: `${t('og-title')} - ${heroGroup}`,

                    description: t('og-description'),

                    url: `/${lng}${getRouteDefenseGalleryGroupPage(heroGroup as HeroGroup)}`,

                },

                alternates: {

                    canonical: `/${lng}${getRouteDefenseGalleryGroupPage(heroGroup as HeroGroup)}`,

                    ...defaultOpenGraph,

                    type: 'website',

                    title,

                    description: groupDesc,

                    url: path,

                    images: ogImages,

                },

                alternates: { canonical: path },

            }),

        });

    }

frontend-next-migration/src/app/[lng]/(helper)/defense-gallery/[herogroup]/not-found.tsx

-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,10 @@ export default function NotFound() { @@
                 }}
             >
                 <h1>{t('not-found-title')}</h1>
-                <Link href={getRouteAllHeroesPage()}>
+                <Link
+                    href={getRouteAllHeroesPage()}
+                    prefetch={false}
+                >
                     <b>{t('not-found-check-heroes')}</b>
                 </Link>
             </div>
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge Dev To Main #621

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!