Merge pull request #609 from Alt-Org/eleino/feature/606-implement-google-analytics-and-perform-minor-uicontent-fixes

Rutjake · web-flow · commit b82fc2abc5db · 2026-01-05T10:10:12.000+02:00
Eleino/feature/606 implement google analytics and perform minor uicontent fixes
diff --git a/frontend-next-migration/package-lock.json b/frontend-next-migration/package-lock.json
diff --git a/frontend-next-migration/package.json b/frontend-next-migration/package.json
@@ -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",
diff --git a/frontend-next-migration/src/app/[lng]/layout.tsx b/frontend-next-migration/src/app/[lng]/layout.tsx
@@ -11,6 +11,8 @@ import localFont from 'next/font/local';
 //import CookieConsentV2 from '@/features/CookieConsentV2/CookieConsentV2';
 import { CookieConsentV3 } from '@/features/CookieConsentV3';
 import { baseUrl, defaultOpenGraph } from '@/shared/seoConstants';
+import { GoogleAnalytics } from '@next/third-parties/google';
+import { envHelper } from '@/shared/const/envHelper';
 // const openSans = Open_Sans({
 //   subsets: ['latin'],
 //   display: 'swap',
@@ -99,6 +101,8 @@ export default function RootLayout(props: Props) {
 
     const { lng } = params;
 
+    const GA_ID = envHelper.isDevMode ? envHelper.gaDevId : envHelper.gaProdId;
+
     return (
         <html
             lang={lng}
@@ -128,6 +132,7 @@ export default function RootLayout(props: Props) {
                     </Providers>
                 </LayoutWithBackground>
             </body>
+            {GA_ID && <GoogleAnalytics gaId={GA_ID} />}
         </html>
     );
 }
diff --git a/frontend-next-migration/src/preparedPages/NewsPages/ui/NewsElementPage/ui/NewsElementPage.module.scss b/frontend-next-migration/src/preparedPages/NewsPages/ui/NewsElementPage/ui/NewsElementPage.module.scss
@@ -65,6 +65,10 @@
     object-position: center;
     align-self: center;
     box-shadow: var(--s-blur);
+    @media (max-width: breakpoint(md)) {
+        width: auto;
+        height: 75%;
+    }
 }
 
 .imageBlur {
diff --git a/frontend-next-migration/src/shared/appLinks/appExternalLinks.ts b/frontend-next-migration/src/shared/appLinks/appExternalLinks.ts
@@ -26,9 +26,9 @@ export const AppExternalLinks = {
     dlpackage: 'https://drive.google.com/file/d/16MJzw25RAzV0uH6m9VzReYGFCExK23Uh/view',
     pastversions: 'https://drive.google.com/drive/folders/1n5GVJVXFF2F1sF5-C07uYkFNd9Bsdxzu',
     prgActivityReport:
-        'https://drive.google.com/file/d/1UATY417TZnsShxNQGagV6JcJOsElvaB5/view?usp=drive_link',
+        'https://drive.google.com/file/d/1UkBPyRLEcbWwbUy37tmHCMcr5AYzbZHe/view?usp=drive_link',
     prgBylaws:
         'https://drive.google.com/file/d/1_ek4eGfbxbCYLliY53gLIs0Gv2pwRkhw/view?usp=drive_link',
     prgActionPlan:
-        'https://drive.google.com/file/d/1PdeCJNDY4yz5y7hQzRGpYrJF0q8Eqt9L/view?usp=drive_link',
+        'https://drive.google.com/file/d/1fu_iab151a2sNvaSp_U8-zKJKdvVhnhz/view?usp=drive_link',
 } as const;
diff --git a/frontend-next-migration/src/shared/const/envHelper.ts b/frontend-next-migration/src/shared/const/envHelper.ts
@@ -21,4 +21,6 @@ export const envHelper = {
     strapiHost: process.env.NEXT_PUBLIC_STRAPI_HOST || '',
     directusHost: process.env.NEXT_PUBLIC_DIRECTUS_HOST || '',
     openAiApiKey: process.env.NEXT_PUBLIC_LLM_HOST || '',
+    gaProdId: process.env.NEXT_PUBLIC_GA_PROD_ID || '',
+    gaDevId: process.env.NEXT_PUBLIC_GA_DEV_ID || '',
 } as const;
