Compare commits

..

3 Commits

Author SHA1 Message Date
dc90be8622 fix: staff member detail
- add slug
- responsive styling
2025-03-05 22:52:42 +07:00
0dbf4dfc35 fix: change blogs and pages search by name 2025-03-05 20:34:51 +07:00
b330c5296f fix: teams add slug 2025-03-05 20:08:52 +07:00
10 changed files with 61 additions and 44 deletions

View File

@ -1,36 +1,45 @@
import { BeforeFooterBlock } from "@/components/Blocks/BeforeFooter";
import HeroOther from "@/components/HeroOther";
import { fetchTeamDetail } from "@/services/payload/team";
import { getDefaultMetadata } from "@/utils/metadata";
import { RichText } from "@payloadcms/richtext-lexical/react";
import Image from "next/image";
import { Metadata } from "next/types";
import { Suspense } from "react";
export async function generateMetadata({ params }: { params: Promise<{ slug: string }> }): Promise<Metadata> {
const name = "Cochise Oncology";
const defaultMetadata = await getDefaultMetadata();
const name = defaultMetadata.openGraph?.siteName ?? "";
let title = "Page";
let description = "Page";
let imgUrl = "";
const slug = (await params).slug;
const blog = await fetchTeamDetail(decodeURIComponent(slug));
const team = await fetchTeamDetail(decodeURIComponent(slug));
// check for blog data
if (!!blog) {
title = `${name} Staff - ${blog.data.name}`;
description = `${name} Staff - ${blog.data.name}`;
imgUrl = blog.imgUrl;
if (!!team) {
title = `${team.data.name} - ${name}`;
imgUrl = team.imgUrl;
}
return {
defaultMetadata.title = title;
if (!!defaultMetadata.openGraph) {
// @ts-ignore
defaultMetadata.openGraph.type = "article";
defaultMetadata.openGraph.title = title;
defaultMetadata.openGraph.images = !!imgUrl ? [imgUrl] : undefined;
}
defaultMetadata.twitter = {
card: "summary_large_image",
title: title,
description: description,
openGraph: {
title: title,
description: description,
images: !!imgUrl ? { url: imgUrl } : undefined,
},
images: !!imgUrl ? [imgUrl] : undefined,
};
defaultMetadata.other = {
"twitter:label1": "Est. reading time",
"twitter:data1": "1 minute",
};
return defaultMetadata;
}
export default async function BiographySinglePage({ params }: { params: Promise<{ slug: string }> }) {

View File

@ -97,5 +97,6 @@ export const Blogs: CollectionConfig = {
admin: {
hideAPIURL: true,
group: "Blogs",
useAsTitle: "title",
},
};

View File

@ -104,5 +104,6 @@ export const Pages: CollectionConfig = {
admin: {
hideAPIURL: true,
group: "General",
useAsTitle: "title",
},
};

View File

@ -1,5 +1,6 @@
import type { CollectionConfig } from "payload";
import { lexicalEditor } from "@payloadcms/richtext-lexical";
import formatSlug from "@/utils/payload/formatSlug";
export const Teams: CollectionConfig = {
slug: "teams",
@ -9,6 +10,13 @@ export const Teams: CollectionConfig = {
type: "text",
required: true,
},
{
name: "slug",
type: "text",
hooks: {
beforeValidate: [formatSlug("name")],
},
},
{
name: "role",
type: "text",

View File

@ -2,6 +2,7 @@ import Team from "@/components/Team";
type Team = {
id: number;
slug: string;
name: string;
role: string;
img: { url: string; alt: string };

View File

@ -2,25 +2,32 @@
import Link from "next/link";
import { CardTeam } from "./Teams/CardTeam";
export default function Team({ data }: any) {
type Team = {
id: number;
slug: string;
name: string;
role: string;
img: { url: string; alt: string };
biography: string;
};
export default function Team({ data }: { data: Team[] }) {
return (
<div className="container">
<div className="row">
<div className="col-md-12 offset-md-2 col-lg-6 offset-lg-3 text-center">
<h2 className="section-title mb-30 mb-sm-20">
<span className="text-gray">Our</span> Team
<span className="text-gray">.</span>
</h2>
</div>
<div className="flex justify-center">
<h2 className="text-4xl mb-30 mb-sm-20">
<span className="text-gray">Our</span> Team
<span className="text-gray">.</span>
</h2>
</div>
<div className="grid grid-cols-4 gap-5">
<div className="grid grid-cols-1 md:grid-cols-3 xl:grid-cols-4 gap-x-5 gap-y-2">
{/* Team item */}
{data.map((member: any, index: any) => (
<div key={index} className="text-center">
<div key={index} className="flex flex-col text-center justify-between">
<CardTeam data={member} />
<Link href={`/biography/${member.name}`} passHref>
<button className="bg-[#64B3B4] text-white px-5 py-1 m-3 rounded-3xl hover:opacity-[0.7]">
Biography
<Link href={`/staff_member/${member.slug}`} passHref>
<button className="bg-extColorPrimary6 text-white px-5 py-1 m-3 rounded-3xl hover:bg-extColorPrimary4 transition-colors duration-500">
BIOGRAPHY
</button>
</Link>
</div>

View File

@ -21,20 +21,6 @@ export function CardTeam({ data }: CardTeamProps) {
data-wow-duration="1.2s"
alt={`Image of ${data.name}`}
/>
<div className="team-item-detail">
<div className="team-social-links">
{[
{ platform: "Facebook", icon: "fa-facebook-f", url: "#" },
{ platform: "Twitter", icon: "fa-twitter", url: "#" },
{ platform: "Pinterest", icon: "fa-pinterest-p", url: "#" },
].map((social, idx) => (
<a key={idx} href={social.url} target="_blank" rel="noopener nofollow">
<div className="visually-hidden">{social.platform}</div>
<i className={social.icon} />
</a>
))}
</div>
</div>
</div>
<div className="team-item-descr">
<div className="team-item-name">{data.name}</div>

View File

@ -319,6 +319,7 @@ export interface Page {
export interface Team {
id: number;
name: string;
slug?: string | null;
role: string;
img: number | Media;
biography?: {
@ -762,6 +763,7 @@ export interface PagesSelect<T extends boolean = true> {
*/
export interface TeamsSelect<T extends boolean = true> {
name?: T;
slug?: T;
role?: T;
img?: T;
biography?: T;

View File

@ -114,11 +114,14 @@ export default buildConfig({
fields: undefined,
admin: {
group: "General",
useAsTitle: "title",
},
},
formSubmissionOverrides: {
fields: undefined,
admin: {
group: "General",
useAsTitle: "form",
},
},
}),

View File

@ -2,17 +2,16 @@ import payloadConfig from "@/payload.config";
import { formatDate } from "@/utils/datetime";
import { getPayload } from "payload";
export async function fetchTeamDetail(name: string | undefined) {
export async function fetchTeamDetail(slug: string) {
const payload = await getPayload({ config: payloadConfig });
const blogDataQuery = await payload.find({
collection: "teams",
where: {
name: { like: `%${name}%` },
slug: { equals: slug },
},
limit: 1,
pagination: false,
});
console.log("data", name);
if (!blogDataQuery?.docs?.[0]) return null;