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

fix: refactor token usage and types

Browse Source
This commit is contained in:
Christel Westerberg
2024-05-23 08:21:01 +02:00
parent 9b295d0126
commit 215b0901c0
7 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/[lang]/fonts.ts
View File

@@ -16,7 +16,7 @@ export const firaSans = Fira_Sans({
export const biroScriptPlus = localFont({ export const biroScriptPlus = localFont({
src: [ src: [
{ {
path: "../../../public/_static/fonts/biro-script-plus/Biro-Script-Plus.ttf", path: "../../public/_static/fonts/biro-script-plus/Biro-Script-Plus.ttf",
style: "normal", style: "normal",
weight: "500", weight: "500",
}, },

3
app/[lang]/webview/layout.module.css
View File

@@ -1,6 +1,5 @@
.layout { .layout {
padding-bottom: 7.7rem;
font-family: var(--ff-fira-sans); font-family: var(--ff-fira-sans);
background-color: var(--Brand-Coffee-Subtle); background-color: var(--Scandic-Brand-Warm-White);
min-height: 100dvh; min-height: 100dvh;
} }

6
components/ContentType/Webviews/accountPage.module.css
View File

@@ -1,7 +1,5 @@
.blocks { .blocks {
display: grid; display: grid;
gap: 4.2rem; gap: var(--Spacing-x5);
padding-left: 2rem; padding: var(--Spacing-x2);
padding-right: 2rem;
padding-top: 2rem;
} }

10
components/ContentType/Webviews/loyaltyPage.module.css
View File

@@ -1,12 +1,10 @@
.content { .content {
display: grid; display: grid;
padding-top: 2rem; padding: var(--Spacing-x2);
padding-left: 2rem; gap: var(--Spacing-x5);
padding-right: 2rem;
gap: 4.2rem;
} }
.sidebar { .sidebar {
margin-left: calc(2rem * -1); margin-left: calc(var(--Spacing-x2) * -1);
margin-right: calc(2rem * -1); margin-right: calc(var(--Spacing-x2) * -1);
} }

2
components/Loyalty/Blocks/WebView/index.tsx
View File

@@ -26,7 +26,7 @@ export function Blocks({ lang, blocks }: BlocksProps & LangParams) {
case LoyaltyBlocksTypenameEnum.LoyaltyPageBlocksDynamicContent: case LoyaltyBlocksTypenameEnum.LoyaltyPageBlocksDynamicContent:
const dynamicContent = { const dynamicContent = {
...block.dynamic_content, ...block.dynamic_content,
linK: block.dynamic_content.link link: block.dynamic_content.link
? { ? {
...block.dynamic_content.link, ...block.dynamic_content.link,
href: modWebviewLink(block.dynamic_content.link.href, lang), href: modWebviewLink(block.dynamic_content.link.href, lang),

2
components/Webviews/LinkToOverview/linkToOverview.module.css
View File

@@ -1,5 +1,5 @@
.overviewLink { .overviewLink {
font-size: 1.6rem; font-size: var(--Spacing-x2);
color: var(--Scandic-Brand-Burgundy, #4d001b); color: var(--Scandic-Brand-Burgundy, #4d001b);
display: flex; display: flex;
align-items: center; align-items: center;

2
server/context.ts
View File

@@ -10,7 +10,7 @@ type CreateContextOptions = {
pathname: string pathname: string
uid?: string | null uid?: string | null
url: string url: string
webToken: string | undefined webToken?: string
} }
/** Use this helper for: /** Use this helper for: