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
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 number Diff line number Diff 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 Down Expand 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 number Diff line number Diff 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
Loading