diff --git a/CHANGELOG.md b/CHANGELOG.md index 091beaed4..065189105 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,20 @@ 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.4] - 2024-09-10 + +### Added + + +### Changed +- Updated how we're retrieving the discord id to display in the directory page + + +### 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 diff --git a/public/img/empty_ideation_dark.png b/public/img/empty_ideation_dark.png index 0b99d75e2..e626d1a59 100644 Binary files a/public/img/empty_ideation_dark.png and b/public/img/empty_ideation_dark.png differ diff --git a/public/img/empty_ideation_light.png b/public/img/empty_ideation_light.png index ed22e460d..ab00a7f1e 100644 Binary files a/public/img/empty_ideation_light.png and b/public/img/empty_ideation_light.png differ diff --git a/public/img/empty_resources_dark.png b/public/img/empty_resources_dark.png index 2b783dfb6..e626d1a59 100644 Binary files a/public/img/empty_resources_dark.png and b/public/img/empty_resources_dark.png differ diff --git a/public/img/empty_resources_light.png b/public/img/empty_resources_light.png index 820238c0b..ab00a7f1e 100644 Binary files a/public/img/empty_resources_light.png and b/public/img/empty_resources_light.png differ diff --git a/src/app/(main)/my-voyage/[teamId]/directory/components/DirectoryComponentWrapper.tsx b/src/app/(main)/my-voyage/[teamId]/directory/components/DirectoryComponentWrapper.tsx index 59a863f66..cc3780ebf 100644 --- a/src/app/(main)/my-voyage/[teamId]/directory/components/DirectoryComponentWrapper.tsx +++ b/src/app/(main)/my-voyage/[teamId]/directory/components/DirectoryComponentWrapper.tsx @@ -42,11 +42,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]; diff --git a/src/app/(main)/my-voyage/[teamId]/directory/components/TeamMember.tsx b/src/app/(main)/my-voyage/[teamId]/directory/components/TeamMember.tsx index 0abcb7daa..56488ebee 100644 --- a/src/app/(main)/my-voyage/[teamId]/directory/components/TeamMember.tsx +++ b/src/app/(main)/my-voyage/[teamId]/directory/components/TeamMember.tsx @@ -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(false); const newRef = useRef(null); + const discordId = + oAuthProfiles.find((profile) => profile.provider.name === "discord") + ?.providerUsername || ""; + useEffect(() => { document.addEventListener("mousedown", handleOutsideClick); return () => { diff --git a/src/app/(main)/my-voyage/[teamId]/sprints/components/sections/Notes.tsx b/src/app/(main)/my-voyage/[teamId]/sprints/components/sections/Notes.tsx index 2316dec7a..a68113bb5 100644 --- a/src/app/(main)/my-voyage/[teamId]/sprints/components/sections/Notes.tsx +++ b/src/app/(main)/my-voyage/[teamId]/sprints/components/sections/Notes.tsx @@ -101,6 +101,7 @@ export default function Notes() { rows={2} {...register("notes")} errorMessage={errors.notes?.message} + defaultValue={data ?? ""} />