Merge branch 'dev' into juhaj77/chore/600-fix-all-lint-errors-and-warnings-from-codebase

Author: juhaj77

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

@@ -0,0 +1,6 @@
+import { redirect } from 'next/navigation';
+import { getRouteAllMusicCollectionsPage } from '@/shared/appLinks/RoutePaths';
+
+export default function Page({ params }: { params: { lng: string; collection: string } }) {
+    redirect(`/${params.lng}${getRouteAllMusicCollectionsPage()}`);
+}

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

@@ -0,0 +1,31 @@
+import { createPage } from '@/app/_helpers';
+import { EthicalGuidelinesPageProps } from '@/preparedPages/EthicalGuidelinesPage';
+import { makeEthicalGuidelinesSectionsWithI18n } from '@/entities/PresentationPackages';
+import { getServerTranslation } from '@/shared/i18n';
+import { getRouteEthicalGuidelinesPage } from '@/shared/appLinks/RoutePaths';
+import { defaultOpenGraph } from '@/shared/seoConstants';
+
+export async function _getPage(lng: string) {
+    const { t } = await getServerTranslation(lng, 'ethics');
+
+    return createPage<EthicalGuidelinesPageProps>({
+        buildPage: () => ({
+            sections: makeEthicalGuidelinesSectionsWithI18n(t),
+            title: t('main-title'),
+        }),
+        buildSeo: () => ({
+            title: t('main-title'),
+            description: t('head-description'),
+            keywords: t('head-keywords'),
+            openGraph: {
+                ...defaultOpenGraph,
+                title: t('og-title'),
+                description: t('og-description'),
+                url: `/${lng}${getRouteEthicalGuidelinesPage()}`,
+            },
+            alternates: {
+                canonical: `/${lng}${getRouteEthicalGuidelinesPage()}`,
+            },
+        }),
+    });
+}

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

@@ -0,0 +1 @@
+export { PageLoader as default } from '@/widgets/PageLoader';

frontend-next-migration/src/app/[lng]/(helper)/ethical-guidelines/page.tsx

@@ -0,0 +1,6 @@
+import { EthicalGuidelinesPage } from '@/preparedPages/EthicalGuidelinesPage';
+import { withPageData, withMetadataGenerator } from '@/app/_helpers';
+import { _getPage } from './_getPage';
+
+export const generateMetadata = withMetadataGenerator(_getPage);
+export default withPageData(EthicalGuidelinesPage, _getPage);

frontend-next-migration/src/app/[lng]/(helper)/furniture/layout.tsx

@@ -1,16 +1,10 @@
 import { ReactNode } from 'react';
-import { ScrollTop } from '@/features/ScrollTop';
 import { FurnitureLayout } from '@/preparedPages/FurniturePages';
 
 type Props = {
     children: ReactNode;
 };
 
 export default function Layout({ children }: Props) {
-    return (
-        <FurnitureLayout>
-            {children}
-            <ScrollTop />
-        </FurnitureLayout>
-    );
+    return <FurnitureLayout>{children}</FurnitureLayout>;
 }

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

@@ -1,6 +1,7 @@
 import { ReactNode } from 'react';
 import { Footer } from '@/widgets/Footer';
 import { Navbar } from '@/widgets/Navbar';
+import { ScrollTop } from '@/features/ScrollTop';
 import LayoutDefault from '../../../preparedPages/Layouts/ui/LayoutDefault/LayoutDefault';
 
 type Props = {
@@ -15,6 +16,7 @@ export default function HelperLayout({ children }: Props) {
             <div style={{ flex: 1 }}>
                 <LayoutDefault>{children}</LayoutDefault>
             </div>
+            <ScrollTop />
             <Footer />
         </div>
     );

frontend-next-migration/src/app/[lng]/(home)/_getPage.ts

@@ -80,7 +80,7 @@ export async function _getPage(lng: string) {
                     href: getRouteAllHeroesPage(),
                 },
             },
-            gallery: {
+            altZone: {
                 title: t('project-description-title'),
                 infoText: t('project-description-text'),
                 socialsText: t('socials-text'),
@@ -97,23 +97,6 @@ export async function _getPage(lng: string) {
                 videoLink: AppExternalLinks.previewVideoYoutube,
                 gameImg: iPhone16,
             },
-            galleryCopy: {
-                title: t('project-description-title'),
-                infoText: t('project-description-text'),
-                socialsText: t('socials-text'),
-                followUsText: t('follow-us-text'),
-                seeMoreLink: {
-                    text: t('gallery-seeMore'),
-                    href: getRouteAboutPage(),
-                },
-                socialMediaLinks: [
-                    AppExternalLinks.igPost1,
-                    AppExternalLinks.igPost2,
-                    AppExternalLinks.fbPost1,
-                ],
-                videoLink: AppExternalLinks.previewVideoYoutube,
-                gameImg: gameImg,
-            },
             contactSection: {
                 title: t('contact-title'),
                 googlePLayLink: AppExternalLinks.duunitori,

frontend-next-migration/src/app/[lng]/(home)/layout.tsx

@@ -14,8 +14,8 @@ export default function HomeLayout({ children }: Props) {
         <div style={{ display: 'flex', flexDirection: 'column', minHeight: '100vh' }}>
             <Navbar />
             <div className={cls.joinUsLayout}>{children}</div>
-            <Footer />
             <ScrollTop />
+            <Footer />
         </div>
     );
 }

frontend-next-migration/src/entities/PresentationPackages/index.ts

@@ -9,3 +9,6 @@ export { makeCookiesSectionsWithI18n } from '@/entities/PresentationPackages/mod
 
 export { PrivacySections } from '@/entities/PresentationPackages/model/data/privacySections';
 export { makePrivacySectionsWithI18n } from '@/entities/PresentationPackages/model/makeSectionsWithI18n';
+
+export { EthicalGuidelinesSections } from '@/entities/PresentationPackages/model/data/ethicalGuidelinesSections';
+export { makeEthicalGuidelinesSectionsWithI18n } from '@/entities/PresentationPackages/model/makeSectionsWithI18n';

frontend-next-migration/src/entities/PresentationPackages/model/data/ethicalGuidelinesSections.ts

@@ -0,0 +1,21 @@
+import { createSection } from '../createSection';
+
+const i18nKeyPrefixes = ['intro', 'players', 'employees', 'business', 'society', 'law'];
+
+const imageSrcs = [''];
+const logoSrc = '';
+
+export const EthicalGuidelinesSections = i18nKeyPrefixes.map((key, index) =>
+    createSection({
+        prefix: key,
+        index,
+        image: {
+            src: imageSrcs[index],
+            alt: `${key}-image`,
+        },
+        logo: {
+            src: logoSrc,
+            alt: `${key}-logo`,
+        },
+    }),
+);