feat(SW-66, SW-348): search functionality and ui

This commit is contained in:
Simon Emanuelsson
2024-08-28 10:47:57 +02:00
parent b9dbcf7d90
commit af850c90e7
437 changed files with 7663 additions and 9881 deletions

View File

@@ -1,4 +1,4 @@
import Breadcrumbs from "@/components/MyPages/Breadcrumbs"
import Breadcrumbs from "@/components/Breadcrumbs"
import { setLang } from "@/i18n/serverContext"
import { LangParams, PageArgs } from "@/types/params"

View File

@@ -1,6 +1,6 @@
import { serverClient } from "@/lib/trpc/server"
import Content from "@/components/MyPages/AccountPage/Content"
import Blocks from "@/components/Blocks"
import Title from "@/components/TempDesignSystem/Text/Title"
import TrackingSDK from "@/components/TrackingSDK"
import { getIntl } from "@/i18n"
@@ -10,7 +10,7 @@ import styles from "./page.module.css"
import type { LangParams, PageArgs } from "@/types/params"
export { generateMetadata } from "@/utils/generateMetadata"
export { generateMetadataAccountPage as generateMetadata } from "@/utils/generateMetadata"
export default async function MyPages({
params,
@@ -30,8 +30,8 @@ export default async function MyPages({
<>
<main className={styles.blocks}>
<Title>{accountPage.heading}</Title>
{accountPage.content.length ? (
<Content content={accountPage.content} />
{accountPage.content?.length ? (
<Blocks blocks={accountPage.content} />
) : (
<p>{formatMessage({ id: "No content published" })}</p>
)}

View File

@@ -1,4 +1,4 @@
import { serverClient } from "@/lib/trpc/server"
import { getProfile } from "@/lib/trpc/memoizedRequests"
import Form from "@/components/Forms/Edit/Profile"
import { setLang } from "@/i18n/serverContext"
@@ -10,7 +10,7 @@ export default async function EditProfileSlot({
}: PageArgs<LangParams>) {
setLang(params.lang)
const user = await serverClient().user.get()
const user = await getProfile()
if (!user || "error" in user) {
return null
}

View File

@@ -1,6 +1,6 @@
import { languages, languageSelect } from "@/constants/languages"
import { profileEdit } from "@/constants/routes/myPages"
import { serverClient } from "@/lib/trpc/server"
import { getProfile } from "@/lib/trpc/memoizedRequests"
import {
CalendarIcon,
@@ -16,7 +16,7 @@ import Link from "@/components/TempDesignSystem/Link"
import Body from "@/components/TempDesignSystem/Text/Body"
import Title from "@/components/TempDesignSystem/Text/Title"
import { getIntl } from "@/i18n"
import { getLang, setLang } from "@/i18n/serverContext"
import { setLang } from "@/i18n/serverContext"
import styles from "./page.module.css"
@@ -25,7 +25,7 @@ import { LangParams, PageArgs } from "@/types/params"
export default async function Profile({ params }: PageArgs<LangParams>) {
setLang(params.lang)
const { formatMessage } = await getIntl()
const user = await serverClient().user.get()
const user = await getProfile()
if (!user || "error" in user) {
return null
}
@@ -44,7 +44,7 @@ export default async function Profile({ params }: PageArgs<LangParams>) {
</Title>
</hgroup>
<Button asChild intent="primary" size="small" theme="base">
<Link prefetch={false} color="none" href={profileEdit[getLang()]}>
<Link prefetch={false} color="none" href={profileEdit[params.lang]}>
{formatMessage({ id: "Edit profile" })}
</Link>
</Button>

View File

@@ -1,5 +1,5 @@
import ProfilePage from "../page"
export { generateMetadata } from "@/utils/generateMetadata"
export { generateMetadataAccountPage as generateMetadata } from "@/utils/generateMetadata"
export default ProfilePage

View File

@@ -7,7 +7,7 @@ import { setLang } from "@/i18n/serverContext"
import { LangParams, PageArgs } from "@/types/params"
export { generateMetadata } from "@/utils/generateMetadata"
export { generateMetadataAccountPage as generateMetadata } from "@/utils/generateMetadata"
export default async function ProfilePage({ params }: PageArgs<LangParams>) {
setLang(params.lang)