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
coodos 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

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

coodos
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

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

coodos
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

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

coodos
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

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

coodos
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

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

coodos
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

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

coodos
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

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

coodos
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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