diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index ee0ffa7..5ea780b 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -8,12 +8,13 @@ env: PNPM_CACHE_FOLDER: .pnpm-store jobs: - setup: + build_and_deploy: runs-on: ubuntu-latest container: jimfx/nodes:latest steps: - name: ๐Ÿ“‘ Checkout Code uses: actions/checkout@v4 + - name: ๐Ÿ’พ Setup pnpm Cache uses: actions/cache@v4 with: @@ -21,52 +22,24 @@ jobs: key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }} restore-keys: | ${{ runner.os }}-pnpm- + - name: ๐Ÿ“ฆ Install Dependencies run: pnpm install --frozen-lockfile --store-dir ${{ env.PNPM_CACHE_FOLDER }} - - name: ๐Ÿ—œ๏ธ Tar Workspace - run: tar -cf workspace.tar --exclude="${{ env.PNPM_CACHE_FOLDER }}" . - - - name: ๐Ÿ“ค Upload Workspace - uses: actions/upload-artifact@v3 - with: - name: workspace-deps - path: workspace.tar - compression-level: 0 - - lint: - needs: setup - runs-on: ubuntu-latest - container: jimfx/nodes:latest - steps: - - name: ๐Ÿ“ฅ Download Workspace - uses: actions/download-artifact@v3 - with: - name: workspace-deps - - name: ๐Ÿ”“ Untar Workspace - run: tar -xf workspace.tar && rm workspace.tar - name: ๐Ÿงน Run Linter run: pnpm lint + - name: ๐ŸŽจ Check Formatting run: pnpm format:check + - name: ๐Ÿงฌ Type Check run: pnpm check - build_and_deploy: - if: github.ref == 'refs/heads/main' - needs: [lint] - runs-on: ubuntu-latest - container: jimfx/nodes:latest - steps: - - name: ๐Ÿ“ฅ Download Workspace - uses: actions/download-artifact@v3 - with: - name: workspace-deps - - name: ๐Ÿ”“ Untar Workspace - run: tar -xf workspace.tar && rm workspace.tar - name: ๐Ÿ› ๏ธ Build Site run: pnpm run build:deploy + - name: ๐Ÿ”‘ Configure rclone + if: github.ref == 'refs/heads/main' run: | echo "$SSH_PRIVATE_KEY" > /tmp/id_rsa chmod 600 /tmp/id_rsa @@ -79,6 +52,7 @@ jobs: SSH_USER: ${{ vars.SSH_USER }} - name: ๐Ÿš€ Deploy Changed Files via rclone + if: github.ref == 'refs/heads/main' run: | echo "Uploading the rest" rclone sync --update -v --progress --exclude _astro/** --stats 2s --stats-one-line ./app/build/ sftp-remote:${REMOTE_DIR} --transfers 4 diff --git a/app/src/app.css b/app/src/app.css index 563075f..731a79f 100644 --- a/app/src/app.css +++ b/app/src/app.css @@ -4,3 +4,7 @@ prefix: "i"; icon-sets: from-folder(custom, "./src/lib/icons"); } + +body * { + color: var(--color-text); +} diff --git a/app/src/lib/graph-interface/components/AddMenu.svelte b/app/src/lib/graph-interface/components/AddMenu.svelte index 0c6b6b9..d355ed7 100644 --- a/app/src/lib/graph-interface/components/AddMenu.svelte +++ b/app/src/lib/graph-interface/components/AddMenu.svelte @@ -149,7 +149,7 @@ } input { - background: var(--layer-0); + background: var(--color-layer-0); font-family: var(--font-family); border: none; border-radius: 5px; @@ -168,10 +168,10 @@ .add-menu-wrapper { position: absolute; - background: var(--layer-1); + background: var(--color-layer-1); border-radius: 7px; overflow: hidden; - border: solid 2px var(--layer-2); + border: solid 2px var(--color-layer-2); width: 150px; } .content { @@ -184,14 +184,14 @@ .result { padding: 1em 0.9em; - border-bottom: solid 1px var(--layer-2); + border-bottom: solid 1px var(--color-layer-2); opacity: 0.7; font-size: 0.9em; cursor: pointer; } .result[aria-selected="true"] { - background: var(--layer-2); + background: var(--color-layer-2); opacity: 1; } diff --git a/app/src/lib/graph-interface/components/BoxSelection.svelte b/app/src/lib/graph-interface/components/BoxSelection.svelte index eb17343..9e10b83 100644 --- a/app/src/lib/graph-interface/components/BoxSelection.svelte +++ b/app/src/lib/graph-interface/components/BoxSelection.svelte @@ -32,7 +32,7 @@ .box-selection { width: 40px; height: 20px; - border: solid 2px var(--outline); + border: solid 2px var(--color-outline); border-style: dashed; border-radius: 2px; } diff --git a/app/src/lib/graph-interface/components/HelpView.svelte b/app/src/lib/graph-interface/components/HelpView.svelte index 61dd8fb..1a62a66 100644 --- a/app/src/lib/graph-interface/components/HelpView.svelte +++ b/app/src/lib/graph-interface/components/HelpView.svelte @@ -88,12 +88,12 @@ position: fixed; pointer-events: none; transform: translate(var(--mx), var(--my)); - background: var(--layer-1); + background: var(--color-layer-1); border-radius: 5px; top: 10px; left: 10px; max-width: 250px; - border: 1px solid var(--outline); + border: 1px solid var(--color-outline); z-index: 10000; display: none; } diff --git a/app/src/lib/graph-interface/graph/Graph.svelte b/app/src/lib/graph-interface/graph/Graph.svelte index 6f14be2..bc36434 100644 --- a/app/src/lib/graph-interface/graph/Graph.svelte +++ b/app/src/lib/graph-interface/graph/Graph.svelte @@ -244,7 +244,7 @@ z-index: 1; width: 100%; height: 100%; - background: var(--layer-2); + background: var(--color-layer-2); opacity: 0; } input:disabled { @@ -264,8 +264,8 @@ border-radius: 5px; width: calc(100% - 20px); height: calc(100% - 25px); - border: dashed 4px var(--layer-2); - background: var(--layer-1); + border: dashed 4px var(--color-layer-2); + background: var(--color-layer-1); opacity: 0.5; } diff --git a/app/src/lib/graph-interface/graph/colors.svelte.ts b/app/src/lib/graph-interface/graph/colors.svelte.ts index e53647c..6f1f5a9 100644 --- a/app/src/lib/graph-interface/graph/colors.svelte.ts +++ b/app/src/lib/graph-interface/graph/colors.svelte.ts @@ -14,7 +14,7 @@ const variables = [ function getColor(variable: (typeof variables)[number]) { const style = getComputedStyle(document.body.parentElement!); - const color = style.getPropertyValue(`--${variable}`); + const color = style.getPropertyValue(`--color-${variable}`); return new Color().setStyle(color, LinearSRGBColorSpace); } @@ -27,7 +27,7 @@ $effect.root(() => { if (!appSettings.value.theme || !('getComputedStyle' in globalThis)) return; const style = getComputedStyle(document.body.parentElement!); for (const v of variables) { - const hex = style.getPropertyValue(`--${v}`); + const hex = style.getPropertyValue(`--color-${v}`); colors[v].setStyle(hex, LinearSRGBColorSpace); } }); diff --git a/app/src/lib/graph-interface/node/NodeHTML.svelte b/app/src/lib/graph-interface/node/NodeHTML.svelte index 51dca40..8cb2b8d 100644 --- a/app/src/lib/graph-interface/node/NodeHTML.svelte +++ b/app/src/lib/graph-interface/node/NodeHTML.svelte @@ -71,22 +71,22 @@ user-select: none !important; cursor: pointer; width: 200px; - color: var(--text-color); + color: var(--color-text); transform: translate3d(var(--nx), var(--ny), 0); z-index: 1; opacity: calc((var(--cz) - 2.5) / 3.5); font-weight: 300; - --stroke: var(--outline); + --stroke: var(--color-outline); --stroke-width: 2px; } .node.active { - --stroke: var(--active); + --stroke: var(--color-active); --stroke-width: 2px; } .node.selected { - --stroke: var(--selected); + --stroke: var(--color-selected); --stroke-width: 2px; } diff --git a/app/src/lib/graph-interface/node/NodeHeader.svelte b/app/src/lib/graph-interface/node/NodeHeader.svelte index 6652d55..9809ec0 100644 --- a/app/src/lib/graph-interface/node/NodeHeader.svelte +++ b/app/src/lib/graph-interface/node/NodeHeader.svelte @@ -109,7 +109,7 @@ svg path { stroke-width: 0.2px; transition: d 0.3s ease, fill 0.3s ease; - fill: var(--layer-2); + fill: var(--color-layer-2); stroke: var(--stroke); stroke-width: var(--stroke-width); d: var(--path); diff --git a/app/src/lib/graph-interface/node/NodeParameter.svelte b/app/src/lib/graph-interface/node/NodeParameter.svelte index 8581a51..e5fcd3e 100644 --- a/app/src/lib/graph-interface/node/NodeParameter.svelte +++ b/app/src/lib/graph-interface/node/NodeParameter.svelte @@ -175,7 +175,7 @@ svg path { transition: d 0.3s ease, fill 0.3s ease; - fill: var(--layer-1); + fill: var(--color-layer-1); stroke: var(--stroke); stroke-width: var(--stroke-width); d: var(--path); diff --git a/app/src/lib/grid/Cell.svelte b/app/src/lib/grid/Cell.svelte index 49911fa..83d775b 100644 --- a/app/src/lib/grid/Cell.svelte +++ b/app/src/lib/grid/Cell.svelte @@ -62,7 +62,7 @@ cursor: ew-resize; height: 100%; width: 1px; - background: var(--outline); + background: var(--color-outline); } .seperator::before { content: ""; diff --git a/app/src/lib/node-store/BreadCrumbs.svelte b/app/src/lib/node-store/BreadCrumbs.svelte index c1a639e..d2fff15 100644 --- a/app/src/lib/node-store/BreadCrumbs.svelte +++ b/app/src/lib/node-store/BreadCrumbs.svelte @@ -1,5 +1,5 @@ -
+

Project

{#if showNewProject} -
+
diff --git a/app/src/lib/sidebar/Panel.svelte b/app/src/lib/sidebar/Panel.svelte index 19b0bc0..603fe36 100644 --- a/app/src/lib/sidebar/Panel.svelte +++ b/app/src/lib/sidebar/Panel.svelte @@ -33,8 +33,8 @@ {#if panelState.activePanel.value === id}
{#if title} -
-

{title}

+
+

{title}

{/if} {@render children?.()} @@ -43,7 +43,7 @@ diff --git a/packages/ui/src/lib/inputs/Checkbox.svelte b/packages/ui/src/lib/inputs/InputCheckbox.svelte similarity index 84% rename from packages/ui/src/lib/inputs/Checkbox.svelte rename to packages/ui/src/lib/inputs/InputCheckbox.svelte index f2c2185..1435b91 100644 --- a/packages/ui/src/lib/inputs/Checkbox.svelte +++ b/packages/ui/src/lib/inputs/InputCheckbox.svelte @@ -18,7 +18,7 @@