diff --git a/src/app/components/AppContainer.svelte b/src/app/components/AppContainer.svelte index 6b2992cd..517f098b 100644 --- a/src/app/components/AppContainer.svelte +++ b/src/app/components/AppContainer.svelte @@ -1,7 +1,7 @@
-

{meta.title || meta.name}

+ {meta.title || meta.name} {#if !isNaN(start) && !isNaN(end)} {@const startDateDisplay = formatTimestampAsDate(start)} {@const endDateDisplay = formatTimestampAsDate(end)} {@const isSingleDay = startDateDisplay === endDateDisplay} -
+
{formatTimestampAsDate(start)} diff --git a/src/app/components/CalendarEventItem.svelte b/src/app/components/CalendarEventItem.svelte index 01e89143..35580a18 100644 --- a/src/app/components/CalendarEventItem.svelte +++ b/src/app/components/CalendarEventItem.svelte @@ -1,7 +1,7 @@
- + Posted by {#if h} in diff --git a/src/app/components/CalendarEventMeta.svelte b/src/app/components/CalendarEventMeta.svelte index 2669d123..f5a987cf 100644 --- a/src/app/components/CalendarEventMeta.svelte +++ b/src/app/components/CalendarEventMeta.svelte @@ -3,7 +3,7 @@ import type {TrustedEvent} from "@welshman/util" import UserCircle from "@assets/icons/user-circle.svg?dataurl" import MapPoint from "@assets/icons/map-point.svg?dataurl" - import Icon from "@lib/components/Icon.svelte" + import Icon from "@lib/components2/Icon.svelte" import ProfileLink from "@app/components/ProfileLink.svelte" type Props = { @@ -15,7 +15,7 @@ const meta = $derived(fromPairs(event.tags) as Record) -
+
Posted by diff --git a/src/app/components/Chat.svelte b/src/app/components/Chat.svelte index fb3e2931..0300c76b 100644 --- a/src/app/components/Chat.svelte +++ b/src/app/components/Chat.svelte @@ -36,12 +36,16 @@ } from "@welshman/app" import Danger from "@assets/icons/danger-triangle.svg?dataurl" import ArrowLeft from "@assets/icons/arrow-left.svg?dataurl" - import Icon from "@lib/components/Icon.svelte" - import Spinner from "@lib/components/Spinner.svelte" - import PageBar from "@lib/components/PageBar.svelte" - import PageContent from "@lib/components/PageContent.svelte" - import Divider from "@lib/components/Divider.svelte" - import Button from "@lib/components/Button.svelte" + import Icon from "@lib/components2/Icon.svelte" + import Spinner from "@lib/components2/Spinner.svelte" + import PageBar from "@lib/components2/PageBar.svelte" + import PageContent from "@lib/components2/PageContent.svelte" + import Divider from "@lib/components2/Divider.svelte" + import Button from "@lib/components2/Button.svelte" + import Row from "@lib/components2/Row.svelte" + import Col from "@lib/components2/Col.svelte" + import Card from "@lib/components2/Card.svelte" + import Text from "@lib/components2/Text.svelte" import ProfileName from "@app/components/ProfileName.svelte" import ProfileLink from "@app/components/ProfileLink.svelte" import ProfileCircle from "@app/components/ProfileCircle.svelte" @@ -249,18 +253,18 @@
-
+
diff --git a/src/app/components/ChatComposeParent.svelte b/src/app/components/ChatComposeParent.svelte index 32b0c07e..9a9ff2d5 100644 --- a/src/app/components/ChatComposeParent.svelte +++ b/src/app/components/ChatComposeParent.svelte @@ -3,8 +3,8 @@ import {displayProfileByPubkey} from "@welshman/app" import {slide} from "@lib/transition" import CloseCircle from "@assets/icons/close-circle.svg?dataurl" - import Icon from "@lib/components/Icon.svelte" - import Button from "@lib/components/Button.svelte" + import Icon from "@lib/components2/Icon.svelte" + import Button from "@lib/components2/Button.svelte" import NoteContentMinimal from "@app/components/NoteContentMinimal.svelte" const { @@ -19,9 +19,10 @@
-

{verb} @{displayProfileByPubkey(event.pubkey)}

+

{verb} @{displayProfileByPubkey(event.pubkey)}

{#key event.id} {/key} diff --git a/src/app/components/ChatEnable.svelte b/src/app/components/ChatEnable.svelte index c22d245e..078743ee 100644 --- a/src/app/components/ChatEnable.svelte +++ b/src/app/components/ChatEnable.svelte @@ -4,14 +4,15 @@ import {preventDefault} from "@lib/html" import AltArrowLeft from "@assets/icons/alt-arrow-left.svg?dataurl" import AltArrowRight from "@assets/icons/alt-arrow-right.svg?dataurl" - import Icon from "@lib/components/Icon.svelte" - import Button from "@lib/components/Button.svelte" - import Spinner from "@lib/components/Spinner.svelte" - import Modal from "@lib/components/Modal.svelte" - import ModalBody from "@lib/components/ModalBody.svelte" - import ModalHeader from "@lib/components/ModalHeader.svelte" - import ModalTitle from "@lib/components/ModalTitle.svelte" - import ModalFooter from "@lib/components/ModalFooter.svelte" + import Icon from "@lib/components2/Icon.svelte" + import Button from "@lib/components2/Button.svelte" + import Spinner from "@lib/components2/Spinner.svelte" + import Text from "@lib/components2/Text.svelte" + import Modal from "@lib/components2/Modal.svelte" + import ModalBody from "@lib/components2/ModalBody.svelte" + import ModalHeader from "@lib/components2/ModalHeader.svelte" + import ModalTitle from "@lib/components2/ModalTitle.svelte" + import ModalFooter from "@lib/components2/ModalFooter.svelte" import {DEFAULT_RELAYS, DEFAULT_MESSAGING_RELAYS} from "@app/env" import {pushToast} from "@app/toast" @@ -57,14 +58,14 @@ Enable direct messaging? -

Direct messaging isn't currently enabled. Would you like to turn it on?

+ Direct messaging isn't currently enabled. Would you like to turn it on? - - diff --git a/src/app/components/ChatItem.svelte b/src/app/components/ChatItem.svelte index 6a09b4a0..542f52af 100644 --- a/src/app/components/ChatItem.svelte +++ b/src/app/components/ChatItem.svelte @@ -1,3 +1,9 @@ + + - + diff --git a/src/app/components/ChatMessageMenu.svelte b/src/app/components/ChatMessageMenu.svelte index c16040b4..d1f9781f 100644 --- a/src/app/components/ChatMessageMenu.svelte +++ b/src/app/components/ChatMessageMenu.svelte @@ -1,6 +1,7 @@ -
+ {#if replyTo} - {/if} {#if edit} - {/if} - -
+ diff --git a/src/app/components/ChatMessageMenuMobile.svelte b/src/app/components/ChatMessageMenuMobile.svelte index c5452f63..1a6dc59f 100644 --- a/src/app/components/ChatMessageMenuMobile.svelte +++ b/src/app/components/ChatMessageMenuMobile.svelte @@ -7,11 +7,12 @@ import Reply from "@assets/icons/reply-2.svg?dataurl" import Copy from "@assets/icons/copy.svg?dataurl" import Code2 from "@assets/icons/code-2.svg?dataurl" - import Icon from "@lib/components/Icon.svelte" - import Modal from "@lib/components/Modal.svelte" - import ModalBody from "@lib/components/ModalBody.svelte" - import Button from "@lib/components/Button.svelte" - import EmojiPicker from "@lib/components/EmojiPicker.svelte" + import Icon from "@lib/components2/Icon.svelte" + import Modal from "@lib/components2/Modal.svelte" + import ModalBody from "@lib/components2/ModalBody.svelte" + import Button from "@lib/components2/Button.svelte" + import Col from "@lib/components2/Col.svelte" + import EmojiPicker from "@lib/components2/EmojiPicker.svelte" import EventInfo from "@app/components/EventInfo.svelte" import {makeReaction} from "@app/reactions" import {pushModal} from "@app/modal" @@ -57,29 +58,29 @@ -
- - - {#if edit} - {/if} - -
+
diff --git a/src/app/components/ChatStart.svelte b/src/app/components/ChatStart.svelte index 173ab14a..4f18f75c 100644 --- a/src/app/components/ChatStart.svelte +++ b/src/app/components/ChatStart.svelte @@ -6,17 +6,17 @@ import {fromNostrURI} from "@welshman/util" import {loadMessagingRelayList} from "@welshman/app" import {preventDefault} from "@lib/html" - import Field from "@lib/components/Field.svelte" - import Button from "@lib/components/Button.svelte" + import Field from "@lib/components2/Field.svelte" + import Button from "@lib/components2/Button.svelte" import AltArrowLeft from "@assets/icons/alt-arrow-left.svg?dataurl" import AltArrowRight from "@assets/icons/alt-arrow-right.svg?dataurl" - import Icon from "@lib/components/Icon.svelte" - import Modal from "@lib/components/Modal.svelte" - import ModalBody from "@lib/components/ModalBody.svelte" - import ModalHeader from "@lib/components/ModalHeader.svelte" - import ModalTitle from "@lib/components/ModalTitle.svelte" - import ModalSubtitle from "@lib/components/ModalSubtitle.svelte" - import ModalFooter from "@lib/components/ModalFooter.svelte" + import Icon from "@lib/components2/Icon.svelte" + import Modal from "@lib/components2/Modal.svelte" + import ModalBody from "@lib/components2/ModalBody.svelte" + import ModalHeader from "@lib/components2/ModalHeader.svelte" + import ModalTitle from "@lib/components2/ModalTitle.svelte" + import ModalSubtitle from "@lib/components2/ModalSubtitle.svelte" + import ModalFooter from "@lib/components2/ModalFooter.svelte" import ProfileMultiSelect from "@app/components/ProfileMultiSelect.svelte" import {goToChat} from "@app/routes" @@ -73,11 +73,11 @@ - - diff --git a/src/app/components/ClassifiedActions.svelte b/src/app/components/ClassifiedActions.svelte index 2de299d3..c1fdf75e 100644 --- a/src/app/components/ClassifiedActions.svelte +++ b/src/app/components/ClassifiedActions.svelte @@ -5,9 +5,10 @@ import {pubkey} from "@welshman/app" import Pen2 from "@assets/icons/pen-2.svg?dataurl" import {normalizeTopic} from "@lib/util" - import Link from "@lib/components/Link.svelte" - import Icon from "@lib/components/Icon.svelte" - import Button from "@lib/components/Button.svelte" + import Link from "@lib/components2/Link.svelte" + import Icon from "@lib/components2/Icon.svelte" + import Button from "@lib/components2/Button.svelte" + import Badge from "@lib/components2/Badge.svelte" import RoomName from "@app/components/RoomName.svelte" import ReactionSummary from "@app/components/ReactionSummary.svelte" import ClassifiedStatus from "@app/components/ClassifiedStatus.svelte" @@ -46,18 +47,20 @@
{#if h && showRoom} - - Posted in # + + + Posted in # + {/if}
{#each uniq(topics) as topic (topic)} - {/each}
- + diff --git a/src/app/components/ClassifiedCreate.svelte b/src/app/components/ClassifiedCreate.svelte index 3a26def2..91477a97 100644 --- a/src/app/components/ClassifiedCreate.svelte +++ b/src/app/components/ClassifiedCreate.svelte @@ -1,7 +1,7 @@ {#if title}
-

+

{title} — {price}

-

+

{formatTimestamp(event.created_at)}

{:else} - {/if} @@ -49,7 +49,7 @@ {/each}
- + Posted by {#if h} diff --git a/src/app/components/ClassifiedStatus.svelte b/src/app/components/ClassifiedStatus.svelte index 1994a68a..4c3ddf25 100644 --- a/src/app/components/ClassifiedStatus.svelte +++ b/src/app/components/ClassifiedStatus.svelte @@ -1,8 +1,8 @@ {#if status} -
+ {ucFirst(status)} -
+ {/if} diff --git a/src/app/components/CommentActions.svelte b/src/app/components/CommentActions.svelte index e6ed4db0..b6c2edf5 100644 --- a/src/app/components/CommentActions.svelte +++ b/src/app/components/CommentActions.svelte @@ -31,7 +31,7 @@
- + {#if showActivity} diff --git a/src/app/components/ComposeMenu.svelte b/src/app/components/ComposeMenu.svelte index d5fa95ca..afd33c54 100644 --- a/src/app/components/ComposeMenu.svelte +++ b/src/app/components/ComposeMenu.svelte @@ -5,8 +5,8 @@ import NotesMinimalistic from "@assets/icons/notes-minimalistic.svg?dataurl" import CaseMinimalistic from "@assets/icons/case-minimalistic.svg?dataurl" import Revote from "@assets/icons/revote.svg?dataurl" - import Button from "@lib/components/Button.svelte" - import Icon from "@lib/components/Icon.svelte" + import Button from "@lib/components2/Button.svelte" + import Icon from "@lib/components2/Icon.svelte" import {pushModal} from "@app/modal" import CalendarEventCreate from "@app/components/CalendarEventCreate.svelte" import ThreadCreate from "@app/components/ThreadCreate.svelte" @@ -39,33 +39,33 @@ }) -