Skip to content

chore: eVoting fixes #305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 22, 2025
Merged

chore: eVoting fixes #305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 0 additions & 80 deletions infrastructure/eid-wallet/src/routes/(app)/scan-qr/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1171,86 +1171,6 @@
{signingData?.pollId ?? "Unknown"}
</p>
</div>

<div class="bg-gray rounded-2xl w-full p-4">
<h4 class="text-base text-black-700">Your Vote</h4>
<div class="text-black-700 font-normal">
{#if signingData?.voteData?.optionId !== undefined}
<!-- Normal voting mode -->
<p>
You selected: <strong
>Option {parseInt(signingData.voteData.optionId) +
1}</strong
>
</p>
<p class="text-sm text-gray-600 mt-1">
(This is the option number from the poll)
</p>
{:else if signingData?.voteData?.ranks}
<!-- Ranked voting mode -->
<p class="mb-2">Your ranking order:</p>
<div class="space-y-2">
{#each Object.entries(signingData.voteData.ranks).sort(([a], [b]) => parseInt(a) - parseInt(b)) as [rank, optionIndex]}
<div
class="flex items-center space-x-3 p-2 bg-blue-50 rounded-lg"
>
<span
class="text-sm bg-blue-500 text-white px-3 py-1 rounded-full font-medium"
>
{rank === "1"
? "1st"
: rank === "2"
? "2nd"
: rank === "3"
? "3rd"
: `${rank}th`}
</span>
<span class="font-medium"
>Option {parseInt(String(optionIndex)) +
1}</span
>
</div>
{/each}
</div>
<p class="text-sm text-gray-600 mt-2">
(1st = most preferred, 2nd = second choice, etc.)
</p>
{:else if signingData?.voteData?.points}
<!-- Points voting mode -->
<p class="mb-2">Your point distribution:</p>
<div class="space-y-2">
{#each Object.entries(signingData.voteData.points)
.filter(([_, points]) => (points as number) > 0)
.sort(([a], [b]) => parseInt(a) - parseInt(b)) as [optionIndex, points]}
<div
class="flex items-center space-x-3 p-2 bg-purple-50 rounded-lg"
>
<span
class="text-sm bg-purple-500 text-white px-3 py-1 rounded-full font-medium"
>
{points} pts
</span>
<span class="font-medium"
>Option {parseInt(String(optionIndex)) +
1}</span
>
</div>
{/each}
</div>
<p class="text-sm text-gray-600 mt-2">
(Total: {Object.values(
signingData.voteData.points,
).reduce(
(sum, points) =>
(sum as number) + ((points as number) || 0),
0,
)}/100 points)
</p>
{:else}
<p>Vote data not available</p>
{/if}
</div>
</div>
{:else if isBlindVotingRequest && signingData?.pollDetails}
<!-- Blind Voting UI -->
<div class="blind-voting-section">
Expand Down
1,035 changes: 530 additions & 505 deletions platforms/eVoting/src/app/(app)/[id]/page.tsx
View file
Open in desktop

Large diffs are not rendered by default.

120 changes: 63 additions & 57 deletions platforms/eVoting/src/app/(app)/create/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,8 @@ const createPollSchema = z.object({
.min(2, "At least 2 options required"),
deadline: z
.string()
.optional()
.min(1, "Deadline is required")
.refine((val) => {
if (!val) return true; // Allow empty deadline
const date = new Date(val);
return !Number.isNaN(date.getTime()) && date > new Date();
}, "Deadline must be a valid future date"),
Expand Down Expand Up @@ -217,15 +216,16 @@ export default function CreatePoll() {
{/* Vote Deadline */}
<div>
<Label className="text-sm font-semibold text-gray-700">
Vote Deadline (Optional)
Vote Deadline
</Label>
<Input
{...register("deadline")}
type="datetime-local"
className="mt-2 focus:ring-(--crimson) focus:border-(--crimson)"
required
/>
<p className="mt-1 text-sm text-gray-500">
Leave empty for no deadline. Voting will be open indefinitely.
Set a deadline for when voting will end.
</p>
{errors.deadline && (
<p className="mt-1 text-sm text-red-600">
Expand All @@ -234,6 +234,59 @@ export default function CreatePoll() {
)}
</div>

{/* Vote Visibility */}
<div>
<Label className="text-sm font-semibold text-gray-700">
Vote Visibility
</Label>
<div className="mt-2 space-y-3">
<Label className={`flex items-center cursor-pointer p-4 border-2 rounded-lg transition-all duration-200 ${
watchedVisibility === "public"
? "border-(--crimson) bg-(--crimson) text-white"
: "border-gray-300 hover:border-gray-400"
}`}>
<input
type="radio"
value="public"
{...register("visibility")}
className="sr-only"
/>
<div className="flex items-center">
<Eye className="w-6 h-6 mr-3" />
<div>
<div className="font-semibold">Public</div>
<div className="text-sm opacity-90">Voters are public</div>
</div>
</div>
</Label>

<Label className={`flex items-center cursor-pointer p-4 border-2 rounded-lg transition-all duration-200 ${
watchedVisibility === "private"
? "border-(--crimson) bg-(--crimson) text-white"
: "border-gray-300 hover:border-gray-400"
}`}>
<input
type="radio"
value="private"
{...register("visibility")}
className="sr-only"
/>
<div className="flex items-center">
<UserX className="w-6 h-6 mr-3" />
<div>
<div className="font-semibold">Private</div>
<div className="text-sm opacity-90">Voters are hidden</div>
</div>
</div>
</Label>
</div>
{errors.visibility && (
<p className="mt-1 text-sm text-red-600">
{errors.visibility.message}
</p>
)}
</div>

{/* Vote Type */}
<div>
<Label className="text-sm font-semibold text-gray-700">
Expand Down Expand Up @@ -263,13 +316,16 @@ export default function CreatePoll() {
<Label className={`flex items-center cursor-pointer p-4 border-2 rounded-lg transition-all duration-200 ${
watchedMode === "point"
? "border-(--crimson) bg-(--crimson) text-white"
: watchedVisibility === "private"
? "border-gray-300 bg-gray-100 opacity-50 cursor-not-allowed"
: "border-gray-300 hover:border-gray-400"
}`}>
<input
type="radio"
value="point"
{...register("mode")}
className="sr-only"
disabled={watchedVisibility === "private"}
/>
<div className="flex items-center">
<ChartLine className="w-6 h-6 mr-3" />
Expand All @@ -283,13 +339,16 @@ export default function CreatePoll() {
<Label className={`flex items-center cursor-pointer p-4 border-2 rounded-lg transition-all duration-200 ${
watchedMode === "rank"
? "border-(--crimson) bg-(--crimson) text-white"
: watchedVisibility === "private"
? "border-gray-300 bg-gray-100 opacity-50 cursor-not-allowed"
: "border-gray-300 hover:border-gray-400"
}`}>
<input
type="radio"
value="rank"
{...register("mode")}
className="sr-only"
disabled={watchedVisibility === "private"}
/>
<div className="flex items-center">
<ListOrdered className="w-6 h-6 mr-3" />
Expand Down Expand Up @@ -363,59 +422,6 @@ export default function CreatePoll() {
<p className="mt-2 text-sm text-gray-500">Coming soon - currently disabled</p>
</div>

{/* Vote Visibility */}
<div>
<Label className="text-sm font-semibold text-gray-700">
Vote Visibility
</Label>
<div className="mt-2 space-y-3">
<Label className={`flex items-center cursor-pointer p-4 border-2 rounded-lg transition-all duration-200 ${
watchedVisibility === "public"
? "border-(--crimson) bg-(--crimson) text-white"
: "border-gray-300 hover:border-gray-400"
}`}>
<input
type="radio"
value="public"
{...register("visibility")}
className="sr-only"
/>
<div className="flex items-center">
<Eye className="w-6 h-6 mr-3" />
<div>
<div className="font-semibold">Public</div>
<div className="text-sm opacity-90">Voters are public</div>
</div>
</div>
</Label>

<Label className={`flex items-center cursor-pointer p-4 border-2 rounded-lg transition-all duration-200 ${
watchedVisibility === "private"
? "border-(--crimson) bg-(--crimson) text-white"
: "border-gray-300 hover:border-gray-400"
}`}>
<input
type="radio"
value="private"
{...register("visibility")}
className="sr-only"
/>
<div className="flex items-center">
<UserX className="w-6 h-6 mr-3" />
<div>
<div className="font-semibold">Private</div>
<div className="text-sm opacity-90">Voters are hidden</div>
</div>
</div>
</Label>
</div>
{errors.visibility && (
<p className="mt-1 text-sm text-red-600">
{errors.visibility.message}
</p>
)}
</div>

{/* Vote Options */}
<div>
<Label className="text-sm font-semibold text-gray-700">
Expand Down
Loading
Loading