0}>
@@ -58,11 +61,15 @@
-
{:else}
{@html part["message"]}
{/if}
{/each}
+ {#if $feedback}
+
+ {/if}
diff --git a/src/UI/BigComponents/MenuDrawer.svelte b/src/UI/BigComponents/MenuDrawer.svelte
index d5bad56e2..c8fd4ba93 100644
--- a/src/UI/BigComponents/MenuDrawer.svelte
+++ b/src/UI/BigComponents/MenuDrawer.svelte
@@ -90,13 +90,13 @@
+
startSelection(wd, h)} on:end={() => endSelection(wd, h)}
- on:move={() => moved(wd, h)} on:clear={() => clearSelection()} />
+ startSelection(wd, h + 0.5)} on:end={() => endSelection(wd, h + 0.5)}
+ on:move={() => moved(wd, h + 0.5)} on:clear={() => clearSelection()} />
{/each}
diff --git a/src/UI/InputElement/Validators.ts b/src/UI/InputElement/Validators.ts
index ec0896948..eb768f2b1 100644
--- a/src/UI/InputElement/Validators.ts
+++ b/src/UI/InputElement/Validators.ts
@@ -15,9 +15,6 @@ import UrlValidator from "./Validators/UrlValidator"
import PhoneValidator from "./Validators/PhoneValidator"
import OpeningHoursValidator from "./Validators/OpeningHoursValidator"
import ColorValidator from "./Validators/ColorValidator"
-import BaseUIElement from "../BaseUIElement"
-import Combine from "../Base/Combine"
-import Title from "../Base/Title"
import SimpleTagValidator from "./Validators/SimpleTagValidator"
import ImageUrlValidator from "./Validators/ImageUrlValidator"
import TagKeyValidator from "./Validators/TagKeyValidator"
@@ -30,6 +27,7 @@ import SlopeValidator from "./Validators/SlopeValidator"
import VeloparkValidator from "./Validators/VeloparkValidator"
import NameSuggestionIndexValidator from "./Validators/NameSuggestionIndexValidator"
import CurrencyValidator from "./Validators/CurrencyValidator"
+import RegexValidator from "./Validators/RegexValidator"
export type ValidatorType = (typeof Validators.availableTypes)[number]
@@ -64,6 +62,7 @@ export default class Validators {
"velopark",
"nsi",
"currency",
+ "regex"
] as const
public static readonly AllValidators: ReadonlyArray = [
@@ -95,6 +94,7 @@ export default class Validators {
new VeloparkValidator(),
new NameSuggestionIndexValidator(),
new CurrencyValidator(),
+ new RegexValidator()
]
private static _byType = Validators._byTypeConstructor()
diff --git a/src/UI/InputElement/Validators/RegexValidator.ts b/src/UI/InputElement/Validators/RegexValidator.ts
new file mode 100644
index 000000000..9323db8fd
--- /dev/null
+++ b/src/UI/InputElement/Validators/RegexValidator.ts
@@ -0,0 +1,22 @@
+import StringValidator from "./StringValidator"
+import { s } from "vitest/dist/env-afee91f0"
+import { Translation } from "../../i18n/Translation"
+import Translations from "../../i18n/Translations"
+
+export default class RegexValidator extends StringValidator{
+ constructor() {
+ super("regex", "Validates a regex")
+ }
+
+ getFeedback(s: string): Translation | undefined {
+ try{
+ new RegExp(s)
+ }catch (e) {
+ return Translations.T("Not a valid Regex: "+e)
+ }
+ }
+
+ isValid(s: string): boolean {
+ return this.getFeedback(s) === undefined
+ }
+}
diff --git a/src/UI/PlantNet/PlantNet.svelte b/src/UI/PlantNet/PlantNet.svelte
index 893aa86c1..d9f0651cd 100644
--- a/src/UI/PlantNet/PlantNet.svelte
+++ b/src/UI/PlantNet/PlantNet.svelte
@@ -9,8 +9,8 @@
import BackButton from "../Base/BackButton.svelte"
import NextButton from "../Base/NextButton.svelte"
import WikipediaPanel from "../Wikipedia/WikipediaPanel.svelte"
- import { createEventDispatcher } from "svelte"
import Plantnet_logo from "../../assets/svg/Plantnet_logo.svelte"
+ import ArrowPath from "@babeard/svelte-heroicons/mini/ArrowPath"
/**
* The main entry point for the plantnet wizard
@@ -23,7 +23,6 @@
*/
export let imageUrls: Store
export let onConfirm: (wikidataId: string) => void
- const dispatch = createEventDispatcher<{ selected: string }>()
let collapsedMode = true
let options: UIEventSource = new UIEventSource(
undefined
@@ -38,18 +37,20 @@
let done = false
- function speciesSelected(species: PlantNetSpeciesMatch) {
+ function speciesSelected(species: string) {
console.log("Selected:", species)
selectedOption = species
}
async function detectSpecies() {
+ error = undefined
collapsedMode = false
try {
const result = await PlantNet.query(imageUrls.data.slice(0, 5))
options.set(result.results.filter((r) => r.score > 0.005).slice(0, 8))
} catch (e) {
+ console.error("Caught", e)
error = e
}
}
@@ -60,8 +61,12 @@
- {:else if $error !== undefined}
+ {:else if error !== undefined}
{#if $userdetails.img}
- 
+
{/if}
{$userdetails.name}
-