Merge branch 'dev' into refactor/hexagonal-pattern-poc-v2

Author: Dan-Y-Ko

CHANGELOG.md

@@ -5,6 +5,56 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/).
 
+
+## [1.0.0-alpha.6] - 2024-09-27
+
+### Added
+- Added po and sm forms for the weekly checkin for the appropriate teams https://github.com/chingu-x/chingu-dashboard/issues/216
+
+### Changed
+- Changed how we're accessing meeting data to match changes in backend https://github.com/chingu-x/chingu-dashboard/pull/269
+- Updated dropdown menu in top nav https://github.com/chingu-x/chingu-dashboard/issues/261
+
+
+### Fixed
+
+## [1.0.0-alpha.5] - 2024-09-19
+
+### Added
+
+
+### Changed
+- Made meeting link optional https://github.com/chingu-x/chingu-dashboard/issues/237
+
+## [1.0.0-alpha.4] - 2024-09-10
+
+### Added
+
+
+### Changed
+- Updated how we're retrieving the discord id to display in the directory page https://github.com/chingu-x/chingu-dashboard/issues/202
+
+
+### Fixed
+- Fixed issue with dark mode images being different size https://github.com/chingu-x/chingu-dashboard/issues/200
+- Fixed issue with meeting notes section becoming scrollable instead of expanding when saved https://github.com/chingu-x/chingu-dashboard/issues/248
+
+
+## [1.0.0-alpha.3] - 2024-09-05
+
+### Added
+- Added 404 page https://github.com/chingu-x/chingu-dashboard/issues/205
+
+### Changed
+- Updated top nav and side bar colors along with some other styling changes https://github.com/chingu-x/chingu-dashboard/issues/197
+
+### Fixed
+- Fixed active states in the sidebar https://github.com/chingu-x/chingu-dashboard/issues/198
+- Fixed spacing issues in the calendar title with longer months wrapping to a newline https://github.com/chingu-x/chingu-dashboard/issues/201
+- Fixed spacing issues in resources page https://github.com/chingu-x/chingu-dashboard/issues/206
+- Fixed overflow issue with features description in the list https://github.com/chingu-x/chingu-dashboard/issues/222
+- Fixed an issue with selecting team members in checkboxes https://github.com/chingu-x/chingu-dashboard/issues/230
+
 ## [1.0.0-alpha.2] - 2024-08-28
 
 ### Added

public/img/empty_ideation_dark.png

@@ -200,7 +200,7 @@ export const getDashboardData = async (
     .map((sprint) =>
       fetchMeeting({
         sprintNumber: sprint.number,
-        meetingId: sprint.teamMeetings[0]?.id,
+        meetingId: sprint.teamMeetings[0],
       }),
     );
 

public/img/empty_ideation_light.png

@@ -43,11 +43,18 @@ export async function fetchTeamDirectory({
 
   if (res) {
     updateDirectoryWithCurrentTime(res);
-    const teamMember = res.voyageTeamMembers;
-    const elementToSort = teamMember.find(
-      (element) => element.member.discordId === user?.discordId,
+    const teamMembers = res.voyageTeamMembers;
+    const userDiscordId = user?.oAuthProfiles.find(
+      (profile) => profile.provider.name === "discord",
+    )?.providerUsername;
+    const elementToSort = teamMembers.find(
+      (element) =>
+        element.member.oAuthProfiles.find(
+          (profile) => profile.provider.name === "discord",
+        )?.providerUsername === userDiscordId,
     );
-    moveElementToFirst(teamMember, elementToSort);
+
+    moveElementToFirst(teamMembers, elementToSort);
   }
 
   return [res, error];

public/img/empty_resources_dark.png

@@ -13,12 +13,16 @@ interface TeamMemberProps {
 
 export default function TeamMember({ teamMember }: TeamMemberProps) {
   const user = useUser().voyageTeamMembers;
-  const { firstName, lastName, discordId, currentTime } = teamMember.member;
+  const { firstName, lastName, oAuthProfiles, currentTime } = teamMember.member;
   const { id, hrPerSprint, voyageRole } = teamMember;
   const isCurrentUser = user.some((user) => user.id === id);
   const [isEditing, setIsEditing] = useState<boolean>(false);
   const newRef = useRef<HTMLDivElement>(null);
 
+  const discordId =
+    oAuthProfiles.find((profile) => profile.provider.name === "discord")
+      ?.providerUsername || "";
+
   useEffect(() => {
     document.addEventListener("mousedown", handleOutsideClick);
     return () => {