From aaf4a7461a34c9f256f2f32008ad0eb53bbdb448 Mon Sep 17 00:00:00 2001 From: Samuel Andert Date: Wed, 6 Sep 2023 15:08:55 +0200 Subject: [PATCH] Major UI upgrade --- package.json | 1 + pnpm-lock.yaml | 17 +++++ src/lib/ACCs.svelte | 89 ++++++++++++------------ src/lib/Wallet.svelte | 68 ++++++++++++------ src/lib/layouts/HeaderMain.svelte | 8 +++ src/lib/machines/walletMachine.ts | 8 ++- src/routes/+layout.svelte | 21 +++--- src/routes/+page.svelte | 38 +++++----- src/routes/acc/+page.svelte | 5 -- src/routes/me/+layout.svelte | 15 ++++ src/routes/me/+page.svelte | 24 +++---- src/routes/me/acc/+page.svelte | 14 ++++ src/routes/me/projects/+page.svelte | 28 ++++++++ src/routes/server/wundergraph/+server.ts | 2 +- tailwind.config.ts | 2 + 15 files changed, 220 insertions(+), 120 deletions(-) create mode 100644 src/lib/layouts/HeaderMain.svelte delete mode 100644 src/routes/acc/+page.svelte create mode 100644 src/routes/me/+layout.svelte create mode 100644 src/routes/me/acc/+page.svelte create mode 100644 src/routes/me/projects/+page.svelte diff --git a/package.json b/package.json index 28c561b..821421a 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "@sveltejs/adapter-auto": "^2.0.0", "@sveltejs/adapter-static": "^2.0.3", "@sveltejs/kit": "^1.5.0", + "@tailwindcss/forms": "^0.5.6", "@tauri-apps/cli": "^1.4.0", "@types/cookie": "^0.5.1", "@types/js-cookie": "^3.0.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4605519..63fb009 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -111,6 +111,9 @@ devDependencies: '@sveltejs/kit': specifier: ^1.5.0 version: 1.5.0(svelte@3.54.0)(vite@4.2.0) + '@tailwindcss/forms': + specifier: ^0.5.6 + version: 0.5.6(tailwindcss@3.3.3) '@tauri-apps/cli': specifier: ^1.4.0 version: 1.4.0 @@ -4612,6 +4615,15 @@ packages: - supports-color dev: true + /@tailwindcss/forms@0.5.6(tailwindcss@3.3.3): + resolution: {integrity: sha512-Fw+2BJ0tmAwK/w01tEFL5TiaJBX1NLT1/YbWgvm7ws3Qcn11kiXxzNTEQDMs5V3mQemhB56l3u0i9dwdzSQldA==} + peerDependencies: + tailwindcss: '>=3.0.0 || >= 3.0.0-alpha.1' + dependencies: + mini-svg-data-uri: 1.4.4 + tailwindcss: 3.3.3 + dev: true + /@tanstack/query-core@4.29.1: resolution: {integrity: sha512-vkPewLEG8ua0efo3SsVT0BcBtkq5RZX8oPhDAyKL+k/rdOYSQTEocfGEXSaBwIwsXeOGBUpfKqI+UmHvNqdWXg==} dev: false @@ -9377,6 +9389,11 @@ packages: engines: {node: '>=4'} dev: true + /mini-svg-data-uri@1.4.4: + resolution: {integrity: sha512-r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg==} + hasBin: true + dev: true + /minimalistic-assert@1.0.1: resolution: {integrity: sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==} dev: false diff --git a/src/lib/ACCs.svelte b/src/lib/ACCs.svelte index 0ed0288..b9b7325 100644 --- a/src/lib/ACCs.svelte +++ b/src/lib/ACCs.svelte @@ -24,51 +24,48 @@ } -
-

Access Control Conditions

- {#each signingConditions as condition, index (index)} - {#each condition.accs as acc} -
- {condition.resourceId.baseUrl}{condition.resourceId.path} -

- {acc.parameters.join(", ")} - {acc.returnValueTest.comparator} - {acc.returnValueTest.value} -

-

- {JSON.stringify(condition)} -

-
- {/each} -

-

- +

Access Control Conditions

+{#each signingConditions as condition, index (index)} + {#each condition.accs as acc} +
+ {condition.resourceId.baseUrl}{condition.resourceId.path} +

+ {acc.parameters.join(", ")} + {acc.returnValueTest.comparator} + {acc.returnValueTest.value} +

+

+ {JSON.stringify(condition)} +

+
{/each} -
- - - - -
+

+

+ +{/each} +

+ + + +
diff --git a/src/lib/Wallet.svelte b/src/lib/Wallet.svelte index b372d0b..842bad5 100644 --- a/src/lib/Wallet.svelte +++ b/src/lib/Wallet.svelte @@ -13,6 +13,7 @@ const { state, send } = useMachine(walletMachine); const drawerStore = getDrawerStore(); + let search = ""; $: walletState.set($state.context); $: { @@ -73,30 +74,55 @@
{:else if $state.context.pkps} -
+
-
-
-

- Address: - {$state.context.pkps[0].ethAddress} -

-

- Provider: - {$state.context.providerName} -

+
+ +
+
+
+ +
+ + + +
- -
{:else if $state.matches("sessionExpired")} diff --git a/src/lib/layouts/HeaderMain.svelte b/src/lib/layouts/HeaderMain.svelte new file mode 100644 index 0000000..bde0675 --- /dev/null +++ b/src/lib/layouts/HeaderMain.svelte @@ -0,0 +1,8 @@ +
+
+

+
+
+ +
+
diff --git a/src/lib/machines/walletMachine.ts b/src/lib/machines/walletMachine.ts index 3ede265..7f977c5 100644 --- a/src/lib/machines/walletMachine.ts +++ b/src/lib/machines/walletMachine.ts @@ -49,9 +49,11 @@ const walletMachine = createMachine({ }, onDone: { target: 'creatingSession', - actions: assign({ - pkps: (_, event) => event.data, - }), + actions: [ + assign({ + pkps: (_, event) => event.data, + }) + ], }, onError: 'authenticated', }, diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 02c8131..192e876 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -24,15 +24,16 @@ let signingConditions = signingConditionsCookie ? JSON.parse(signingConditionsCookie) : []; - console.log("layout signingConditions: ", signingConditions); // Add this line + console.log("layout signingConditions: ", signingConditions); let correctCondition = signingConditions ? signingConditions.find( (condition) => condition.resourceId.baseUrl === "https://localhost:3000" && - condition.resourceId.path === "/server/wundergraph" + condition.resourceId.path === "/server/wundergraph" && + condition.resourceId.role === "owner" ) : null; - console.log("layout correctcondition: ", correctCondition); // Update this line + console.log("layout correctcondition: ", correctCondition); const token = correctCondition ? correctCondition.jwt : null; @@ -58,16 +59,9 @@ {/if} -
+
-
-
- -
-
+
@@ -76,6 +70,9 @@