@@ -13,16 +13,6 @@ type Person = {
1313 role : string ;
1414 image ?: string ;
1515} ;
16- < < << << < HEAD
17-
18- interface TeamResponse {
19- ADMINS ?: Person [ ] ;
20- MENTORS ?: Person [ ] ;
21- CEO ?: Person | null ;
22- error ?: string ;
23- }
24- === = ===
25- > >>> > >> 10e4 b1e1fb38e31ee56d942c6143a8118e265af8
2616
2717// -------------------------
2818// Avatar
@@ -81,30 +71,12 @@ function Avatar({
8171// -------------------------
8272function PersonCard ( { person } : { person : Person } ) {
8373 return (
84- < < << < < < HEAD
85- < div
86- className = { cn (
87- "group relative overflow-hidden rounded-2xl border" ,
88- "border-white/10 bg-white/[0.06] p-4 shadow-[0_10px_30px_-15px_rgba(0,0,0,0.6)] backdrop-blur-md" ,
89- "transition-all duration-300 hover:border-cyan-400/30 hover:shadow-cyan-500/20"
90- ) }
91- >
92- < div className = "flex items-center gap-3" >
93- < Avatar person = { person } size = { 56 } />
94- < div className = "min-w-0" >
95- < h4 className = "text-sm font-semibold text-white/90" > { person . name } </ h4 >
96- < p className = "truncate text-xs text-white/60" > { person . role } </ p >
97- </ div >
98- </ div >
99- < span className = "pointer-events-none absolute inset-x-0 bottom-0 h-0.5 bg-gradient-to-r from-cyan-400 via-fuchsia-500 to-emerald-400 opacity-70" />
100- =======
10174 < div className = "flex flex-col items-center gap-2 text-center" >
10275 < Avatar person = { person } size = { 80 } />
10376 < div className = "min-w-0" >
10477 < h4 className = "text-sm font-semibold text-white/90" > { person . name } </ h4 >
10578 < p className = "truncate text-xs text-white/60" > { person . role } </ p >
10679 </ div >
107- >>> >>> > 10e4 b1e1fb38e31ee56d942c6143a8118e265af8
10880 </ div >
10981 ) ;
11082}
@@ -118,11 +90,7 @@ export default function TeamSection() {
11890 const [ ceo , setCeo ] = useState < Person > ( {
11991 name : "CEO Name" ,
12092 role : "Founder / CEO" ,
121- < << << << HEAD
122- image : ""
123- === = ===
12493 image : undefined
125- >>> > >>> 10e4 b1e1fb38e31ee56d942c6143a8118e265af8
12694 } ) ;
12795 const [ loading , setLoading ] = useState ( true ) ;
12896 const [ errMsg , setErrMsg ] = useState < string | null > ( null ) ;
@@ -134,33 +102,6 @@ export default function TeamSection() {
134102 setErrMsg ( null ) ;
135103
136104 try {
137- < < << << < HEAD
138- const res = await fetch ( "/api/team" ) ;
139-
140- let body : TeamResponse ;
141- try {
142- body = ( await res . json ( ) ) as TeamResponse ;
143- } catch {
144- body = { } as TeamResponse ;
145- }
146-
147- if ( ! res . ok ) {
148- throw new Error ( body . error ?? `Fetch failed (${ res . status } )` ) ;
149- }
150-
151- if ( ! mounted ) return ;
152-
153- const adminsList = Array . isArray ( body . ADMINS ) ? body . ADMINS : [ ] ;
154- const mentorsList = Array . isArray ( body . MENTORS ) ? body . MENTORS : [ ] ;
155-
156- // Set CEO directly from API response
157- if ( body . CEO ) {
158- setCeo ( body . CEO ) ;
159- }
160-
161- setAdmins ( adminsList ) ;
162- setMentors ( mentorsList ) ;
163- = === ===
164105 const result = await getTeamData ( ) ;
165106
166107 if ( ! mounted ) return ;
@@ -174,7 +115,6 @@ export default function TeamSection() {
174115 if ( result . ceo ) {
175116 setCeo ( result . ceo ) ;
176117 }
177- > >>> >>> 10e4 b1e1fb38e31ee56d942c6143a8118e265af8
178118 } catch ( err : any ) {
179119 console . error ( "Error loading team:" , err ) ;
180120 if ( mounted ) setErrMsg ( err ?. message ?? "Failed to load team" ) ;
0 commit comments