Compare commits

..

No commits in common. "c59afe3893e50b5c87102a07c62b6fb17030c342" and "2b6080ba7e5e091f8f9b3b8e0404c570baac9bf8" have entirely different histories.

11 changed files with 32 additions and 78 deletions

View File

@ -1,5 +0,0 @@
{
"recommendations": [
"inlang.vs-code-extension"
]
}

View File

@ -1,5 +1,4 @@
{ {
"$schema": "https://inlang.com/schema/inlang-message-format", "$schema": "https://inlang.com/schema/inlang-message-format",
"hello_world": "Hello, {name} from sv!", "hello_world": "Hello, {name} from sv!"
"stt": "skrivtolkning"
} }

3
package-lock.json generated
View File

@ -8,7 +8,7 @@
"name": "code", "name": "code",
"version": "0.0.1", "version": "0.0.1",
"dependencies": { "dependencies": {
"@inlang/paraglide-sveltekit": "0.15.5", "@inlang/paraglide-sveltekit": "^0.15.5",
"@libsql/client": "^0.14.0", "@libsql/client": "^0.14.0",
"@node-rs/argon2": "^2.0.2", "@node-rs/argon2": "^2.0.2",
"@oslojs/crypto": "^1.0.1", "@oslojs/crypto": "^1.0.1",
@ -21,7 +21,6 @@
"devDependencies": { "devDependencies": {
"@eslint/compat": "^1.2.5", "@eslint/compat": "^1.2.5",
"@eslint/js": "^9.18.0", "@eslint/js": "^9.18.0",
"@inlang/paraglide-js": "1.11.8",
"@playwright/test": "^1.49.1", "@playwright/test": "^1.49.1",
"@sveltejs/adapter-auto": "^4.0.0", "@sveltejs/adapter-auto": "^4.0.0",
"@sveltejs/kit": "^2.16.0", "@sveltejs/kit": "^2.16.0",

View File

@ -22,7 +22,6 @@
"devDependencies": { "devDependencies": {
"@eslint/compat": "^1.2.5", "@eslint/compat": "^1.2.5",
"@eslint/js": "^9.18.0", "@eslint/js": "^9.18.0",
"@inlang/paraglide-js": "1.11.8",
"@playwright/test": "^1.49.1", "@playwright/test": "^1.49.1",
"@sveltejs/adapter-auto": "^4.0.0", "@sveltejs/adapter-auto": "^4.0.0",
"@sveltejs/kit": "^2.16.0", "@sveltejs/kit": "^2.16.0",
@ -53,7 +52,7 @@
"zod": "^3.24.1" "zod": "^3.24.1"
}, },
"dependencies": { "dependencies": {
"@inlang/paraglide-sveltekit": "0.15.5", "@inlang/paraglide-sveltekit": "^0.15.5",
"@libsql/client": "^0.14.0", "@libsql/client": "^0.14.0",
"@node-rs/argon2": "^2.0.2", "@node-rs/argon2": "^2.0.2",
"@oslojs/crypto": "^1.0.1", "@oslojs/crypto": "^1.0.1",

View File

@ -23,18 +23,16 @@
}; };
let importing = false; let importing = false;
let progress = 0; let progress = 0;
const handleImport = async () => { const handleImport = () => {
importing = true; importing = true;
const l: List = { name: form.name, type: form.type ? 1 : 0, updated: new Date() }; const l: List = { name: form.name, type: form.type ? 1 : 0, updated: new Date() };
const listid = await createShortformList(l); createShortformList(l);
let sfs = [] form.textarea.split('\n').forEach((sf, i, sfs) => {
form.textarea.split('\n').forEach((line) => { progress = 100 * (i / sfs.length);
const fields = line.split("=") if (Math.random() > 0.8) {
if (fields.length == 2) { setTimeout(() => {}, 125);
sfs.push({shortform: fields[0], phrase: fields[1], used: 0, listid: listid})
} }
}); });
importShortforms(sfs)
}; };
const cancelImport = () => { const cancelImport = () => {
importState.data = ''; importState.data = '';

View File

@ -6,28 +6,9 @@
import { getCurrentWord, insertExpandedPhrase, insertText } from '$lib/textarea/main'; import { getCurrentWord, insertExpandedPhrase, insertText } from '$lib/textarea/main';
import { cacheShortforms, expandShortform } from '../modules/shortforms'; import { cacheShortforms, expandShortform } from '../modules/shortforms';
import { defaultExpanders } from '../modules/keyboard'; import { defaultExpanders } from '../modules/keyboard';
import { db, type Shortform } from '../db/main'; import type { Shortform } from '../db/main';
import { liveQuery } from "dexie"; import AccordionTrigger from '$lib/components/ui/accordion/accordion-trigger.svelte';
import * as Select from "$lib/components/ui/select/index.js";
let styles = {
"text-bg": "#333333",
"text-fg": "#baff00",
}
$: cssVarStyles = Object.entries(styles)
.map(([key, value]) => `--${key}:${value}`)
.join(';');
$: standardLists = liveQuery( async () => {
return await db.lists.toArray()
}
)
let selectedStandardList = {}
const selectedStandardListChanged = (v) => {
shortforms.cache = cacheShortforms([Number(v.value)]);
}
let state = { let state = {
capitalizeNext: true, capitalizeNext: true,
currentWord: '' currentWord: ''
@ -97,24 +78,8 @@
*/ */
</script> </script>
<div class="docContainer h-full flex flex-col" role="application" id="docContainer"> <div class="docContainer" role="application" id="docContainer">
<textarea style={cssVarStyles} class="textarea flex-grow" id="doc" on:keyup={change} on:beforeinput={input} bind:value={text}></textarea> <textarea id="doc" rows="4" on:keyup={change} on:beforeinput={input} bind:value={text}></textarea>
<Select.Root
selected={selectedStandardList}
onSelectedChange={selectedStandardListChanged}
class="flex-none"
>
<Select.Trigger>
<Select.Value placeholder="Välj standardlista" />
</Select.Trigger>
<Select.Content>
<Select.Group>
{#each $standardLists as list}
<Select.Item value={list.id} label={list.name}>{list.name}</Select.Item>
{/each}
</Select.Group>
</Select.Content>
</Select.Root>
</div> </div>
<style lang="postcss"> <style lang="postcss">
@ -123,12 +88,9 @@
} }
.docContainer textarea { .docContainer textarea {
width: 100%; width: 100%;
color: black;
padding: 0.3em; padding: 0.3em;
resize: none; resize: none;
font-size: 2em; font-size: 2em;
} }
.textarea {
color: var(--text-fg, black);
background-color: var(--text-bg, white);
}
</style> </style>

View File

@ -2,13 +2,12 @@ import default_shortforms from "./shortforms.se.json";
import { db, type Shortform, type List } from "./main" import { db, type Shortform, type List } from "./main"
export const importShortforms = (shortforms: Array<Shortform>) => { export const importShortforms = (shortforms: Array<Shortform>) => {
const used = new Date(0) /*
const updated = Date.now()
shortforms.map((sf: Shortform) => { shortforms.map((sf: Shortform) => {
db.shortforms.add({ shortform: sf.shortform, phrase: sf.phrase, listid: sf.listid, used, uses: 0, remind: -1, updated }) db.shortforms.add({ shortform: sf.sf, phrase: sf.p })
}) })
*/
} }
export const importDefaultShortforms = () => { export const importDefaultShortforms = () => {
const shortforms = default_shortforms.shortforms const shortforms = default_shortforms.shortforms
const list: List = { id: default_shortforms.listid, type: default_shortforms.type, name: default_shortforms.name, updated: new Date(default_shortforms.updated) } const list: List = { id: default_shortforms.listid, type: default_shortforms.type, name: default_shortforms.name, updated: new Date(default_shortforms.updated) }

View File

@ -46,15 +46,18 @@ export class SkrivertDB extends Dexie {
if (localListsCount === 0) { if (localListsCount === 0) {
// No local data - perform full download // No local data - perform full download
//importDefaultShortforms() importDefaultShortforms()
console.log('No local data found. Prompt user to import data or use standard list...'); console.log('No local data found. Prompt user to import data or use standard list...');
} }
}) })
}; };
} }
export async function createShortformList(l: List): number { export function createShortformList(l: List): number {
return await db.lists.add(l) db.lists.add(l)
.then(result => {
console.log(result)
})
} }

View File

@ -23,7 +23,6 @@ export function cacheShortforms(lists: Array<number> = []) {
} }
else { else {
lists.forEach(listid => { lists.forEach(listid => {
console.log("looking up shortforms for this listid:", listid)
db.shortforms.where("listid").equals(listid).toArray().then(sfs => { db.shortforms.where("listid").equals(listid).toArray().then(sfs => {
sfs.forEach(sf => { sfs.forEach(sf => {
shortforms.set(sf.shortform, sf) shortforms.set(sf.shortform, sf)

View File

@ -5,6 +5,8 @@
let { children } = $props(); let { children } = $props();
</script> </script>
<div role="presentation">
<ParaglideJS {i18n}> <ParaglideJS {i18n}>
{@render children()} {@render children()}
</ParaglideJS> </ParaglideJS>
</div>

View File

@ -29,10 +29,9 @@
<svelte:window on:keydown={handleHotkeys} /> <svelte:window on:keydown={handleHotkeys} />
<div class="h-dvh w-full" role="application"> <div class="h-full w-full" role="application">
<div class="h-full">
<Textarea /> <Textarea />
<Dashboard open={showDashboard} /> <Dashboard open={showDashboard} />
<!-- <Button variant="destructive" on:click={deleteDefaultShortforms}>Ta bort standardlista</Button>--> <!-- <Button variant="destructive" on:click={deleteDefaultShortforms}>Ta bort standardlista</Button>-->
</div> </div>
</div>