diff --git a/bun.lockb b/bun.lockb index 35b3e761..ab3293e0 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/package.json b/package.json index fc081049..ffe52ea2 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "@dicebear/core": "^6.0.4", "@dicebear/initials": "^6.0.4", "markdown-it": "^13.0.1", - "mono-svelte": "^1.4.5" + "mono-svelte": "latest" }, "overrides": { "@rollup/plugin-node-resolve": "^15.2.3", diff --git a/src/lib/components/markdown/MarkdownEditor.svelte b/src/lib/components/markdown/MarkdownEditor.svelte index bea100a5..373f01e8 100644 --- a/src/lib/components/markdown/MarkdownEditor.svelte +++ b/src/lib/components/markdown/MarkdownEditor.svelte @@ -8,6 +8,7 @@ import { createEventDispatcher } from 'svelte' import { CodeBracket, + DocumentPlus, ExclamationTriangle, Icon, Link, @@ -60,16 +61,17 @@ let uploadingImage = false let loading = false - let image: FileList | null = null + let image: any + $: previewURL = image instanceof FileList ? URL.createObjectURL(image[0]) : image ? URL.createObjectURL(image) : '' async function upload() { - if (!$profile?.jwt || image == null) return + if (!$profile?.jwt || !image) return loading = true try { const uploaded = await uploadImage( - image[0], + image instanceof FileList ? image[0] : image, $profile.instance, $profile.jwt ) @@ -105,7 +107,35 @@ Upload image
- +
+ +
@@ -251,6 +281,14 @@ overflow-hidden focus-within:border-black focus-within:dark:border-white transit } } }} + on:paste={(e) => { + if (!e.clipboardData?.files) return + const files = Array.from(e.clipboardData.files) + if (files[0]?.type.startsWith('image/')) { + image = e.clipboardData.files[0] + uploadingImage = true + } + }} {rows} {...$$restProps} /> diff --git a/src/lib/ui/colors.ts b/src/lib/ui/colors.ts index 4bd62e22..7028b2f7 100644 --- a/src/lib/ui/colors.ts +++ b/src/lib/ui/colors.ts @@ -116,7 +116,6 @@ export function colorsToVars(colors: Colors): string { let vars: string[] = [] for (let category in colors) { for (let shade in colors[category as keyof Colors]) { - console.log(shade) if (category) // @ts-ignore vars.push(`--c-${category.slice(0, 1)}-${shade}:${colors[category][shade]}`) @@ -128,14 +127,14 @@ export function colorsToVars(colors: Colors): string { export const colorToVar = (category: keyof Colors, shade: keyof keyof Colors): string => `--c-${category.slice(0,2)}-${shade.toString()}` -colors.subscribe((v) => { - -}) function loadColors() { const loaded = localStorage.getItem('colors') if (!loaded) return colors.set(JSON.parse(loaded)) + colors.subscribe((v) => { + localStorage.setItem('colors', JSON.stringify(v)) + }) } if (browser) { @@ -143,16 +142,6 @@ if (browser) { } - - - - - - - - - - const configuredLegacyTheme = env.PUBLIC_LEGACYTHEME ?? 'system' export const legacyTheme = writable<'system' | 'light' | 'dark'>( configuredLegacyTheme as 'system' | 'light' | 'dark' diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 6321cbb5..50fb7dc4 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -10,7 +10,7 @@ import { pwaInfo } from 'virtual:pwa-info' import { inDarkLegacyTheme, legacyTheme } from '$lib/ui/colors.js' import { userSettings } from '$lib/settings.js' - import { Button, Spinner, ToastContainer } from 'mono-svelte' + import { Button, ModalContainer, Spinner, ToastContainer } from 'mono-svelte' import { onMount } from 'svelte' import { browser } from '$app/environment' import { Forward, Icon } from 'svelte-hero-icons' @@ -95,6 +95,7 @@ + - import { Button, Material, Modal, TextArea, toast } from 'mono-svelte' + import { + Button, + Material, + Modal, + TextArea, + action, + modal, + toast, + } from 'mono-svelte' import { defaultColors, type Colors, colors } from '$lib/ui/colors' - import { ArrowDownTray, ArrowUpTray, Bookmark, Icon } from 'svelte-hero-icons' + import { + ArrowDownTray, + ArrowPath, + ArrowUpTray, + Bookmark, + Icon, + } from 'svelte-hero-icons' const c = defaultColors @@ -57,6 +71,32 @@ Export +
{#each svelteIntellisenseSucks() as category}