Skip to content

Commit

Permalink
Merge pull request #266 from chingu-x/dev
Browse files Browse the repository at this point in the history
1.0.0-alpha.5
  • Loading branch information
Dan-Y-Ko authored Sep 22, 2024
2 parents d87f2a0 + 14d5f26 commit 13d2836
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 6 deletions.
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,21 @@ 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.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
- Updated how we're retrieving the discord id to display in the directory page https://github.com/chingu-x/chingu-dashboard/issues/202


### Fixed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,7 @@ export default function MeetingForm() {
timezone,
}),
meetingLink: validateTextInput({
inputName: "Meeting Link",
required: true,
inputName: "Meeting link",
isUrl: true,
}),
});
Expand Down Expand Up @@ -117,9 +116,18 @@ export default function MeetingForm() {
timeZone: timezone,
});

const newData =
data.meetingLink === ""
? { description: data.description, title: data.title }
: {
description: data.description,
title: data.title,
meetingLink: data.meetingLink,
};

if (editMode) {
const [res, error] = await editMeetingAction({
...data,
...newData,
dateTime,
meetingId,
sprintNumber,
Expand All @@ -143,7 +151,7 @@ export default function MeetingForm() {
setEditMeetingLoading(false);
}
} else {
const payload = { ...data, dateTime, teamId, sprintNumber };
const payload = { ...newData, dateTime, teamId, sprintNumber };

const [res, error] = await addMeetingAction(payload);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ export default function MeetingOverview({
className="w-full"
>
<Button
disabled={!meetingLink}
className="w-full justify-between bg-primary-content text-base-300 hover:text-base-200"
size="lg"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ interface MeetingBody {
title: string;
description: string;
dateTime: string;
meetingLink: string;
meetingLink?: string;
notes: string;
}

Expand Down

0 comments on commit 13d2836

Please sign in to comment.