fix: make scan qr page work again#185

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
Jun 2, 2025
Merged

fix: make scan qr page work again #185

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
4 changes: 2 additions & 2 deletions infrastructure/eid-wallet/src-tauri/gen/apple/eid-wallet.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -377,7 +377,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = "eid-wallet_iOS/eid-wallet_iOS.entitlements";
CODE_SIGN_IDENTITY = "iPhone Developer";
DEVELOPMENT_TEAM = 3FS4B734X5;
DEVELOPMENT_TEAM = 7F2T2WK6DR;
ENABLE_BITCODE = NO;
"EXCLUDED_ARCHS[sdk=iphoneos*]" = "arm64-sim x86_64";
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
Expand DownExpand Up@@ -430,7 +430,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = "eid-wallet_iOS/eid-wallet_iOS.entitlements";
CODE_SIGN_IDENTITY = "iPhone Developer";
DEVELOPMENT_TEAM = 3FS4B734X5;
DEVELOPMENT_TEAM = 7F2T2WK6DR;
ENABLE_BITCODE = NO;
"EXCLUDED_ARCHS[sdk=iphoneos*]" = "arm64-sim x86_64";
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
Expand Down
259 changes: 147 additions & 112 deletions infrastructure/eid-wallet/src/routes/(app)/scan-qr/+page.svelte
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,125 +1,134 @@
<script lang="ts">
import AppNav from "$lib/fragments/AppNav/AppNav.svelte";
import { Drawer } from "$lib/ui";
import * as Button from "$lib/ui/Button";
import {
FlashlightIcon,
Image02Icon,
QrCodeIcon,
} from "@hugeicons/core-free-icons";
import { HugeiconsIcon } from "@hugeicons/svelte";
import {
Format,
type PermissionState,
type Scanned,
cancel,
checkPermissions,
requestPermissions,
scan,
} from "@tauri-apps/plugin-barcode-scanner";
import { onDestroy, onMount } from "svelte";
import type { SVGAttributes } from "svelte/elements";

const pathProps: SVGAttributes<SVGPathElement> = {
stroke: "white",
"stroke-width": 7,
"stroke-linecap": "round",
"stroke-linejoin": "round",
};

let codeScannedDrawerOpen = $state(false);
let loggedInDrawerOpen = $state(false);
let flashlightOn = $state(false);

let scannedData: Scanned | undefined = $state(undefined);

let scanning = false;
let loading = false;

let permissions_nullable: PermissionState | null;

