Skip to content

fixed login redirect and disabled lang options in settings #261

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 2 commits into from
Jul 23, 2025
Merged

fixed login redirect and disabled lang options in settings #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
321629c
fixed the login redirect and also disabled lang options in settings
ananyayaya129 Jul 21, 2025
c1d1d0b
removed duplicate image in pictique
ananyayaya129 Jul 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 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 @@ -389,7 +389,7 @@
CODE_SIGN_ENTITLEMENTS = "eid-wallet_iOS/eid-wallet_iOS.entitlements";
CODE_SIGN_IDENTITY = "iPhone Developer";
CURRENT_PROJECT_VERSION = 0.1.7.2;
DEVELOPMENT_TEAM = M49C8XS835;
DEVELOPMENT_TEAM = 3FS4B734X5;
ENABLE_BITCODE = NO;
"EXCLUDED_ARCHS[sdk=iphoneos*]" = x86_64;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -416,7 +416,7 @@
"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)",
);
MARKETING_VERSION = 0.1.7;
PRODUCT_BUNDLE_IDENTIFIER = "foundation.metastate.eid-wallet";
PRODUCT_BUNDLE_IDENTIFIER = foundation.metastate.eid-wallet;
PRODUCT_NAME = "eID for W3DS";
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
Expand All @@ -437,7 +437,7 @@
CODE_SIGN_ENTITLEMENTS = "eid-wallet_iOS/eid-wallet_iOS.entitlements";
CODE_SIGN_IDENTITY = "iPhone Developer";
CURRENT_PROJECT_VERSION = 0.1.7.2;
DEVELOPMENT_TEAM = M49C8XS835;
DEVELOPMENT_TEAM = 3FS4B734X5;
ENABLE_BITCODE = NO;
"EXCLUDED_ARCHS[sdk=iphoneos*]" = x86_64;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -464,7 +464,7 @@
"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)",
);
MARKETING_VERSION = 0.1.7;
PRODUCT_BUNDLE_IDENTIFIER = "foundation.metastate.eid-wallet";
PRODUCT_BUNDLE_IDENTIFIER = foundation.metastate.eid-wallet;
PRODUCT_NAME = "eID for W3DS";
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
Expand Down
10 changes: 0 additions & 10 deletions .../apple/eid-wallet.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion infrastructure/eid-wallet/src-tauri/gen/apple/eid-wallet_iOS/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
</dict>
</plist>
</plist>
80 changes: 42 additions & 38 deletions infrastructure/eid-wallet/src/lib/ui/Selector/Selector.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,42 @@
<script lang="ts">
import { cn } from "$lib/utils";
import { Tick01Icon } from "@hugeicons/core-free-icons";
import { HugeiconsIcon } from "@hugeicons/svelte";
import type { Snippet } from "svelte";
import type { HTMLLabelAttributes } from "svelte/elements";
import { fade } from "svelte/transition";
import { cn } from "$lib/utils";
import { Tick01Icon } from "@hugeicons/core-free-icons";
import { HugeiconsIcon } from "@hugeicons/svelte";
import type { Snippet } from "svelte";
import type { HTMLLabelAttributes } from "svelte/elements";
import { fade } from "svelte/transition";

interface ISelectorProps extends HTMLLabelAttributes {
id: string;
name: string;
value: string;
icon?: Snippet<[string]>;
selected?: string;
children?: Snippet;
}
interface ISelectorProps extends HTMLLabelAttributes {
id: string;
name: string;
value: string;
icon?: Snippet<[string]>;
selected?: string;
children?: Snippet;
disable?: boolean;
}

let {
id,
name,
value,
icon = undefined,
selected = $bindable(),
children = undefined,
...restProps
}: ISelectorProps = $props();
let {
id,
name,
value,
icon = undefined,
selected = $bindable(),
children = undefined,
disable = false,
...restProps
}: ISelectorProps = $props();
</script>

