diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..94f480d --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* text=auto eol=lf \ No newline at end of file diff --git a/frontend/components/profile-page.tsx b/frontend/components/profile-page.tsx index 38f0c11..38589ca 100644 --- a/frontend/components/profile-page.tsx +++ b/frontend/components/profile-page.tsx @@ -11,7 +11,7 @@ const headerProps: ProfileHeaderProps = { user: { description: "I'm a passionate student leader with a keen interest in campus politics and public speaking.", name: 'Jane Doe', - email: '', + email: 'janedoe@gmail.com', building: 'Building A', room: 'Room 101', twitterHandle: '@janedoe', diff --git a/frontend/components/profile/group-membership-card.tsx b/frontend/components/profile/group-membership-card.tsx index bbb14e3..f94ce67 100644 --- a/frontend/components/profile/group-membership-card.tsx +++ b/frontend/components/profile/group-membership-card.tsx @@ -15,36 +15,38 @@ export interface MembershipProps { export function GroupMembershipCard({ membership }: { membership: MembershipProps }) { return ( - - - - {membership.name} - {membership.primary && ( - - Primary - - )} - - -
- - Started: {membership.startDate} - {membership.endDate && ` | Ended: ${membership.endDate}`} -
-
-
- -

- Role: {membership.currentRole} -

- {membership.pastRoles.length > 0 && ( -

- Past: {membership.pastRoles.join(', ')} + + + + + {membership.name} + {membership.primary && ( + + Primary + + )} + + +

+ + Started: {membership.startDate} + {membership.endDate && ` | Ended: ${membership.endDate}`} +
+ + + +

+ Role: {membership.currentRole}

- )} -
-
+ {membership.pastRoles.length > 0 && ( +

+ Past: {membership.pastRoles.join(', ')} +

+ )} + + +
); } diff --git a/frontend/components/profile/group-memberships.tsx b/frontend/components/profile/group-memberships.tsx index d62614c..4558bdc 100644 --- a/frontend/components/profile/group-memberships.tsx +++ b/frontend/components/profile/group-memberships.tsx @@ -6,6 +6,7 @@ import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'; export function GroupMemberships() { const memberships = [ { + id: '1', name: 'Student Council', startDate: '2022-09-01', currentRole: 'President', @@ -13,14 +14,15 @@ export function GroupMemberships() { primary: true, }, { + id: '2', name: 'Debate Club', startDate: '2021-09-01', currentRole: 'Member', pastRoles: ['Vice President'], endDate: '2023-05-31', }, - { name: 'Chess Club', startDate: '2022-01-15', currentRole: 'Treasurer', pastRoles: [] }, - { name: 'Environmental Society', startDate: '2023-03-01', currentRole: 'Member', pastRoles: [] }, + { id: '3', name: 'Chess Club', startDate: '2022-01-15', currentRole: 'Treasurer', pastRoles: [] }, + { id: '4', name: 'Environmental Society', startDate: '2023-03-01', currentRole: 'Member', pastRoles: [] }, ]; return (