From 286578bfc7e37d6dc442cfba4e64068e5b437689 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Thu, 9 Nov 2023 16:30:26 +0100 Subject: [PATCH] Chore: formatting --- src/UI/Base/LoginToggle.svelte | 3 +- src/UI/Base/NextButton.svelte | 4 +- src/UI/Base/TabbedGroup.svelte | 34 +- .../BigComponents/SelectedElementView.svelte | 2 +- src/UI/DownloadFlow/DownloadPanel.svelte | 4 +- src/UI/Image/UploadImage.svelte | 2 +- .../InputElement/Helpers/ImageHelper.svelte | 12 +- .../Helpers/SimpleTagInput.svelte | 58 ++-- src/UI/InputElement/Helpers/TagInput.svelte | 33 +- .../Helpers/TranslationInput.svelte | 75 ++-- src/UI/InputElement/InputHelper.svelte | 55 ++- src/UI/InputElement/ValidatedInput.svelte | 249 +++++++------- .../Validators/TagKeyValidator.ts | 1 - .../InputElement/Validators/TagValidator.ts | 1 - .../Validators/TranslationValidator.ts | 1 - .../InputElement/Validators/UrlValidator.ts | 5 +- src/UI/Leaderboard.svelte | 2 +- src/UI/Map/DynamicIcon.svelte | 61 ++-- src/UI/Map/DynamicMarker.svelte | 17 +- src/UI/Map/Icon.svelte | 49 ++- src/UI/Map/Marker.svelte | 9 +- src/UI/Map/ShowDataLayer.ts | 5 +- src/UI/Popup/AddNewPoint/AddNewPoint.svelte | 251 +++++++------- src/UI/Popup/AddNewPoint/PresetList.svelte | 8 +- src/UI/Popup/AllTagsPanel.svelte | 4 +- .../Popup/TagRendering/FreeformInput.svelte | 14 +- src/UI/Popup/TagRendering/Questionbox.svelte | 6 +- .../TagRendering/SpecialTranslation.svelte | 57 ++-- .../TagRendering/TagRenderingEditable.svelte | 70 ++-- .../TagRendering/TagRenderingQuestion.svelte | 171 +++++----- src/UI/Studio/ArrayMultiAnswer.svelte | 46 +-- src/UI/Studio/ChooseLayerToEdit.svelte | 13 +- src/UI/Studio/EditItemButton.svelte | 37 +- src/UI/Studio/EditLayer.svelte | 162 +++++---- src/UI/Studio/EditTheme.svelte | 72 ++-- src/UI/Studio/ErrorIndicatorForRegion.svelte | 22 +- src/UI/Studio/MappingInput.svelte | 85 ++--- src/UI/Studio/QuestionPreview.svelte | 142 ++++---- src/UI/Studio/Region.svelte | 40 +-- src/UI/Studio/RegisteredTagInput.svelte | 106 +++--- src/UI/Studio/SchemaBasedArray.svelte | 174 ++++++---- src/UI/Studio/SchemaBasedField.svelte | 240 +++++++------ src/UI/Studio/SchemaBasedInput.svelte | 25 +- src/UI/Studio/SchemaBasedMultiType.svelte | 289 ++++++++-------- .../Studio/SchemaBasedTranslationInput.svelte | 21 +- src/UI/Studio/ShowConversionMessage.svelte | 24 +- src/UI/Studio/ShowConversionMessages.svelte | 14 +- src/UI/Studio/TagExpression.svelte | 251 +++++++------- src/UI/Studio/TagInfoStats.svelte | 104 +++--- src/UI/Studio/TagInput/BasicTagInput.svelte | 232 ++++++------- src/UI/Studio/TagInput/FullTagInput.svelte | 28 +- .../Studio/TagRenderingFreeformInput.svelte | 14 +- src/UI/Studio/TagRenderingInput.svelte | 312 ++++++++++------- src/UI/StudioGUI.svelte | 322 +++++++++++------- src/UI/StylesheetTestGui.svelte | 8 +- src/UI/ThemeViewGUI.svelte | 13 +- src/UI/Walkthrough/Walkthrough.svelte | 29 +- src/UI/Walkthrough/WalkthroughStep.svelte | 26 +- 58 files changed, 2199 insertions(+), 1915 deletions(-) diff --git a/src/UI/Base/LoginToggle.svelte b/src/UI/Base/LoginToggle.svelte index 11d5eb0a3..f0dd14003 100644 --- a/src/UI/Base/LoginToggle.svelte +++ b/src/UI/Base/LoginToggle.svelte @@ -24,7 +24,8 @@ unknown: t.loginFailedUnreachableMode, readonly: t.loginFailedReadonlyMode, } - const apiState = state?.osmConnection?.apiIsOnline ?? new ImmutableStore("online") + const apiState = + state?.osmConnection?.apiIsOnline ?? new ImmutableStore("online") {#if $badge} diff --git a/src/UI/Base/NextButton.svelte b/src/UI/Base/NextButton.svelte index 687417b53..3fa2b6c7f 100644 --- a/src/UI/Base/NextButton.svelte +++ b/src/UI/Base/NextButton.svelte @@ -20,6 +20,8 @@
- = 0? "h-4 w-4 shrink-0": "h-12 w-12 shrink-0" }/> + = 0 ? "h-4 w-4 shrink-0" : "h-12 w-12 shrink-0"} + />
diff --git a/src/UI/Base/TabbedGroup.svelte b/src/UI/Base/TabbedGroup.svelte index 429909adc..b3aeb531a 100644 --- a/src/UI/Base/TabbedGroup.svelte +++ b/src/UI/Base/TabbedGroup.svelte @@ -3,9 +3,9 @@ * Thin wrapper around 'TabGroup' which binds the state */ - import { Tab, TabGroup, TabList, TabPanel, TabPanels } from "@rgossiaux/svelte-headlessui"; - import { ImmutableStore, Store, UIEventSource } from "../../Logic/UIEventSource"; - import { twJoin } from "tailwind-merge"; + import { Tab, TabGroup, TabList, TabPanel, TabPanels } from "@rgossiaux/svelte-headlessui" + import { ImmutableStore, Store, UIEventSource } from "../../Logic/UIEventSource" + import { twJoin } from "tailwind-merge" /** * If a condition is given for a certain tab, it will only be shown if this condition is true. @@ -43,49 +43,63 @@
{#if $$slots.title0} - twJoin("tab", selected && "primary", !$condition0 && "hidden")}> + twJoin("tab", selected && "primary", !$condition0 && "hidden")} + >
Tab 0
{/if} {#if $$slots.title1} - twJoin("tab", selected && "primary", !$condition1 && "hidden")}> + twJoin("tab", selected && "primary", !$condition1 && "hidden")} + >
{/if} {#if $$slots.title2} - twJoin("tab", selected && "primary", !$condition2 && "hidden")}> + twJoin("tab", selected && "primary", !$condition2 && "hidden")} + >
{/if} {#if $$slots.title3} - twJoin("tab", selected && "primary", !$condition3 && "hidden")}> + twJoin("tab", selected && "primary", !$condition3 && "hidden")} + >
{/if} {#if $$slots.title4} - twJoin("tab", selected && "primary", !$condition4 && "hidden")}> + twJoin("tab", selected && "primary", !$condition4 && "hidden")} + >
{/if} {#if $$slots.title5} - twJoin("tab", selected && "primary", !$condition5 && "hidden")}> + twJoin("tab", selected && "primary", !$condition5 && "hidden")} + >
{/if} {#if $$slots.title6} - twJoin("tab", selected && "primary", !$condition6 && "hidden")}> + twJoin("tab", selected && "primary", !$condition6 && "hidden")} + >
diff --git a/src/UI/BigComponents/SelectedElementView.svelte b/src/UI/BigComponents/SelectedElementView.svelte index efa54cf29..c780ea931 100644 --- a/src/UI/BigComponents/SelectedElementView.svelte +++ b/src/UI/BigComponents/SelectedElementView.svelte @@ -28,7 +28,7 @@ {:else} -
+
{#each layer.tagRenderings as config (config.id)} {#if (config.condition?.matchesProperties($tags) ?? true) && config.metacondition?.matchesProperties({ ...$tags, ..._metatags } ?? true)} {#if config.IsKnown($tags)} diff --git a/src/UI/DownloadFlow/DownloadPanel.svelte b/src/UI/DownloadFlow/DownloadPanel.svelte index 05688a5e6..9fab44c75 100644 --- a/src/UI/DownloadFlow/DownloadPanel.svelte +++ b/src/UI/DownloadFlow/DownloadPanel.svelte @@ -27,7 +27,7 @@ mapExtent: state.mapProperties.bounds.data, width: maindiv.offsetWidth, height: maindiv.offsetHeight, - noSelfIntersectingLines: true + noSelfIntersectingLines: true, }) } @@ -84,7 +84,7 @@ helperText={t.downloadAsSvgLinesOnlyHelper} construct={() => offerSvg(true)} /> - + - import {UIEventSource} from "../../../Logic/UIEventSource"; + import { UIEventSource } from "../../../Logic/UIEventSource" - /** - * Simply shows the image - */ - export let value: UIEventSource + /** + * Simply shows the image + */ + export let value: UIEventSource - + diff --git a/src/UI/InputElement/Helpers/SimpleTagInput.svelte b/src/UI/InputElement/Helpers/SimpleTagInput.svelte index 9af4a549d..bee89682e 100644 --- a/src/UI/InputElement/Helpers/SimpleTagInput.svelte +++ b/src/UI/InputElement/Helpers/SimpleTagInput.svelte @@ -1,31 +1,39 @@ - - - + {#if $dropdownFocussed} -
- {documentation.name} - +
+ {documentation.name} +
{/if} diff --git a/src/UI/InputElement/Helpers/TagInput.svelte b/src/UI/InputElement/Helpers/TagInput.svelte index 7144268b8..23576ac27 100644 --- a/src/UI/InputElement/Helpers/TagInput.svelte +++ b/src/UI/InputElement/Helpers/TagInput.svelte @@ -1,22 +1,21 @@ - - - + diff --git a/src/UI/InputElement/Helpers/TranslationInput.svelte b/src/UI/InputElement/Helpers/TranslationInput.svelte index 821eea801..5acca6172 100644 --- a/src/UI/InputElement/Helpers/TranslationInput.svelte +++ b/src/UI/InputElement/Helpers/TranslationInput.svelte @@ -1,55 +1,59 @@ -
+ +
- {prefix} + {prefix} - dispatch("submit")} /> + dispatch("submit")} + /> - {postfix} + {postfix}
diff --git a/src/UI/InputElement/InputHelper.svelte b/src/UI/InputElement/InputHelper.svelte index 0d5906698..27bc2bfdf 100644 --- a/src/UI/InputElement/InputHelper.svelte +++ b/src/UI/InputElement/InputHelper.svelte @@ -4,50 +4,49 @@ * Note that all values are stringified */ - import { UIEventSource } from "../../Logic/UIEventSource"; - import type { ValidatorType } from "./Validators"; - import InputHelpers from "./InputHelpers"; - import ToSvelte from "../Base/ToSvelte.svelte"; - import type { Feature } from "geojson"; - import { createEventDispatcher } from "svelte"; - import ImageHelper from "./Helpers/ImageHelper.svelte"; - import TranslationInput from "./Helpers/TranslationInput.svelte"; - import TagInput from "./Helpers/TagInput.svelte"; - import SimpleTagInput from "./Helpers/SimpleTagInput.svelte"; - import DirectionInput from "./Helpers/DirectionInput.svelte"; - import DateInput from "./Helpers/DateInput.svelte"; - import ColorInput from "./Helpers/ColorInput.svelte"; - import OpeningHoursInput from "./Helpers/OpeningHoursInput.svelte"; + import { UIEventSource } from "../../Logic/UIEventSource" + import type { ValidatorType } from "./Validators" + import InputHelpers from "./InputHelpers" + import ToSvelte from "../Base/ToSvelte.svelte" + import type { Feature } from "geojson" + import { createEventDispatcher } from "svelte" + import ImageHelper from "./Helpers/ImageHelper.svelte" + import TranslationInput from "./Helpers/TranslationInput.svelte" + import TagInput from "./Helpers/TagInput.svelte" + import SimpleTagInput from "./Helpers/SimpleTagInput.svelte" + import DirectionInput from "./Helpers/DirectionInput.svelte" + import DateInput from "./Helpers/DateInput.svelte" + import ColorInput from "./Helpers/ColorInput.svelte" + import OpeningHoursInput from "./Helpers/OpeningHoursInput.svelte" - export let type: ValidatorType; - export let value: UIEventSource; + export let type: ValidatorType + export let value: UIEventSource - export let feature: Feature; - export let args: (string | number | boolean)[] = undefined; + export let feature: Feature + export let args: (string | number | boolean)[] = undefined - let properties = { feature, args: args ?? [] }; + let properties = { feature, args: args ?? [] } let dispatch = createEventDispatcher<{ selected - }>(); - + }>() -{#if type === "translation" } +{#if type === "translation"} {:else if type === "direction"} {:else if type === "date"} - + {:else if type === "color"} - + {:else if type === "image"} - + {:else if type === "tag"} - + {:else if type === "simple_tag"} - + {:else if type === "opening_hours"} - + {:else if type === "wikidata"} InputHelpers.constructWikidataHelper(value, properties)} /> {/if} diff --git a/src/UI/InputElement/ValidatedInput.svelte b/src/UI/InputElement/ValidatedInput.svelte index 2c3430102..416db5347 100644 --- a/src/UI/InputElement/ValidatedInput.svelte +++ b/src/UI/InputElement/ValidatedInput.svelte @@ -1,145 +1,156 @@ {#if validator?.textArea} -
sendSubmit()}> - - -
+
sendSubmit()}> +