async function startScan() {
let permissions = await checkPermissions()
.then((permissions) => {
return permissions;
})
.catch(() => {
return null; // possibly return "denied"? or does that imply that the check has been successful, but was actively denied?
});

// TODO: handle receiving "prompt-with-rationale" (issue: https://github.com/tauri-apps/plugins-workspace/issues/979)
if (permissions === "prompt") {
permissions = await requestPermissions(); // handle in more detail?
}

permissions_nullable = permissions;

if (permissions === "granted") {
// Scanning parameters
const formats = [Format.QRCode];
const windowed = true;

if (scanning) return;
scanning = true;
scan({ formats, windowed })
.then((res) => {
console.log("Scan result:", res);
scannedData = res;
codeScannedDrawerOpen = true;
})
.catch((error) => {
// TODO: display error to user
console.error("Scan error:", error);
import AppNav from "$lib/fragments/AppNav/AppNav.svelte";
import { Drawer } from "$lib/ui";
import * as Button from "$lib/ui/Button";
import {
FlashlightIcon,
Image02Icon,
QrCodeIcon,
} from "@hugeicons/core-free-icons";
import { HugeiconsIcon } from "@hugeicons/svelte";
import {
Format,
type PermissionState,
type Scanned,
cancel,
checkPermissions,
requestPermissions,
scan,
} from "@tauri-apps/plugin-barcode-scanner";
import { onDestroy, onMount } from "svelte";
import type { SVGAttributes } from "svelte/elements";

const pathProps: SVGAttributes<SVGPathElement> = {
stroke: "white",
"stroke-width": 7,
"stroke-linecap": "round",
"stroke-linejoin": "round",
};

let codeScannedDrawerOpen = $state(false);
let loggedInDrawerOpen = $state(false);
let flashlightOn = $state(false);

let scannedData: Scanned | undefined = $state(undefined);

let scanning = false;
let loading = false;

let permissions_nullable: PermissionState | null;

async function startScan() {
let permissions = await checkPermissions()
.then((permissions) => {
return permissions;
})
.finally(() => {
scanning = false;
.catch(() => {
return null; // possibly return "denied"? or does that imply that the check has been successful, but was actively denied?
});
}

console.error("Permission denied or not granted");
// TODO: consider handling GUI for permission denied
}
// TODO: handle receiving "prompt-with-rationale" (issue: https://github.com/tauri-apps/plugins-workspace/issues/979)
if (permissions === "prompt") {
permissions = await requestPermissions(); // handle in more detail?
}

permissions_nullable = permissions;

if (permissions === "granted") {
// Scanning parameters
const formats = [Format.QRCode];
const windowed = true;

if (scanning) return;
scanning = true;
scan({ formats, windowed })
.then((res) => {
console.log("Scan result:", res);
scannedData = res;
codeScannedDrawerOpen = true;
})
.catch((error) => {
// TODO: display error to user
console.error("Scan error:", error);
})
.finally(() => {
scanning = false;
});
}

console.error("Permission denied or not granted");
// TODO: consider handling GUI for permission denied
}

async function cancelScan() {
await cancel();
scanning = false;
}
async function cancelScan() {
await cancel();
scanning = false;
}

onMount(async () => {
startScan();
});
onMount(async () => {
startScan();
});

onDestroy(async () => {
await cancelScan();
});
onDestroy(async () => {
await cancelScan();
});
</script>

<AppNav title="Scan QR Code" titleClasses="text-white" iconColor="white" />

<svg class="mx-auto mt-48" width="204" height="215" viewBox="0 0 204 215" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M46 4H15C8.92487 4 4 8.92487 4 15V46" {...pathProps}/>
<path d="M158 4H189C195.075 4 200 8.92487 200 15V46" {...pathProps}/>
<path d="M46 211H15C8.92487 211 4 206.075 4 200V169" {...pathProps}/>
<path d="M158 211H189C195.075 211 200 206.075 200 200V169" {...pathProps}/>
<svg
class="mx-auto mt-48"
width="204"
height="215"
viewBox="0 0 204 215"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path d="M46 4H15C8.92487 4 4 8.92487 4 15V46" {...pathProps} />
<path d="M158 4H189C195.075 4 200 8.92487 200 15V46" {...pathProps} />
<path d="M46 211H15C8.92487 211 4 206.075 4 200V169" {...pathProps} />
<path d="M158 211H189C195.075 211 200 206.075 200 200V169" {...pathProps} />
</svg>

<h4 class="text-white font-semibold text-center mt-20">Point the camera at the code</h4>
<h4 class="text-white font-semibold text-center mt-20">
Point the camera at the code
</h4>

<div class="fixed bottom-2 left-1/2 -translate-x-1/2 z-10 flex gap-8 justify-center items-center">
<Button.Icon
icon={Image02Icon}
bgColor="white"
bgSize="md"
/>
<div
class="fixed bottom-2 left-1/2 -translate-x-1/2 z-10 flex gap-8 justify-center items-center"
>
<Button.Icon icon={Image02Icon} bgColor="white" bgSize="md" />
<Button.Icon
icon={QrCodeIcon}
bgColor="white"
bgSize="lg"
iconSize="lg"
callback={() => { codeScannedDrawerOpen = true; }}
callback={() => {
codeScannedDrawerOpen = true;
}}
/>
<Button.Icon
icon={FlashlightIcon}
icon={FlashlightIcon}
aria-label="Toggle flashlight"
bgSize="md"
iconSize={32}
Expand All@@ -135,9 +144,15 @@ onDestroy(async () => {
bind:isPaneOpen={codeScannedDrawerOpen}
class="flex flex-col gap-4 items-center justify-center"
>
<div class="flex justify-center mb-4 relative items-center overflow-hidden bg-gray rounded-xl p-4 h-[72px] w-[72px]">
<div class="bg-white h-[16px] w-[200px] -rotate-45 absolute top-1"></div>
<div class="bg-white h-[16px] w-[200px] -rotate-45 absolute bottom-1"></div>
<div
class="flex justify-center mb-4 relative items-center overflow-hidden bg-gray rounded-xl p-4 h-[72px] w-[72px]"
>
<div
class="bg-white h-[16px] w-[200px] -rotate-45 absolute top-1"
></div>
<div
class="bg-white h-[16px] w-[200px] -rotate-45 absolute bottom-1"
></div>
<HugeiconsIcon
size={40}
className="z-10"
Expand All@@ -152,22 +167,27 @@ onDestroy(async () => {

<div class="bg-gray rounded-2xl w-full p-4 mt-4">
<h4 class="text-base text-black-700">Website URL</h4>
<p class="text-black-700 font-normal underline">{scannedData?.content}</p>
<p class="text-black-700 font-normal underline">
{scannedData?.content}
</p>
</div>
<div class="flex justify-center gap-3 items-center mt-4">
<Button.Action
variant="danger-soft"
class="w-full"
callback={() => { codeScannedDrawerOpen = false; startScan(); }}
callback={() => {
codeScannedDrawerOpen = false;
startScan();
}}
>
Decline
</Button.Action>
<Button.Action
variant="solid"
class="w-full"
callback={() => {
codeScannedDrawerOpen = false
loggedInDrawerOpen = true
codeScannedDrawerOpen = false;
loggedInDrawerOpen = true;
startScan();
}}
>
Expand All@@ -182,9 +202,15 @@ onDestroy(async () => {
bind:isPaneOpen={loggedInDrawerOpen}
class="flex flex-col gap-4 items-center justify-center"
>
<div class="flex justify-center mb-4 relative items-center overflow-hidden bg-gray rounded-xl p-4 h-[72px] w-[72px]">
<div class="bg-white h-[16px] w-[200px] -rotate-45 absolute top-1"></div>
<div class="bg-white h-[16px] w-[200px] -rotate-45 absolute bottom-1"></div>
<div
class="flex justify-center mb-4 relative items-center overflow-hidden bg-gray rounded-xl p-4 h-[72px] w-[72px]"
>
<div
class="bg-white h-[16px] w-[200px] -rotate-45 absolute top-1"
></div>
<div
class="bg-white h-[16px] w-[200px] -rotate-45 absolute bottom-1"
></div>
<HugeiconsIcon
size={40}
className="z-10"
Expand All@@ -201,10 +227,19 @@ onDestroy(async () => {
<Button.Action
variant="solid"
class="w-full"
callback={() => { loggedInDrawerOpen = false; startScan(); }}
callback={() => {
loggedInDrawerOpen = false;
startScan();
}}
>
Close
</Button.Action>
</div>
</Drawer>

<style>
:global(body, *:not(button)) {
background-color: #00000000;
overflow-y: hidden;
}
</style>
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
fix: make scan qr page work again#185

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

Jun 2, 2025
 Merged


fix: make scan qr page work again
#185
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


4 changes: 2 additions & 2 deletions
infrastructure/eid-wallet/src-tauri/gen/apple/eid-wallet.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -377,7 +377,7 @@
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 CODE_SIGN_ENTITLEMENTS = "eid-wallet_iOS/eid-wallet_iOS.entitlements";
 CODE_SIGN_IDENTITY = "iPhone Developer";
 DEVELOPMENT_TEAM = 3FS4B734X5;
 DEVELOPMENT_TEAM = 7F2T2WK6DR;
 ENABLE_BITCODE = NO;
 "EXCLUDED_ARCHS[sdk=iphoneos*]" = "arm64-sim x86_64";
 "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
Expand DownExpand Up@@ -430,7 +430,7 @@
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 CODE_SIGN_ENTITLEMENTS = "eid-wallet_iOS/eid-wallet_iOS.entitlements";
 CODE_SIGN_IDENTITY = "iPhone Developer";
 DEVELOPMENT_TEAM = 3FS4B734X5;
 DEVELOPMENT_TEAM = 7F2T2WK6DR;
 ENABLE_BITCODE = NO;
 "EXCLUDED_ARCHS[sdk=iphoneos*]" = "arm64-sim x86_64";
 "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
Expand Down

259 changes: 147 additions & 112 deletions
infrastructure/eid-wallet/src/routes/(app)/scan-qr/+page.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,125 +1,134 @@
<script lang="ts">
import AppNav from "$lib/fragments/AppNav/AppNav.svelte";
import { Drawer } from "$lib/ui";
import * as Button from "$lib/ui/Button";
import {
 FlashlightIcon,
 Image02Icon,
 QrCodeIcon,
} from "@hugeicons/core-free-icons";
import { HugeiconsIcon } from "@hugeicons/svelte";
import {
 Format,
 type PermissionState,
 type Scanned,
 cancel,
 checkPermissions,
 requestPermissions,
 scan,
} from "@tauri-apps/plugin-barcode-scanner";
import { onDestroy, onMount } from "svelte";
import type { SVGAttributes } from "svelte/elements";

const pathProps: SVGAttributes<SVGPathElement> = {
 stroke: "white",
 "stroke-width": 7,
 "stroke-linecap": "round",
 "stroke-linejoin": "round",
};

let codeScannedDrawerOpen = $state(false);
let loggedInDrawerOpen = $state(false);
let flashlightOn = $state(false);

let scannedData: Scanned | undefined = $state(undefined);

let scanning = false;
let loading = false;

let permissions_nullable: PermissionState | null;

async function startScan() {
 let permissions = await checkPermissions()
 .then((permissions) => {
 return permissions;
 })
 .catch(() => {
 return null; // possibly return "denied"? or does that imply that the check has been successful, but was actively denied?
 });

 // TODO: handle receiving "prompt-with-rationale" (issue: https://github.com/tauri-apps/plugins-workspace/issues/979)
 if (permissions === "prompt") {
 permissions = await requestPermissions(); // handle in more detail?
 }

 permissions_nullable = permissions;

 if (permissions === "granted") {
 // Scanning parameters
 const formats = [Format.QRCode];
 const windowed = true;

 if (scanning) return;
 scanning = true;
 scan({ formats, windowed })
 .then((res) => {
 console.log("Scan result:", res);
 scannedData = res;
 codeScannedDrawerOpen = true;
 })
 .catch((error) => {
 // TODO: display error to user
 console.error("Scan error:", error);
 import AppNav from "$lib/fragments/AppNav/AppNav.svelte";
 import { Drawer } from "$lib/ui";
 import * as Button from "$lib/ui/Button";
 import {
 FlashlightIcon,
 Image02Icon,
 QrCodeIcon,
 } from "@hugeicons/core-free-icons";
 import { HugeiconsIcon } from "@hugeicons/svelte";
 import {
 Format,
 type PermissionState,
 type Scanned,
 cancel,
 checkPermissions,
 requestPermissions,
 scan,
 } from "@tauri-apps/plugin-barcode-scanner";
 import { onDestroy, onMount } from "svelte";
 import type { SVGAttributes } from "svelte/elements";

 const pathProps: SVGAttributes<SVGPathElement> = {
 stroke: "white",
 "stroke-width": 7,
 "stroke-linecap": "round",
 "stroke-linejoin": "round",
 };

 let codeScannedDrawerOpen = $state(false);
 let loggedInDrawerOpen = $state(false);
 let flashlightOn = $state(false);

 let scannedData: Scanned | undefined = $state(undefined);

 let scanning = false;
 let loading = false;

 let permissions_nullable: PermissionState | null;

 async function startScan() {
 let permissions = await checkPermissions()
 .then((permissions) => {
 return permissions;
 })
 .finally(() => {
scanning = false;
 .catch(() => {
return null; // possibly return "denied"? or does that imply that the check has been successful, but was actively denied?
 });
 }

 console.error("Permission denied or not granted");
 // TODO: consider handling GUI for permission denied
}
 // TODO: handle receiving "prompt-with-rationale" (issue: https://github.com/tauri-apps/plugins-workspace/issues/979)
 if (permissions === "prompt") {
 permissions = await requestPermissions(); // handle in more detail?
 }

 permissions_nullable = permissions;

 if (permissions === "granted") {
 // Scanning parameters
 const formats = [Format.QRCode];
 const windowed = true;

 if (scanning) return;
 scanning = true;
 scan({ formats, windowed })
 .then((res) => {
 console.log("Scan result:", res);
 scannedData = res;
 codeScannedDrawerOpen = true;
 })
 .catch((error) => {
 // TODO: display error to user
 console.error("Scan error:", error);
 })
 .finally(() => {
 scanning = false;
 });
 }

 console.error("Permission denied or not granted");
 // TODO: consider handling GUI for permission denied
 }

async function cancelScan() {
 await cancel();
 scanning = false;
}
async function cancelScan() {
await cancel();
scanning = false;
}

onMount(async () => {
 startScan();
});
onMount(async () => {
startScan();
});

onDestroy(async () => {
 await cancelScan();
});
onDestroy(async () => {
await cancelScan();
});
</script>

<AppNav title="Scan QR Code" titleClasses="text-white" iconColor="white" />

<svg class="mx-auto mt-48" width="204" height="215" viewBox="0 0 204 215" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M46 4H15C8.92487 4 4 8.92487 4 15V46" {...pathProps}/>
 <path d="M158 4H189C195.075 4 200 8.92487 200 15V46" {...pathProps}/>
 <path d="M46 211H15C8.92487 211 4 206.075 4 200V169" {...pathProps}/>
 <path d="M158 211H189C195.075 211 200 206.075 200 200V169" {...pathProps}/>
<svg
 class="mx-auto mt-48"
 width="204"
 height="215"
 viewBox="0 0 204 215"
 fill="none"
 xmlns="http://www.w3.org/2000/svg"
>
 <path d="M46 4H15C8.92487 4 4 8.92487 4 15V46" {...pathProps} />
 <path d="M158 4H189C195.075 4 200 8.92487 200 15V46" {...pathProps} />
 <path d="M46 211H15C8.92487 211 4 206.075 4 200V169" {...pathProps} />
 <path d="M158 211H189C195.075 211 200 206.075 200 200V169" {...pathProps} />
</svg>

<h4 class="text-white font-semibold text-center mt-20">Point the camera at the code</h4>
<h4 class="text-white font-semibold text-center mt-20">
 Point the camera at the code
</h4>

<div class="fixed bottom-2 left-1/2 -translate-x-1/2 z-10 flex gap-8 justify-center items-center">
 <Button.Icon
 icon={Image02Icon}
 bgColor="white"
 bgSize="md"
 />
<div
 class="fixed bottom-2 left-1/2 -translate-x-1/2 z-10 flex gap-8 justify-center items-center"
>
 <Button.Icon icon={Image02Icon} bgColor="white" bgSize="md" />
 <Button.Icon
 icon={QrCodeIcon}
 bgColor="white"
 bgSize="lg"
 iconSize="lg"
 callback={() => { codeScannedDrawerOpen = true; }}
 callback={() => {
 codeScannedDrawerOpen = true;
 }}
 />
 <Button.Icon
 icon={FlashlightIcon}
icon={FlashlightIcon}
 aria-label="Toggle flashlight"
 bgSize="md"
 iconSize={32}
Expand All@@ -135,9 +144,15 @@ onDestroy(async () => {
 bind:isPaneOpen={codeScannedDrawerOpen}
 class="flex flex-col gap-4 items-center justify-center"
>
 <div class="flex justify-center mb-4 relative items-center overflow-hidden bg-gray rounded-xl p-4 h-[72px] w-[72px]">
 <div class="bg-white h-[16px] w-[200px] -rotate-45 absolute top-1"></div>
 <div class="bg-white h-[16px] w-[200px] -rotate-45 absolute bottom-1"></div>
 <div
 class="flex justify-center mb-4 relative items-center overflow-hidden bg-gray rounded-xl p-4 h-[72px] w-[72px]"
 >
 <div
 class="bg-white h-[16px] w-[200px] -rotate-45 absolute top-1"
 ></div>
 <div
 class="bg-white h-[16px] w-[200px] -rotate-45 absolute bottom-1"
 ></div>
 <HugeiconsIcon
 size={40}
 className="z-10"
Expand All@@ -152,22 +167,27 @@ onDestroy(async () => {

 <div class="bg-gray rounded-2xl w-full p-4 mt-4">
 <h4 class="text-base text-black-700">Website URL</h4>
 <p class="text-black-700 font-normal underline">{scannedData?.content}</p>
 <p class="text-black-700 font-normal underline">
 {scannedData?.content}
 </p>
 </div>
 <div class="flex justify-center gap-3 items-center mt-4">
 <Button.Action
 variant="danger-soft"
 class="w-full"
 callback={() => { codeScannedDrawerOpen = false; startScan(); }}
 callback={() => {
 codeScannedDrawerOpen = false;
 startScan();
 }}
 >
 Decline
 </Button.Action>
 <Button.Action
 variant="solid"
 class="w-full"
 callback={() => {
 codeScannedDrawerOpen = false
 loggedInDrawerOpen = true
 codeScannedDrawerOpen = false;
 loggedInDrawerOpen = true;
 startScan();
 }}
 >
Expand All@@ -182,9 +202,15 @@ onDestroy(async () => {
 bind:isPaneOpen={loggedInDrawerOpen}
 class="flex flex-col gap-4 items-center justify-center"
>
 <div class="flex justify-center mb-4 relative items-center overflow-hidden bg-gray rounded-xl p-4 h-[72px] w-[72px]">
 <div class="bg-white h-[16px] w-[200px] -rotate-45 absolute top-1"></div>
 <div class="bg-white h-[16px] w-[200px] -rotate-45 absolute bottom-1"></div>
 <div
 class="flex justify-center mb-4 relative items-center overflow-hidden bg-gray rounded-xl p-4 h-[72px] w-[72px]"
 >
 <div
 class="bg-white h-[16px] w-[200px] -rotate-45 absolute top-1"
 ></div>
 <div
 class="bg-white h-[16px] w-[200px] -rotate-45 absolute bottom-1"
 ></div>
 <HugeiconsIcon
 size={40}
 className="z-10"
Expand All@@ -201,10 +227,19 @@ onDestroy(async () => {
 <Button.Action
 variant="solid"
 class="w-full"
 callback={() => { loggedInDrawerOpen = false; startScan(); }}
 callback={() => {
 loggedInDrawerOpen = false;
 startScan();
 }}
 >
 Close
 </Button.Action>
 </div>
</Drawer>

<style>
 :global(body, *:not(button)) {
 background-color: #00000000;
 overflow-y: hidden;
 }
</style>
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
fix: make scan qr page work again#185

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

Jun 2, 2025
 Merged


fix: make scan qr page work again
#185
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


4 changes: 2 additions & 2 deletions
infrastructure/eid-wallet/src-tauri/gen/apple/eid-wallet.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -377,7 +377,7 @@
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 CODE_SIGN_ENTITLEMENTS = "eid-wallet_iOS/eid-wallet_iOS.entitlements";
 CODE_SIGN_IDENTITY = "iPhone Developer";
 DEVELOPMENT_TEAM = 3FS4B734X5;
 DEVELOPMENT_TEAM = 7F2T2WK6DR;
 ENABLE_BITCODE = NO;
 "EXCLUDED_ARCHS[sdk=iphoneos*]" = "arm64-sim x86_64";
 "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
Expand DownExpand Up@@ -430,7 +430,7 @@
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 CODE_SIGN_ENTITLEMENTS = "eid-wallet_iOS/eid-wallet_iOS.entitlements";
 CODE_SIGN_IDENTITY = "iPhone Developer";
 DEVELOPMENT_TEAM = 3FS4B734X5;
 DEVELOPMENT_TEAM = 7F2T2WK6DR;
 ENABLE_BITCODE = NO;
 "EXCLUDED_ARCHS[sdk=iphoneos*]" = "arm64-sim x86_64";
 "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
Expand Down

259 changes: 147 additions & 112 deletions
infrastructure/eid-wallet/src/routes/(app)/scan-qr/+page.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,125 +1,134 @@
<script lang="ts">
import AppNav from "$lib/fragments/AppNav/AppNav.svelte";
import { Drawer } from "$lib/ui";
import * as Button from "$lib/ui/Button";
import {
 FlashlightIcon,
 Image02Icon,
 QrCodeIcon,
} from "@hugeicons/core-free-icons";
import { HugeiconsIcon } from "@hugeicons/svelte";
import {
 Format,
 type PermissionState,
 type Scanned,
 cancel,
 checkPermissions,
 requestPermissions,
 scan,
} from "@tauri-apps/plugin-barcode-scanner";
import { onDestroy, onMount } from "svelte";
import type { SVGAttributes } from "svelte/elements";

const pathProps: SVGAttributes<SVGPathElement> = {
 stroke: "white",
 "stroke-width": 7,
 "stroke-linecap": "round",
 "stroke-linejoin": "round",
};

let codeScannedDrawerOpen = $state(false);
let loggedInDrawerOpen = $state(false);
let flashlightOn = $state(false);

let scannedData: Scanned | undefined = $state(undefined);

let scanning = false;
let loading = false;

let permissions_nullable: PermissionState | null;

async function startScan() {
 let permissions = await checkPermissions()
 .then((permissions) => {
 return permissions;
 })
 .catch(() => {
 return null; // possibly return "denied"? or does that imply that the check has been successful, but was actively denied?
 });

 // TODO: handle receiving "prompt-with-rationale" (issue: https://github.com/tauri-apps/plugins-workspace/issues/979)
 if (permissions === "prompt") {
 permissions = await requestPermissions(); // handle in more detail?
 }

 permissions_nullable = permissions;

 if (permissions === "granted") {
 // Scanning parameters
 const formats = [Format.QRCode];
 const windowed = true;

 if (scanning) return;
 scanning = true;
 scan({ formats, windowed })
 .then((res) => {
 console.log("Scan result:", res);
 scannedData = res;
 codeScannedDrawerOpen = true;
 })
 .catch((error) => {
 // TODO: display error to user
 console.error("Scan error:", error);
 import AppNav from "$lib/fragments/AppNav/AppNav.svelte";
 import { Drawer } from "$lib/ui";
 import * as Button from "$lib/ui/Button";
 import {
 FlashlightIcon,
 Image02Icon,
 QrCodeIcon,
 } from "@hugeicons/core-free-icons";
 import { HugeiconsIcon } from "@hugeicons/svelte";
 import {
 Format,
 type PermissionState,
 type Scanned,
 cancel,
 checkPermissions,
 requestPermissions,
 scan,
 } from "@tauri-apps/plugin-barcode-scanner";
 import { onDestroy, onMount } from "svelte";
 import type { SVGAttributes } from "svelte/elements";

 const pathProps: SVGAttributes<SVGPathElement> = {
 stroke: "white",
 "stroke-width": 7,
 "stroke-linecap": "round",
 "stroke-linejoin": "round",
 };

 let codeScannedDrawerOpen = $state(false);
 let loggedInDrawerOpen = $state(false);
 let flashlightOn = $state(false);

 let scannedData: Scanned | undefined = $state(undefined);

 let scanning = false;
 let loading = false;

 let permissions_nullable: PermissionState | null;

 async function startScan() {
 let permissions = await checkPermissions()
 .then((permissions) => {
 return permissions;
 })
 .finally(() => {
scanning = false;
 .catch(() => {
return null; // possibly return "denied"? or does that imply that the check has been successful, but was actively denied?
 });
 }

 console.error("Permission denied or not granted");
 // TODO: consider handling GUI for permission denied
}
 // TODO: handle receiving "prompt-with-rationale" (issue: https://github.com/tauri-apps/plugins-workspace/issues/979)
 if (permissions === "prompt") {
 permissions = await requestPermissions(); // handle in more detail?
 }

 permissions_nullable = permissions;

 if (permissions === "granted") {
 // Scanning parameters
 const formats = [Format.QRCode];
 const windowed = true;

 if (scanning) return;
 scanning = true;
 scan({ formats, windowed })
 .then((res) => {
 console.log("Scan result:", res);
 scannedData = res;
 codeScannedDrawerOpen = true;
 })
 .catch((error) => {
 // TODO: display error to user
 console.error("Scan error:", error);
 })
 .finally(() => {
 scanning = false;
 });
 }

 console.error("Permission denied or not granted");
 // TODO: consider handling GUI for permission denied
 }

async function cancelScan() {
 await cancel();
 scanning = false;
}
async function cancelScan() {
await cancel();
scanning = false;
}

onMount(async () => {
 startScan();
});
onMount(async () => {
startScan();
});

onDestroy(async () => {
 await cancelScan();
});
onDestroy(async () => {
await cancelScan();
});
</script>

<AppNav title="Scan QR Code" titleClasses="text-white" iconColor="white" />

<svg class="mx-auto mt-48" width="204" height="215" viewBox="0 0 204 215" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M46 4H15C8.92487 4 4 8.92487 4 15V46" {...pathProps}/>
 <path d="M158 4H189C195.075 4 200 8.92487 200 15V46" {...pathProps}/>
 <path d="M46 211H15C8.92487 211 4 206.075 4 200V169" {...pathProps}/>
 <path d="M158 211H189C195.075 211 200 206.075 200 200V169" {...pathProps}/>
<svg
 class="mx-auto mt-48"
 width="204"
 height="215"
 viewBox="0 0 204 215"
 fill="none"
 xmlns="http://www.w3.org/2000/svg"
>
 <path d="M46 4H15C8.92487 4 4 8.92487 4 15V46" {...pathProps} />
 <path d="M158 4H189C195.075 4 200 8.92487 200 15V46" {...pathProps} />
 <path d="M46 211H15C8.92487 211 4 206.075 4 200V169" {...pathProps} />
 <path d="M158 211H189C195.075 211 200 206.075 200 200V169" {...pathProps} />
</svg>

<h4 class="text-white font-semibold text-center mt-20">Point the camera at the code</h4>
<h4 class="text-white font-semibold text-center mt-20">
 Point the camera at the code
</h4>

<div class="fixed bottom-2 left-1/2 -translate-x-1/2 z-10 flex gap-8 justify-center items-center">
 <Button.Icon
 icon={Image02Icon}
 bgColor="white"
 bgSize="md"
 />
<div
 class="fixed bottom-2 left-1/2 -translate-x-1/2 z-10 flex gap-8 justify-center items-center"
>
 <Button.Icon icon={Image02Icon} bgColor="white" bgSize="md" />
 <Button.Icon
 icon={QrCodeIcon}
 bgColor="white"
 bgSize="lg"
 iconSize="lg"
 callback={() => { codeScannedDrawerOpen = true; }}
 callback={() => {
 codeScannedDrawerOpen = true;
 }}
 />
 <Button.Icon
 icon={FlashlightIcon}
icon={FlashlightIcon}
 aria-label="Toggle flashlight"
 bgSize="md"
 iconSize={32}
Expand All@@ -135,9 +144,15 @@ onDestroy(async () => {
 bind:isPaneOpen={codeScannedDrawerOpen}
 class="flex flex-col gap-4 items-center justify-center"
>
 <div class="flex justify-center mb-4 relative items-center overflow-hidden bg-gray rounded-xl p-4 h-[72px] w-[72px]">
 <div class="bg-white h-[16px] w-[200px] -rotate-45 absolute top-1"></div>
 <div class="bg-white h-[16px] w-[200px] -rotate-45 absolute bottom-1"></div>
 <div
 class="flex justify-center mb-4 relative items-center overflow-hidden bg-gray rounded-xl p-4 h-[72px] w-[72px]"
 >
 <div
 class="bg-white h-[16px] w-[200px] -rotate-45 absolute top-1"
 ></div>
 <div
 class="bg-white h-[16px] w-[200px] -rotate-45 absolute bottom-1"
 ></div>
 <HugeiconsIcon
 size={40}
 className="z-10"
Expand All@@ -152,22 +167,27 @@ onDestroy(async () => {

 <div class="bg-gray rounded-2xl w-full p-4 mt-4">
 <h4 class="text-base text-black-700">Website URL</h4>
 <p class="text-black-700 font-normal underline">{scannedData?.content}</p>
 <p class="text-black-700 font-normal underline">
 {scannedData?.content}
 </p>
 </div>
 <div class="flex justify-center gap-3 items-center mt-4">
 <Button.Action
 variant="danger-soft"
 class="w-full"
 callback={() => { codeScannedDrawerOpen = false; startScan(); }}
 callback={() => {
 codeScannedDrawerOpen = false;
 startScan();
 }}
 >
 Decline
 </Button.Action>
 <Button.Action
 variant="solid"
 class="w-full"
 callback={() => {
 codeScannedDrawerOpen = false
 loggedInDrawerOpen = true
 codeScannedDrawerOpen = false;
 loggedInDrawerOpen = true;
 startScan();
 }}
 >
Expand All@@ -182,9 +202,15 @@ onDestroy(async () => {
 bind:isPaneOpen={loggedInDrawerOpen}
 class="flex flex-col gap-4 items-center justify-center"
>
 <div class="flex justify-center mb-4 relative items-center overflow-hidden bg-gray rounded-xl p-4 h-[72px] w-[72px]">
 <div class="bg-white h-[16px] w-[200px] -rotate-45 absolute top-1"></div>
 <div class="bg-white h-[16px] w-[200px] -rotate-45 absolute bottom-1"></div>
 <div
 class="flex justify-center mb-4 relative items-center overflow-hidden bg-gray rounded-xl p-4 h-[72px] w-[72px]"
 >
 <div
 class="bg-white h-[16px] w-[200px] -rotate-45 absolute top-1"
 ></div>
 <div
 class="bg-white h-[16px] w-[200px] -rotate-45 absolute bottom-1"
 ></div>
 <HugeiconsIcon
 size={40}
 className="z-10"
Expand All@@ -201,10 +227,19 @@ onDestroy(async () => {
 <Button.Action
 variant="solid"
 class="w-full"
 callback={() => { loggedInDrawerOpen = false; startScan(); }}
 callback={() => {
 loggedInDrawerOpen = false;
 startScan();
 }}
 >
 Close
 </Button.Action>
 </div>
</Drawer>

<style>
 :global(body, *:not(button)) {
 background-color: #00000000;
 overflow-y: hidden;
 }
</style>
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
fix: make scan qr page work again#185

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

Jun 2, 2025
 Merged


fix: make scan qr page work again
#185
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


4 changes: 2 additions & 2 deletions
infrastructure/eid-wallet/src-tauri/gen/apple/eid-wallet.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -377,7 +377,7 @@
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 CODE_SIGN_ENTITLEMENTS = "eid-wallet_iOS/eid-wallet_iOS.entitlements";
 CODE_SIGN_IDENTITY = "iPhone Developer";
 DEVELOPMENT_TEAM = 3FS4B734X5;
 DEVELOPMENT_TEAM = 7F2T2WK6DR;
 ENABLE_BITCODE = NO;
 "EXCLUDED_ARCHS[sdk=iphoneos*]" = "arm64-sim x86_64";
 "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
Expand DownExpand Up@@ -430,7 +430,7 @@
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 CODE_SIGN_ENTITLEMENTS = "eid-wallet_iOS/eid-wallet_iOS.entitlements";
 CODE_SIGN_IDENTITY = "iPhone Developer";
 DEVELOPMENT_TEAM = 3FS4B734X5;
 DEVELOPMENT_TEAM = 7F2T2WK6DR;
 ENABLE_BITCODE = NO;
 "EXCLUDED_ARCHS[sdk=iphoneos*]" = "arm64-sim x86_64";
 "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
Expand Down

259 changes: 147 additions & 112 deletions
infrastructure/eid-wallet/src/routes/(app)/scan-qr/+page.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,125 +1,134 @@
<script lang="ts">
import AppNav from "$lib/fragments/AppNav/AppNav.svelte";
import { Drawer } from "$lib/ui";
import * as Button from "$lib/ui/Button";
import {
 FlashlightIcon,
 Image02Icon,
 QrCodeIcon,
} from "@hugeicons/core-free-icons";
import { HugeiconsIcon } from "@hugeicons/svelte";
import {
 Format,
 type PermissionState,
 type Scanned,
 cancel,
 checkPermissions,
 requestPermissions,
 scan,
} from "@tauri-apps/plugin-barcode-scanner";
import { onDestroy, onMount } from "svelte";
import type { SVGAttributes } from "svelte/elements";

const pathProps: SVGAttributes<SVGPathElement> = {
 stroke: "white",
 "stroke-width": 7,
 "stroke-linecap": "round",
 "stroke-linejoin": "round",
};

let codeScannedDrawerOpen = $state(false);
let loggedInDrawerOpen = $state(false);
let flashlightOn = $state(false);

let scannedData: Scanned | undefined = $state(undefined);

let scanning = false;
let loading = false;

let permissions_nullable: PermissionState | null;

async function startScan() {
 let permissions = await checkPermissions()
 .then((permissions) => {
 return permissions;
 })
 .catch(() => {
 return null; // possibly return "denied"? or does that imply that the check has been successful, but was actively denied?
 });

 // TODO: handle receiving "prompt-with-rationale" (issue: https://github.com/tauri-apps/plugins-workspace/issues/979)
 if (permissions === "prompt") {
 permissions = await requestPermissions(); // handle in more detail?
 }

 permissions_nullable = permissions;

 if (permissions === "granted") {
 // Scanning parameters
 const formats = [Format.QRCode];
 const windowed = true;

 if (scanning) return;
 scanning = true;
 scan({ formats, windowed })
 .then((res) => {
 console.log("Scan result:", res);
 scannedData = res;
 codeScannedDrawerOpen = true;
 })
 .catch((error) => {
 // TODO: display error to user
 console.error("Scan error:", error);
 import AppNav from "$lib/fragments/AppNav/AppNav.svelte";
 import { Drawer } from "$lib/ui";
 import * as Button from "$lib/ui/Button";
 import {
 FlashlightIcon,
 Image02Icon,
 QrCodeIcon,
 } from "@hugeicons/core-free-icons";
 import { HugeiconsIcon } from "@hugeicons/svelte";
 import {
 Format,
 type PermissionState,
 type Scanned,
 cancel,
 checkPermissions,
 requestPermissions,
 scan,
 } from "@tauri-apps/plugin-barcode-scanner";
 import { onDestroy, onMount } from "svelte";
 import type { SVGAttributes } from "svelte/elements";

 const pathProps: SVGAttributes<SVGPathElement> = {
 stroke: "white",
 "stroke-width": 7,
 "stroke-linecap": "round",
 "stroke-linejoin": "round",
 };

 let codeScannedDrawerOpen = $state(false);
 let loggedInDrawerOpen = $state(false);
 let flashlightOn = $state(false);

 let scannedData: Scanned | undefined = $state(undefined);

 let scanning = false;
 let loading = false;

 let permissions_nullable: PermissionState | null;

 async function startScan() {
 let permissions = await checkPermissions()
 .then((permissions) => {
 return permissions;
 })
 .finally(() => {
scanning = false;
 .catch(() => {
return null; // possibly return "denied"? or does that imply that the check has been successful, but was actively denied?
 });
 }

 console.error("Permission denied or not granted");
 // TODO: consider handling GUI for permission denied
}
 // TODO: handle receiving "prompt-with-rationale" (issue: https://github.com/tauri-apps/plugins-workspace/issues/979)
 if (permissions === "prompt") {
 permissions = await requestPermissions(); // handle in more detail?
 }

 permissions_nullable = permissions;

 if (permissions === "granted") {
 // Scanning parameters
 const formats = [Format.QRCode];
 const windowed = true;

 if (scanning) return;
 scanning = true;
 scan({ formats, windowed })
 .then((res) => {
 console.log("Scan result:", res);
 scannedData = res;
 codeScannedDrawerOpen = true;
 })
 .catch((error) => {
 // TODO: display error to user
 console.error("Scan error:", error);
 })
 .finally(() => {
 scanning = false;
 });
 }

 console.error("Permission denied or not granted");
 // TODO: consider handling GUI for permission denied
 }

async function cancelScan() {
 await cancel();
 scanning = false;
}
async function cancelScan() {
await cancel();
scanning = false;
}

onMount(async () => {
 startScan();
});
onMount(async () => {
startScan();
});

onDestroy(async () => {
 await cancelScan();
});
onDestroy(async () => {
await cancelScan();
});
</script>

<AppNav title="Scan QR Code" titleClasses="text-white" iconColor="white" />

<svg class="mx-auto mt-48" width="204" height="215" viewBox="0 0 204 215" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M46 4H15C8.92487 4 4 8.92487 4 15V46" {...pathProps}/>
 <path d="M158 4H189C195.075 4 200 8.92487 200 15V46" {...pathProps}/>
 <path d="M46 211H15C8.92487 211 4 206.075 4 200V169" {...pathProps}/>
 <path d="M158 211H189C195.075 211 200 206.075 200 200V169" {...pathProps}/>
<svg
 class="mx-auto mt-48"
 width="204"
 height="215"
 viewBox="0 0 204 215"
 fill="none"
 xmlns="http://www.w3.org/2000/svg"
>
 <path d="M46 4H15C8.92487 4 4 8.92487 4 15V46" {...pathProps} />
 <path d="M158 4H189C195.075 4 200 8.92487 200 15V46" {...pathProps} />
 <path d="M46 211H15C8.92487 211 4 206.075 4 200V169" {...pathProps} />
 <path d="M158 211H189C195.075 211 200 206.075 200 200V169" {...pathProps} />
</svg>

<h4 class="text-white font-semibold text-center mt-20">Point the camera at the code</h4>
<h4 class="text-white font-semibold text-center mt-20">
 Point the camera at the code
</h4>

<div class="fixed bottom-2 left-1/2 -translate-x-1/2 z-10 flex gap-8 justify-center items-center">
 <Button.Icon
 icon={Image02Icon}
 bgColor="white"
 bgSize="md"
 />
<div
 class="fixed bottom-2 left-1/2 -translate-x-1/2 z-10 flex gap-8 justify-center items-center"
>
 <Button.Icon icon={Image02Icon} bgColor="white" bgSize="md" />
 <Button.Icon
 icon={QrCodeIcon}
 bgColor="white"
 bgSize="lg"
 iconSize="lg"
 callback={() => { codeScannedDrawerOpen = true; }}
 callback={() => {
 codeScannedDrawerOpen = true;
 }}
 />
 <Button.Icon
 icon={FlashlightIcon}
icon={FlashlightIcon}
 aria-label="Toggle flashlight"
 bgSize="md"
 iconSize={32}
Expand All@@ -135,9 +144,15 @@ onDestroy(async () => {
 bind:isPaneOpen={codeScannedDrawerOpen}
 class="flex flex-col gap-4 items-center justify-center"
>
 <div class="flex justify-center mb-4 relative items-center overflow-hidden bg-gray rounded-xl p-4 h-[72px] w-[72px]">
 <div class="bg-white h-[16px] w-[200px] -rotate-45 absolute top-1"></div>
 <div class="bg-white h-[16px] w-[200px] -rotate-45 absolute bottom-1"></div>
 <div
 class="flex justify-center mb-4 relative items-center overflow-hidden bg-gray rounded-xl p-4 h-[72px] w-[72px]"
 >
 <div
 class="bg-white h-[16px] w-[200px] -rotate-45 absolute top-1"
 ></div>
 <div
 class="bg-white h-[16px] w-[200px] -rotate-45 absolute bottom-1"
 ></div>
 <HugeiconsIcon
 size={40}
 className="z-10"
Expand All@@ -152,22 +167,27 @@ onDestroy(async () => {

 <div class="bg-gray rounded-2xl w-full p-4 mt-4">
 <h4 class="text-base text-black-700">Website URL</h4>
 <p class="text-black-700 font-normal underline">{scannedData?.content}</p>
 <p class="text-black-700 font-normal underline">
 {scannedData?.content}
 </p>
 </div>
 <div class="flex justify-center gap-3 items-center mt-4">
 <Button.Action
 variant="danger-soft"
 class="w-full"
 callback={() => { codeScannedDrawerOpen = false; startScan(); }}
 callback={() => {
 codeScannedDrawerOpen = false;
 startScan();
 }}
 >
 Decline
 </Button.Action>
 <Button.Action
 variant="solid"
 class="w-full"
 callback={() => {
 codeScannedDrawerOpen = false
 loggedInDrawerOpen = true
 codeScannedDrawerOpen = false;
 loggedInDrawerOpen = true;
 startScan();
 }}
 >
Expand All@@ -182,9 +202,15 @@ onDestroy(async () => {
 bind:isPaneOpen={loggedInDrawerOpen}
 class="flex flex-col gap-4 items-center justify-center"
>
 <div class="flex justify-center mb-4 relative items-center overflow-hidden bg-gray rounded-xl p-4 h-[72px] w-[72px]">
 <div class="bg-white h-[16px] w-[200px] -rotate-45 absolute top-1"></div>
 <div class="bg-white h-[16px] w-[200px] -rotate-45 absolute bottom-1"></div>
 <div
 class="flex justify-center mb-4 relative items-center overflow-hidden bg-gray rounded-xl p-4 h-[72px] w-[72px]"
 >
 <div
 class="bg-white h-[16px] w-[200px] -rotate-45 absolute top-1"
 ></div>
 <div
 class="bg-white h-[16px] w-[200px] -rotate-45 absolute bottom-1"
 ></div>
 <HugeiconsIcon
 size={40}
 className="z-10"
Expand All@@ -201,10 +227,19 @@ onDestroy(async () => {
 <Button.Action
 variant="solid"
 class="w-full"
 callback={() => { loggedInDrawerOpen = false; startScan(); }}
 callback={() => {
 loggedInDrawerOpen = false;
 startScan();
 }}
 >
 Close
 </Button.Action>
 </div>
</Drawer>

<style>
 :global(body, *:not(button)) {
 background-color: #00000000;
 overflow-y: hidden;
 }
</style>
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
fix: make scan qr page work again#185

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

Jun 2, 2025
 Merged


fix: make scan qr page work again
#185
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


4 changes: 2 additions & 2 deletions
infrastructure/eid-wallet/src-tauri/gen/apple/eid-wallet.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -377,7 +377,7 @@
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 CODE_SIGN_ENTITLEMENTS = "eid-wallet_iOS/eid-wallet_iOS.entitlements";
 CODE_SIGN_IDENTITY = "iPhone Developer";
 DEVELOPMENT_TEAM = 3FS4B734X5;
 DEVELOPMENT_TEAM = 7F2T2WK6DR;
 ENABLE_BITCODE = NO;
 "EXCLUDED_ARCHS[sdk=iphoneos*]" = "arm64-sim x86_64";
 "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
Expand DownExpand Up@@ -430,7 +430,7 @@
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 CODE_SIGN_ENTITLEMENTS = "eid-wallet_iOS/eid-wallet_iOS.entitlements";
 CODE_SIGN_IDENTITY = "iPhone Developer";
 DEVELOPMENT_TEAM = 3FS4B734X5;
 DEVELOPMENT_TEAM = 7F2T2WK6DR;
 ENABLE_BITCODE = NO;
 "EXCLUDED_ARCHS[sdk=iphoneos*]" = "arm64-sim x86_64";
 "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
Expand Down

259 changes: 147 additions & 112 deletions
infrastructure/eid-wallet/src/routes/(app)/scan-qr/+page.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,125 +1,134 @@
<script lang="ts">
import AppNav from "$lib/fragments/AppNav/AppNav.svelte";
import { Drawer } from "$lib/ui";
import * as Button from "$lib/ui/Button";
import {
 FlashlightIcon,
 Image02Icon,
 QrCodeIcon,
} from "@hugeicons/core-free-icons";
import { HugeiconsIcon } from "@hugeicons/svelte";
import {
 Format,
 type PermissionState,
 type Scanned,
 cancel,
 checkPermissions,
 requestPermissions,
 scan,
} from "@tauri-apps/plugin-barcode-scanner";
import { onDestroy, onMount } from "svelte";
import type { SVGAttributes } from "svelte/elements";

const pathProps: SVGAttributes<SVGPathElement> = {
 stroke: "white",
 "stroke-width": 7,
 "stroke-linecap": "round",
 "stroke-linejoin": "round",
};

let codeScannedDrawerOpen = $state(false);
let loggedInDrawerOpen = $state(false);
let flashlightOn = $state(false);

let scannedData: Scanned | undefined = $state(undefined);

let scanning = false;
let loading = false;

let permissions_nullable: PermissionState | null;

async function startScan() {
 let permissions = await checkPermissions()
 .then((permissions) => {
 return permissions;
 })
 .catch(() => {
 return null; // possibly return "denied"? or does that imply that the check has been successful, but was actively denied?
 });

 // TODO: handle receiving "prompt-with-rationale" (issue: https://github.com/tauri-apps/plugins-workspace/issues/979)
 if (permissions === "prompt") {
 permissions = await requestPermissions(); // handle in more detail?
 }

 permissions_nullable = permissions;

 if (permissions === "granted") {
 // Scanning parameters
 const formats = [Format.QRCode];
 const windowed = true;

 if (scanning) return;
 scanning = true;
 scan({ formats, windowed })
 .then((res) => {
 console.log("Scan result:", res);
 scannedData = res;
 codeScannedDrawerOpen = true;
 })
 .catch((error) => {
 // TODO: display error to user
 console.error("Scan error:", error);
 import AppNav from "$lib/fragments/AppNav/AppNav.svelte";
 import { Drawer } from "$lib/ui";
 import * as Button from "$lib/ui/Button";
 import {
 FlashlightIcon,
 Image02Icon,
 QrCodeIcon,
 } from "@hugeicons/core-free-icons";
 import { HugeiconsIcon } from "@hugeicons/svelte";
 import {
 Format,
 type PermissionState,
 type Scanned,
 cancel,
 checkPermissions,
 requestPermissions,
 scan,
 } from "@tauri-apps/plugin-barcode-scanner";
 import { onDestroy, onMount } from "svelte";
 import type { SVGAttributes } from "svelte/elements";

 const pathProps: SVGAttributes<SVGPathElement> = {
 stroke: "white",
 "stroke-width": 7,
 "stroke-linecap": "round",
 "stroke-linejoin": "round",
 };

 let codeScannedDrawerOpen = $state(false);
 let loggedInDrawerOpen = $state(false);
 let flashlightOn = $state(false);

 let scannedData: Scanned | undefined = $state(undefined);

 let scanning = false;
 let loading = false;

 let permissions_nullable: PermissionState | null;

 async function startScan() {
 let permissions = await checkPermissions()
 .then((permissions) => {
 return permissions;
 })
 .finally(() => {
scanning = false;
 .catch(() => {
return null; // possibly return "denied"? or does that imply that the check has been successful, but was actively denied?
 });
 }

 console.error("Permission denied or not granted");
 // TODO: consider handling GUI for permission denied
}
 // TODO: handle receiving "prompt-with-rationale" (issue: https://github.com/tauri-apps/plugins-workspace/issues/979)
 if (permissions === "prompt") {
 permissions = await requestPermissions(); // handle in more detail?
 }

 permissions_nullable = permissions;

 if (permissions === "granted") {
 // Scanning parameters
 const formats = [Format.QRCode];
 const windowed = true;

 if (scanning) return;
 scanning = true;
 scan({ formats, windowed })
 .then((res) => {
 console.log("Scan result:", res);
 scannedData = res;
 codeScannedDrawerOpen = true;
 })
 .catch((error) => {
 // TODO: display error to user
 console.error("Scan error:", error);
 })
 .finally(() => {
 scanning = false;
 });
 }

 console.error("Permission denied or not granted");
 // TODO: consider handling GUI for permission denied
 }

async function cancelScan() {
 await cancel();
 scanning = false;
}
async function cancelScan() {
await cancel();
scanning = false;
}

onMount(async () => {
 startScan();
});
onMount(async () => {
startScan();
});

onDestroy(async () => {
 await cancelScan();
});
onDestroy(async () => {
await cancelScan();
});
</script>

<AppNav title="Scan QR Code" titleClasses="text-white" iconColor="white" />

<svg class="mx-auto mt-48" width="204" height="215" viewBox="0 0 204 215" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M46 4H15C8.92487 4 4 8.92487 4 15V46" {...pathProps}/>
 <path d="M158 4H189C195.075 4 200 8.92487 200 15V46" {...pathProps}/>
 <path d="M46 211H15C8.92487 211 4 206.075 4 200V169" {...pathProps}/>
 <path d="M158 211H189C195.075 211 200 206.075 200 200V169" {...pathProps}/>
<svg
 class="mx-auto mt-48"
 width="204"
 height="215"
 viewBox="0 0 204 215"
 fill="none"
 xmlns="http://www.w3.org/2000/svg"
>
 <path d="M46 4H15C8.92487 4 4 8.92487 4 15V46" {...pathProps} />
 <path d="M158 4H189C195.075 4 200 8.92487 200 15V46" {...pathProps} />
 <path d="M46 211H15C8.92487 211 4 206.075 4 200V169" {...pathProps} />
 <path d="M158 211H189C195.075 211 200 206.075 200 200V169" {...pathProps} />
</svg>

<h4 class="text-white font-semibold text-center mt-20">Point the camera at the code</h4>
<h4 class="text-white font-semibold text-center mt-20">
 Point the camera at the code
</h4>

<div class="fixed bottom-2 left-1/2 -translate-x-1/2 z-10 flex gap-8 justify-center items-center">
 <Button.Icon
 icon={Image02Icon}
 bgColor="white"
 bgSize="md"
 />
<div
 class="fixed bottom-2 left-1/2 -translate-x-1/2 z-10 flex gap-8 justify-center items-center"
>
 <Button.Icon icon={Image02Icon} bgColor="white" bgSize="md" />
 <Button.Icon
 icon={QrCodeIcon}
 bgColor="white"
 bgSize="lg"
 iconSize="lg"
 callback={() => { codeScannedDrawerOpen = true; }}
 callback={() => {
 codeScannedDrawerOpen = true;
 }}
 />
 <Button.Icon
 icon={FlashlightIcon}
icon={FlashlightIcon}
 aria-label="Toggle flashlight"
 bgSize="md"
 iconSize={32}
Expand All@@ -135,9 +144,15 @@ onDestroy(async () => {
 bind:isPaneOpen={codeScannedDrawerOpen}
 class="flex flex-col gap-4 items-center justify-center"
>
 <div class="flex justify-center mb-4 relative items-center overflow-hidden bg-gray rounded-xl p-4 h-[72px] w-[72px]">
 <div class="bg-white h-[16px] w-[200px] -rotate-45 absolute top-1"></div>
 <div class="bg-white h-[16px] w-[200px] -rotate-45 absolute bottom-1"></div>
 <div
 class="flex justify-center mb-4 relative items-center overflow-hidden bg-gray rounded-xl p-4 h-[72px] w-[72px]"
 >
 <div
 class="bg-white h-[16px] w-[200px] -rotate-45 absolute top-1"
 ></div>
 <div
 class="bg-white h-[16px] w-[200px] -rotate-45 absolute bottom-1"
 ></div>
 <HugeiconsIcon
 size={40}
 className="z-10"
Expand All@@ -152,22 +167,27 @@ onDestroy(async () => {

 <div class="bg-gray rounded-2xl w-full p-4 mt-4">
 <h4 class="text-base text-black-700">Website URL</h4>
 <p class="text-black-700 font-normal underline">{scannedData?.content}</p>
 <p class="text-black-700 font-normal underline">
 {scannedData?.content}
 </p>
 </div>
 <div class="flex justify-center gap-3 items-center mt-4">
 <Button.Action
 variant="danger-soft"
 class="w-full"
 callback={() => { codeScannedDrawerOpen = false; startScan(); }}
 callback={() => {
 codeScannedDrawerOpen = false;
 startScan();
 }}
 >
 Decline
 </Button.Action>
 <Button.Action
 variant="solid"
 class="w-full"
 callback={() => {
 codeScannedDrawerOpen = false
 loggedInDrawerOpen = true
 codeScannedDrawerOpen = false;
 loggedInDrawerOpen = true;
 startScan();
 }}
 >
Expand All@@ -182,9 +202,15 @@ onDestroy(async () => {
 bind:isPaneOpen={loggedInDrawerOpen}
 class="flex flex-col gap-4 items-center justify-center"
>
 <div class="flex justify-center mb-4 relative items-center overflow-hidden bg-gray rounded-xl p-4 h-[72px] w-[72px]">
 <div class="bg-white h-[16px] w-[200px] -rotate-45 absolute top-1"></div>
 <div class="bg-white h-[16px] w-[200px] -rotate-45 absolute bottom-1"></div>
 <div
 class="flex justify-center mb-4 relative items-center overflow-hidden bg-gray rounded-xl p-4 h-[72px] w-[72px]"
 >
 <div
 class="bg-white h-[16px] w-[200px] -rotate-45 absolute top-1"
 ></div>
 <div
 class="bg-white h-[16px] w-[200px] -rotate-45 absolute bottom-1"
 ></div>
 <HugeiconsIcon
 size={40}
 className="z-10"
Expand All@@ -201,10 +227,19 @@ onDestroy(async () => {
 <Button.Action
 variant="solid"
 class="w-full"
 callback={() => { loggedInDrawerOpen = false; startScan(); }}
 callback={() => {
 loggedInDrawerOpen = false;
 startScan();
 }}
 >
 Close
 </Button.Action>
 </div>
</Drawer>

<style>
 :global(body, *:not(button)) {
 background-color: #00000000;
 overflow-y: hidden;
 }
</style>
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
fix: make scan qr page work again#185

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

Jun 2, 2025
 Merged


fix: make scan qr page work again
#185
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


4 changes: 2 additions & 2 deletions
infrastructure/eid-wallet/src-tauri/gen/apple/eid-wallet.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -377,7 +377,7 @@
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 CODE_SIGN_ENTITLEMENTS = "eid-wallet_iOS/eid-wallet_iOS.entitlements";
 CODE_SIGN_IDENTITY = "iPhone Developer";
 DEVELOPMENT_TEAM = 3FS4B734X5;
 DEVELOPMENT_TEAM = 7F2T2WK6DR;
 ENABLE_BITCODE = NO;
 "EXCLUDED_ARCHS[sdk=iphoneos*]" = "arm64-sim x86_64";
 "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
Expand DownExpand Up@@ -430,7 +430,7 @@
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 CODE_SIGN_ENTITLEMENTS = "eid-wallet_iOS/eid-wallet_iOS.entitlements";
 CODE_SIGN_IDENTITY = "iPhone Developer";
 DEVELOPMENT_TEAM = 3FS4B734X5;
 DEVELOPMENT_TEAM = 7F2T2WK6DR;
 ENABLE_BITCODE = NO;
 "EXCLUDED_ARCHS[sdk=iphoneos*]" = "arm64-sim x86_64";
 "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
Expand Down

259 changes: 147 additions & 112 deletions
infrastructure/eid-wallet/src/routes/(app)/scan-qr/+page.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,125 +1,134 @@
<script lang="ts">
import AppNav from "$lib/fragments/AppNav/AppNav.svelte";
import { Drawer } from "$lib/ui";
import * as Button from "$lib/ui/Button";
import {
 FlashlightIcon,
 Image02Icon,
 QrCodeIcon,
} from "@hugeicons/core-free-icons";
import { HugeiconsIcon } from "@hugeicons/svelte";
import {
 Format,
 type PermissionState,
 type Scanned,
 cancel,
 checkPermissions,
 requestPermissions,
 scan,
} from "@tauri-apps/plugin-barcode-scanner";
import { onDestroy, onMount } from "svelte";
import type { SVGAttributes } from "svelte/elements";

const pathProps: SVGAttributes<SVGPathElement> = {
 stroke: "white",
 "stroke-width": 7,
 "stroke-linecap": "round",
 "stroke-linejoin": "round",
};

let codeScannedDrawerOpen = $state(false);
let loggedInDrawerOpen = $state(false);
let flashlightOn = $state(false);

let scannedData: Scanned | undefined = $state(undefined);

let scanning = false;
let loading = false;

let permissions_nullable: PermissionState | null;

async function startScan() {
 let permissions = await checkPermissions()
 .then((permissions) => {
 return permissions;
 })
 .catch(() => {
 return null; // possibly return "denied"? or does that imply that the check has been successful, but was actively denied?
 });

 // TODO: handle receiving "prompt-with-rationale" (issue: https://github.com/tauri-apps/plugins-workspace/issues/979)
 if (permissions === "prompt") {
 permissions = await requestPermissions(); // handle in more detail?
 }

 permissions_nullable = permissions;

 if (permissions === "granted") {
 // Scanning parameters
 const formats = [Format.QRCode];
 const windowed = true;

 if (scanning) return;
 scanning = true;
 scan({ formats, windowed })
 .then((res) => {
 console.log("Scan result:", res);
 scannedData = res;
 codeScannedDrawerOpen = true;
 })
 .catch((error) => {
 // TODO: display error to user
 console.error("Scan error:", error);
 import AppNav from "$lib/fragments/AppNav/AppNav.svelte";
 import { Drawer } from "$lib/ui";
 import * as Button from "$lib/ui/Button";
 import {
 FlashlightIcon,
 Image02Icon,
 QrCodeIcon,
 } from "@hugeicons/core-free-icons";
 import { HugeiconsIcon } from "@hugeicons/svelte";
 import {
 Format,
 type PermissionState,
 type Scanned,
 cancel,
 checkPermissions,
 requestPermissions,
 scan,
 } from "@tauri-apps/plugin-barcode-scanner";
 import { onDestroy, onMount } from "svelte";
 import type { SVGAttributes } from "svelte/elements";

 const pathProps: SVGAttributes<SVGPathElement> = {
 stroke: "white",
 "stroke-width": 7,
 "stroke-linecap": "round",
 "stroke-linejoin": "round",
 };

 let codeScannedDrawerOpen = $state(false);
 let loggedInDrawerOpen = $state(false);
 let flashlightOn = $state(false);

 let scannedData: Scanned | undefined = $state(undefined);

 let scanning = false;
 let loading = false;

 let permissions_nullable: PermissionState | null;

 async function startScan() {
 let permissions = await checkPermissions()
 .then((permissions) => {
 return permissions;
 })
 .finally(() => {
scanning = false;
 .catch(() => {
return null; // possibly return "denied"? or does that imply that the check has been successful, but was actively denied?
 });
 }

 console.error("Permission denied or not granted");
 // TODO: consider handling GUI for permission denied
}
 // TODO: handle receiving "prompt-with-rationale" (issue: https://github.com/tauri-apps/plugins-workspace/issues/979)
 if (permissions === "prompt") {
 permissions = await requestPermissions(); // handle in more detail?
 }

 permissions_nullable = permissions;

 if (permissions === "granted") {
 // Scanning parameters
 const formats = [Format.QRCode];
 const windowed = true;

 if (scanning) return;
 scanning = true;
 scan({ formats, windowed })
 .then((res) => {
 console.log("Scan result:", res);
 scannedData = res;
 codeScannedDrawerOpen = true;
 })
 .catch((error) => {
 // TODO: display error to user
 console.error("Scan error:", error);
 })
 .finally(() => {
 scanning = false;
 });
 }

 console.error("Permission denied or not granted");
 // TODO: consider handling GUI for permission denied
 }

async function cancelScan() {
 await cancel();
 scanning = false;
}
async function cancelScan() {
await cancel();
scanning = false;
}

onMount(async () => {
 startScan();
});
onMount(async () => {
startScan();
});

onDestroy(async () => {
 await cancelScan();
});
onDestroy(async () => {
await cancelScan();
});
</script>

<AppNav title="Scan QR Code" titleClasses="text-white" iconColor="white" />

<svg class="mx-auto mt-48" width="204" height="215" viewBox="0 0 204 215" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M46 4H15C8.92487 4 4 8.92487 4 15V46" {...pathProps}/>
 <path d="M158 4H189C195.075 4 200 8.92487 200 15V46" {...pathProps}/>
 <path d="M46 211H15C8.92487 211 4 206.075 4 200V169" {...pathProps}/>
 <path d="M158 211H189C195.075 211 200 206.075 200 200V169" {...pathProps}/>
<svg
 class="mx-auto mt-48"
 width="204"
 height="215"
 viewBox="0 0 204 215"
 fill="none"
 xmlns="http://www.w3.org/2000/svg"
>
 <path d="M46 4H15C8.92487 4 4 8.92487 4 15V46" {...pathProps} />
 <path d="M158 4H189C195.075 4 200 8.92487 200 15V46" {...pathProps} />
 <path d="M46 211H15C8.92487 211 4 206.075 4 200V169" {...pathProps} />
 <path d="M158 211H189C195.075 211 200 206.075 200 200V169" {...pathProps} />
</svg>

<h4 class="text-white font-semibold text-center mt-20">Point the camera at the code</h4>
<h4 class="text-white font-semibold text-center mt-20">
 Point the camera at the code
</h4>

<div class="fixed bottom-2 left-1/2 -translate-x-1/2 z-10 flex gap-8 justify-center items-center">
 <Button.Icon
 icon={Image02Icon}
 bgColor="white"
 bgSize="md"
 />
<div
 class="fixed bottom-2 left-1/2 -translate-x-1/2 z-10 flex gap-8 justify-center items-center"
>
 <Button.Icon icon={Image02Icon} bgColor="white" bgSize="md" />
 <Button.Icon
 icon={QrCodeIcon}
 bgColor="white"
 bgSize="lg"
 iconSize="lg"
 callback={() => { codeScannedDrawerOpen = true; }}
 callback={() => {
 codeScannedDrawerOpen = true;
 }}
 />
 <Button.Icon
 icon={FlashlightIcon}
icon={FlashlightIcon}
 aria-label="Toggle flashlight"
 bgSize="md"
 iconSize={32}
Expand All@@ -135,9 +144,15 @@ onDestroy(async () => {
 bind:isPaneOpen={codeScannedDrawerOpen}
 class="flex flex-col gap-4 items-center justify-center"
>
 <div class="flex justify-center mb-4 relative items-center overflow-hidden bg-gray rounded-xl p-4 h-[72px] w-[72px]">
 <div class="bg-white h-[16px] w-[200px] -rotate-45 absolute top-1"></div>
 <div class="bg-white h-[16px] w-[200px] -rotate-45 absolute bottom-1"></div>
 <div
 class="flex justify-center mb-4 relative items-center overflow-hidden bg-gray rounded-xl p-4 h-[72px] w-[72px]"
 >
 <div
 class="bg-white h-[16px] w-[200px] -rotate-45 absolute top-1"
 ></div>
 <div
 class="bg-white h-[16px] w-[200px] -rotate-45 absolute bottom-1"
 ></div>
 <HugeiconsIcon
 size={40}
 className="z-10"
Expand All@@ -152,22 +167,27 @@ onDestroy(async () => {

 <div class="bg-gray rounded-2xl w-full p-4 mt-4">
 <h4 class="text-base text-black-700">Website URL</h4>
 <p class="text-black-700 font-normal underline">{scannedData?.content}</p>
 <p class="text-black-700 font-normal underline">
 {scannedData?.content}
 </p>
 </div>
 <div class="flex justify-center gap-3 items-center mt-4">
 <Button.Action
 variant="danger-soft"
 class="w-full"
 callback={() => { codeScannedDrawerOpen = false; startScan(); }}
 callback={() => {
 codeScannedDrawerOpen = false;
 startScan();
 }}
 >
 Decline
 </Button.Action>
 <Button.Action
 variant="solid"
 class="w-full"
 callback={() => {
 codeScannedDrawerOpen = false
 loggedInDrawerOpen = true
 codeScannedDrawerOpen = false;
 loggedInDrawerOpen = true;
 startScan();
 }}
 >
Expand All@@ -182,9 +202,15 @@ onDestroy(async () => {
 bind:isPaneOpen={loggedInDrawerOpen}
 class="flex flex-col gap-4 items-center justify-center"
>
 <div class="flex justify-center mb-4 relative items-center overflow-hidden bg-gray rounded-xl p-4 h-[72px] w-[72px]">
 <div class="bg-white h-[16px] w-[200px] -rotate-45 absolute top-1"></div>
 <div class="bg-white h-[16px] w-[200px] -rotate-45 absolute bottom-1"></div>
 <div
 class="flex justify-center mb-4 relative items-center overflow-hidden bg-gray rounded-xl p-4 h-[72px] w-[72px]"
 >
 <div
 class="bg-white h-[16px] w-[200px] -rotate-45 absolute top-1"
 ></div>
 <div
 class="bg-white h-[16px] w-[200px] -rotate-45 absolute bottom-1"
 ></div>
 <HugeiconsIcon
 size={40}
 className="z-10"
Expand All@@ -201,10 +227,19 @@ onDestroy(async () => {
 <Button.Action
 variant="solid"
 class="w-full"
 callback={() => { loggedInDrawerOpen = false; startScan(); }}
 callback={() => {
 loggedInDrawerOpen = false;
 startScan();
 }}
 >
 Close
 </Button.Action>
 </div>
</Drawer>

<style>
 :global(body, *:not(button)) {
 background-color: #00000000;
 overflow-y: hidden;
 }
</style>
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
fix: make scan qr page work again#185

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

Jun 2, 2025
 Merged


fix: make scan qr page work again
#185
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


4 changes: 2 additions & 2 deletions
infrastructure/eid-wallet/src-tauri/gen/apple/eid-wallet.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -377,7 +377,7 @@
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 CODE_SIGN_ENTITLEMENTS = "eid-wallet_iOS/eid-wallet_iOS.entitlements";
 CODE_SIGN_IDENTITY = "iPhone Developer";
 DEVELOPMENT_TEAM = 3FS4B734X5;
 DEVELOPMENT_TEAM = 7F2T2WK6DR;
 ENABLE_BITCODE = NO;
 "EXCLUDED_ARCHS[sdk=iphoneos*]" = "arm64-sim x86_64";
 "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
Expand DownExpand Up@@ -430,7 +430,7 @@
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 CODE_SIGN_ENTITLEMENTS = "eid-wallet_iOS/eid-wallet_iOS.entitlements";
 CODE_SIGN_IDENTITY = "iPhone Developer";
 DEVELOPMENT_TEAM = 3FS4B734X5;
 DEVELOPMENT_TEAM = 7F2T2WK6DR;
 ENABLE_BITCODE = NO;
 "EXCLUDED_ARCHS[sdk=iphoneos*]" = "arm64-sim x86_64";
 "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
Expand Down

259 changes: 147 additions & 112 deletions
infrastructure/eid-wallet/src/routes/(app)/scan-qr/+page.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,125 +1,134 @@
<script lang="ts">
import AppNav from "$lib/fragments/AppNav/AppNav.svelte";
import { Drawer } from "$lib/ui";
import * as Button from "$lib/ui/Button";
import {
 FlashlightIcon,
 Image02Icon,
 QrCodeIcon,
} from "@hugeicons/core-free-icons";
import { HugeiconsIcon } from "@hugeicons/svelte";
import {
 Format,
 type PermissionState,
 type Scanned,
 cancel,
 checkPermissions,
 requestPermissions,
 scan,
} from "@tauri-apps/plugin-barcode-scanner";
import { onDestroy, onMount } from "svelte";
import type { SVGAttributes } from "svelte/elements";

const pathProps: SVGAttributes<SVGPathElement> = {
 stroke: "white",
 "stroke-width": 7,
 "stroke-linecap": "round",
 "stroke-linejoin": "round",
};

let codeScannedDrawerOpen = $state(false);
let loggedInDrawerOpen = $state(false);
let flashlightOn = $state(false);

let scannedData: Scanned | undefined = $state(undefined);

let scanning = false;
let loading = false;

let permissions_nullable: PermissionState | null;

async function startScan() {
 let permissions = await checkPermissions()
 .then((permissions) => {
 return permissions;
 })
 .catch(() => {
 return null; // possibly return "denied"? or does that imply that the check has been successful, but was actively denied?
 });

 // TODO: handle receiving "prompt-with-rationale" (issue: https://github.com/tauri-apps/plugins-workspace/issues/979)
 if (permissions === "prompt") {
 permissions = await requestPermissions(); // handle in more detail?
 }

 permissions_nullable = permissions;

 if (permissions === "granted") {
 // Scanning parameters
 const formats = [Format.QRCode];
 const windowed = true;

 if (scanning) return;
 scanning = true;
 scan({ formats, windowed })
 .then((res) => {
 console.log("Scan result:", res);
 scannedData = res;
 codeScannedDrawerOpen = true;
 })
 .catch((error) => {
 // TODO: display error to user
 console.error("Scan error:", error);
 import AppNav from "$lib/fragments/AppNav/AppNav.svelte";
 import { Drawer } from "$lib/ui";
 import * as Button from "$lib/ui/Button";
 import {
 FlashlightIcon,
 Image02Icon,
 QrCodeIcon,
 } from "@hugeicons/core-free-icons";
 import { HugeiconsIcon } from "@hugeicons/svelte";
 import {
 Format,
 type PermissionState,
 type Scanned,
 cancel,
 checkPermissions,
 requestPermissions,
 scan,
 } from "@tauri-apps/plugin-barcode-scanner";
 import { onDestroy, onMount } from "svelte";
 import type { SVGAttributes } from "svelte/elements";

 const pathProps: SVGAttributes<SVGPathElement> = {
 stroke: "white",
 "stroke-width": 7,
 "stroke-linecap": "round",
 "stroke-linejoin": "round",
 };

 let codeScannedDrawerOpen = $state(false);
 let loggedInDrawerOpen = $state(false);
 let flashlightOn = $state(false);

 let scannedData: Scanned | undefined = $state(undefined);

 let scanning = false;
 let loading = false;

 let permissions_nullable: PermissionState | null;

 async function startScan() {
 let permissions = await checkPermissions()
 .then((permissions) => {
 return permissions;
 })
 .finally(() => {
scanning = false;
 .catch(() => {
return null; // possibly return "denied"? or does that imply that the check has been successful, but was actively denied?
 });
 }

 console.error("Permission denied or not granted");
 // TODO: consider handling GUI for permission denied
}
 // TODO: handle receiving "prompt-with-rationale" (issue: https://github.com/tauri-apps/plugins-workspace/issues/979)
 if (permissions === "prompt") {
 permissions = await requestPermissions(); // handle in more detail?
 }

 permissions_nullable = permissions;

 if (permissions === "granted") {
 // Scanning parameters
 const formats = [Format.QRCode];
 const windowed = true;

 if (scanning) return;
 scanning = true;
 scan({ formats, windowed })
 .then((res) => {
 console.log("Scan result:", res);
 scannedData = res;
 codeScannedDrawerOpen = true;
 })
 .catch((error) => {
 // TODO: display error to user
 console.error("Scan error:", error);
 })
 .finally(() => {
 scanning = false;
 });
 }

 console.error("Permission denied or not granted");
 // TODO: consider handling GUI for permission denied
 }

async function cancelScan() {
 await cancel();
 scanning = false;
}
async function cancelScan() {
await cancel();
scanning = false;
}

onMount(async () => {
 startScan();
});
onMount(async () => {
startScan();
});

onDestroy(async () => {
 await cancelScan();
});
onDestroy(async () => {
await cancelScan();
});
</script>

<AppNav title="Scan QR Code" titleClasses="text-white" iconColor="white" />

<svg class="mx-auto mt-48" width="204" height="215" viewBox="0 0 204 215" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M46 4H15C8.92487 4 4 8.92487 4 15V46" {...pathProps}/>
 <path d="M158 4H189C195.075 4 200 8.92487 200 15V46" {...pathProps}/>
 <path d="M46 211H15C8.92487 211 4 206.075 4 200V169" {...pathProps}/>
 <path d="M158 211H189C195.075 211 200 206.075 200 200V169" {...pathProps}/>
<svg
 class="mx-auto mt-48"
 width="204"
 height="215"
 viewBox="0 0 204 215"
 fill="none"
 xmlns="http://www.w3.org/2000/svg"
>
 <path d="M46 4H15C8.92487 4 4 8.92487 4 15V46" {...pathProps} />
 <path d="M158 4H189C195.075 4 200 8.92487 200 15V46" {...pathProps} />
 <path d="M46 211H15C8.92487 211 4 206.075 4 200V169" {...pathProps} />
 <path d="M158 211H189C195.075 211 200 206.075 200 200V169" {...pathProps} />
</svg>

<h4 class="text-white font-semibold text-center mt-20">Point the camera at the code</h4>
<h4 class="text-white font-semibold text-center mt-20">
 Point the camera at the code
</h4>

<div class="fixed bottom-2 left-1/2 -translate-x-1/2 z-10 flex gap-8 justify-center items-center">
 <Button.Icon
 icon={Image02Icon}
 bgColor="white"
 bgSize="md"
 />
<div
 class="fixed bottom-2 left-1/2 -translate-x-1/2 z-10 flex gap-8 justify-center items-center"
>
 <Button.Icon icon={Image02Icon} bgColor="white" bgSize="md" />
 <Button.Icon
 icon={QrCodeIcon}
 bgColor="white"
 bgSize="lg"
 iconSize="lg"
 callback={() => { codeScannedDrawerOpen = true; }}
 callback={() => {
 codeScannedDrawerOpen = true;
 }}
 />
 <Button.Icon
 icon={FlashlightIcon}
icon={FlashlightIcon}
 aria-label="Toggle flashlight"
 bgSize="md"
 iconSize={32}
Expand All@@ -135,9 +144,15 @@ onDestroy(async () => {
 bind:isPaneOpen={codeScannedDrawerOpen}
 class="flex flex-col gap-4 items-center justify-center"
>
 <div class="flex justify-center mb-4 relative items-center overflow-hidden bg-gray rounded-xl p-4 h-[72px] w-[72px]">
 <div class="bg-white h-[16px] w-[200px] -rotate-45 absolute top-1"></div>
 <div class="bg-white h-[16px] w-[200px] -rotate-45 absolute bottom-1"></div>
 <div
 class="flex justify-center mb-4 relative items-center overflow-hidden bg-gray rounded-xl p-4 h-[72px] w-[72px]"
 >
 <div
 class="bg-white h-[16px] w-[200px] -rotate-45 absolute top-1"
 ></div>
 <div
 class="bg-white h-[16px] w-[200px] -rotate-45 absolute bottom-1"
 ></div>
 <HugeiconsIcon
 size={40}
 className="z-10"
Expand All@@ -152,22 +167,27 @@ onDestroy(async () => {

 <div class="bg-gray rounded-2xl w-full p-4 mt-4">
 <h4 class="text-base text-black-700">Website URL</h4>
 <p class="text-black-700 font-normal underline">{scannedData?.content}</p>
 <p class="text-black-700 font-normal underline">
 {scannedData?.content}
 </p>
 </div>
 <div class="flex justify-center gap-3 items-center mt-4">
 <Button.Action
 variant="danger-soft"
 class="w-full"
 callback={() => { codeScannedDrawerOpen = false; startScan(); }}
 callback={() => {
 codeScannedDrawerOpen = false;
 startScan();
 }}
 >
 Decline
 </Button.Action>
 <Button.Action
 variant="solid"
 class="w-full"
 callback={() => {
 codeScannedDrawerOpen = false
 loggedInDrawerOpen = true
 codeScannedDrawerOpen = false;
 loggedInDrawerOpen = true;
 startScan();
 }}
 >
Expand All@@ -182,9 +202,15 @@ onDestroy(async () => {
 bind:isPaneOpen={loggedInDrawerOpen}
 class="flex flex-col gap-4 items-center justify-center"
>
 <div class="flex justify-center mb-4 relative items-center overflow-hidden bg-gray rounded-xl p-4 h-[72px] w-[72px]">
 <div class="bg-white h-[16px] w-[200px] -rotate-45 absolute top-1"></div>
 <div class="bg-white h-[16px] w-[200px] -rotate-45 absolute bottom-1"></div>
 <div
 class="flex justify-center mb-4 relative items-center overflow-hidden bg-gray rounded-xl p-4 h-[72px] w-[72px]"
 >
 <div
 class="bg-white h-[16px] w-[200px] -rotate-45 absolute top-1"
 ></div>
 <div
 class="bg-white h-[16px] w-[200px] -rotate-45 absolute bottom-1"
 ></div>
 <HugeiconsIcon
 size={40}
 className="z-10"
Expand All@@ -201,10 +227,19 @@ onDestroy(async () => {
 <Button.Action
 variant="solid"
 class="w-full"
 callback={() => { loggedInDrawerOpen = false; startScan(); }}
 callback={() => {
 loggedInDrawerOpen = false;
 startScan();
 }}
 >
 Close
 </Button.Action>
 </div>
</Drawer>

<style>
 :global(body, *:not(button)) {
 background-color: #00000000;
 overflow-y: hidden;
 }
</style>
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
fix: make scan qr page work again#185

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

Jun 2, 2025
 Merged


fix: make scan qr page work again
#185
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


4 changes: 2 additions & 2 deletions
infrastructure/eid-wallet/src-tauri/gen/apple/eid-wallet.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -377,7 +377,7 @@
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 CODE_SIGN_ENTITLEMENTS = "eid-wallet_iOS/eid-wallet_iOS.entitlements";
 CODE_SIGN_IDENTITY = "iPhone Developer";
 DEVELOPMENT_TEAM = 3FS4B734X5;
 DEVELOPMENT_TEAM = 7F2T2WK6DR;
 ENABLE_BITCODE = NO;
 "EXCLUDED_ARCHS[sdk=iphoneos*]" = "arm64-sim x86_64";
 "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
Expand DownExpand Up@@ -430,7 +430,7 @@
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 CODE_SIGN_ENTITLEMENTS = "eid-wallet_iOS/eid-wallet_iOS.entitlements";
 CODE_SIGN_IDENTITY = "iPhone Developer";
 DEVELOPMENT_TEAM = 3FS4B734X5;
 DEVELOPMENT_TEAM = 7F2T2WK6DR;
 ENABLE_BITCODE = NO;
 "EXCLUDED_ARCHS[sdk=iphoneos*]" = "arm64-sim x86_64";
 "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
Expand Down

259 changes: 147 additions & 112 deletions
infrastructure/eid-wallet/src/routes/(app)/scan-qr/+page.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,125 +1,134 @@
<script lang="ts">
import AppNav from "$lib/fragments/AppNav/AppNav.svelte";
import { Drawer } from "$lib/ui";
import * as Button from "$lib/ui/Button";
import {
 FlashlightIcon,
 Image02Icon,
 QrCodeIcon,
} from "@hugeicons/core-free-icons";
import { HugeiconsIcon } from "@hugeicons/svelte";
import {
 Format,
 type PermissionState,
 type Scanned,
 cancel,
 checkPermissions,
 requestPermissions,
 scan,
} from "@tauri-apps/plugin-barcode-scanner";
import { onDestroy, onMount } from "svelte";
import type { SVGAttributes } from "svelte/elements";

const pathProps: SVGAttributes<SVGPathElement> = {
 stroke: "white",
 "stroke-width": 7,
 "stroke-linecap": "round",
 "stroke-linejoin": "round",
};

let codeScannedDrawerOpen = $state(false);
let loggedInDrawerOpen = $state(false);
let flashlightOn = $state(false);

let scannedData: Scanned | undefined = $state(undefined);

let scanning = false;
let loading = false;

let permissions_nullable: PermissionState | null;

async function startScan() {
 let permissions = await checkPermissions()
 .then((permissions) => {
 return permissions;
 })
 .catch(() => {
 return null; // possibly return "denied"? or does that imply that the check has been successful, but was actively denied?
 });

 // TODO: handle receiving "prompt-with-rationale" (issue: https://github.com/tauri-apps/plugins-workspace/issues/979)
 if (permissions === "prompt") {
 permissions = await requestPermissions(); // handle in more detail?
 }

 permissions_nullable = permissions;

 if (permissions === "granted") {
 // Scanning parameters
 const formats = [Format.QRCode];
 const windowed = true;

 if (scanning) return;
 scanning = true;
 scan({ formats, windowed })
 .then((res) => {
 console.log("Scan result:", res);
 scannedData = res;
 codeScannedDrawerOpen = true;
 })
 .catch((error) => {
 // TODO: display error to user
 console.error("Scan error:", error);
 import AppNav from "$lib/fragments/AppNav/AppNav.svelte";
 import { Drawer } from "$lib/ui";
 import * as Button from "$lib/ui/Button";
 import {
 FlashlightIcon,
 Image02Icon,
 QrCodeIcon,
 } from "@hugeicons/core-free-icons";
 import { HugeiconsIcon } from "@hugeicons/svelte";
 import {
 Format,
 type PermissionState,
 type Scanned,
 cancel,
 checkPermissions,
 requestPermissions,
 scan,
 } from "@tauri-apps/plugin-barcode-scanner";
 import { onDestroy, onMount } from "svelte";
 import type { SVGAttributes } from "svelte/elements";

 const pathProps: SVGAttributes<SVGPathElement> = {
 stroke: "white",
 "stroke-width": 7,
 "stroke-linecap": "round",
 "stroke-linejoin": "round",
 };

 let codeScannedDrawerOpen = $state(false);
 let loggedInDrawerOpen = $state(false);
 let flashlightOn = $state(false);

 let scannedData: Scanned | undefined = $state(undefined);

 let scanning = false;
 let loading = false;

 let permissions_nullable: PermissionState | null;

 async function startScan() {
 let permissions = await checkPermissions()
 .then((permissions) => {
 return permissions;
 })
 .finally(() => {
scanning = false;
 .catch(() => {
return null; // possibly return "denied"? or does that imply that the check has been successful, but was actively denied?
 });
 }

 console.error("Permission denied or not granted");
 // TODO: consider handling GUI for permission denied
}
 // TODO: handle receiving "prompt-with-rationale" (issue: https://github.com/tauri-apps/plugins-workspace/issues/979)
 if (permissions === "prompt") {
 permissions = await requestPermissions(); // handle in more detail?
 }

 permissions_nullable = permissions;

 if (permissions === "granted") {
 // Scanning parameters
 const formats = [Format.QRCode];
 const windowed = true;

 if (scanning) return;
 scanning = true;
 scan({ formats, windowed })
 .then((res) => {
 console.log("Scan result:", res);
 scannedData = res;
 codeScannedDrawerOpen = true;
 })
 .catch((error) => {
 // TODO: display error to user
 console.error("Scan error:", error);
 })
 .finally(() => {
 scanning = false;
 });
 }

 console.error("Permission denied or not granted");
 // TODO: consider handling GUI for permission denied
 }

async function cancelScan() {
 await cancel();
 scanning = false;
}
async function cancelScan() {
await cancel();
scanning = false;
}

onMount(async () => {
 startScan();
});
onMount(async () => {
startScan();
});

onDestroy(async () => {
 await cancelScan();
});
onDestroy(async () => {
await cancelScan();
});
</script>

<AppNav title="Scan QR Code" titleClasses="text-white" iconColor="white" />

<svg class="mx-auto mt-48" width="204" height="215" viewBox="0 0 204 215" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M46 4H15C8.92487 4 4 8.92487 4 15V46" {...pathProps}/>
 <path d="M158 4H189C195.075 4 200 8.92487 200 15V46" {...pathProps}/>
 <path d="M46 211H15C8.92487 211 4 206.075 4 200V169" {...pathProps}/>
 <path d="M158 211H189C195.075 211 200 206.075 200 200V169" {...pathProps}/>
<svg
 class="mx-auto mt-48"
 width="204"
 height="215"
 viewBox="0 0 204 215"
 fill="none"
 xmlns="http://www.w3.org/2000/svg"
>
 <path d="M46 4H15C8.92487 4 4 8.92487 4 15V46" {...pathProps} />
 <path d="M158 4H189C195.075 4 200 8.92487 200 15V46" {...pathProps} />
 <path d="M46 211H15C8.92487 211 4 206.075 4 200V169" {...pathProps} />
 <path d="M158 211H189C195.075 211 200 206.075 200 200V169" {...pathProps} />
</svg>

<h4 class="text-white font-semibold text-center mt-20">Point the camera at the code</h4>
<h4 class="text-white font-semibold text-center mt-20">
 Point the camera at the code
</h4>

<div class="fixed bottom-2 left-1/2 -translate-x-1/2 z-10 flex gap-8 justify-center items-center">
 <Button.Icon
 icon={Image02Icon}
 bgColor="white"
 bgSize="md"
 />
<div
 class="fixed bottom-2 left-1/2 -translate-x-1/2 z-10 flex gap-8 justify-center items-center"
>
 <Button.Icon icon={Image02Icon} bgColor="white" bgSize="md" />
 <Button.Icon
 icon={QrCodeIcon}
 bgColor="white"
 bgSize="lg"
 iconSize="lg"
 callback={() => { codeScannedDrawerOpen = true; }}
 callback={() => {
 codeScannedDrawerOpen = true;
 }}
 />
 <Button.Icon
 icon={FlashlightIcon}
icon={FlashlightIcon}
 aria-label="Toggle flashlight"
 bgSize="md"
 iconSize={32}
Expand All@@ -135,9 +144,15 @@ onDestroy(async () => {
 bind:isPaneOpen={codeScannedDrawerOpen}
 class="flex flex-col gap-4 items-center justify-center"
>
 <div class="flex justify-center mb-4 relative items-center overflow-hidden bg-gray rounded-xl p-4 h-[72px] w-[72px]">
 <div class="bg-white h-[16px] w-[200px] -rotate-45 absolute top-1"></div>
 <div class="bg-white h-[16px] w-[200px] -rotate-45 absolute bottom-1"></div>
 <div
 class="flex justify-center mb-4 relative items-center overflow-hidden bg-gray rounded-xl p-4 h-[72px] w-[72px]"
 >
 <div
 class="bg-white h-[16px] w-[200px] -rotate-45 absolute top-1"
 ></div>
 <div
 class="bg-white h-[16px] w-[200px] -rotate-45 absolute bottom-1"
 ></div>
 <HugeiconsIcon
 size={40}
 className="z-10"
Expand All@@ -152,22 +167,27 @@ onDestroy(async () => {

 <div class="bg-gray rounded-2xl w-full p-4 mt-4">
 <h4 class="text-base text-black-700">Website URL</h4>
 <p class="text-black-700 font-normal underline">{scannedData?.content}</p>
 <p class="text-black-700 font-normal underline">
 {scannedData?.content}
 </p>
 </div>
 <div class="flex justify-center gap-3 items-center mt-4">
 <Button.Action
 variant="danger-soft"
 class="w-full"
 callback={() => { codeScannedDrawerOpen = false; startScan(); }}
 callback={() => {
 codeScannedDrawerOpen = false;
 startScan();
 }}
 >
 Decline
 </Button.Action>
 <Button.Action
 variant="solid"
 class="w-full"
 callback={() => {
 codeScannedDrawerOpen = false
 loggedInDrawerOpen = true
 codeScannedDrawerOpen = false;
 loggedInDrawerOpen = true;
 startScan();
 }}
 >
Expand All@@ -182,9 +202,15 @@ onDestroy(async () => {
 bind:isPaneOpen={loggedInDrawerOpen}
 class="flex flex-col gap-4 items-center justify-center"
>
 <div class="flex justify-center mb-4 relative items-center overflow-hidden bg-gray rounded-xl p-4 h-[72px] w-[72px]">
 <div class="bg-white h-[16px] w-[200px] -rotate-45 absolute top-1"></div>
 <div class="bg-white h-[16px] w-[200px] -rotate-45 absolute bottom-1"></div>
 <div
 class="flex justify-center mb-4 relative items-center overflow-hidden bg-gray rounded-xl p-4 h-[72px] w-[72px]"
 >
 <div
 class="bg-white h-[16px] w-[200px] -rotate-45 absolute top-1"
 ></div>
 <div
 class="bg-white h-[16px] w-[200px] -rotate-45 absolute bottom-1"
 ></div>
 <HugeiconsIcon
 size={40}
 className="z-10"
Expand All@@ -201,10 +227,19 @@ onDestroy(async () => {
 <Button.Action
 variant="solid"
 class="w-full"
 callback={() => { loggedInDrawerOpen = false; startScan(); }}
 callback={() => {
 loggedInDrawerOpen = false;
 startScan();
 }}
 >
 Close
 </Button.Action>
 </div>
</Drawer>

<style>
 :global(body, *:not(button)) {
 background-color: #00000000;
 overflow-y: hidden;
 }
</style>
Loading