Skip to content

Commit

Permalink
basic split screen
Browse files Browse the repository at this point in the history
  • Loading branch information
Brendonovich committed Oct 10, 2024
1 parent 8dfa05f commit 4951cff
Show file tree
Hide file tree
Showing 26 changed files with 4,163 additions and 3,734 deletions.
4 changes: 2 additions & 2 deletions apps/desktop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"dependencies": {
"@iconify/json": "^2.2.196",
"@kobalte/core": "^0.13.4",
"@kobalte/core": "^0.13.6",
"@macrograph/api-contract": "workspace:*",
"@macrograph/interface": "workspace:*",
"@macrograph/packages": "workspace:*",
Expand All @@ -28,7 +28,7 @@
"@tauri-apps/api": "^1.5.3",
"@ts-rest/core": "^3.41.1",
"@ts-rest/solid-query": "^3.41.1",
"solid-js": "^1.8.20",
"solid-js": "^1.9.1",
"solid-sonner": "^0.2.5",
"tauri-plugin-midi": "workspace:*",
"valibot": "^0.37.0",
Expand Down
2 changes: 1 addition & 1 deletion apps/storybook/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"dependencies": {
"@storybook/docs-tools": "^8.2.7",
"solid-js": "^1.8.20"
"solid-js": "^1.9.1"
},
"devDependencies": {
"@chromatic-com/storybook": "^1.6.1",
Expand Down
4 changes: 2 additions & 2 deletions apps/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@fontsource/geist-sans": "^5.0.3",
"@fontsource/source-sans-pro": "^5.0.8",
"@iconify/json": "^2.2.196",
"@kobalte/core": "^0.13.4",
"@kobalte/core": "^0.13.6",
"@lucia-auth/adapter-drizzle": "^1.0.7",
"@macrograph/api-contract": "workspace:*",
"@macrograph/clipboard": "workspace:*",
Expand Down Expand Up @@ -46,7 +46,7 @@
"oslo": "^1.2.0",
"pg": "^8.11.5",
"postgres": "^3.4.4",
"solid-js": "^1.8.20",
"solid-js": "^1.9.1",
"solid-mdx": "^0.0.7",
"solid-sonner": "^0.2.5",
"solid-transition-group": "^0.2.3",
Expand Down
1 change: 1 addition & 0 deletions apps/web/src/app/docs/[...catchall].md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# todo
3 changes: 0 additions & 3 deletions apps/web/src/app/docs/[...catchall].tsx

This file was deleted.

4 changes: 2 additions & 2 deletions interface/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"./tailwind.config.js": "./tailwind.config.js"
},
"dependencies": {
"@kobalte/core": "^0.13.4",
"@kobalte/core": "^0.13.6",
"@macrograph/action-history": "workspace:*",
"@macrograph/api-contract": "workspace:*",
"@macrograph/clipboard": "workspace:*",
Expand Down Expand Up @@ -38,7 +38,7 @@
"@ts-rest/core": "^3.41.1",
"@ts-rest/solid-query": "^3.41.1",
"clsx": "^1.2.1",
"solid-js": "^1.8.20",
"solid-js": "^1.9.1",
"solid-sonner": "^0.2.5",
"valibot": "^0.37.0",
"zod": "^3.22.4"
Expand Down
70 changes: 35 additions & 35 deletions interface/src/ActionHistory.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,41 +2,41 @@ import { For, Show } from "solid-js";
import { useInterfaceContext } from "./context";

export function ActionHistory() {
const ctx = useInterfaceContext();
const ctx = useInterfaceContext();

return (
<ul class="absolute rounded top-4 right-4 bg-neutral-900 max-w-64 w-full p-2 flex flex-col">
<For
each={ctx.history}
fallback={
<span class="w-full text-center text-neutral-300 text-sm">
No History
</span>
}
>
{(entry, i) => (
<div class="pl-4 py-0.5 relative">
<div class="w-4 absolute inset-y-0 left-0 flex items-center justify-center">
<Show when={ctx.nextHistoryIndex() - 1 === i()}>
<IconMaterialSymbolsArrowRightRounded class="w-6 h-6 -m-1" />
</Show>
</div>
return (
<ul class="absolute rounded top-4 right-4 bg-neutral-900 max-w-64 w-full p-2 flex flex-col">
<For
each={ctx.history}
fallback={
<span class="w-full text-center text-neutral-300 text-sm">
No History
</span>
}
>
{(entry, i) => (
<div class="pl-4 py-0.5 relative">
<div class="w-4 absolute inset-y-0 left-0 flex items-center justify-center">
<Show when={ctx.nextHistoryIndex() - 1 === i()}>
<IconMaterialSymbolsArrowRightRounded class="w-6 h-6 -m-1" />
</Show>
</div>

<For each={entry}>
{(e) => (
<li
class="flex flex-row items-center"
classList={{
"border-l-2 border-neutral-800 pl-2": entry.length > 1,
}}
>
{e.type}
</li>
)}
</For>
</div>
)}
</For>
</ul>
);
<For each={entry}>
{(e) => (
<li
class="flex flex-row items-center"
classList={{
"border-l-2 border-neutral-800 pl-2": entry.length > 1,
}}
>
{e.type}
</li>
)}
</For>
</div>
)}
</For>
</ul>
);
}
6 changes: 1 addition & 5 deletions interface/src/Sidebar/Project/Graphs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,7 @@ import { IconButton } from "../../components/ui";
import { useInterfaceContext } from "../../context";
import { Button } from "../../settings/ui";
import { createTokenisedSearchFilter, tokeniseString } from "../../util";
import {
InlineTextEditor,
InlineTextEditorContext,
useInlineTextEditorCtx,
} from "../InlineTextEditor";
import { InlineTextEditor, InlineTextEditorContext } from "../InlineTextEditor";
import { SearchInput } from "../SearchInput";

interface Props {
Expand Down
Loading

0 comments on commit 4951cff

Please sign in to comment.