Merge pull request #434 from memser-spaceport/feat/details-page-irl-c…

…ontribution Feat/details page irl contribution
memser-spaceport · Dec 16, 2024 · bb64a38 · bb64a38
2 parents 9264185 + 19a4dba
commit bb64a38
Show file tree

Hide file tree

Showing 20 changed files with 1,120 additions and 5 deletions.
diff --git a/analytics/members.analytics.ts b/analytics/members.analytics.ts
@@ -315,6 +315,20 @@ export const useMemberAnalytics = () => {
     captureEvent(MEMBER_ANALYTICS_EVENTS.MEMBER_DETAIL_BIO_EDIT_RECORD_SAVE, params);
   }
 
+  function onClickSeeMoreIrlContribution(user: IAnalyticsUserInfo | null){
+    const params = {
+      user,
+    };
+    captureEvent(MEMBER_ANALYTICS_EVENTS.ON_CLICK_SEE_MORE_BUTTON_IRL_CONTRIBUTIONS, params);
+  }
+
+  function onClickEventIrlContribution(user: IAnalyticsUserInfo | null){
+    const params = {
+      user,
+    };
+    captureEvent(MEMBER_ANALYTICS_EVENTS.MEMBER_DETAILS_ON_CLICK_IRL_CONTRIBUTIONS, params);
+  }
+
   return {
     onOfficeHourClicked,
     onProjectContributionEditClicked,
@@ -349,6 +363,8 @@ export const useMemberAnalytics = () => {
     onMemberDetailsBioEditClicked,
     onMemberDetailsBioEditSaveClicked,
     onMemberDetailsBioEditCancelClicked,
-    recordBioSave
+    recordBioSave,
+    onClickSeeMoreIrlContribution,
+    onClickEventIrlContribution,
   };
 };
diff --git a/analytics/teams.analytics.ts b/analytics/teams.analytics.ts
@@ -256,6 +256,20 @@ export const useTeamAnalytics = () => {
         captureEvent(TEAMS_ANALYTICS_EVENTS.TEAM_DETAIL_ABOUT_SAVE, params);
       }
 
+      function onClickSeeMoreIrlContribution(user: IAnalyticsUserInfo | null){
+        const params = {
+          user,
+        };
+        captureEvent(TEAMS_ANALYTICS_EVENTS.ON_CLICK_SEE_MORE_BUTTON_IRL_CONTRIBUTIONS, params);
+      }
+
+      function onClickTeamIrlContribution(user: IAnalyticsUserInfo | null){
+        const params = {
+          user,
+        };
+        captureEvent(TEAMS_ANALYTICS_EVENTS. TEAM_DETAILS_ON_CLICK_IRL_CONTRIBUTIONS, params);
+      }
+
       return {
         onOfficeHoursSelected,
         onFriendsOfProtocolSelected,
@@ -287,7 +301,9 @@ export const useTeamAnalytics = () => {
         onTeamDetailAboutEditSaveClicked,
         onTeamDetailAboutEditCancelClicked,
         onTeamDetailAboutEditClicked,
-        recordAboutSave
+        recordAboutSave,
+        onClickSeeMoreIrlContribution,
+        onClickTeamIrlContribution
       }
 
 }
diff --git a/app/members/[id]/page.module.css b/app/members/[id]/page.module.css
@@ -60,6 +60,13 @@
   background: #fff;
 }
 
+.memberDetail__irlContribution{
+  box-shadow: 0px 4px 4px 0px #0f172a0a;
+  background: #fff;
+  min-height: 20px;
+  padding: 20px;
+}
+
 @media (min-width: 1024px) {
   .memberDetail {
     align-items: center;
@@ -86,7 +93,7 @@
     border-radius: 8px;
   }
 
-  .memberDetail__container__repositories {
+  .memberDetail__container__repositories, .memberDetail__irlContribution {
     border-radius: 8px;
   }
 }
diff --git a/app/members/[id]/page.tsx b/app/members/[id]/page.tsx
@@ -14,6 +14,7 @@ import { getAllTeams } from '@/services/teams.service';
 import MemberProjectContribution from '@/components/page/member-details/member-project-contribution';
 import MemberOfficeHours from '@/components/page/member-details/member-office-hours';
 import Bio from '@/components/page/member-details/bio';
+import IrlMemberContribution from '@/components/page/member-details/member-irl-contributions';
 
 const MemberDetails = async ({ params }: { params: any }) => {
   const memberId = params?.id;
@@ -52,6 +53,11 @@ const MemberDetails = async ({ params }: { params: any }) => {
             <MemberProjectContribution member={member} userInfo={userInfo} />
           </div>
         )}
+        {member.eventGuests.length > 0 && (
+          <div className={styles?.memberDetail__irlContribution}>
+            <IrlMemberContribution member={member} userInfo={userInfo} />
+          </div>
+        )}
         {isLoggedIn && (
           <div className={styles?.memberDetail__container__repositories}>
             <MemberRepositories member={member} userInfo={userInfo} />

diff --git a/app/teams/[id]/page.module.css b/app/teams/[id]/page.module.css
@@ -47,6 +47,13 @@
   min-height: 100px;
 }
 
+.teamDetail__irlContributions {
+  box-shadow: 0px 4px 4px 0px #0f172a0a;
+  background: #fff;
+  min-height: 20px;
+  padding: 20px;
+}
+
 @media (min-width: 1024px) {
   .teamDetail {
     align-items: center;

diff --git a/app/teams/[id]/page.tsx b/app/teams/[id]/page.tsx
@@ -19,6 +19,7 @@ import { getFocusAreas } from '@/services/common.service';
 import { IFocusArea } from '@/types/shared.types';
 import SelectedFocusAreas from '@/components/core/selected-focus-area';
 import TeamOfficeHours from '@/components/page/team-details/team-office-hours';
+import TeamIrlContributions from '@/components/page/team-details/team-irl-contributions';
 
 async function Page({ params }: { params: ITeamDetailParams }) {
   const teamId: string = params?.id;
@@ -60,6 +61,12 @@ async function Page({ params }: { params: ITeamDetailParams }) {
               <SelectedFocusAreas focusAreas={focusAreas} selectedFocusAreas={team.teamFocusAreas} />
             </div>
           )}
+          {/* Irl Contribuions */}
+          {team.eventGuests.length > 0 &&
+            <div className={styles?.teamDetail__irlContributions}>
+              <TeamIrlContributions team={team} userInfo={userInfo} members={members} teamId={teamId} />
+            </div>
+          }
           {/* Member */}
           <div className={styles?.teamDetail__container__member}>
             <TeamMembers team={team} userInfo={userInfo} members={members} teamId={teamId} />