From 16b817f469207984eab7c4f520e73756c145ae70 Mon Sep 17 00:00:00 2001 From: Simon Emanuelsson Date: Fri, 24 May 2024 10:13:24 +0200 Subject: [PATCH] feat(WEB-250): overview hero final ui --- .env.local.example | 7 +- .gitignore | 5 +- .../my-pages/@breadcrumbs/[...path]/page.tsx | 5 + .../my-pages/@breadcrumbs/default.tsx | 3 + .../my-pages/[...path]/page.module.css | 39 +- .../(protected)/my-pages/[...path]/page.tsx | 27 +- .../(protected)/my-pages/layout.module.css | 5 +- .../(live)/(protected)/my-pages/layout.tsx | 14 +- .../(public)/[contentType]/[uid]/page.tsx | 2 +- app/[lang]/(live)/error.module.css | 4 +- app/[lang]/(live)/error.tsx | 6 +- app/[lang]/(live)/layout.tsx | 5 +- .../(live)/middleware-error/[status]/page.tsx | 6 +- app/[lang]/webview/layout.tsx | 6 +- app/fonts.ts | 25 - app/global-error.module.css | 2 +- app/global-error.tsx | 7 +- app/globals.css | 70 + app/not-found.module.css | 2 +- components/ContentType/LoyaltyPage.tsx | 5 +- components/ContentType/loyaltyPage.module.css | 2 +- .../Current/Aside/Contacts/contact.module.css | 4 +- components/Current/Aside/Puff/puff.module.css | 4 +- .../Current/Blocks/List/list.module.css | 2 +- components/Current/Blocks/blocks.module.css | 2 +- .../Header/MainMenu/mainMenu.module.css | 24 +- .../Current/Header/TopMenu/topMenu.module.css | 8 +- components/Current/Header/header.module.css | 4 +- components/Current/Hero/hero.module.css | 4 +- .../Current/Preamble/preamble.module.css | 14 +- components/Current/Section/section.module.css | 4 +- .../LanguageSwitcher/language.module.css | 2 +- components/Header/header.module.css | 4 +- components/Levels/Level/BestFriend.tsx | 161 + components/Levels/Level/CloseFriend.tsx | 169 + components/Levels/Level/DearFriend.tsx | 157 + components/Levels/Level/GoodFriend.tsx | 167 + components/Levels/Level/LoyalFriend.tsx | 157 + components/Levels/Level/NewFriend.tsx | 149 + components/Levels/Level/ScandicFamily.tsx | 189 + components/Levels/Level/ScandicFriends.tsx | 205 ++ components/Levels/Level/TrueFriend.tsx | 153 + components/Levels/index.tsx | 9 + components/Levels/levels.module.css | 19 + components/Levels/levels.ts | 7 + components/Levels/variants.ts | 18 + .../DynamicContent/HowItWorks/index.tsx | 8 +- .../DynamicContent/LoyaltyLevels/index.tsx | 4 +- .../LoyaltyLevels/loyaltyLevels.module.css | 9 +- .../OverviewTable/BenefitCard/index.tsx | 2 +- .../OverviewTable/Title/index.tsx | 4 +- .../Loyalty/Blocks/DynamicContent/index.tsx | 34 +- components/Loyalty/Blocks/index.tsx | 2 +- .../JoinLoyalty/Contact/contact.module.css | 2 +- .../Sidebar/JoinLoyalty/Contact/index.tsx | 2 +- .../Loyalty/Sidebar/JoinLoyalty/index.tsx | 4 +- .../JoinLoyalty/joinLoyalty.module.css | 2 +- components/Loyalty/Sidebar/sidebar.module.css | 2 +- components/MyPages/AccountPage/Content.tsx | 2 +- .../MyPages/AccountPage/Webview/Content.tsx | 9 +- .../Blocks/Benefits/CurrentLevel/index.tsx | 2 +- .../Blocks/Benefits/NextLevel/next.module.css | 7 +- .../Blocks/Challenges/challenges.module.css | 4 +- .../MyPages/Blocks/Challenges/index.tsx | 12 +- .../MyPages/Blocks/Header/header.module.css | 16 +- components/MyPages/Blocks/Header/index.tsx | 53 +- .../Blocks/Overview/Buttons/btn.module.css | 2 +- .../Blocks/Overview/Friend/friend.module.css | 84 +- .../MyPages/Blocks/Overview/Friend/index.tsx | 39 +- .../Blocks/Overview/Stats/Label/index.tsx | 5 + .../Overview/Stats/Label/label.module.css | 9 + .../Blocks/Overview/Stats/NextLevel/index.tsx | 22 + .../Stats/NextLevel/nextLevel.module.css | 12 + .../Blocks/Overview/Stats/Points/index.tsx | 26 + .../Stats/Points/totalPoints.module.css | 11 + .../Blocks/Overview/Stats/Progress/index.tsx | 21 - .../Stats/Progress/progress.module.css | 62 - .../Blocks/Overview/Stats/Title/index.tsx | 5 - .../Overview/Stats/Title/title.module.css | 16 - .../Overview/Stats/TotalPoints/index.tsx | 19 - .../Stats/TotalPoints/totalPoints.module.css | 20 - .../MyPages/Blocks/Overview/Stats/index.tsx | 15 +- .../Blocks/Overview/Stats/stats.module.css | 12 +- components/MyPages/Blocks/Overview/index.tsx | 21 +- .../Blocks/Overview/overview.module.css | 35 +- components/MyPages/Blocks/Shortcuts/index.tsx | 21 +- .../Stays/Container/container.module.css | 3 +- .../Previous/EmptyPreviousStays/index.tsx | 4 +- .../MyPages/Blocks/Stays/Previous/index.tsx | 5 +- .../Soonest/EmptyUpcomingStays/index.tsx | 11 +- .../MyPages/Blocks/Stays/Soonest/index.tsx | 4 +- .../MyPages/Blocks/Stays/StayCard/index.tsx | 10 +- .../Upcoming/EmptyUpcomingStays/index.tsx | 11 +- .../MyPages/Blocks/Stays/Upcoming/index.tsx | 5 +- .../Breadcrumbs/breadcrumbs.module.css | 17 +- .../MyPages/Header/User/user.module.css | 43 + components/MyPages/Sidebar/index.tsx | 6 +- components/MyPages/Sidebar/sidebar.module.css | 5 +- .../MyProfile/Card/Title/title.module.css | 6 +- .../BiroScript/biroScript.module.css | 46 + .../TempDesignSystem/BiroScript/biroScript.ts | 7 + .../TempDesignSystem/BiroScript/index.tsx | 17 + .../TempDesignSystem/BiroScript/variants.ts | 21 + components/TempDesignSystem/Card/index.tsx | 30 +- .../CardGrid/cardGrid.module.css | 2 +- .../Divider/divider.module.css | 2 +- .../TempDesignSystem/Subtitle/index.tsx | 21 + .../Subtitle/subtitle.module.css | 37 + .../TempDesignSystem/Subtitle/subtitle.ts | 9 + .../TempDesignSystem/Subtitle/variants.ts | 22 + .../{ => TempDesignSystem}/Title/index.tsx | 14 +- .../TempDesignSystem/Title/title.module.css | 104 + .../TempDesignSystem/Title}/title.ts | 6 +- .../{ => TempDesignSystem}/Title/variants.ts | 18 +- components/Title/title.module.css | 86 - middleware.ts | 2 +- next.config.js | 16 +- package-lock.json | 3147 ++++++++++++++++- package.json | 1 + .../_static/fonts/fira-mono/FiraMono-Bold.ttf | Bin 0 -> 201708 bytes .../fonts/fira-mono/FiraMono-Medium.ttf | Bin 0 -> 169056 bytes .../fonts/fira-mono/FiraMono-Regular.ttf | Bin 0 -> 170204 bytes public/_static/fonts/fira-mono/OFL.txt | 93 + .../fonts/fira-sans/FiraSans-Black.ttf | Bin 0 -> 491496 bytes .../fonts/fira-sans/FiraSans-BlackItalic.ttf | Bin 0 -> 511708 bytes .../_static/fonts/fira-sans/FiraSans-Bold.ttf | Bin 0 -> 473876 bytes .../fonts/fira-sans/FiraSans-BoldItalic.ttf | Bin 0 -> 491048 bytes .../fonts/fira-sans/FiraSans-ExtraBold.ttf | Bin 0 -> 481124 bytes .../fira-sans/FiraSans-ExtraBoldItalic.ttf | Bin 0 -> 521088 bytes .../fonts/fira-sans/FiraSans-ExtraLight.ttf | Bin 0 -> 431308 bytes .../fira-sans/FiraSans-ExtraLightItalic.ttf | Bin 0 -> 446916 bytes .../fonts/fira-sans/FiraSans-Italic.ttf | Bin 0 -> 456436 bytes .../fonts/fira-sans/FiraSans-Light.ttf | Bin 0 -> 433824 bytes .../fonts/fira-sans/FiraSans-LightItalic.ttf | Bin 0 -> 447376 bytes .../fonts/fira-sans/FiraSans-Medium.ttf | Bin 0 -> 441384 bytes .../fonts/fira-sans/FiraSans-MediumItalic.ttf | Bin 0 -> 456840 bytes .../fonts/fira-sans/FiraSans-Regular.ttf | Bin 0 -> 440984 bytes .../fonts/fira-sans/FiraSans-SemiBold.ttf | Bin 0 -> 473160 bytes .../fira-sans/FiraSans-SemiBoldItalic.ttf | Bin 0 -> 490704 bytes .../_static/fonts/fira-sans/FiraSans-Thin.ttf | Bin 0 -> 426752 bytes .../fonts/fira-sans/FiraSans-ThinItalic.ttf | Bin 0 -> 441292 bytes public/_static/fonts/fira-sans/OFL.txt | 93 + .../icons/loyaltylevels/best_friend.svg | 37 + .../icons/loyaltylevels/close_friend.svg | 76 +- .../icons/loyaltylevels/dear_friend.svg | 36 + .../icons/loyaltylevels/good_friend.svg | 74 +- .../icons/loyaltylevels/loyal_friend.svg | 36 + .../icons/loyaltylevels/new_friend.svg | 66 +- .../icons/loyaltylevels/scandic_family.svg | 44 + .../icons/loyaltylevels/scandic_friends.svg | 48 + .../icons/loyaltylevels/true_friend.svg | 35 + .../contentstack/breadcrumbs/output.ts | 62 +- .../routers/contentstack/breadcrumbs/query.ts | 163 +- .../routers/contentstack/breadcrumbs/utils.ts | 81 + server/routers/user/input.ts | 2 +- server/routers/user/query.ts | 11 +- types/components/myPages/myPage/overview.ts | 5 - .../myPages/myPage/qualifyingPoints.ts | 5 - types/components/myPages/myPage/shortcuts.ts | 8 +- types/components/myPages/myPage/stats.ts | 5 - .../components/myPages/myPage/totalPoints.ts | 5 - types/components/myPages/stays/page.ts | 2 +- types/components/myPages/stays/title.ts | 5 +- .../myPages/{myPage/friend.ts => user.ts} | 2 +- 164 files changed, 6262 insertions(+), 990 deletions(-) create mode 100644 app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/[...path]/page.tsx create mode 100644 app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/default.tsx delete mode 100644 app/fonts.ts create mode 100644 components/Levels/Level/BestFriend.tsx create mode 100644 components/Levels/Level/CloseFriend.tsx create mode 100644 components/Levels/Level/DearFriend.tsx create mode 100644 components/Levels/Level/GoodFriend.tsx create mode 100644 components/Levels/Level/LoyalFriend.tsx create mode 100644 components/Levels/Level/NewFriend.tsx create mode 100644 components/Levels/Level/ScandicFamily.tsx create mode 100644 components/Levels/Level/ScandicFriends.tsx create mode 100644 components/Levels/Level/TrueFriend.tsx create mode 100644 components/Levels/index.tsx create mode 100644 components/Levels/levels.module.css create mode 100644 components/Levels/levels.ts create mode 100644 components/Levels/variants.ts create mode 100644 components/MyPages/Blocks/Overview/Stats/Label/index.tsx create mode 100644 components/MyPages/Blocks/Overview/Stats/Label/label.module.css create mode 100644 components/MyPages/Blocks/Overview/Stats/NextLevel/index.tsx create mode 100644 components/MyPages/Blocks/Overview/Stats/NextLevel/nextLevel.module.css create mode 100644 components/MyPages/Blocks/Overview/Stats/Points/index.tsx create mode 100644 components/MyPages/Blocks/Overview/Stats/Points/totalPoints.module.css delete mode 100644 components/MyPages/Blocks/Overview/Stats/Progress/index.tsx delete mode 100644 components/MyPages/Blocks/Overview/Stats/Progress/progress.module.css delete mode 100644 components/MyPages/Blocks/Overview/Stats/Title/index.tsx delete mode 100644 components/MyPages/Blocks/Overview/Stats/Title/title.module.css delete mode 100644 components/MyPages/Blocks/Overview/Stats/TotalPoints/index.tsx delete mode 100644 components/MyPages/Blocks/Overview/Stats/TotalPoints/totalPoints.module.css create mode 100644 components/MyPages/Header/User/user.module.css create mode 100644 components/TempDesignSystem/BiroScript/biroScript.module.css create mode 100644 components/TempDesignSystem/BiroScript/biroScript.ts create mode 100644 components/TempDesignSystem/BiroScript/index.tsx create mode 100644 components/TempDesignSystem/BiroScript/variants.ts create mode 100644 components/TempDesignSystem/Subtitle/index.tsx create mode 100644 components/TempDesignSystem/Subtitle/subtitle.module.css create mode 100644 components/TempDesignSystem/Subtitle/subtitle.ts create mode 100644 components/TempDesignSystem/Subtitle/variants.ts rename components/{ => TempDesignSystem}/Title/index.tsx (63%) create mode 100644 components/TempDesignSystem/Title/title.module.css rename {types/components/myPages => components/TempDesignSystem/Title}/title.ts (64%) rename components/{ => TempDesignSystem}/Title/variants.ts (71%) delete mode 100644 components/Title/title.module.css create mode 100644 public/_static/fonts/fira-mono/FiraMono-Bold.ttf create mode 100644 public/_static/fonts/fira-mono/FiraMono-Medium.ttf create mode 100644 public/_static/fonts/fira-mono/FiraMono-Regular.ttf create mode 100644 public/_static/fonts/fira-mono/OFL.txt create mode 100644 public/_static/fonts/fira-sans/FiraSans-Black.ttf create mode 100644 public/_static/fonts/fira-sans/FiraSans-BlackItalic.ttf create mode 100644 public/_static/fonts/fira-sans/FiraSans-Bold.ttf create mode 100644 public/_static/fonts/fira-sans/FiraSans-BoldItalic.ttf create mode 100644 public/_static/fonts/fira-sans/FiraSans-ExtraBold.ttf create mode 100644 public/_static/fonts/fira-sans/FiraSans-ExtraBoldItalic.ttf create mode 100644 public/_static/fonts/fira-sans/FiraSans-ExtraLight.ttf create mode 100644 public/_static/fonts/fira-sans/FiraSans-ExtraLightItalic.ttf create mode 100644 public/_static/fonts/fira-sans/FiraSans-Italic.ttf create mode 100644 public/_static/fonts/fira-sans/FiraSans-Light.ttf create mode 100644 public/_static/fonts/fira-sans/FiraSans-LightItalic.ttf create mode 100644 public/_static/fonts/fira-sans/FiraSans-Medium.ttf create mode 100644 public/_static/fonts/fira-sans/FiraSans-MediumItalic.ttf create mode 100644 public/_static/fonts/fira-sans/FiraSans-Regular.ttf create mode 100644 public/_static/fonts/fira-sans/FiraSans-SemiBold.ttf create mode 100644 public/_static/fonts/fira-sans/FiraSans-SemiBoldItalic.ttf create mode 100644 public/_static/fonts/fira-sans/FiraSans-Thin.ttf create mode 100644 public/_static/fonts/fira-sans/FiraSans-ThinItalic.ttf create mode 100644 public/_static/fonts/fira-sans/OFL.txt create mode 100644 public/_static/icons/loyaltylevels/best_friend.svg create mode 100644 public/_static/icons/loyaltylevels/dear_friend.svg create mode 100644 public/_static/icons/loyaltylevels/loyal_friend.svg create mode 100644 public/_static/icons/loyaltylevels/scandic_family.svg create mode 100644 public/_static/icons/loyaltylevels/scandic_friends.svg create mode 100644 public/_static/icons/loyaltylevels/true_friend.svg delete mode 100644 types/components/myPages/myPage/overview.ts delete mode 100644 types/components/myPages/myPage/qualifyingPoints.ts delete mode 100644 types/components/myPages/myPage/stats.ts delete mode 100644 types/components/myPages/myPage/totalPoints.ts rename types/components/myPages/{myPage/friend.ts => user.ts} (66%) diff --git a/.env.local.example b/.env.local.example index f24f3b573..b8711818e 100644 --- a/.env.local.example +++ b/.env.local.example @@ -17,7 +17,6 @@ DEPLOY_PRIME_URL="http://localhost:3000" DESIGN_SYSTEM_ACCESS_TOKEN="" NEXTAUTH_REDIRECT_PROXY_URL="http://localhost:3000/api/web/auth" NEXTAUTH_SECRET="" -# NEXTAUTH_URL="DO NOT SET THIS HERE, it is managed in next.config.js" REVALIDATE_SECRET="" SEAMLESS_LOGIN_DA="http://www.example.dk/updatelogin" SEAMLESS_LOGIN_DE="http://www.example.de/updatelogin" @@ -31,4 +30,8 @@ SEAMLESS_LOGOUT_EN="http://www.example.com/updatelogout?newweb" SEAMLESS_LOGOUT_FI="http://www.example.fi/updatelogout?newweb" SEAMLESS_LOGOUT_NO="http://www.example.no/updatelogout?newweb" SEAMLESS_LOGOUT_SV="http://www.example.sv/updatelogout?newweb" -WEBVIEW_ENCRYPTION_KEY="MTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTI=" \ No newline at end of file +WEBVIEW_ENCRYPTION_KEY="MTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTI=" + +PUBLIC_URL="http://localhost:3000" +AUTH_URL="$PUBLIC_URL/api/web/auth" +NEXTAUTH_URL="$PUBLIC_URL/api/web/auth" diff --git a/.gitignore b/.gitignore index 1e2395721..4663988fb 100644 --- a/.gitignore +++ b/.gitignore @@ -40,4 +40,7 @@ certificates .netlify #vscode -.vscode/ \ No newline at end of file +.vscode/ + +# localfile with all the CSS variables exported from design system +variables.css \ No newline at end of file diff --git a/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/[...path]/page.tsx b/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/[...path]/page.tsx new file mode 100644 index 000000000..666fa6367 --- /dev/null +++ b/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/[...path]/page.tsx @@ -0,0 +1,5 @@ +import Breadcrumbs from "@/components/MyPages/Breadcrumbs" + +export default function AllBreadcrumbs() { + return +} diff --git a/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/default.tsx b/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/default.tsx new file mode 100644 index 000000000..f110fe5bf --- /dev/null +++ b/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/default.tsx @@ -0,0 +1,3 @@ +export default function DefaultMyPages() { + return null +} diff --git a/app/[lang]/(live)/(protected)/my-pages/[...path]/page.module.css b/app/[lang]/(live)/(protected)/my-pages/[...path]/page.module.css index 872aa93d7..6667d27ac 100644 --- a/app/[lang]/(live)/(protected)/my-pages/[...path]/page.module.css +++ b/app/[lang]/(live)/(protected)/my-pages/[...path]/page.module.css @@ -1,34 +1,29 @@ .content { display: grid; - padding-bottom: 7.7rem; - padding-left: 0; - padding-right: 0; + padding-bottom: var(--Spacing-x9); + padding-left: var(--Spacing-x0); + padding-right: var(--Spacing-x0); position: relative; } -@media screen and (min-width: 950px) { - .content { - gap: 10rem; - grid-template-columns: 25rem 1fr; - padding-bottom: 17.5rem; - padding-left: 2.4rem; - padding-right: 2.4rem; - padding-top: 5.8rem; - } -} - .blocks { display: grid; - gap: 4.2rem; - padding-top: 4rem; - padding-left: 1.6rem; - padding-right: 1.6rem; + gap: var(--Spacing-x5); + padding-left: var(--Spacing-x2); + padding-right: var(--Spacing-x2); } -@media screen and (min-width: 950px) { +@media screen and (min-width: 1367px) { + .content { + gap: var(--Spacing-x9); + grid-template-columns: 25rem 1fr; + padding-left: var(--Spacing-x3); + padding-right: var(--Spacing-x3); + } + .blocks { - gap: 6.4rem; - padding-left: 0; - padding-right: 0; + gap: var(--Spacing-x7); + padding-left: var(--Spacing-x0); + padding-right: var(--Spacing-x0); } } diff --git a/app/[lang]/(live)/(protected)/my-pages/[...path]/page.tsx b/app/[lang]/(live)/(protected)/my-pages/[...path]/page.tsx index 3097f566b..a6050337e 100644 --- a/app/[lang]/(live)/(protected)/my-pages/[...path]/page.tsx +++ b/app/[lang]/(live)/(protected)/my-pages/[...path]/page.tsx @@ -1,8 +1,7 @@ +import { _ } from "@/lib/translation" import { serverClient } from "@/lib/trpc/server" -import MaxWidth from "@/components/MaxWidth" import Content from "@/components/MyPages/AccountPage/Content" -import Breadcrumbs from "@/components/MyPages/Breadcrumbs" import Sidebar from "@/components/MyPages/Sidebar" import styles from "./page.module.css" @@ -15,19 +14,15 @@ export default async function MyPages({ const accountPage = await serverClient().contentstack.accountPage.get() return ( - <> - - -
- - - {accountPage.content.length ? ( - - ) : ( -

No content published

- )} - -
- +
+ +
+ {accountPage.content.length ? ( + + ) : ( +

{_("No content published")}

+ )} +
+
) } diff --git a/app/[lang]/(live)/(protected)/my-pages/layout.module.css b/app/[lang]/(live)/(protected)/my-pages/layout.module.css index 5e70c4db4..d2b0bc4bd 100644 --- a/app/[lang]/(live)/(protected)/my-pages/layout.module.css +++ b/app/[lang]/(live)/(protected)/my-pages/layout.module.css @@ -3,7 +3,8 @@ background-color: var(--Scandic-Brand-Warm-White); display: grid; - font-family: var(--ff-fira-sans); - grid-template-rows: var(--header-height) auto 1fr; + font-family: var(--typography-Body-Regular-fontFamily); + gap: var(--Spacing-x3); + grid-template-rows: auto 1fr; min-height: 100dvh; } diff --git a/app/[lang]/(live)/(protected)/my-pages/layout.tsx b/app/[lang]/(live)/(protected)/my-pages/layout.tsx index 935f1addd..4ba2376f5 100644 --- a/app/[lang]/(live)/(protected)/my-pages/layout.tsx +++ b/app/[lang]/(live)/(protected)/my-pages/layout.tsx @@ -1,17 +1,17 @@ -import { firaMono, firaSans } from "@/app/fonts" - import styles from "./layout.module.css" import { LangParams, LayoutArgs } from "@/types/params" export default async function MyPagesLayout({ + breadcrumbs, children, -}: React.PropsWithChildren>) { +}: React.PropsWithChildren> & { + breadcrumbs: React.ReactNode +}) { return ( -
+
+ {breadcrumbs} {children} -
+ ) } diff --git a/app/[lang]/(live)/(public)/[contentType]/[uid]/page.tsx b/app/[lang]/(live)/(public)/[contentType]/[uid]/page.tsx index 2759874ed..adbde5d25 100644 --- a/app/[lang]/(live)/(public)/[contentType]/[uid]/page.tsx +++ b/app/[lang]/(live)/(public)/[contentType]/[uid]/page.tsx @@ -15,7 +15,7 @@ export default async function ContentTypePage({ }: PageArgs) { switch (params.contentType) { case "loyalty-page": - return + return case "content-page": return default: diff --git a/app/[lang]/(live)/error.module.css b/app/[lang]/(live)/error.module.css index 4782b4cb4..ed84d6e82 100644 --- a/app/[lang]/(live)/error.module.css +++ b/app/[lang]/(live)/error.module.css @@ -2,7 +2,7 @@ --header-height: 4.5rem; display: grid; - font-family: var(--ff-fira-sans); + font-family: var(--typography-Body-Regular-fontFamily); grid-template-rows: var(--header-height) auto 1fr; min-height: 100dvh; } @@ -15,7 +15,7 @@ position: relative; } -@media screen and (min-width: 950px) { +@media screen and (min-width: 1367px) { .content { gap: 10rem; grid-template-columns: 25rem 1fr; diff --git a/app/[lang]/(live)/error.tsx b/app/[lang]/(live)/error.tsx index b05823085..b833c6699 100644 --- a/app/[lang]/(live)/error.tsx +++ b/app/[lang]/(live)/error.tsx @@ -7,8 +7,6 @@ import { findLang } from "@/constants/languages" import { login } from "@/constants/routes/handleAuth" import { SESSION_EXPIRED } from "@/server/errors/trpc" -import { firaMono, firaSans } from "@/app/fonts" - import styles from "./error.module.css" import { LangParams } from "@/types/params" @@ -34,9 +32,7 @@ export default function Error({ const lang = findLang(pathname) return ( -
+
{lang}: Something went wrong!
) diff --git a/app/[lang]/(live)/layout.tsx b/app/[lang]/(live)/layout.tsx index b3e6c387f..34e4cf3b5 100644 --- a/app/[lang]/(live)/layout.tsx +++ b/app/[lang]/(live)/layout.tsx @@ -5,7 +5,6 @@ import Script from "next/script" import TrpcProvider from "@/lib/trpc/Provider" -import { biroScriptPlus, firaMono, firaSans } from "@/app/fonts" import AdobeScript from "@/components/Current/AdobeScript" import VwoScript from "@/components/Current/VwoScript" @@ -43,9 +42,7 @@ export default async function RootLayout({ - + {children}