<label
{...restProps}
for={id}
class={cn(
["flex w-full justify-between items-center ps-[5vw] py-6", restProps.class].join(
" "
)
[
"flex w-full justify-between items-center ps-[5vw] py-6",
disable ? "opacity-50 pointer-events-none select-none" : "",
restProps.class,
].join(" "),
)}
>
<div class="flex">
Expand All @@ -46,12 +50,12 @@ let {
bind:group={selected}
/>
{#if icon}
<div class="">
{@render icon?.(id)}
</div>
<div class="">
{@render icon?.(id)}
</div>
{/if}
<p>
{@render children?.()}
{@render children?.()}
</p>
</div>
</div>
Expand All @@ -66,7 +70,7 @@ let {
{/if}
</label>

<!--
<!--
@component
export default Selector
@description
Expand All @@ -86,28 +90,28 @@ let {
import Selector from '$lib/ui/Selector/Selector.svelte'
import { getLanguageWithCountry } from '$lib/utils/getLanguage'
import { writable } from 'svelte/store'

const AVAILABLE_LANGUAGES = ['en-GB', 'es', 'de', 'fr', 'ru']

const selectors = AVAILABLE_LANGUAGES.map((locale) => {
const { code, name } = getLanguageWithCountry(locale)

return {
id: code,
value: name,
checked: locale === 'en-GB',
}
})

let selected = writable(selectors[0].value)
</script>

<h1 class="text-2xl font-bold">Select your language</h1>

<fieldset class="mx-8 flex flex-col gap-4 mt-12">
{#each selectors as selector}
{@const { id, value, checked } = selector}

<Selector {id} name="lang" {value} bind:selected={$selected}>
{#snippet icon(id: string)}
<div
Expand Down
3 changes: 2 additions & 1 deletion 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
Expand Up @@ -18,6 +18,7 @@
import type { SVGAttributes } from "svelte/elements";
import type { GlobalState } from "$lib/global";
import axios from "axios";
import { goto } from "$app/navigation";

const globalState = getContext<() => GlobalState>("globalState")();
const pathProps: SVGAttributes<SVGPathElement> = {
Expand Down Expand Up @@ -56,7 +57,6 @@
if (permissions === "granted") {
const formats = [Format.QRCode];
const windowed = true;

if (scanning) return;
scanning = true;
scan({ formats, windowed })
Expand Down Expand Up @@ -218,6 +218,7 @@
class="w-full"
callback={() => {
loggedInDrawerOpen = false;
goto("/main");
startScan();
}}
>
Expand Down
50 changes: 27 additions & 23 deletions infrastructure/eid-wallet/src/routes/(app)/settings/language/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,35 @@
<script lang="ts">
import { runtime } from "$lib/global/runtime.svelte";
import { Selector } from "$lib/ui";
import { runtime } from "$lib/global/runtime.svelte";
import { Selector } from "$lib/ui";

let languages: { name: string; country: string }[] = [
{ name: "English", country: "gb" },
{ name: "Spanish", country: "es" },
{ name: "German", country: "de" },
{ name: "French", country: "fr" },
];
let selected = $state("");
let languages: { name: string; country: string }[] = [
{ name: "English", country: "gb" },
{ name: "Spanish", country: "es" },
{ name: "German", country: "de" },
{ name: "French", country: "fr" },
];
let selected = $state("English");

$effect(() => {
runtime.header.title = "Language";
});
$effect(() => {
runtime.header.title = "Language";
});
</script>



<main>
{#each languages as lang, i}
<Selector id={`option-${i}`} name={lang.name} bind:selected value={lang.name}>
{lang.name}
{#snippet icon()}
<div
class={`rounded-full fi fis fi-${lang.country} scale-150 mr-12 outline-8 outline-gray`}
></div>
{/snippet}
</Selector>
<Selector
id={`option-${i}`}
name={lang.name}
bind:selected
value={lang.name}
disable={lang.name === "English" ? false : true}
>
{lang.name}
{#snippet icon()}
<div
class={`rounded-full fi fis fi-${lang.country} scale-150 mr-12 outline-8 outline-gray`}
></div>
{/snippet}
</Selector>
{/each}
</main>
</main>
2 changes: 1 addition & 1 deletion platforms/pictique/src/lib/fragments/ActionMenu/ActionMenu.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<button
bind:this={buttonEl}
onclick={(e) => {
e.preventDefault(), openMenu();
(e.preventDefault(), openMenu());
}}
>
<HugeiconsIcon icon={MoreVerticalIcon} size={24} color="black" />
Expand Down
Loading
Loading