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

fix: rebase issues

Browse Source
This commit is contained in:
Christel Westerberg
2024-05-21 16:13:50 +02:00
parent d5f2604ca0
commit 158b5a5dbb
25 changed files with 43 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/MyPages/Breadcrumbs/index.tsx
+2 -12
View File
@@ -1,4 +1,3 @@
import { Lang } from "@/constants/languages"
import { _ } from "@/lib/translation"
import { serverClient } from "@/lib/trpc/server"
@@ -7,17 +6,8 @@ import BreadcrumbsWithLink from "./BreadcrumbWithLink"
import styles from "./breadcrumbs.module.css"
export default async function Breadcrumbs({
href,
locale,
}: {
href: string
locale: Lang
}) {
const breadcrumbs = await serverClient().contentstack.breadcrumbs.get({
href,
locale,
})
export default async function Breadcrumbs() {
const breadcrumbs = await serverClient().contentstack.breadcrumbs.get()
return (
<nav className={styles.breadcrumbs}>
components/MyPages/Header/Hamburger/hamburger.module.css
-16
View File
@@ -1,16 +0,0 @@
.hamburger {
background: none;
border: none;
cursor: pointer;
display: flex;
flex-direction: column;
gap: 0.5rem;
padding: 0;
}
.line {
background-color: var(--some-black-color, #1c1b1f);
border-radius: 0.8rem;
height: 0.2rem;
width: 2.5rem;
}
components/MyPages/Header/Hamburger/index.tsx
-11
View File
@@ -1,11 +0,0 @@
import styles from "./hamburger.module.css"
export default function Hamburger() {
return (
<button className={styles.hamburger} type="button">
<div className={styles.line} />
<div className={styles.line} />
<div className={styles.line} />
</button>
)
}
components/MyPages/Header/LanguageSwitcher/index.tsx
-17
View File
@@ -1,17 +0,0 @@
import Image from "@/components/Image"
import styles from "./language.module.css"
export default function LanguageSwitcher() {
return (
<div className={styles.switcher}>
<Image
alt="Swedish flag"
height={21}
src="/_static/icons/sweden.svg"
width={21}
/>
<span>SV / SEK</span>
</div>
)
}
components/MyPages/Header/LanguageSwitcher/language.module.css
-15
View File
@@ -1,15 +0,0 @@
.switcher {
align-items: center;
display: none;
font-family: var(--ff-fira-sans);
font-size: 1.4rem;
font-weight: 400;
gap: 0.6rem;
line-height: 1.6rem;
}
@media screen and (min-width: 950px) {
.switcher {
display: flex;
}
}
components/MyPages/Header/Logo/index.tsx
-34
View File
@@ -1,34 +0,0 @@
import Link from "next/link"
import { GetMyPagesLogo } from "@/lib/graphql/Query/Logo.graphql"
import { request } from "@/lib/graphql/request"
import Image from "@/components/Image"
import styles from "./logo.module.css"
import type { LangParams } from "@/types/params"
import type { LogoQueryData } from "@/types/requests/myPages/logo"
export default async function Logo({ lang }: LangParams) {
const { data } = await request<LogoQueryData>(GetMyPagesLogo, {
locale: lang,
})
if (
!data.all_header.items.length ||
!data.all_header.items?.[0].logoConnection.totalCount
) {
return null
}
const logo = data.all_header.items[0].logoConnection.edges[0]
return (
<Link className={styles.link} href="#">
<Image
alt={logo.node.title}
height={logo.node.dimension.height}
src={logo.node.url}
width={logo.node.dimension.width}
/>
</Link>
)
}
components/MyPages/Header/Logo/logo.module.css
-4
View File
@@ -1,4 +0,0 @@
.link {
cursor: pointer;
display: block;
}
components/MyPages/Header/User/index.tsx
-15
View File
@@ -1,15 +0,0 @@
import { serverClient } from "@/lib/trpc/server"
import styles from "./user.module.css"
export default async function User() {
const user = await serverClient().user.get()
return (
<div className={styles.user}>
{user.firstName[0].toUpperCase()}
{user.lastName[0].toUpperCase()}
<span className={styles.alert}>1</span>
</div>
)
}
components/MyPages/Header/User/user.module.css
-43
View File
@@ -1,43 +0,0 @@
.user {
align-items: center;
background-color: var(--some-black-color, #000);
border-radius: 50%;
color: var(--some-white-color, #fff);
display: flex;
font-family: var(--ff-fira-sans);
font-size: 1.2rem;
font-weight: 600;
height: 3.5rem;
justify-content: center;
position: relative;
width: 3.5rem;
}
.alert {
align-items: center;
background-color: var(--some-red-color, #ed2027);
border-radius: 50%;
display: flex;
font-size: 1rem;
height: 2rem;
justify-content: center;
position: absolute;
right: -1rem;
top: -0.5rem;
width: 2rem;
}
@media screen and (min-width: 950px) {
.user {
height: 2.8rem;
width: 2.8rem;
}
.alert {
font-size: 0.6rem;
height: 1rem;
right: -0.2rem;
top: -0.1rem;
width: 1rem;
}
}
components/MyPages/Header/header.module.css
-25
View File
@@ -1,25 +0,0 @@
.header {
align-items: center;
background-color: var(--some-white-color, #fff);
box-shadow: 0px 1.0006656646728516px 1.0006656646728516px 0px #0000000d;
display: grid;
gap: 3rem;
grid-template-columns: 1fr auto auto;
height: var(--header-height);
padding: 0 2rem;
position: sticky;
top: 0;
z-index: 999;
}
@media screen and (min-width: 950px) {
.header {
background-color: var(--some-grey-color, #ececec);
border-bottom: 0.1rem solid var(--some-grey-color, #ccc);
box-shadow: none;
gap: 3.2rem;
grid-template-columns: 1fr 19rem auto auto;
padding: 0 2.4rem;
}
}
components/MyPages/Header/index.tsx
-19
View File
@@ -1,19 +0,0 @@
import Hamburger from "./Hamburger"
import LanguageSwitcher from "./LanguageSwitcher"
import Logo from "./Logo"
import User from "./User"
import styles from "./header.module.css"
import type { LangParams } from "@/types/params"
export default function Header({ lang }: LangParams) {
return (
<header className={styles.header}>
<Logo lang={lang} />
<LanguageSwitcher />
<User />
<Hamburger />
</header>
)
}