From 18b2b0201ad66878e482b61557a50c93f78ff107 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Domonkos?= Date: Fri, 15 Nov 2024 21:06:04 +0100 Subject: [PATCH 1/4] membership card link added --- frontend/components/profile-page.tsx | 2 +- .../profile/group-membership-card.tsx | 64 ++++++++++--------- 2 files changed, 34 insertions(+), 32 deletions(-) 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 4c1f001..428f455 100644 --- a/frontend/components/profile/group-membership-card.tsx +++ b/frontend/components/profile/group-membership-card.tsx @@ -1,4 +1,4 @@ -import { CalendarIcon } from 'lucide-react'; +import { CalendarIcon, Link } from 'lucide-react'; import { Badge } from '@/components/ui/badge'; import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card'; @@ -14,36 +14,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(', ')} +

+ )} + + + ); } From 47002aea8627e0190caeb310e8851320c529dd69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Domonkos?= Date: Fri, 15 Nov 2024 21:13:52 +0100 Subject: [PATCH 2/4] gitattribues added --- .gitattributes | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitattributes 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 From 9fc59d6c52f9e337db32736bfd3bd8e75defb0c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Domonkos?= Date: Fri, 15 Nov 2024 21:29:14 +0100 Subject: [PATCH 3/4] link root change --- frontend/components/profile/group-membership-card.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/components/profile/group-membership-card.tsx b/frontend/components/profile/group-membership-card.tsx index 4e5ca88..f94ce67 100644 --- a/frontend/components/profile/group-membership-card.tsx +++ b/frontend/components/profile/group-membership-card.tsx @@ -1,4 +1,4 @@ -import { CalendarIcon, Link } from 'lucide-react'; +import { CalendarIcon } from 'lucide-react'; import { Badge } from '@/components/ui/badge'; import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card'; @@ -15,7 +15,7 @@ export interface MembershipProps { export function GroupMembershipCard({ membership }: { membership: MembershipProps }) { return ( - + @@ -47,6 +47,6 @@ export function GroupMembershipCard({ membership }: { membership: MembershipProp )} - + ); } From af97e4da444e7e540a7c80fd18838a0d993106a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1lint=20Kir=C3=A1ly?= Date: Fri, 15 Nov 2024 21:33:24 +0100 Subject: [PATCH 4/4] Add ids to mock membership data --- frontend/components/profile/group-memberships.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 (