Skip to content

Commit 625372d

Browse files
author
Alexandra Zwinger
committed
Add usage of username instead of userid
1 parent 8794f1e commit 625372d

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

src/components/calendar/meeting/MeetingSearchResult.tsx

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -28,61 +28,61 @@ export default function MeetingSearchResult(
2828
onToggle
2929
}: Props
3030
) {
31-
const [userIds, setUserIds] = useState<string[]>([]);
31+
const [usernames, setUsernames] = useState<string[]>([]);
3232
const [myUser, setMyUser] = useState<UserDto | null>(null);
3333
const [loading, setLoading] = useState<boolean>(false);
34-
const [myUserId, setMyUserId] = useState<string | undefined>();
34+
const [myUsername, setMyUsername] = useState<string | undefined>();
3535
const [isMember, setIsMember] = useState<boolean>(false);
3636
const mdAndUp = useMediaQuery((theme: Theme) => theme.breakpoints.up('md'));
3737

3838
useEffect(() => {
3939
getUser(axiosInstance).then(setMyUser).catch(console.error);
4040
getUserIdsForMeeting(axiosInstance, meeting.id)
41-
.then(setUserIds)
41+
.then(setUsernames)
4242
.catch(console.error);
4343
}, [meeting.id]);
4444

4545
useEffect(() => {
4646
if (myUser == null) return;
47-
setMyUserId(myUser.uuid);
48-
setIsMember(userIds.includes(myUser.uuid));
49-
}, [myUser, userIds]);
47+
setMyUsername(myUser.username);
48+
setIsMember(usernames.includes(myUser.username));
49+
}, [myUser, usernames]);
5050

5151
const joinMeeting = () => {
5252
setLoading(true);
53-
if (myUserId === undefined) {
53+
if (myUsername === undefined) {
5454
setLoading(false);
55-
alert("userId undefined");
55+
alert("username undefined");
5656
return;
5757
}
5858
joinStudyGroup(axiosInstance, meeting.id)
59-
.then(() => setUserIds(prev => [...prev, myUserId]))
59+
.then(() => setUsernames(prev => [...prev, myUsername]))
6060
.finally(() => setLoading(false));
6161
};
6262

6363
const joinSuperMeeting = () => {
6464
setLoading(true);
65-
if (myUserId === undefined) {
65+
if (myUsername === undefined) {
6666
setLoading(false);
67-
alert("userId undefined");
67+
alert("username undefined");
6868
return;
6969
}
7070
joinSuperStudyGroup(axiosInstance, meeting.superId.toString())
71-
.then(() => setUserIds(prev => [...prev, myUserId]))
71+
.then(() => setUsernames(prev => [...prev, myUsername]))
7272
.finally(() => setLoading(false));
7373
};
7474

7575
const leaveMeeting = () => {
7676
setLoading(true);
7777
leaveStudyGroup(axiosInstance, meeting.id)
78-
.then(() => setUserIds(prev => prev.filter(id => id !== myUserId)))
78+
.then(() => setUsernames(prev => prev.filter(id => id !== myUsername)))
7979
.finally(() => setLoading(false));
8080
};
8181

8282
const leaveSuperMeeting = () => {
8383
setLoading(true);
8484
leaveSuperStudyGroup(axiosInstance, meeting.superId.toString())
85-
.then(() => setUserIds(prev => prev.filter(id => id !== myUserId)))
85+
.then(() => setUsernames(prev => prev.filter(id => id !== myUsername)))
8686
.finally(() => setLoading(false));
8787
};
8888

@@ -131,8 +131,8 @@ export default function MeetingSearchResult(
131131
<p>Alle Teilnehmenden:</p>
132132
<ul style={{margin: 0, padding: 0, listStyle: 'inside'}}>
133133
<li key={meeting.creator}>{meeting.creator}</li>
134-
{userIds.map(id => (
135-
<li key={id}>{id}</li>
134+
{usernames.map(name => (
135+
<li key={name}>{name}</li>
136136
))}
137137

138138
</ul>
@@ -150,8 +150,8 @@ export default function MeetingSearchResult(
150150
</p>
151151
<ul className="text-white text-sm list-disc list-inside">
152152
<li key={meeting.creator}>{meeting.creator}</li>
153-
{userIds.map(id => (
154-
<li key={id}>{id}</li>
153+
{usernames.map(name => (
154+
<li key={name}>{name}</li>
155155
))}
156156
</ul>
157157
</>

0 commit comments

Comments
 (0)