scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(sw-187): fix merge conflicts

Browse Source
This commit is contained in:
Pontus Dreij
2024-09-04 09:22:37 +02:00
parent d2e56739af
commit 4e2ce378ed
3 changed files with 50 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/Footer/Details/index.tsx
View File

@@ -1,6 +1,6 @@
import LanguageSwitcher from "@/components/Current/Header/LanguageSwitcher"
import { getIconByIconName } from "@/components/Icons/get-icon-by-icon-name"
import Image from "@/components/Image"
import LanguageSwitcher from "@/components/LanguageSwitcher"
import Link from "@/components/TempDesignSystem/Link"
import Footnote from "@/components/TempDesignSystem/Text/Footnote"
import { getLang } from "@/i18n/serverContext"
@@ -84,7 +84,7 @@ export default function FooterDetails() {
{
// This will be changed to the new LangueSwitcher that is done in the header branch, when implementing contentstack
}
<LanguageSwitcher urls={languageSwitcher.urls} />
<LanguageSwitcher type="desktopFooter" urls={languageSwitcher.urls} />
</div>
</div>
</section>

12
components/Footer/Navigation/SecondaryNav/index.tsx
View File

@@ -22,8 +22,12 @@ export default function FooterSecondaryNav({
</Body>
<ul className={styles.secondaryNavigationList}>
{appDownloads.links.map((link) => (
<li key={link.id} className={styles.appDownloadItem}>
<a href={link.href} target="_blank" aria-label={link.title}>
<li key={link.type} className={styles.appDownloadItem}>
<a
href={link.href.href}
target="_blank"
aria-label={link.href.title}
>
<Image
src={
AppDownLoadLinks[link.type as keyof typeof AppDownLoadLinks]
@@ -47,7 +51,7 @@ export default function FooterSecondaryNav({
<li key={link.id} className={styles.secondaryNavigationItem}>
{link.isExternal ? (
<a
href={link.href}
href={link.url}
key={link.title}
target={link.openInNewTab ? "_blank" : "_self"}
aria-label={link.title}
@@ -55,7 +59,7 @@ export default function FooterSecondaryNav({
{link.title}
</a>
) : (
<Link href={link.href} key={link.title}>
<Link href={link.url} key={link.title}>
{link.title}
</Link>
)}

208
components/Footer/mockedData.ts
View File

@@ -127,7 +127,46 @@ export const footer = {
],
},
],
tertiaryLinks: [
{
title: "Cookies",
href: "/cookies",
id: "cookies",
},
{
title: "Privacy policy",
href: "/privacy",
id: "privacy",
},
],
languageSwitcher: {
urls: {
da: {
url: "https://www.scandichotels.com/da",
isExternal: true,
},
de: {
url: "https://www.scandichotels.com/de",
isExternal: true,
},
en: {
url: "https://www.scandichotels.com/en",
isExternal: true,
},
fi: {
url: "https://www.scandichotels.com/fi",
isExternal: true,
},
no: {
url: "https://www.scandichotels.com/no",
isExternal: true,
},
sv: {
url: "https://www.scandichotels.com/sv",
isExternal: true,
},
},
},
copyrightCompany: "Scandic AB",
copyrightInfo: "All rights reserved.",
socialMedia: {
@@ -149,171 +188,4 @@ export const footer = {
},
],
},
tertiaryLinks: [
{
title: "Cookies",
href: "/cookies",
id: "cookies",
},
{
title: "Privacy policy",
href: "/privacy",
id: "privacy",
},
],
languageSwitcher: {
urls: {
da: {
url: "https://www.scandichotels.com/da",
isExternal: true,
},
de: {
url: "https://www.scandichotels.com/de",
isExternal: true,
},
en: {
url: "https://www.scandichotels.com/en",
isExternal: true,
},
fi: {
url: "https://www.scandichotels.com/fi",
isExternal: true,
},
no: {
url: "https://www.scandichotels.com/no",
isExternal: true,
},
sv: {
url: "https://www.scandichotels.com/sv",
isExternal: true,
},
},
},
}
copyrightCompany: "Scandic AB",
copyrightInfo: "All rights reserved.",
socialMedia: {
links: [
{
title: "Facebook",
href: "https://www.facebook.com/scandichotels/",
id: "facebook",
},
{
title: "Instagram",
href: "https://www.instagram.com/scandichotels/",
id: "instagram",
},
{
title: "Tripadvisor",
href: "https://www.tripadvisor.com/Hotel_Review-g297628-d1020208712-Reviews-Scandic_Hotels-Stockholm_Sweden.html",
id: "tripadvisor",
},
],
},
tertiaryLinks: [
{
title: "Cookies",
href: "/cookies",
id: "cookies",
},
{
title: "Privacy policy",
href: "/privacy",
id: "privacy",
},
],
languageSwitcher: {
urls: {
da: {
url: "https://www.scandichotels.com/da",
isExternal: true,
},
de: {
url: "https://www.scandichotels.com/de",
isExternal: true,
},
en: {
url: "https://www.scandichotels.com/en",
isExternal: true,
},
fi: {
url: "https://www.scandichotels.com/fi",
isExternal: true,
},
no: {
url: "https://www.scandichotels.com/no",
isExternal: true,
},
sv: {
url: "https://www.scandichotels.com/sv",
isExternal: true,
},
},
},
}
export const detailsData = {
copyrightCompany: "© 2024 Scandic AB",
copyrightInfo: "All rights reserved.",
socialMedia: {
links: [
{
title: "Facebook",
href: "https://www.facebook.com/scandichotels/",
id: "facebook",
},
{
title: "Instagram",
href: "https://www.instagram.com/scandichotels/",
id: "instagram",
},
{
title: "Tripadvisor",
href: "https://www.tripadvisor.com/Hotel_Review-g297628-d1020208712-Reviews-Scandic_Hotels-Stockholm_Sweden.html",
id: "tripadvisor",
},
],
},
tertiaryLinks: [
{
title: "Cookies",
href: "/cookies",
id: "cookies",
},
{
title: "Privacy policy",
href: "/privacy",
id: "privacy",
},
],
languageSwitcher: {
urls: {
da: {
url: "https://www.scandichotels.com/da",
isExternal: true,
},
de: {
url: "https://www.scandichotels.com/de",
isExternal: true,
},
en: {
url: "https://www.scandichotels.com/en",
isExternal: true,
},
fi: {
url: "https://www.scandichotels.com/fi",
isExternal: true,
},
no: {
url: "https://www.scandichotels.com/no",
isExternal: true,
},
sv: {
url: "https://www.scandichotels.com/sv",
isExternal: true,
},
},
},
}