Skip to content

Commit 011e42b

Browse files
committed
fix: merge conflicts
2 parents 0e6da35 + fa4458e commit 011e42b

File tree

400 files changed

+31207
-10863
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

400 files changed

+31207
-10863
lines changed

.env.example

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
1+
# Pictique Configuration
2+
PUBLIC_PICTIQUE_BASE_URL=your_public_pictique_base_url_here
3+
4+
# Blabsy Configuration
5+
PUBLIC_BLABSY_BASE_URL=your_public_blabsy_base_url_here
6+
7+
# Eid Wallet Configuration
8+
PUBLIC_REGISTRY_URL=your_public_registry_url_here
9+
PUBLIC_PROVISIONER_URL=your_public_provisioner_url_here
10+
111
# Neo4j Configuration
212
NEO4J_URI=bolt://neo4j:7687
313
NEO4J_USER=neo4j
414
NEO4J_PASSWORD=your_secure_password_here
515

616
# eVault Configuration
7-
PORT=4000
17+
PORT=4000

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,6 @@
2727
"source.organizeImports.biome": "explicit",
2828
"source.fixAll.biome": "explicit"
2929
}
30-
}
30+
},
31+
"editor.formatOnSave": true
3132
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import type { Handle } from '@sveltejs/kit';
2+
import { paraglideMiddleware } from '$lib/paraglide/server';
3+
4+
const handleParaglide: Handle = ({ event, resolve }) =>
5+
paraglideMiddleware(event.request, ({ request, locale }) => {
6+
event.request = request;
7+
8+
return resolve(event, {
9+
transformPageChunk: ({ html }) => html.replace('%paraglide.lang%', locale)
10+
});
11+
});
12+
13+
export const handle: Handle = handleParaglide;
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import { deLocalizeUrl } from '$lib/paraglide/runtime';
2+
3+
export const reroute = (request) => deLocalizeUrl(request.url).pathname;

infrastructure/control-panel/src/routes/+page.svelte

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
import { TableCard, TableCardHeader } from '$lib/fragments';
33
import { Table } from '$lib/ui';
44
5-
let eventsSearchValue = $state('');
6-
let platformsSearchQuery = $state('');
5+
let eventsSearchValue = $state('');
6+
let platformsSearchQuery = $state('');
77
88
const handlePreviousPage = async () => {
99
alert('Previous btn clicked. Make a call to your server to fetch data.');
@@ -98,7 +98,7 @@
9898
<TableCard>
9999
<TableCardHeader
100100
title="Events"
101-
placeholder="Search Events"
101+
placeholder="Search Events"
102102
bind:searchValue={eventsSearchValue}
103103
rightTitle="No evault selected. Select an evault to monitor logs"
104104
/>
@@ -114,7 +114,7 @@
114114
<TableCard>
115115
<TableCardHeader
116116
title="Platforms"
117-
placeholder="Search Platforms"
117+
placeholder="Search Platforms"
118118
bind:searchValue={platformsSearchQuery}
119119
rightTitle="No evault selected. Select an evault to monitor logs"
120120
/>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<a href="/demo/paraglide">paraglide</a>
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<script lang="ts">
2+
import { setLocale } from '$lib/paraglide/runtime';
3+
import { page } from '$app/state';
4+
import { goto } from '$app/navigation';
5+
import { m } from '$lib/paraglide/messages.js';
6+
</script>
7+
8+
<h1>{m.hello_world({ name: 'SvelteKit User' })}</h1>
9+
<div>
10+
<button onclick={() => setLocale('en')}>en</button>
11+
<button onclick={() => setLocale('es')}>es</button>
12+
</div>
13+
<p>
14+
If you use VSCode, install the <a
15+
href="https://marketplace.visualstudio.com/items?itemName=inlang.vs-code-extension"
16+
target="_blank">Sherlock i18n extension</a
17+
> for a better i18n experience.
18+
</p>
Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
import type { StorybookConfig } from "@storybook/sveltekit";
2-
import { join, dirname } from "path";
2+
import { join, dirname } from "node:path";
33

44
function getAbsolutePath(value: string): any {
5-
return dirname(require.resolve(join(value, "package.json")));
5+
return dirname(require.resolve(join(value, "package.json")));
66
}
77

88
const config: StorybookConfig = {
9-
stories: ["../src/**/*.mdx", "../src/**/*.stories.@(js|ts)"],
10-
addons: [
11-
getAbsolutePath("@storybook/addon-essentials"),
12-
getAbsolutePath("@chromatic-com/storybook"),
13-
getAbsolutePath("@storybook/experimental-addon-test"),
14-
],
15-
framework: {
16-
name: "@storybook/sveltekit",
17-
options: {},
18-
},
9+
stories: ["../src/**/*.mdx", "../src/**/*.stories.@(js|ts)"],
10+
addons: [
11+
getAbsolutePath("@storybook/addon-essentials"),
12+
getAbsolutePath("@chromatic-com/storybook"),
13+
getAbsolutePath("@storybook/experimental-addon-test"),
14+
],
15+
framework: {
16+
name: "@storybook/sveltekit",
17+
options: {},
18+
},
1919

20-
staticDirs: ["../static"],
20+
staticDirs: ["../static"],
2121
};
2222
export default config;

infrastructure/eid-wallet/.storybook/preview.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ import type { Preview } from "@storybook/svelte";
22
import "../src/app.css";
33

44
const preview: Preview = {
5-
parameters: {
6-
controls: {
7-
matchers: {
8-
color: /(background|color)$/i,
9-
date: /Date$/i,
10-
},
11-
},
12-
},
5+
parameters: {
6+
controls: {
7+
matchers: {
8+
color: /(background|color)$/i,
9+
date: /Date$/i,
10+
},
11+
},
12+
},
1313
};
1414

1515
export default preview;
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"recommendations": [
3-
"svelte.svelte-vscode",
4-
"tauri-apps.tauri-vscode",
5-
"rust-lang.rust-analyzer"
6-
]
2+
"recommendations": [
3+
"svelte.svelte-vscode",
4+
"tauri-apps.tauri-vscode",
5+
"rust-lang.rust-analyzer"
6+
]
77
}

0 commit comments

Comments
 (0)