Skip to content

Commit 8b09128

Browse files
Sahil2004Sahil2004
committed
fix: merge conflict.
2 parents d6cd57a + 4d89694 commit 8b09128

File tree

36 files changed

+682
-428
lines changed

36 files changed

+682
-428
lines changed

‎infrastructure/control-panel/.gitignore‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,5 @@ Thumbs.db
2222
vite.config.js.timestamp-*
2323
vite.config.ts.timestamp-*
2424

25-
# Paraglide
26-
src/lib/paraglide
27-
2825
*storybook.log
2926
storybook-static

‎infrastructure/control-panel/biome.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"$schema": "./node_modules/@biomejs/biome/configuration_schema.json",
3+
"extends": ["../../biome.json"],
4+
"organizeImports": {
5+
"include": ["src/**/*.ts", "src/**/*.svelte"]
6+
}
7+
}

‎infrastructure/control-panel/src/app.css‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -32,40 +32,40 @@
3232
.small {
3333
@apply text-xs/[1.5] font-normal text-black;
3434
}
35-
}
3635

37-
@theme {
38-
/* Custom theme */
39-
--color-primary: #8e52ff;
40-
--color-primary-100: #e8dcff;
41-
--color-primary-200: #d2baff;
42-
--color-primary-300: #bb97ff;
43-
--color-primary-400: #a575ff;
44-
--color-primary-500: #8e52ff;
36+
:root {
37+
/* Custom theme */
38+
--color-primary: #8e52ff;
39+
--color-primary-100: #e8dcff;
40+
--color-primary-200: #d2baff;
41+
--color-primary-300: #bb97ff;
42+
--color-primary-400: #a575ff;
43+
--color-primary-500: #8e52ff;
4544

46-
--color-secondary: #73efd5;
47-
--color-secondary-100: #e3fcf7;
48-
--color-secondary-200: #c7f9ee;
49-
--color-secondary-300: #abf6e6;
50-
--color-secondary-400: #8ff2dd;
51-
--color-secondary-500: #73efd5;
45+
--color-secondary: #73efd5;
46+
--color-secondary-100: #e3fcf7;
47+
--color-secondary-200: #c7f9ee;
48+
--color-secondary-300: #abf6e6;
49+
--color-secondary-400: #8ff2dd;
50+
--color-secondary-500: #73efd5;
5251

53-
--color-white: #ffffff;
54-
--color-gray: #f5f5f5;
52+
--color-white: #ffffff;
53+
--color-gray: #f5f5f5;
5554

56-
--color-black: #1f1f1f;
57-
--color-black-100: #d2d2d2;
58-
--color-black-300: #a5a5a5;
59-
--color-black-500: #797979;
60-
--color-black-700: #4c4c4c;
61-
--color-black-900: #1f1f1f;
55+
--color-black: #1f1f1f;
56+
--color-black-100: #d2d2d2;
57+
--color-black-300: #a5a5a5;
58+
--color-black-500: #797979;
59+
--color-black-700: #4c4c4c;
60+
--color-black-900: #1f1f1f;
6261

63-
--color-danger: #ff5255;
64-
--color-danger-100: #ffdcdd;
65-
--color-danger-200: #ffb1a7;
66-
--color-danger-300: #ff968e;
67-
--color-danger-400: #ff7b77;
68-
--color-danger-500: #ff5255;
62+
--color-danger: #ff5255;
63+
--color-danger-100: #ffdcdd;
64+
--color-danger-200: #ffb1a7;
65+
--color-danger-300: #ff968e;
66+
--color-danger-400: #ff7b77;
67+
--color-danger-500: #ff5255;
6968

70-
--color-green: #0fb340;
69+
--color-green: #0fb340;
70+
}
7171
}

‎infrastructure/control-panel/src/app.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!doctype html>
2-
<html lang="%paraglide.lang%">
2+
<html lang="en">
33
<head>
44
<meta charset="utf-8" />
55
<link rel="icon" href="%sveltekit.assets%/favicon.svg" />

‎infrastructure/control-panel/src/hooks.server.ts‎

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

‎infrastructure/control-panel/src/hooks.ts‎

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

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

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎infrastructure/control-panel/src/routes/demo/paraglide/+page.svelte‎

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

‎infrastructure/control-panel/vite.config.ts‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
1-
import { paraglideVitePlugin } from '@inlang/paraglide-js';
2-
import tailwindcss from '@tailwindcss/vite';
31
import { sveltekit } from '@sveltejs/kit/vite';
2+
import tailwindcss from '@tailwindcss/vite';
43
import { defineConfig } from 'vite';
54

65
export default defineConfig({
7-
plugins: [
8-
tailwindcss(),
9-
sveltekit(),
10-
paraglideVitePlugin({
11-
project: './project.inlang',
12-
outdir: './src/lib/paraglide'
13-
})
14-
]
6+
plugins: [tailwindcss(), sveltekit()]
157
});

‎infrastructure/web3-adapter/src/evault/evault.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,10 @@ export class EVaultClient {
190190
private async requestPlatformToken(): Promise<TokenInfo> {
191191
try {
192192
const response = await fetch(
193-
new URL("/platforms/certification", this.registryUrl).toString(),
193+
new URL(
194+
"/platforms/certification",
195+
this.registryUrl,
196+
).toString(),
194197
{
195198
method: "POST",
196199
headers: {
@@ -204,7 +207,7 @@ export class EVaultClient {
204207
throw new Error(`HTTP error! status: ${response.status}`);
205208
}
206209

207-
const data = await response.json() as PlatformTokenResponse;
210+
const data = (await response.json()) as PlatformTokenResponse;
208211
const now = Date.now();
209212
const expiresAt = data.expiresAt || now + 3600000; // Default 1 hour
210213

0 commit comments

Comments
 (0)