Skip to content

Commit

Permalink
chore: save progress
Browse files Browse the repository at this point in the history
  • Loading branch information
o-az committed May 21, 2024
1 parent ee97bfd commit e830732
Show file tree
Hide file tree
Showing 12 changed files with 261 additions and 64 deletions.
2 changes: 1 addition & 1 deletion app/app.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
{
packages = {
app = unstablePkgs.buildNpmPackage {
npmDepsHash = "sha256-kviCUpabT9qEJTIx/95rnIhl6pTFOoraeZ/x2Qevkgs=";
npmDepsHash = "sha256-/p0TTkE6HSk/nb7sDMSFaxoKtvODynO9cX7cPjffYuI=";
src = ./.;
sourceRoot = "app";
npmFlags = [ "--legacy-peer-deps" ];
Expand Down
53 changes: 39 additions & 14 deletions app/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,14 @@
"@tanstack/svelte-query": "^5.37.1",
"@tanstack/svelte-query-persist-client": "^5.37.1",
"@tanstack/svelte-table": "^8.17.3",
"@tanstack/svelte-virtual": "^3.5.0",
"@union/client": "npm:@jsr/union__client@^0.0.1-rc.9",
"@urql/exchange-graphcache": "^7.1.0",
"@urql/exchange-persisted": "^4.3.0",
"@urql/exchange-retry": "^1.3.0",
"@urql/svelte": "^4.2.0",
"@wagmi/connectors": "^5.0.2",
"@wagmi/core": "^2.10.2",
"@wagmi/connectors": "^5.0.3",
"@wagmi/core": "^2.10.3",
"@web3modal/wagmi": "^4.2.1",
"bits-ui": "^0.21.9",
"cmdk-sv": "^0.0.17",
Expand Down Expand Up @@ -68,7 +69,7 @@
"@melt-ui/svelte": "^0.79.1",
"@svelte-put/shortcut": "^3.1.1",
"@sveltejs/adapter-static": "^3.0.1",
"@sveltejs/kit": "^2.5.9",
"@sveltejs/kit": "^2.5.10",
"@sveltejs/vite-plugin-svelte": "^3.1.0",
"@tailwindcss/aspect-ratio": "^0.4.2",
"@tailwindcss/container-queries": "^0.1.1",
Expand Down
13 changes: 2 additions & 11 deletions app/src/generated/graphql-env.d.ts

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion app/src/lib/components/ui/button/button.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ type $$Props = Props
type $$Events = Events
let className: $$Props["class"] = undefined
export let value: $$Props["value"] = ""
export let variant: $$Props["variant"] = "default"
export let size: $$Props["size"] = "default"
export let builders: $$Props["builders"] = []
Expand All @@ -23,5 +24,7 @@ export { className as class }
on:click
on:keydown
>
<slot />
<slot>
{value}
</slot>
</ButtonPrimitive.Root>
1 change: 1 addition & 0 deletions app/src/lib/components/ui/button/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ type Props = ButtonPrimitive.Props & {
variant?: Variant
size?: Size
name?: string
value?: any
}

type Events = ButtonPrimitive.Events
Expand Down
10 changes: 10 additions & 0 deletions app/src/lib/components/ui/scroll-area/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import Scrollbar from "./scroll-area-scrollbar.svelte"
import Root from "./scroll-area.svelte"

export {
Root,
Scrollbar,
//,
Root as ScrollArea,
Scrollbar as ScrollAreaScrollbar
}
27 changes: 27 additions & 0 deletions app/src/lib/components/ui/scroll-area/scroll-area-scrollbar.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<script lang="ts">
import { ScrollArea as ScrollAreaPrimitive } from "bits-ui"
import { cn } from "$lib/utilities/shadcn.js"
type $$Props = ScrollAreaPrimitive.ScrollbarProps & {
orientation?: "vertical" | "horizontal"
}
let className: $$Props["class"] = undefined
export let orientation: $$Props["orientation"] = "vertical"
export { className as class }
</script>

<ScrollAreaPrimitive.Scrollbar
{orientation}
class={cn(
"flex touch-none select-none transition-colors",
orientation === "vertical" && "h-full w-2.5 border-l border-l-transparent p-px",
orientation === "horizontal" && "h-2.5 w-full border-t border-t-transparent p-px",
className
)}
>
<slot />
<ScrollAreaPrimitive.Thumb
class={cn("relative rounded-full bg-border", orientation === "vertical" && "flex-1")}
/>
</ScrollAreaPrimitive.Scrollbar>
32 changes: 32 additions & 0 deletions app/src/lib/components/ui/scroll-area/scroll-area.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<script lang="ts">
import { ScrollArea as ScrollAreaPrimitive } from "bits-ui"
import { Scrollbar } from "./index.js"
import { cn } from "$lib/utilities/shadcn.js"
type $$Props = ScrollAreaPrimitive.Props & {
orientation?: "vertical" | "horizontal" | "both"
scrollbarXClasses?: string
scrollbarYClasses?: string
}
let className: $$Props["class"] = undefined
export { className as class }
export let orientation = "vertical"
export let scrollbarXClasses = ""
export let scrollbarYClasses = ""
</script>

<ScrollAreaPrimitive.Root {...$$restProps} class={cn("relative overflow-hidden", className)}>
<ScrollAreaPrimitive.Viewport class="h-full w-full rounded-[inherit]">
<ScrollAreaPrimitive.Content>
<slot />
</ScrollAreaPrimitive.Content>
</ScrollAreaPrimitive.Viewport>
{#if orientation === "vertical" || orientation === "both"}
<Scrollbar orientation="vertical" class={scrollbarYClasses} />
{/if}
{#if orientation === "horizontal" || orientation === "both"}
<Scrollbar orientation="horizontal" class={scrollbarXClasses} />
{/if}
<ScrollAreaPrimitive.Corner />
</ScrollAreaPrimitive.Root>
9 changes: 0 additions & 9 deletions app/src/lib/components/ui/tabs/components/button.svelte

This file was deleted.

2 changes: 2 additions & 0 deletions app/src/lib/utilities/types.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
export type NonNullable<T> = T extends null | undefined ? never : T

export type TODO = any

export type Nullable<T> = T | null | undefined
Expand Down
Loading

0 comments on commit e830732

Please sign in to comment.