Merge pull request #254 from chingu-x/dev

1.0.0-alpha.4

Author: Dan-Y-Ko

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

public/img/empty_ideation_dark.png

@@ -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];

public/img/empty_ideation_light.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 () => {

public/img/empty_resources_dark.png

@@ -101,6 +101,7 @@ export default function Notes() {
         rows={2}
         {...register("notes")}
         errorMessage={errors.notes?.message}
+        defaultValue={data ?? ""}
       />
       <Button
         type="submit"

public/img/empty_resources_light.png

@@ -4,6 +4,8 @@ import {
   type VoyageStatus,
 } from "@/store/features/user/userSlice";
 
+type providerType = "discord";
+
 interface VoyageTier {
   id: number;
   name: string;
@@ -20,10 +22,12 @@ interface VoyageMember {
   firstName: string;
   lastName: string;
   avatar: string;
-  githubId: string | null;
-  discordId: string | null;
-  twitterId: string | null;
-  linkedinId: string | null;
+  oAuthProfiles: {
+    provider: {
+      name: providerType;
+    };
+    providerUsername: string;
+  }[];
   countryCode: string;
   timezone: string;
   currentTime: string;
@@ -73,10 +77,14 @@ const initialState: DirectoryState = {
           firstName: "",
           lastName: "",
           avatar: "",
-          githubId: null,
-          discordId: null,
-          twitterId: null,
-          linkedinId: null,
+          oAuthProfiles: [
+            {
+              provider: {
+                name: "discord",
+              },
+              providerUsername: "",
+            },
+          ],
           countryCode: "",
           timezone: "",
           currentTime: "",

src/app/(main)/my-voyage/[teamId]/directory/components/DirectoryComponentWrapper.tsx

@@ -1,6 +1,8 @@
 import { type PayloadAction, createSlice } from "@reduxjs/toolkit";
 import { clientSignOut } from "@/store/features/auth/authSlice";
 
+type providerType = "discord";
+
 export interface VoyageStatus {
   name: string;
 }
@@ -31,10 +33,12 @@ export interface User {
   firstName: string;
   lastName: string;
   countryCode: string;
-  discordId: string;
-  githubId: string;
-  twitterId: string;
-  linkedinId: string;
+  oAuthProfiles: {
+    provider: {
+      name: providerType;
+    };
+    providerUsername: string;
+  }[];
   email: string;
   timezone: string;
   avatar: string;
@@ -48,10 +52,14 @@ const initialState: User = {
   firstName: "",
   lastName: "",
   countryCode: "",
-  discordId: "",
-  githubId: "",
-  twitterId: "",
-  linkedinId: "",
+  oAuthProfiles: [
+    {
+      provider: {
+        name: "discord",
+      },
+      providerUsername: "",
+    },
+  ],
   email: "",
   timezone: "",
   avatar: "",