Skip to content

Commit 5b46ef1

Browse files
ananyayaya129ananyayaya129
authored
fixed login redirect and disabled lang options in settings (#261)
* fixed the login redirect and also disabled lang options in settings * removed duplicate image in pictique
1 parent 9ac3873 commit 5b46ef1

File tree

8 files changed

+9381
-11561
lines changed

8 files changed

+9381
-11561
lines changed

‎infrastructure/eid-wallet/src-tauri/gen/apple/eid-wallet.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@
389389
CODE_SIGN_ENTITLEMENTS = "eid-wallet_iOS/eid-wallet_iOS.entitlements";
390390
CODE_SIGN_IDENTITY = "iPhone Developer";
391391
CURRENT_PROJECT_VERSION = 0.1.7.2;
392-
DEVELOPMENT_TEAM = M49C8XS835;
392+
DEVELOPMENT_TEAM = 3FS4B734X5;
393393
ENABLE_BITCODE = NO;
394394
"EXCLUDED_ARCHS[sdk=iphoneos*]" = x86_64;
395395
FRAMEWORK_SEARCH_PATHS = (
@@ -416,7 +416,7 @@
416416
"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)",
417417
);
418418
MARKETING_VERSION = 0.1.7;
419-
PRODUCT_BUNDLE_IDENTIFIER = "foundation.metastate.eid-wallet";
419+
PRODUCT_BUNDLE_IDENTIFIER = foundation.metastate.eid-wallet;
420420
PRODUCT_NAME = "eID for W3DS";
421421
SDKROOT = iphoneos;
422422
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -437,7 +437,7 @@
437437
CODE_SIGN_ENTITLEMENTS = "eid-wallet_iOS/eid-wallet_iOS.entitlements";
438438
CODE_SIGN_IDENTITY = "iPhone Developer";
439439
CURRENT_PROJECT_VERSION = 0.1.7.2;
440-
DEVELOPMENT_TEAM = M49C8XS835;
440+
DEVELOPMENT_TEAM = 3FS4B734X5;
441441
ENABLE_BITCODE = NO;
442442
"EXCLUDED_ARCHS[sdk=iphoneos*]" = x86_64;
443443
FRAMEWORK_SEARCH_PATHS = (
@@ -464,7 +464,7 @@
464464
"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)",
465465
);
466466
MARKETING_VERSION = 0.1.7;
467-
PRODUCT_BUNDLE_IDENTIFIER = "foundation.metastate.eid-wallet";
467+
PRODUCT_BUNDLE_IDENTIFIER = foundation.metastate.eid-wallet;
468468
PRODUCT_NAME = "eID for W3DS";
469469
SDKROOT = iphoneos;
470470
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

‎infrastructure/eid-wallet/src-tauri/gen/apple/eid-wallet.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎infrastructure/eid-wallet/src-tauri/gen/apple/eid-wallet_iOS/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,4 @@
5050
<string>UIInterfaceOrientationLandscapeRight</string>
5151
</array>
5252
</dict>
53-
</plist>
53+
</plist>

‎infrastructure/eid-wallet/src/lib/ui/Selector/Selector.svelte‎

Lines changed: 42 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,42 @@
11
<script lang="ts">
2-
import { cn } from "$lib/utils";
3-
import { Tick01Icon } from "@hugeicons/core-free-icons";
4-
import { HugeiconsIcon } from "@hugeicons/svelte";
5-
import type { Snippet } from "svelte";
6-
import type { HTMLLabelAttributes } from "svelte/elements";
7-
import { fade } from "svelte/transition";
2+
import { cn } from "$lib/utils";
3+
import { Tick01Icon } from "@hugeicons/core-free-icons";
4+
import { HugeiconsIcon } from "@hugeicons/svelte";
5+
import type { Snippet } from "svelte";
6+
import type { HTMLLabelAttributes } from "svelte/elements";
7+
import { fade } from "svelte/transition";
88
9-
interface ISelectorProps extends HTMLLabelAttributes {
10-
id: string;
11-
name: string;
12-
value: string;
13-
icon?: Snippet<[string]>;
14-
selected?: string;
15-
children?: Snippet;
16-
}
9+
interface ISelectorProps extends HTMLLabelAttributes {
10+
id: string;
11+
name: string;
12+
value: string;
13+
icon?: Snippet<[string]>;
14+
selected?: string;
15+
children?: Snippet;
16+
disable?: boolean;
17+
}
1718
18-
let {
19-
id,
20-
name,
21-
value,
22-
icon = undefined,
23-
selected = $bindable(),
24-
children = undefined,
25-
...restProps
26-
}: ISelectorProps = $props();
19+
let {
20+
id,
21+
name,
22+
value,
23+
icon = undefined,
24+
selected = $bindable(),
25+
children = undefined,
26+
disable = false,
27+
...restProps
28+
}: ISelectorProps = $props();
2729
</script>
2830

2931
<label
3032
{...restProps}
3133
for={id}
3234
class={cn(
33-
["flex w-full justify-between items-center ps-[5vw] py-6", restProps.class].join(
34-
" "
35-
)
35+
[
36+
"flex w-full justify-between items-center ps-[5vw] py-6",
37+
disable ? "opacity-50 pointer-events-none select-none" : "",
38+
restProps.class,
39+
].join(" "),
3640
)}
3741
>
3842
<div class="flex">
@@ -46,12 +50,12 @@ let {
4650
bind:group={selected}
4751
/>
4852
{#if icon}
49-
<div class="">
50-
{@render icon?.(id)}
51-
</div>
53+
<div class="">
54+
{@render icon?.(id)}
55+
</div>
5256
{/if}
5357
<p>
54-
{@render children?.()}
58+
{@render children?.()}
5559
</p>
5660
</div>
5761
</div>
@@ -66,7 +70,7 @@ let {
6670
{/if}
6771
</label>
6872

69-
<!--
73+
<!--
7074
@component
7175
export default Selector
7276
@description
@@ -86,28 +90,28 @@ let {
8690
import Selector from '$lib/ui/Selector/Selector.svelte'
8791
import { getLanguageWithCountry } from '$lib/utils/getLanguage'
8892
import { writable } from 'svelte/store'
89-
93+
9094
const AVAILABLE_LANGUAGES = ['en-GB', 'es', 'de', 'fr', 'ru']
91-
95+
9296
const selectors = AVAILABLE_LANGUAGES.map((locale) => {
9397
const { code, name } = getLanguageWithCountry(locale)
94-
98+
9599
return {
96100
id: code,
97101
value: name,
98102
checked: locale === 'en-GB',
99103
}
100104
})
101-
105+
102106
let selected = writable(selectors[0].value)
103107
</script>
104-
108+
105109
<h1 class="text-2xl font-bold">Select your language</h1>
106-
110+
107111
<fieldset class="mx-8 flex flex-col gap-4 mt-12">
108112
{#each selectors as selector}
109113
{@const { id, value, checked } = selector}
110-
114+
111115
<Selector {id} name="lang" {value} bind:selected={$selected}>
112116
{#snippet icon(id: string)}
113117
<div

‎infrastructure/eid-wallet/src/routes/(app)/scan-qr/+page.svelte‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import type { SVGAttributes } from "svelte/elements";
1919
import type { GlobalState } from "$lib/global";
2020
import axios from "axios";
21+
import { goto } from "$app/navigation";
2122
2223
const globalState = getContext<() => GlobalState>("globalState")();
2324
const pathProps: SVGAttributes<SVGPathElement> = {
@@ -56,7 +57,6 @@
5657
if (permissions === "granted") {
5758
const formats = [Format.QRCode];
5859
const windowed = true;
59-
6060
if (scanning) return;
6161
scanning = true;
6262
scan({ formats, windowed })
@@ -218,6 +218,7 @@
218218
class="w-full"
219219
callback={() => {
220220
loggedInDrawerOpen = false;
221+
goto("/main");
221222
startScan();
222223
}}
223224
>

‎infrastructure/eid-wallet/src/routes/(app)/settings/language/+page.svelte‎

Lines changed: 27 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,35 @@
11
<script lang="ts">
2-
import { runtime } from "$lib/global/runtime.svelte";
3-
import { Selector } from "$lib/ui";
2+
import { runtime } from "$lib/global/runtime.svelte";
3+
import { Selector } from "$lib/ui";
44
5-
let languages: { name: string; country: string }[] = [
6-
{ name: "English", country: "gb" },
7-
{ name: "Spanish", country: "es" },
8-
{ name: "German", country: "de" },
9-
{ name: "French", country: "fr" },
10-
];
11-
let selected = $state("");
5+
let languages: { name: string; country: string }[] = [
6+
{ name: "English", country: "gb" },
7+
{ name: "Spanish", country: "es" },
8+
{ name: "German", country: "de" },
9+
{ name: "French", country: "fr" },
10+
];
11+
let selected = $state("English");
1212
13-
$effect(() => {
14-
runtime.header.title = "Language";
15-
});
13+
$effect(() => {
14+
runtime.header.title = "Language";
15+
});
1616
</script>
1717

18-
19-
2018
<main>
2119
{#each languages as lang, i}
22-
<Selector id={`option-${i}`} name={lang.name} bind:selected value={lang.name}>
23-
{lang.name}
24-
{#snippet icon()}
25-
<div
26-
class={`rounded-full fi fis fi-${lang.country} scale-150 mr-12 outline-8 outline-gray`}
27-
></div>
28-
{/snippet}
29-
</Selector>
20+
<Selector
21+
id={`option-${i}`}
22+
name={lang.name}
23+
bind:selected
24+
value={lang.name}
25+
disable={lang.name === "English" ? false : true}
26+
>
27+
{lang.name}
28+
{#snippet icon()}
29+
<div
30+
class={`rounded-full fi fis fi-${lang.country} scale-150 mr-12 outline-8 outline-gray`}
31+
></div>
32+
{/snippet}
33+
</Selector>
3034
{/each}
31-
</main>
35+
</main>

‎platforms/pictique/src/lib/fragments/ActionMenu/ActionMenu.svelte‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<button
5555
bind:this={buttonEl}
5656
onclick={(e) => {
57-
e.preventDefault(), openMenu();
57+
(e.preventDefault(), openMenu());
5858
}}
5959
>
6060
<HugeiconsIcon icon={MoreVerticalIcon} size={24} color="black" />

0 commit comments

Comments
 (0)