Skip to content

Fix/control panel button issue #308

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 3 commits into from
Aug 22, 2025
Merged

Fix/control panel button issue #308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eee8e7b
fix: button
coodos Aug 22, 2025
df907a7
chore: fix control panel storage selection
coodos Aug 22, 2025
efed108
Merge branch 'main' into fix/control-panel-button-issue
coodos Aug 22, 2025
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
11 changes: 10 additions & 1 deletion infrastructure/blindvote/src/crypto/pedersen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,16 @@ function addPoints(arr: any[]) {
* Helper function to compare encodings
*/
function encEq(A: any, B: any) {
return Buffer.from(A.toRawBytes()).equals(Buffer.from(B.toRawBytes()));
const bytesA = A.toRawBytes();
const bytesB = B.toRawBytes();

if (bytesA.length !== bytesB.length) return false;

for (let i = 0; i < bytesA.length; i++) {
if (bytesA[i] !== bytesB[i]) return false;
}

return true;
}

export function verifyFinal(C_aggb: Uint8Array, H_Sb: Uint8Array, M: number): boolean {
Expand Down
20 changes: 19 additions & 1 deletion infrastructure/control-panel/src/routes/+layout.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,25 @@
size="sm"
class="whitespace-nowrap"
variant="solid"
callback={() => goto('/monitoring')}>Start Monitoring</ButtonAction
callback={() => {
// Get selected items from the current page
const evaultsData = sessionStorage.getItem('selectedEVaults');
const platformsData = sessionStorage.getItem('selectedPlatforms');

// If no items selected, show alert
if (
(!evaultsData || JSON.parse(evaultsData).length === 0) &&
(!platformsData || JSON.parse(platformsData).length === 0)
) {
alert(
'Please select eVaults and/or platforms first before starting monitoring.'
);
return;
}

// Navigate to monitoring
goto('/monitoring');
}}>Start Monitoring</ButtonAction
>
</div>
{:else}
Expand Down
8 changes: 8 additions & 0 deletions infrastructure/control-panel/src/routes/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@
} else {
selectedEVaults = selectedEVaults.filter((i) => i !== index);
}

// Store selections immediately in sessionStorage
const selectedEVaultData = selectedEVaults.map((i) => evaults[i]);
sessionStorage.setItem('selectedEVaults', JSON.stringify(selectedEVaultData));
}

// Handle platform selection changes
Expand All @@ -78,6 +82,10 @@
} else {
selectedPlatforms = selectedPlatforms.filter((i) => i !== index);
}

// Store selections immediately in sessionStorage
const selectedPlatformData = selectedPlatforms.map((i) => platforms[i]);
sessionStorage.setItem('selectedPlatforms', JSON.stringify(selectedPlatformData));
}

// Navigate to monitoring with selected items
Expand Down
201 changes: 104 additions & 97 deletions infrastructure/control-panel/src/routes/monitoring/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,11 @@
selectedPlatforms = JSON.parse(platformsData);
}

// Check if any items are selected, if not redirect back to home
// Check if any items are selected, if not show selection interface
if (
(!selectedEVaults || selectedEVaults.length === 0) &&
(!selectedPlatforms || selectedPlatforms.length === 0)
) {
goto('/');
return;
}

Expand Down Expand Up @@ -483,69 +482,77 @@
}
</script>

