Skip to content

Commit

Permalink
fix: small fix (#287)
Browse files Browse the repository at this point in the history
  • Loading branch information
userMeh authored Jul 23, 2024
1 parent db4ce4b commit 794cd2c
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 4 deletions.
12 changes: 10 additions & 2 deletions apps/admin/app/(dashboard)/dashboard/votes/details/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,12 @@ function ShowContent() {
router.push('/dashboard/votes');
}
setPoll(data);
setTotalVotes(data.results.reduce((acc, result) => acc + result.votes, 0));
setTotalVotes(
Math.max(
1,
data.results.reduce((acc, result) => acc + result.votes, 0),
),
);
};

fetchData();
Expand Down Expand Up @@ -91,7 +96,10 @@ function ShowContent() {
votes: subPoll.results.find((subPollResult) => subPollResult.id_original === result.id_original)?.votes,
};
});
const subPollTotalVotes = slicedResults?.reduce((total, result) => total + (result.votes ?? 0), 0);
const subPollTotalVotes = Math.max(
1,
slicedResults?.reduce((total, result) => total + (result.votes ?? 0), 0) || 0,
);

return (
<div
Expand Down
9 changes: 9 additions & 0 deletions apps/client/app/(auth)/(members)/members/chat/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ export default function ChatView() {
const handleSubmit = form.handleSubmit(async (data) => {
const message = await sendMessage({ id_sender: id, message: data.message });
if (message) {
setMessages((prev) => ({ ...prev, data: [...prev.data, message] }));
form.reset();
}
});
Expand All @@ -95,12 +96,20 @@ export default function ChatView() {
const message = await updateMessage(editingId, data.message);
if (message) {
setEditingId(null);
setMessages((prev) => ({
...prev,
data: prev.data.map((m) => (m.id === message.id ? message : m)),
}));
editForm.reset();
}
});

const handleDelete = async (messageId: number) => {
if (!window.confirm('Voulez-vous vraiment supprimer ce message ?')) return;
setMessages((prev) => ({
...prev,
data: prev.data.filter((m) => m.id !== messageId),
}));
await deleteMessage(messageId);
};

Expand Down
4 changes: 3 additions & 1 deletion apps/client/app/(auth)/(members)/members/votes/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,9 @@ export default function ListVotes() {
<CardHeader>
<CardTitle className="flex justify-between items-center">
<span className="text-lg font-semibold line-clamp-1">{poll.title}</span>
<Badge variant="outline">{poll.max_choices > 1 ? 'Choix multiples' : 'Choix unique'}</Badge>
<Badge variant="outline" className="flex-shrink-0">
{poll.max_choices > 1 ? 'Choix multiples' : 'Choix unique'}
</Badge>
</CardTitle>
</CardHeader>
<CardContent>
Expand Down
2 changes: 1 addition & 1 deletion apps/client/app/ui/auth/SignupForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export default function SignupForm(): JSX.Element {
}

return (
<div className={`w-full lg:grid lg:h-screen lg:grid-cols-2 ${showForm ? 'pb-10 mb-20' : ''}`}>
<div className={'w-full lg:grid lg:grid-cols-2'}>
<div className="hidden bg-muted lg:block">
<Image
src="/running_track.jpg"
Expand Down

0 comments on commit 794cd2c

Please sign in to comment.