Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
DangTinh422003 committed Nov 10, 2024
1 parent 4d86ea0 commit 95991dd
Show file tree
Hide file tree
Showing 4 changed files with 73 additions and 98 deletions.
2 changes: 1 addition & 1 deletion src/app/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ export default function Home() {
<Hero />
<About />
<Vision />
<Members />
<Awards />
<Members />
<Projects />
<Footer />
</div>
Expand Down
20 changes: 13 additions & 7 deletions src/components/About.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,25 @@ const About = () => {
className="grid h-screen grid-cols-3 border-b"
id={SECTION_IDS.WHO_WE_ARE}
>
<div className={`
<div
className={`
col-span-1 hidden h-full
md:block
`}>
`}
>
<div
style={{ height: 'calc(100% - calc(0.25rem * 40))' }}
className="my-20 border-y"
></div>
</div>
<div className={`
<div
className={`
col-span-3 flex h-full items-center justify-center border-x py-20
md:col-span-1
`}>
`}
>
<div
className={`
flex size-full items-center justify-center border-y px-10
Expand All @@ -37,15 +41,17 @@ const About = () => {
<h2 className="font-bebas-neue text-8xl text-muted-foreground">
<span className="text-foreground">WHO</span> WE ARE
</h2>
<p className="font-pp-neue-montreal font-medium">{weminal.about}</p>
<p className="fontbse font-medium">{weminal.about}</p>
</div>
</div>
</div>
<div className={`
<div
className={`
col-span-1 hidden h-full
md:block
`}>
`}
>
<div
style={{ height: 'calc(100% - calc(0.25rem * 40))' }}
className="my-20 border-y"
Expand Down
2 changes: 1 addition & 1 deletion src/components/Awards.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ const Awards = () => {
<div
id={SECTION_IDS.AWARDS}
className={`
h-screen px-4 py-10
px-4 py-10
md:py-20
`}
Expand Down
147 changes: 58 additions & 89 deletions src/components/Members.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -69,97 +69,66 @@ const Members = () => {
fetchMembers()
}, [])

// return (
// <div
// id={SECTION_IDS.OUR_TEAM}
// className={`
// my-10

// lg:my-48

// md:my-16
// `}
// >
// <h2
// className={`
// text-center font-bebas-neue text-4xl uppercase

// lg:text-6xl

// md:text-5xl

// xl:text-8xl
// `}
// >
// our DEDICATED team
// </h2>
// {/* <p className="mx-auto my-10 max-w-xl text-center font-pp-neue-montreal">
// Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam aliquet,
// nisi sit amet ultrices tempor, odio magna tempus libero, in volutpat
// odio turpis sit amet urna. Integer a ex nec risus scelerisque dapibus.
// Nam cursus metus vel lorem varius, a iaculis ligula sodales.
// </p> */}

// {isLoading ?
// <div className="flex h-96 items-center justify-center">
// <Loader className="animate-spin" size={30} />
// </div>
// : <Swiper
// {...swiperConfig}
// className={`
// mt-4

// md:mt-8
// `}
// >
// {members.map((m, _index) => (
// <SwiperSlide key={m.id}>
// <Link href={`/members/${m.id}`} className="relative">
// <Card
// key={m.id}
// card={{
// src: m.img,
// title: m.name,
// }}
// role={m.role}
// index={_index}
// hovered={hovered}
// setHovered={setHovered}
// />
// </Link>
// </SwiperSlide>
// ))}
// </Swiper>
// }
// </div>
// )

return (
<div className="flex h-screen items-center">
<div className="container grid grid-cols-4 gap-10">
<div className="flex items-center justify-center">
<div>
<p
className={`
font-bebas-neue text-4xl font-semibold
xl:text-8xl
`}
>
OUR MEMBERS
</p>
<p>
Lorem ipsum dolor sit amet consectetur adipisicing elit. Veniam
voluptatibus corporis distinctio dolorem sunt illum, et
recusandae! Quasi, quidem. Cum culpa temporibus iure, voluptate
excepturi nemo ex suscipit voluptatibus. Consequuntur!
</p>
</div>
</div>
<div className="col-span-3">
<AnimatedTestimonials testimonials={members} />
<div
id={SECTION_IDS.OUR_TEAM}
className={`
my-10
md:my-20
`}
>
<h2
className={`
text-center font-bebas-neue text-4xl uppercase
lg:text-6xl
md:text-5xl
xl:text-8xl
`}
>
our DEDICATED team
</h2>
{/* <p className="mx-auto my-10 max-w-xl text-center font-pp-neue-montreal">
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam aliquet,
nisi sit amet ultrices tempor, odio magna tempus libero, in volutpat
odio turpis sit amet urna. Integer a ex nec risus scelerisque dapibus.
Nam cursus metus vel lorem varius, a iaculis ligula sodales.
</p> */}

{isLoading ?
<div className="flex h-96 items-center justify-center">
<Loader className="animate-spin" size={30} />
</div>
</div>
: <Swiper
{...swiperConfig}
className={`
mt-4
md:mt-8
`}
>
{members.map((m, _index) => (
<SwiperSlide key={m.id}>
<Link href={`/members/${m.id}`} className="relative">
<Card
key={m.id}
card={{
src: m.img,
title: m.name,
}}
role={m.role}
index={_index}
hovered={hovered}
setHovered={setHovered}
/>
</Link>
</SwiperSlide>
))}
</Swiper>
}
</div>
)
}
Expand Down

0 comments on commit 95991dd

Please sign in to comment.