<section class="flex h-full w-full">
<div class="bg-gray flex h-screen w-screen flex-col">
<div class="z-10 flex w-full items-center justify-between bg-white p-4">
<div>
<h4 class="text-xl font-semibold text-gray-800">Live Monitoring</h4>
<p class="mt-1 text-sm text-gray-600">
Monitoring {selectedEVaults.length} eVault{selectedEVaults.length !== 1
? 's'
: ''} and {selectedPlatforms.length} platform{selectedPlatforms.length !== 1
? 's'
: ''}
</p>
{#if currentFlowStep > 0}
<div class="mt-2 flex items-center gap-2">
<div class="h-3 w-3 animate-pulse rounded-full bg-green-500"></div>
<span class="text-xs font-medium text-green-600">
{currentFlowStep === 1
? 'Platform creating entry locally'
: currentFlowStep === 2
? 'Syncing to eVault'
: currentFlowStep === 3
? 'eVault created metaenvelope'
: currentFlowStep === 4
? 'Awareness Protocol'
: currentFlowStep === 5
? 'All platforms notified'
: 'Complete'}
</span>
</div>
{/if}
</div>
<div class="flex gap-2">
<button
onclick={() => goto('/')}
class="font-geist flex items-center gap-2 rounded-full border border-[#e5e5e5] bg-white px-4 py-2 text-base font-medium text-gray-700 shadow-md transition-colors hover:bg-gray-50"
>
← Back to Control Panel
</button>
<button
onclick={() => (isPaused = !isPaused)}
class="font-geist flex items-center gap-2 rounded-full border border-[#e5e5e5] bg-white px-4 py-2 text-base font-medium text-gray-700 shadow-md transition-colors hover:bg-gray-50"
>
{#if isPaused}
<HugeiconsIcon icon={PlayFreeIcons} size="20px" />
{:else}
<HugeiconsIcon icon={PauseFreeIcons} size="20px" />
{#if (!selectedEVaults || selectedEVaults.length === 0) && (!selectedPlatforms || selectedPlatforms.length === 0)}
<!-- No items selected - show selection interface -->
<div class="flex h-full w-full items-center justify-center">
<div class="text-center">
<h2 class="mb-4 text-2xl font-bold text-gray-900">No Items Selected</h2>
<p class="mb-6 text-gray-600">
Please select eVaults and/or platforms from the home page to start monitoring.
</p>
<button
onclick={() => goto('/')}
class="bg-primary hover:bg-primary-600 rounded-full px-8 py-3 text-lg font-semibold text-white transition-colors"
>
Back to Selection
</button>
</div>
</div>
{:else}
<section class="flex h-full w-full">
<div class="bg-gray flex h-screen w-screen flex-col">
<div class="z-10 flex w-full items-center justify-between bg-white p-4">
<div>
<h4 class="text-xl font-semibold text-gray-800">Live Monitoring</h4>
<p class="mt-1 text-sm text-gray-600">
Monitoring {selectedEVaults.length} eVault{selectedEVaults.length !== 1
? 's'
: ''} and {selectedPlatforms.length} platform{selectedPlatforms.length !==
1
? 's'
: ''}
</p>
{#if currentFlowStep > 0}
<div class="mt-2 flex items-center gap-2">
<div class="h-3 w-3 animate-pulse rounded-full bg-green-500"></div>
<span class="text-xs font-medium text-green-600">
{currentFlowStep === 1
? 'Platform creating entry locally'
: currentFlowStep === 2
? 'Syncing to eVault'
: currentFlowStep === 3
? 'eVault created metaenvelope'
: currentFlowStep === 4
? 'Awareness Protocol'
: currentFlowStep === 5
? 'All platforms notified'
: 'Complete'}
</span>
</div>
{/if}
{isPaused ? 'Resume Live Feed' : 'Pause Live Feed'}
</button>
</div>
<div class="flex gap-2">
<button
onclick={() => goto('/')}
class="font-geist flex items-center gap-2 rounded-full border border-[#e5e5e5] bg-white px-4 py-2 text-base font-medium text-gray-700 shadow-md transition-colors hover:bg-gray-50"
>
← Back to Control Panel
</button>
<button
onclick={() => (isPaused = !isPaused)}
class="font-geist flex items-center gap-2 rounded-full border border-[#e5e5e5] bg-white px-4 py-2 text-base font-medium text-gray-700 shadow-md transition-colors hover:bg-gray-50"
>
{#if isPaused}
<HugeiconsIcon icon={PlayFreeIcons} size="20px" />
{:else}
<HugeiconsIcon icon={PauseFreeIcons} size="20px" />
{/if}
{isPaused ? 'Resume Live Feed' : 'Pause Live Feed'}
</button>
</div>
</div>
</div>

{#if SvelteFlowComponent}
{#if selectedEVaults.length === 0 && selectedPlatforms.length === 0}
<div class="flex flex-grow items-center justify-center">
<div class="text-center">
<h3 class="mb-2 text-xl font-semibold text-gray-700">No Items Selected</h3>
<p class="text-gray-500">
Go back to the main page and select eVaults and platforms to monitor.
</p>
</div>
</div>
{:else}
{#if SvelteFlowComponent}
<div class="flex-grow">
<SvelteFlow
bind:nodes
Expand Down Expand Up @@ -583,46 +590,46 @@
</svg>
</SvelteFlow>
</div>
{:else}
<div class="flex flex-grow items-center justify-center text-gray-700">
Loading flow chart...
</div>
{/if}
{:else}
<div class="flex flex-grow items-center justify-center text-gray-700">
Loading flow chart...
</div>
{/if}
</div>

<!-- Flow Messages Panel -->
<div
class="flex h-full w-[40%] cursor-default flex-col bg-white p-4 transition-colors hover:bg-gray-50"
>
<div class="mb-4">
<h3 class="text-lg font-semibold text-gray-800">Data Flow</h3>
<div class="mt-2 text-sm text-gray-600">
Current Step: {currentFlowStep === 0
? 'Waiting for events...'
: currentFlowStep === 1
? 'Platform creating entry locally'
: currentFlowStep === 2
? 'Syncing to eVault'
: currentFlowStep === 3
? 'eVault created metaenvelope'
: currentFlowStep === 4
? 'Awareness Protocol'
: currentFlowStep === 5
? 'All platforms notified'
: 'Complete'}
</div>
</div>

<div class="flex-1 space-y-2 overflow-y-auto">
{#each flowMessages as message, i}
<div class="rounded bg-gray-50 p-2 font-mono text-sm">
{message}
<!-- Flow Messages Panel -->
<div
class="flex h-full w-[40%] cursor-default flex-col bg-white p-4 transition-colors hover:bg-gray-50"
>
<div class="mb-4">
<h3 class="text-lg font-semibold text-gray-800">Data Flow</h3>
<div class="mt-2 text-sm text-gray-600">
Current Step: {currentFlowStep === 0
? 'Waiting for events...'
: currentFlowStep === 1
? 'Platform creating entry locally'
: currentFlowStep === 2
? 'Syncing to eVault'
: currentFlowStep === 3
? 'eVault created metaenvelope'
: currentFlowStep === 4
? 'Awareness Protocol'
: currentFlowStep === 5
? 'All platforms notified'
: 'Complete'}
</div>
{/each}
</div>

<div class="flex-1 space-y-2 overflow-y-auto">
{#each flowMessages as message, i}
<div class="rounded bg-gray-50 p-2 font-mono text-sm">
{message}
</div>
{/each}
</div>
</div>
</div>
</section>
</section>
{/if}

<style>
/*
Expand Down
Binary file removed infrastructure/eid-wallet/src-tauri/gen/android/app/arm64/release/eid-w3ds-v0.2.0.1.apk
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion infrastructure/eid-wallet/src/routes/(app)/settings/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
on:click={handleVersionTap}
disabled={isRetrying}
>
Version v0.2.0.1
Version v0.2.0.2
</button>

{#if retryMessage}
Expand Down
25 changes: 21 additions & 4 deletions infrastructure/eid-wallet/vite.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ export default defineConfig(async () => ({
tailwindcss(),
sveltekit(),
nodePolyfills({
// Polyfill all Node.js core modules
include: ['buffer', 'crypto', 'stream', 'util'],
// Polyfill specific Node.js core modules
include: ['buffer', 'crypto'],
// Polyfill globals
globals: {
Buffer: true,
Expand All @@ -35,13 +35,30 @@ export default defineConfig(async () => ({

// Handle workspace dependencies
optimizeDeps: {
include: ['blindvote']
include: ['blindvote'],
esbuildOptions: {
// Node.js global to ES global conversion
define: {
global: 'globalThis',
},
},
},

// Handle Node.js modules in browser environment
resolve: {
alias: {
'noble-secp256k1': 'noble-secp256k1'
'noble-secp256k1': 'noble-secp256k1',
'blindvote': '../blindvote/src/index.ts'
}
},

// Build configuration
build: {
rollupOptions: {
external: [],
},
commonjsOptions: {
include: [/blindvote/, /node_modules/]
}
},

Expand Down
Loading