Feature/basic i18n

.eslintrc.js

@@ -32,5 +32,11 @@ module.exports = {
     'import/no-extraneous-dependencies': 'off', // fixme revisit and refactor files when there's time to spare
     'react/react-in-jsx-scope': 'off',
     'react/jsx-one-expression-per-line': 'warn',
+    'no-restricted-imports': ['error', {
+      paths: [{
+        name: 'react-i18next',
+        message: 'Please import useTranslation from next-i18next.',
+      }],
+    }],
   },
 }

__tests__/index.test.tsx

@@ -1,5 +1,4 @@
 import { fireEvent, render, screen } from '@testing-library/react'
-import '@testing-library/jest-dom'
 import Home from '../pages/index'
 
 vi.mock('../public/icons/info.svg', () => ({ default: () => 'svg' }))
@@ -22,6 +21,12 @@ vi.mock('next/router', () => ({
   }),
 }))
 
+vi.mock('next-i18next', () => ({
+  useTranslation: vi.fn(() => ({
+    t: (str: string) => str,
+  })),
+}))
+
 describe('Home Page', () => {
   // Mock data for municipalities
   const mockMunicipalities = [
@@ -65,6 +70,8 @@ describe('Home Page', () => {
       TotalConsumptionEmission: 0,
       ElectricVehiclePerChargePoints: 0,
       Name: 'Sollentuna',
+      ProcurementScore: 0,
+      ProcurementLink: '',
     },
   ]
 
@@ -73,24 +80,24 @@ describe('Home Page', () => {
   })
 
   it('renders without crashing', () => {
-    expect(screen.getByText(/Hur går det med?/)).toBeInTheDocument()
+    expect(screen.getByText(/startPage:questionTitle/)).toBeInTheDocument()
   })
 
   it('changes view mode when toggle button is clicked', () => {
-    const toggleButton = screen.getByText('Listvy')
+    const toggleButton = screen.getByText('startPage:toggleView.list')
     fireEvent.click(toggleButton)
-    expect(screen.getByText('Kartvy')).toBeInTheDocument()
+    expect(screen.getByText('startPage:toggleView.map')).toBeInTheDocument()
   })
 
   it('handles dataset change', () => {
-    const newDataset = 'Klimatplanerna'
+    const newDataset = 'common:datasets.plans.name'
     const radioButton = screen.getByLabelText(newDataset)
     fireEvent.click(radioButton)
     expect(screen.getByText(newDataset)).toBeInTheDocument()
   })
 
   it('renders the dropdown component', () => {
-    const dropdownInput = screen.getByPlaceholderText(/hur går det i din kommun?/i)
+    const dropdownInput = screen.getByPlaceholderText(/startPage:yourMunicipality/i)
     expect(dropdownInput).toBeInTheDocument()
   })
 })

__tests__/utils/generateMunipacitySitemap.test.ts

@@ -1,10 +1,14 @@
+import { TFunction } from 'next-i18next'
 import {
   generateMunipacitySitemapData,
   generateSitemap,
 } from '../../utils/generateMunipacitySitemap'
 import { Municipality } from '../../utils/types'
 
 const municipalities = [{ Name: 'Stockholm' }, { Name: 'Göteborg' }] as Municipality[]
+
+const t = vi.fn((str) => str) as unknown as TFunction
+
 describe('generateSitemap', () => {
   it('should generate valid municipality sitemap data', () => {
     const siteMap = generateMunipacitySitemapData({ municipalities })
@@ -28,7 +32,7 @@ describe('generateSitemap', () => {
 
   it('should generate a valid sitemap XML string', () => {
     const siteMap = generateMunipacitySitemapData({ municipalities })
-    const sitemapXml = generateSitemap(siteMap)
+    const sitemapXml = generateSitemap(siteMap, t)
     expect(() => new DOMParser().parseFromString(sitemapXml, 'text/xml')).not.toThrow()
   })
 })

components/ComparisonTable.tsx

@@ -127,11 +127,13 @@ function ComparisonTable<T extends object>({ data, columns }: TableProps<T>) {
 
   return (
     <StyledTable key={resizeCount}>
-      {table.getHeaderGroups().map((headerGroup) => (
-        <tr key={headerGroup.id}>
-          {headerGroup.headers.map((header, index) => renderHeader(header, index))}
-        </tr>
-      ))}
+      <thead>
+        {table.getHeaderGroups().map((headerGroup) => (
+          <tr key={headerGroup.id}>
+            {headerGroup.headers.map((header, index) => renderHeader(header, index))}
+          </tr>
+        ))}
+      </thead>
       <tbody>
         {table.getRowModel().rows.map((row) => (
           <TableRow key={row.id} onClick={() => handleRowClick(row)}>

components/DropDown.tsx

@@ -1,6 +1,8 @@
 import { useState, useRef, useEffect } from 'react'
 import styled from 'styled-components'
 import { useRouter } from 'next/router'
+import { useTranslation } from 'next-i18next'
+
 import ArrowDown from '../public/icons/arrow-down.svg'
 import { devices } from '../utils/devices'
 
@@ -83,7 +85,6 @@ const ErrorText = styled.div`
 type Props = {
   municipalitiesName: Array<string>
   placeholder: string
-  className: string
 }
 
 export function getSortedMunicipalities(municipalitiesName: Array<string>) {
@@ -113,7 +114,7 @@ export function search(query: string, municipalitiesName: Array<string>) {
     })
 }
 
-function DropDown({ municipalitiesName, placeholder, className }: Props) {
+function DropDown({ municipalitiesName, placeholder }: Props) {
   const sortedMunicipalities = getSortedMunicipalities(municipalitiesName)
   const [showDropDown, setShowDropDown] = useState(false)
   const [selectedMunicipality, setSelectedMunicipality] = useState<string>('')
@@ -122,6 +123,7 @@ function DropDown({ municipalitiesName, placeholder, className }: Props) {
 
   const ref = useRef<HTMLDivElement>(null)
   const router = useRouter()
+  const { t } = useTranslation()
 
   useEffect(() => {
     const checkIfClickedOutside = (e: MouseEvent) => {
@@ -192,13 +194,13 @@ function DropDown({ municipalitiesName, placeholder, className }: Props) {
               value={selectedMunicipality}
             />
             <Btn onClick={() => setShowDropDown((current) => !current)}>
-              <ArrowDown aria-label="Visa kommun" />
+              <ArrowDown aria-label={t('common:components.DropDown.label')} />
             </Btn>
           </Flex>
           {showDropDown && (
-            <MunicipalitiesWrapper className={className}>
+            <MunicipalitiesWrapper>
               {municipalities.map((name) => (
-                <Municipality onClick={() => onMunicipalityClick(name)}>
+                <Municipality onClick={() => onMunicipalityClick(name)} key={name}>
                   {name}
                 </Municipality>
               ))}

components/FactSection.tsx

@@ -4,6 +4,7 @@ import { useState } from 'react'
 import { H3, ParagraphBold } from './Typography'
 import Icon from '../public/icons/add_light_white.svg'
 import IconGreen from '../public/icons/remove_light_white.svg'
+import Markdown from './Markdown'
 
 const Row = styled.summary`
   display: flex;
@@ -40,6 +41,10 @@ const InfoSection = styled.div`
     text-decoration: underline;
     cursor: pointer;
   }
+
+  & p:first-of-type {
+    margin-top: 0;
+  }
 `
 
 const StyledIcon = styled.div`
@@ -53,7 +58,7 @@ const StyledIcon = styled.div`
 type Props = {
   heading: string
   data: string
-  info?: JSX.Element | string
+  info?: string
 }
 
 function FactSection({ heading, data, info }: Props) {
@@ -75,7 +80,7 @@ function FactSection({ heading, data, info }: Props) {
         )}
       </Row>
       <InfoSection>
-        {info}
+        <Markdown>{info}</Markdown>
       </InfoSection>
     </details>
   )