From f2fb4911832e337ebe8919db105434aea78b42df Mon Sep 17 00:00:00 2001 From: space-nuko <24979496+space-nuko@users.noreply.github.com> Date: Thu, 27 Apr 2023 16:11:46 -0700 Subject: [PATCH] Trying to use framework7 components --- package.json | 4 +- pnpm-lock.yaml | 53 ++- src/app.html | 16 +- src/lib/api.ts | 2 +- src/lib/components/ComfyApp.svelte | 2 - src/lib/components/ComfyApp.ts | 4 +- src/lib/defaultGraph.ts | 520 ++++++++++++++++++++++------- src/lib/stores/widgetState.ts | 3 +- src/lib/widgets/ComboWidget.svelte | 2 +- src/lib/widgets/RangeWidget.svelte | 88 ++++- src/lib/widgets/TextWidget.svelte | 2 +- src/routes/+page.svelte | 15 +- src/routes/+page.ts | 5 + src/scss/global.scss | 8 + src/scss/shared.scss | 0 svelte.config.js | 2 +- vite.config.ts | 4 +- 17 files changed, 577 insertions(+), 153 deletions(-) create mode 100644 src/scss/global.scss delete mode 100644 src/scss/shared.scss diff --git a/package.json b/package.json index 13a0e9e..5e4c6f8 100644 --- a/package.json +++ b/package.json @@ -42,10 +42,12 @@ "@gradio/theme": "workspace:*", "@gradio/upload": "workspace:*", "@gradio/utils": "workspace:*", - "@litegraph-ts/tsconfig": "workspace:*", "@litegraph-ts/core": "workspace:*", "@litegraph-ts/nodes-basic": "workspace:*", + "@litegraph-ts/tsconfig": "workspace:*", "events": "^3.3.0", + "framework7": "^8.0.3", + "framework7-svelte": "^8.0.3", "pollen-css": "^4.6.2", "radix-icons-svelte": "^1.2.1", "svelte-preprocess": "^5.0.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index defceac..7620a25 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -43,6 +43,12 @@ importers: events: specifier: ^3.3.0 version: 3.3.0 + framework7: + specifier: ^8.0.3 + version: 8.0.3 + framework7-svelte: + specifier: ^8.0.3 + version: 8.0.3 pollen-css: specifier: ^4.6.2 version: 4.6.2 @@ -3146,6 +3152,12 @@ packages: esutils: 2.0.3 dev: true + /dom7@4.0.6: + resolution: {integrity: sha512-emjdpPLhpNubapLFdjNL9tP06Sr+GZkrIHEXLWvOGsytACUrkbeIdjO5g77m00BrHTznnlcNqgmn7pCN192TBA==} + dependencies: + ssr-window: 4.0.2 + dev: false + /ecc-jsbn@0.1.2: resolution: {integrity: sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==} dependencies: @@ -3801,6 +3813,21 @@ packages: resolution: {integrity: sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==} dev: true + /framework7-svelte@8.0.3: + resolution: {integrity: sha512-SHirFqZBvm9E989Gyy59+pdBZdamZmqxLc/hklvorsY8llKpPuPBXbcS+fGvujvuhDq0fHHmN5tbLqYUPJ9Cyg==} + dev: false + + /framework7@8.0.3: + resolution: {integrity: sha512-5DGd9J4OdTUn9hfrRaxDXYXF4hx2RAV+xy+9tzq0+R5d6DgjeE/WkqJ5ElDToww9IVAsafZcRwZodd+4a0wr/Q==} + dependencies: + dom7: 4.0.6 + htm: 3.1.1 + path-to-regexp: 6.2.1 + skeleton-elements: 4.0.1 + ssr-window: 4.0.2 + swiper: 9.2.4 + dev: false + /fs-extra@10.1.0: resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==} engines: {node: '>=12'} @@ -3992,6 +4019,10 @@ packages: dependencies: function-bind: 1.1.1 + /htm@3.1.1: + resolution: {integrity: sha512-983Vyg8NwUE7JkZ6NmOqpCZ+sh1bKv2iYTlUkzlWmA5JD2acKoxd4KVxbMmxX/85mtfdnDmTFoNKcg5DGAvxNQ==} + dev: false + /html-escaper@2.0.2: resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==} dev: true @@ -4096,7 +4127,7 @@ packages: '@formatjs/ecma402-abstract': 1.11.4 '@formatjs/fast-memoize': 1.2.1 '@formatjs/icu-messageformat-parser': 2.1.0 - tslib: 2.3.1 + tslib: 2.5.0 dev: false /is-arrayish@0.2.1: @@ -5143,6 +5174,10 @@ packages: /path-parse@1.0.7: resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==} + /path-to-regexp@6.2.1: + resolution: {integrity: sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw==} + dev: false + /path-type@4.0.0: resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==} engines: {node: '>=8'} @@ -5648,6 +5683,10 @@ packages: resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==} dev: true + /skeleton-elements@4.0.1: + resolution: {integrity: sha512-T7YSF/Vu/raUcM6v3HiE4VSY/OvrNflg8Dur3Zza6VVJkq4slxm4pJRpGLNhoOfblIPZLQKh1cu7ADKveyqm/Q==} + dev: false + /slash@3.0.0: resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==} engines: {node: '>=8'} @@ -5716,6 +5755,10 @@ packages: tweetnacl: 0.14.5 dev: false + /ssr-window@4.0.2: + resolution: {integrity: sha512-ISv/Ch+ig7SOtw7G2+qkwfVASzazUnvlDTwypdLoPoySv+6MqlOV10VwPSE6EWkGjhW50lUmghPmpYZXMu/+AQ==} + dev: false + /stack-utils@2.0.6: resolution: {integrity: sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==} engines: {node: '>=10'} @@ -6134,6 +6177,13 @@ packages: resolution: {integrity: sha512-brIBNNB76mXFmU/Kerm4wFnkskBbluBDCjx/8TcpYRb298Yh2dztS2kQ6bhtjMcvUhd5ynClfwpz5h2gnzdQ1A==} engines: {node: '>= 8'} + /swiper@9.2.4: + resolution: {integrity: sha512-L7y3K/iiMXNYQ94FbfcJn7jex4QPnS4+voXGupTdC+UHW4XrR40QDdm4c9hXJ+Br0Il7PP0vP1W3goM9/Ly6Sg==} + engines: {node: '>= 4.7.0'} + dependencies: + ssr-window: 4.0.2 + dev: false + /sync-request@6.1.0: resolution: {integrity: sha512-8fjNkrNlNCrVc/av+Jn+xxqfCjYaBoHqCsDz6mt030UMxJGr+GSfCV1dQt2gRtlL63+VPidwDVLr7V2OcTSdRw==} engines: {node: '>=8.0.0'} @@ -6315,6 +6365,7 @@ packages: /tslib@2.3.1: resolution: {integrity: sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==} + dev: true /tslib@2.5.0: resolution: {integrity: sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==} diff --git a/src/app.html b/src/app.html index effe0d0..8c8df3e 100644 --- a/src/app.html +++ b/src/app.html @@ -2,11 +2,13 @@ - - - %sveltekit.head% - - -
%sveltekit.body%
- + + + + + %sveltekit.head% + + +
%sveltekit.body%
+ diff --git a/src/lib/api.ts b/src/lib/api.ts index ebe2b52..c831e0c 100644 --- a/src/lib/api.ts +++ b/src/lib/api.ts @@ -3,7 +3,7 @@ type PromptRequestBody = { prompt: any, extra_data: any, front: boolean, - number: number | null + number: number | undefined } export type QueueItemType = "queue" | "history"; diff --git a/src/lib/components/ComfyApp.svelte b/src/lib/components/ComfyApp.svelte index 004f9f3..f163e69 100644 --- a/src/lib/components/ComfyApp.svelte +++ b/src/lib/components/ComfyApp.svelte @@ -181,8 +181,6 @@