From 949359dca5667192f27b9d10897ca036b0dde41b Mon Sep 17 00:00:00 2001 From: Jon Staab Date: Tue, 23 Jun 2026 17:44:30 +0000 Subject: [PATCH] Add new claymorphic component library --- src/app/components/AppContainer.svelte | 2 +- src/app/components/BunkerConnect.svelte | 5 +- src/app/components/BunkerUrl.svelte | 14 +- .../components/CalendarEventActions.svelte | 10 +- src/app/components/CalendarEventCreate.svelte | 6 +- src/app/components/CalendarEventDate.svelte | 4 +- src/app/components/CalendarEventEdit.svelte | 6 +- src/app/components/CalendarEventForm.svelte | 35 +- src/app/components/CalendarEventHeader.svelte | 7 +- src/app/components/CalendarEventItem.svelte | 6 +- src/app/components/CalendarEventMeta.svelte | 4 +- src/app/components/Chat.svelte | 56 +- src/app/components/ChatCompose.svelte | 14 +- src/app/components/ChatComposeEdit.svelte | 9 +- src/app/components/ChatComposeParent.svelte | 9 +- src/app/components/ChatEnable.svelte | 23 +- src/app/components/ChatItem.svelte | 22 +- src/app/components/ChatMembers.svelte | 19 +- src/app/components/ChatMenu.svelte | 14 +- src/app/components/ChatMessage.svelte | 25 +- .../components/ChatMessageEmojiButton.svelte | 6 +- src/app/components/ChatMessageMenu.svelte | 15 +- .../components/ChatMessageMenuMobile.svelte | 25 +- src/app/components/ChatStart.svelte | 22 +- src/app/components/ClassifiedActions.svelte | 17 +- src/app/components/ClassifiedCreate.svelte | 6 +- src/app/components/ClassifiedEdit.svelte | 6 +- src/app/components/ClassifiedForm.svelte | 57 +- src/app/components/ClassifiedItem.svelte | 14 +- src/app/components/ClassifiedStatus.svelte | 6 +- src/app/components/CommentActions.svelte | 2 +- src/app/components/ComposeMenu.svelte | 16 +- src/app/components/Content.svelte | 31 +- src/app/components/ContentCode.svelte | 2 +- src/app/components/ContentEmail.svelte | 4 +- src/app/components/ContentLinkBlock.svelte | 31 +- .../components/ContentLinkBlockImage.svelte | 6 +- src/app/components/ContentLinkDetail.svelte | 8 +- src/app/components/ContentLinkInline.svelte | 8 +- src/app/components/ContentLinkUrl.svelte | 8 +- src/app/components/ContentMention.svelte | 4 +- src/app/components/ContentMinimal.svelte | 13 +- src/app/components/ContentQuote.svelte | 18 +- src/app/components/ContentToken.svelte | 6 +- src/app/components/ContentTopic.svelte | 6 +- src/app/components/CurrencyInput.svelte | 16 +- src/app/components/EventActions.svelte | 19 +- src/app/components/EventActivity.svelte | 15 +- src/app/components/EventDeleteConfirm.svelte | 2 +- src/app/components/EventInfo.svelte | 42 +- src/app/components/EventMenu.svelte | 58 +- src/app/components/EventReply.svelte | 15 +- src/app/components/EventShare.svelte | 29 +- src/app/components/GoalActions.svelte | 6 +- src/app/components/GoalCreate.svelte | 44 +- src/app/components/GoalItem.svelte | 47 +- src/app/components/GoalSummary.svelte | 35 +- src/app/components/IconPicker.svelte | 22 +- src/app/components/IconPickerModal.svelte | 4 +- src/app/components/IconPickerPopover.svelte | 5 +- src/app/components/InfoBunker.svelte | 55 +- src/app/components/InfoHandle.svelte | 38 +- src/app/components/InfoKeys.svelte | 39 +- src/app/components/InfoNostr.svelte | 33 +- src/app/components/InfoRelay.svelte | 27 +- src/app/components/InfoSignatures.svelte | 29 +- src/app/components/InfoZapperError.svelte | 18 +- src/app/components/InputProfilePicture.svelte | 18 +- src/app/components/KeyDownload.svelte | 30 +- src/app/components/KeyRecoveryConfirm.svelte | 24 +- src/app/components/KeyRecoveryRequest.svelte | 22 +- src/app/components/Landing.svelte | 32 +- src/app/components/LogIn.svelte | 50 +- src/app/components/LogInBunker.svelte | 26 +- src/app/components/LogInEmail.svelte | 34 +- src/app/components/LogInKey.svelte | 37 +- src/app/components/LogInOTP.svelte | 26 +- src/app/components/LogInOTPConfirm.svelte | 24 +- src/app/components/LogInSelect.svelte | 23 +- src/app/components/LogOut.svelte | 23 +- src/app/components/MenuSettings.svelte | 27 +- src/app/components/ModalContainer.svelte | 4 +- src/app/components/NoteCard.svelte | 11 +- .../components/NoteContentClassified.svelte | 2 +- .../components/NoteContentEventTime.svelte | 4 +- .../NoteContentMinimalEventTime.svelte | 15 +- .../components/NoteContentMinimalGoal.svelte | 8 +- .../components/NoteContentMinimalPoll.svelte | 8 +- .../NoteContentMinimalThread.svelte | 3 +- src/app/components/NoteContentPoll.svelte | 5 +- src/app/components/NoteContentThread.svelte | 8 +- src/app/components/NoteItem.svelte | 10 +- src/app/components/PasswordReset.svelte | 24 +- .../components/PasswordResetConfirm.svelte | 26 +- src/app/components/PeopleItem.svelte | 32 +- src/app/components/PollCreate.svelte | 80 ++- src/app/components/PollItem.svelte | 30 +- src/app/components/PollOption.svelte | 23 +- src/app/components/PollVotes.svelte | 17 +- src/app/components/PomadeSessions.svelte | 59 +- src/app/components/PrimaryNav.svelte | 14 +- src/app/components/PrimaryNavItemSpace.svelte | 3 +- src/app/components/PrimaryNavSpaces.svelte | 6 +- src/app/components/Profile.svelte | 8 +- src/app/components/ProfileBadges.svelte | 6 +- src/app/components/ProfileCircle.svelte | 2 +- src/app/components/ProfileCircles.svelte | 6 +- src/app/components/ProfileDelete.svelte | 54 +- src/app/components/ProfileDetail.svelte | 62 +- src/app/components/ProfileEdit.svelte | 10 +- src/app/components/ProfileEditForm.svelte | 56 +- src/app/components/ProfileFeed.svelte | 14 +- src/app/components/ProfileLatest.svelte | 17 +- src/app/components/ProfileLink.svelte | 6 +- src/app/components/ProfileList.svelte | 21 +- src/app/components/ProfileMultiSelect.svelte | 17 +- src/app/components/ProfileSpaces.svelte | 38 +- src/app/components/ProgressBar.svelte | 5 +- src/app/components/QRCode.svelte | 4 +- src/app/components/Reaction.svelte | 2 +- src/app/components/ReactionSummary.svelte | 51 +- src/app/components/RecentConversation.svelte | 35 +- src/app/components/RelayAdd.svelte | 28 +- src/app/components/RelayIcon.svelte | 2 +- src/app/components/RelayItem.svelte | 40 +- src/app/components/RelayList.svelte | 41 +- .../RelaySettingsHealthCheck.svelte | 21 +- .../RelaySettingsHealthChecks.svelte | 25 +- src/app/components/RelaySettingsItem.svelte | 10 +- src/app/components/RelaySummary.svelte | 34 +- src/app/components/Report.svelte | 34 +- src/app/components/ReportDetails.svelte | 16 +- src/app/components/ReportItem.svelte | 41 +- src/app/components/ReportMenu.svelte | 56 +- src/app/components/RoomAccess.svelte | 35 +- src/app/components/RoomCompose.svelte | 24 +- src/app/components/RoomComposeEdit.svelte | 9 +- src/app/components/RoomComposeParent.svelte | 9 +- src/app/components/RoomCreate.svelte | 20 +- src/app/components/RoomDetail.svelte | 195 +++--- src/app/components/RoomEdit.svelte | 20 +- src/app/components/RoomForm.svelte | 60 +- src/app/components/RoomImage.svelte | 4 +- src/app/components/RoomItem.svelte | 51 +- src/app/components/RoomItemAddMember.svelte | 4 +- src/app/components/RoomItemContent.svelte | 18 +- src/app/components/RoomItemEmojiButton.svelte | 6 +- src/app/components/RoomItemMenu.svelte | 38 +- src/app/components/RoomItemMenuButton.svelte | 8 +- src/app/components/RoomItemMenuMobile.svelte | 29 +- src/app/components/RoomItemZapButton.svelte | 4 +- src/app/components/RoomJoinItem.svelte | 22 +- src/app/components/RoomLink.svelte | 5 +- src/app/components/RoomMembers.svelte | 58 +- src/app/components/RoomMembersAdd.svelte | 28 +- src/app/components/RoomName.svelte | 2 +- src/app/components/SignUp.svelte | 22 +- src/app/components/SignUpComplete.svelte | 27 +- src/app/components/SignUpEmail.svelte | 28 +- src/app/components/SignUpEmailConfirm.svelte | 26 +- src/app/components/SignUpProfile.svelte | 8 +- src/app/components/SignerStatus.svelte | 40 +- .../components/SocketStatusIndicator.svelte | 14 +- src/app/components/SpaceAccessRequest.svelte | 28 +- src/app/components/SpaceActionItems.svelte | 22 +- src/app/components/SpaceAdd.svelte | 24 +- src/app/components/SpaceAuthError.svelte | 24 +- src/app/components/SpaceBar.svelte | 8 +- src/app/components/SpaceDetail.svelte | 79 +-- src/app/components/SpaceEdit.svelte | 50 +- src/app/components/SpaceExit.svelte | 24 +- src/app/components/SpaceInvite.svelte | 52 +- src/app/components/SpaceInviteAccept.svelte | 38 +- src/app/components/SpaceJoin.svelte | 16 +- src/app/components/SpaceJoinSettings.svelte | 52 +- src/app/components/SpaceMembers.svelte | 65 +- src/app/components/SpaceMembersAdd.svelte | 24 +- src/app/components/SpaceMembersBanned.svelte | 53 +- src/app/components/SpaceMenu.svelte | 63 +- src/app/components/SpaceMenuRoomItem.svelte | 4 +- src/app/components/SpaceRelayStatus.svelte | 119 ++-- src/app/components/SpaceReports.svelte | 28 +- src/app/components/SpaceSearch.svelte | 135 ++-- src/app/components/SpaceTrustRelay.svelte | 42 +- src/app/components/ThreadActions.svelte | 6 +- src/app/components/ThreadBoard.svelte | 20 +- src/app/components/ThreadBoardItem.svelte | 24 +- src/app/components/ThreadCreate.svelte | 50 +- src/app/components/ThreadItem.svelte | 57 +- src/app/components/ThreadPagination.svelte | 32 +- src/app/components/ThreadPost.svelte | 29 +- src/app/components/ThunkFailure.svelte | 6 +- src/app/components/ThunkPending.svelte | 6 +- src/app/components/ThunkStatusDetail.svelte | 19 +- .../components/ThunkStatusOrDeleted.svelte | 3 +- src/app/components/ThunkToast.svelte | 3 +- src/app/components/Toast.svelte | 26 +- src/app/components/TopicMultiSelect.svelte | 16 +- src/app/components/VideoCallContent.svelte | 27 +- .../VoiceCallAudioSettingsDialog.svelte | 43 +- .../VoiceParticipantMediaBadges.svelte | 4 +- src/app/components/VoiceRoomItem.svelte | 14 +- src/app/components/VoiceRoomJoinDialog.svelte | 45 +- src/app/components/VoiceWidget.svelte | 74 ++- .../WalletAsReceivingAddress.svelte | 35 +- src/app/components/WalletConnect.svelte | 41 +- src/app/components/WalletDisconnect.svelte | 2 +- src/app/components/WalletPay.svelte | 50 +- src/app/components/WalletReceive.svelte | 48 +- .../WalletUpdateReceivingAddress.svelte | 78 +-- src/app/components/WotScore.svelte | 4 +- src/app/components/Zap.svelte | 42 +- src/app/components/ZapButton.svelte | 2 +- src/app/components/ZapInvoice.svelte | 54 +- src/lib/components2/Alert.svelte | 28 + src/lib/components2/Avatar.svelte | 40 ++ src/lib/components2/Badge.svelte | 31 + src/lib/components2/Button.svelte | 62 ++ src/lib/components2/ButtonGroup.svelte | 90 +++ src/lib/components2/COMPONENTS.md | 83 +++ src/lib/components2/Card.svelte | 42 ++ src/lib/components2/CardButton.svelte | 50 ++ src/lib/components2/Center.svelte | 14 + src/lib/components2/Checkbox.svelte | 32 + src/lib/components2/Col.svelte | 15 + src/lib/components2/Confirm.svelte | 57 ++ src/lib/components2/ContentPill.svelte | 53 ++ src/lib/components2/ContentSearch.svelte | 20 + src/lib/components2/CurrencySymbol.svelte | 11 + src/lib/components2/DataTip.svelte | 75 +++ src/lib/components2/DateTimeInput.svelte | 96 +++ src/lib/components2/Dialog.svelte | 62 ++ src/lib/components2/Divider.svelte | 15 + src/lib/components2/Drawer.svelte | 28 + src/lib/components2/EmojiButton.svelte | 42 ++ src/lib/components2/EmojiPicker.svelte | 30 + src/lib/components2/FAB.svelte | 23 + src/lib/components2/Field.svelte | 34 ++ src/lib/components2/FieldInline.svelte | 30 + src/lib/components2/Grid.svelte | 16 + src/lib/components2/Heading.svelte | 28 + src/lib/components2/Hoverable.svelte | 78 +++ src/lib/components2/Icon.svelte | 72 +++ src/lib/components2/IconPickerButton.svelte | 57 ++ src/lib/components2/ImageIcon.svelte | 21 + src/lib/components2/ImagesInput.svelte | 131 ++++ src/lib/components2/Input.svelte | 30 + src/lib/components2/InputList.svelte | 90 +++ src/lib/components2/Link.svelte | 41 ++ src/lib/components2/Modal.svelte | 17 + src/lib/components2/ModalBody.svelte | 15 + src/lib/components2/ModalFooter.svelte | 18 + src/lib/components2/ModalHeader.svelte | 13 + src/lib/components2/ModalSubtitle.svelte | 11 + src/lib/components2/ModalTitle.svelte | 11 + src/lib/components2/NoteCard.svelte | 91 +++ src/lib/components2/Page.svelte | 14 + src/lib/components2/PageBar.svelte | 16 + src/lib/components2/PageContent.svelte | 23 + src/lib/components2/PageHeader.svelte | 13 + src/lib/components2/Popover.svelte | 34 ++ src/lib/components2/PrimaryNavItem.svelte | 53 ++ src/lib/components2/Progress.svelte | 24 + src/lib/components2/Quote.svelte | 31 + src/lib/components2/Row.svelte | 15 + src/lib/components2/Scanner.svelte | 67 ++ src/lib/components2/Scrim.svelte | 82 +++ src/lib/components2/SecondaryNav.svelte | 21 + src/lib/components2/SecondaryNavHeader.svelte | 11 + src/lib/components2/SecondaryNavItem.svelte | 72 +++ .../components2/SecondaryNavSection.svelte | 12 + src/lib/components2/Select.svelte | 29 + src/lib/components2/SignerStatus.svelte | 90 +++ src/lib/components2/Spinner.svelte | 19 + src/lib/components2/Stack.svelte | 15 + src/lib/components2/Stat.svelte | 23 + src/lib/components2/StatusIcon.svelte | 35 ++ src/lib/components2/StatusIndicator.svelte | 21 + src/lib/components2/StringMultiInput.svelte | 76 +++ src/lib/components2/SuggestionString.svelte | 5 + src/lib/components2/Suggestions.svelte | 83 +++ src/lib/components2/Surface.svelte | 60 ++ src/lib/components2/Switch.svelte | 51 ++ src/lib/components2/TapTarget.svelte | 15 + src/lib/components2/Text.svelte | 28 + src/lib/components2/Textarea.svelte | 30 + src/lib/components2/Tippy.svelte | 41 ++ src/lib/components2/Toggle.svelte | 86 +++ src/lib/components2/Tooltip.svelte | 67 ++ src/lib/components2/theme.css | 574 ++++++++++++++++++ src/routes/+layout.svelte | 3 +- 291 files changed, 6460 insertions(+), 2581 deletions(-) create mode 100644 src/lib/components2/Alert.svelte create mode 100644 src/lib/components2/Avatar.svelte create mode 100644 src/lib/components2/Badge.svelte create mode 100644 src/lib/components2/Button.svelte create mode 100644 src/lib/components2/ButtonGroup.svelte create mode 100644 src/lib/components2/COMPONENTS.md create mode 100644 src/lib/components2/Card.svelte create mode 100644 src/lib/components2/CardButton.svelte create mode 100644 src/lib/components2/Center.svelte create mode 100644 src/lib/components2/Checkbox.svelte create mode 100644 src/lib/components2/Col.svelte create mode 100644 src/lib/components2/Confirm.svelte create mode 100644 src/lib/components2/ContentPill.svelte create mode 100644 src/lib/components2/ContentSearch.svelte create mode 100644 src/lib/components2/CurrencySymbol.svelte create mode 100644 src/lib/components2/DataTip.svelte create mode 100644 src/lib/components2/DateTimeInput.svelte create mode 100644 src/lib/components2/Dialog.svelte create mode 100644 src/lib/components2/Divider.svelte create mode 100644 src/lib/components2/Drawer.svelte create mode 100644 src/lib/components2/EmojiButton.svelte create mode 100644 src/lib/components2/EmojiPicker.svelte create mode 100644 src/lib/components2/FAB.svelte create mode 100644 src/lib/components2/Field.svelte create mode 100644 src/lib/components2/FieldInline.svelte create mode 100644 src/lib/components2/Grid.svelte create mode 100644 src/lib/components2/Heading.svelte create mode 100644 src/lib/components2/Hoverable.svelte create mode 100644 src/lib/components2/Icon.svelte create mode 100644 src/lib/components2/IconPickerButton.svelte create mode 100644 src/lib/components2/ImageIcon.svelte create mode 100644 src/lib/components2/ImagesInput.svelte create mode 100644 src/lib/components2/Input.svelte create mode 100644 src/lib/components2/InputList.svelte create mode 100644 src/lib/components2/Link.svelte create mode 100644 src/lib/components2/Modal.svelte create mode 100644 src/lib/components2/ModalBody.svelte create mode 100644 src/lib/components2/ModalFooter.svelte create mode 100644 src/lib/components2/ModalHeader.svelte create mode 100644 src/lib/components2/ModalSubtitle.svelte create mode 100644 src/lib/components2/ModalTitle.svelte create mode 100644 src/lib/components2/NoteCard.svelte create mode 100644 src/lib/components2/Page.svelte create mode 100644 src/lib/components2/PageBar.svelte create mode 100644 src/lib/components2/PageContent.svelte create mode 100644 src/lib/components2/PageHeader.svelte create mode 100644 src/lib/components2/Popover.svelte create mode 100644 src/lib/components2/PrimaryNavItem.svelte create mode 100644 src/lib/components2/Progress.svelte create mode 100644 src/lib/components2/Quote.svelte create mode 100644 src/lib/components2/Row.svelte create mode 100644 src/lib/components2/Scanner.svelte create mode 100644 src/lib/components2/Scrim.svelte create mode 100644 src/lib/components2/SecondaryNav.svelte create mode 100644 src/lib/components2/SecondaryNavHeader.svelte create mode 100644 src/lib/components2/SecondaryNavItem.svelte create mode 100644 src/lib/components2/SecondaryNavSection.svelte create mode 100644 src/lib/components2/Select.svelte create mode 100644 src/lib/components2/SignerStatus.svelte create mode 100644 src/lib/components2/Spinner.svelte create mode 100644 src/lib/components2/Stack.svelte create mode 100644 src/lib/components2/Stat.svelte create mode 100644 src/lib/components2/StatusIcon.svelte create mode 100644 src/lib/components2/StatusIndicator.svelte create mode 100644 src/lib/components2/StringMultiInput.svelte create mode 100644 src/lib/components2/SuggestionString.svelte create mode 100644 src/lib/components2/Suggestions.svelte create mode 100644 src/lib/components2/Surface.svelte create mode 100644 src/lib/components2/Switch.svelte create mode 100644 src/lib/components2/TapTarget.svelte create mode 100644 src/lib/components2/Text.svelte create mode 100644 src/lib/components2/Textarea.svelte create mode 100644 src/lib/components2/Tippy.svelte create mode 100644 src/lib/components2/Toggle.svelte create mode 100644 src/lib/components2/Tooltip.svelte create mode 100644 src/lib/components2/theme.css 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 @@ }) -
    +
    • -
    • -
    • -
    • -
    • - diff --git a/src/app/components/Content.svelte b/src/app/components/Content.svelte index 19c59eeb..72359e38 100644 --- a/src/app/components/Content.svelte +++ b/src/app/components/Content.svelte @@ -21,10 +21,12 @@ } from "@welshman/content" import type {Parsed} from "@welshman/content" import {preventDefault, stopPropagation} from "@lib/html" - import Link from "@lib/components/Link.svelte" + import Link from "@lib/components2/Link.svelte" import Danger from "@assets/icons/danger-triangle.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 Alert from "@lib/components2/Alert.svelte" + import Row from "@lib/components2/Row.svelte" import ContentToken from "@app/components/ContentToken.svelte" import ContentEmoji from "@app/components/ContentEmoji.svelte" import ContentEmail from "@app/components/ContentEmail.svelte" @@ -144,13 +146,15 @@
      {#if warning} -
      - -

      - This note has been flagged by the author as "{warning}".
      - -

      -
      + + + +

      + This note has been flagged by the author as "{warning}".
      + +

      +       +       {:else}
      {#if expandBlock}
      - +
      {/if} {/if} diff --git a/src/app/components/ContentCode.svelte b/src/app/components/ContentCode.svelte index 8c9674b4..3d14560f 100644 --- a/src/app/components/ContentCode.svelte +++ b/src/app/components/ContentCode.svelte @@ -3,7 +3,7 @@ {value.trim()} diff --git a/src/app/components/ContentEmail.svelte b/src/app/components/ContentEmail.svelte index b2e68264..e7d8dde2 100644 --- a/src/app/components/ContentEmail.svelte +++ b/src/app/components/ContentEmail.svelte @@ -1,7 +1,7 @@ diff --git a/src/app/components/ContentLinkBlock.svelte b/src/app/components/ContentLinkBlock.svelte index e6dfc90b..a5e3faf4 100644 --- a/src/app/components/ContentLinkBlock.svelte +++ b/src/app/components/ContentLinkBlock.svelte @@ -3,7 +3,8 @@ import {isRelayUrl, getTagValue} from "@welshman/util" import {Capacitor} from "@capacitor/core" import {preventDefault, stopPropagation} from "@lib/html" - import Link from "@lib/components/Link.svelte" + import Link from "@lib/components2/Link.svelte" + import Center from "@lib/components2/Center.svelte" import ContentLinkDetail from "@app/components/ContentLinkDetail.svelte" import ContentLinkUrl from "@app/components/ContentLinkUrl.svelte" import ContentLinkBlockImage from "@app/components/ContentLinkBlockImage.svelte" @@ -53,37 +54,45 @@ {#if isRoomOrRelay}
      - +
      {:else} -
      +
      {#if url.match(/\.(mov|webm|mp4)$/) || VIDEO_CONTENT_TYPES.includes(fileType)} {:else if url.match(/\.(jpe?g|png|gif|webp)$/) || IMAGE_CONTENT_TYPES.includes(fileType)} {:else} {#await loadPreview()} -
      - -
      +
      + +
      {:then preview} -
      +
      {#if preview.image && !hideImage} + class="cl-surface-alt max-h-72 object-contain object-center" + style="border-top-left-radius: var(--cl-r-card); border-top-right-radius: var(--cl-r-card)" /> {/if}
      {:catch} -

      +

      Unable to load a preview for {url}

      {/await} diff --git a/src/app/components/ContentLinkBlockImage.svelte b/src/app/components/ContentLinkBlockImage.svelte index d0cac62c..8b3a3b99 100644 --- a/src/app/components/ContentLinkBlockImage.svelte +++ b/src/app/components/ContentLinkBlockImage.svelte @@ -11,7 +11,7 @@ } from "@welshman/util" import {signer} from "@welshman/app" import LinkRound from "@assets/icons/link-round.svg?dataurl" - import Icon from "@lib/components/Icon.svelte" + import Icon from "@lib/components2/Icon.svelte" const {value, event, ...props} = $props() @@ -87,7 +87,9 @@ {#if hasError} - + {displayUrl(url)} diff --git a/src/app/components/ContentLinkDetail.svelte b/src/app/components/ContentLinkDetail.svelte index 7c4e660e..e88486a4 100644 --- a/src/app/components/ContentLinkDetail.svelte +++ b/src/app/components/ContentLinkDetail.svelte @@ -1,6 +1,6 @@ diff --git a/src/app/components/ContentLinkInline.svelte b/src/app/components/ContentLinkInline.svelte index ff2a661a..77450ed4 100644 --- a/src/app/components/ContentLinkInline.svelte +++ b/src/app/components/ContentLinkInline.svelte @@ -3,7 +3,7 @@ import {getTagValue} from "@welshman/util" import {preventDefault, stopPropagation} from "@lib/html" import LinkRound from "@assets/icons/link-round.svg?dataurl" - import Icon from "@lib/components/Icon.svelte" + import Icon from "@lib/components2/Icon.svelte" import ContentLinkDetail from "@app/components/ContentLinkDetail.svelte" import ContentLinkUrl from "@app/components/ContentLinkUrl.svelte" import {pushModal} from "@app/modal" @@ -21,11 +21,13 @@ {displayUrl(url)} {:else} - + {/if} diff --git a/src/app/components/ContentLinkUrl.svelte b/src/app/components/ContentLinkUrl.svelte index 0b786d5f..0020fe37 100644 --- a/src/app/components/ContentLinkUrl.svelte +++ b/src/app/components/ContentLinkUrl.svelte @@ -2,8 +2,8 @@ import {call, displayUrl} from "@welshman/lib" import {displayRelayUrl, isRelayUrl, normalizeRelayUrl} from "@welshman/util" import LinkRound from "@assets/icons/link-round.svg?dataurl" - import Icon from "@lib/components/Icon.svelte" - import Link from "@lib/components/Link.svelte" + import Icon from "@lib/components2/Icon.svelte" + import Link from "@lib/components2/Link.svelte" import {PLATFORM_URL} from "@app/env" import {displayRoom, isRoomId, splitRoomId} from "@app/groups" import {makeRoomPath, makeSpacePath} from "@app/routes" @@ -49,10 +49,10 @@ {#if roomReference} - ~{displayRelayUrl(roomReference.url)} / + ~{displayRelayUrl(roomReference.url)} / {displayRoom(roomReference.url, roomReference.h)} {:else if relayReference} - {displayRelayUrl(relayReference)} + {displayRelayUrl(relayReference)} {:else} {displayUrl(url)} diff --git a/src/app/components/ContentMention.svelte b/src/app/components/ContentMention.svelte index 17512e77..6ad1be1d 100644 --- a/src/app/components/ContentMention.svelte +++ b/src/app/components/ContentMention.svelte @@ -2,7 +2,7 @@ import {removeUndefined} from "@welshman/lib" import type {ProfilePointer} from "@welshman/content" import {deriveProfileDisplay} from "@welshman/app" - import Button from "@lib/components/Button.svelte" + import Button from "@lib/components2/Button.svelte" import ProfileDetail from "@app/components/ProfileDetail.svelte" import {pushModal} from "@app/modal" @@ -18,6 +18,6 @@ const openProfile = () => pushModal(ProfileDetail, {pubkey: value.pubkey, url}) - diff --git a/src/app/components/ContentMinimal.svelte b/src/app/components/ContentMinimal.svelte index f35be776..173a2f7a 100644 --- a/src/app/components/ContentMinimal.svelte +++ b/src/app/components/ContentMinimal.svelte @@ -19,10 +19,11 @@ isNewline, } from "@welshman/content" import type {Parsed} from "@welshman/content" - import Link from "@lib/components/Link.svelte" + import Link from "@lib/components2/Link.svelte" import Danger from "@assets/icons/danger-triangle.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 Alert from "@lib/components2/Alert.svelte" import ContentToken from "@app/components/ContentToken.svelte" import ContentEmoji from "@app/components/ContentEmoji.svelte" import ContentEmail from "@app/components/ContentEmail.svelte" @@ -96,13 +97,13 @@
      {#if warning} -
      +

      This note has been flagged by the author as "{warning}".
      - +

      -
      + {:else}
      {#each shortContent as parsed, i} diff --git a/src/app/components/ContentQuote.svelte b/src/app/components/ContentQuote.svelte index 1f847a7a..67472327 100644 --- a/src/app/components/ContentQuote.svelte +++ b/src/app/components/ContentQuote.svelte @@ -3,8 +3,8 @@ import {Router} from "@welshman/router" import type {TrustedEvent} from "@welshman/util" import {Address, MESSAGE} from "@welshman/util" - import Button from "@lib/components/Button.svelte" - import Spinner from "@lib/components/Spinner.svelte" + import Button from "@lib/components2/Button.svelte" + import Spinner from "@lib/components2/Spinner.svelte" import NoteCard from "@app/components/NoteCard.svelte" import NoteContent from "@app/components/NoteContent.svelte" import NoteContentMinimal from "@app/components/NoteContentMinimal.svelte" @@ -48,17 +48,19 @@ {:else if $quote.kind === MESSAGE}
      + class="cl-surface-alt py-1 pl-2 opacity-90" + style="border-left: 2px solid var(--cl-primary);">
      {:else} - - - +
      + + + +
      {/if} {:else} -
      +
      Loading event...
      {/if} diff --git a/src/app/components/ContentToken.svelte b/src/app/components/ContentToken.svelte index e4a0a643..24088d2f 100644 --- a/src/app/components/ContentToken.svelte +++ b/src/app/components/ContentToken.svelte @@ -1,7 +1,7 @@ - diff --git a/src/app/components/ContentTopic.svelte b/src/app/components/ContentTopic.svelte index 8f12a467..ceecd82f 100644 --- a/src/app/components/ContentTopic.svelte +++ b/src/app/components/ContentTopic.svelte @@ -1,7 +1,9 @@ - + #{value} - + diff --git a/src/app/components/CurrencyInput.svelte b/src/app/components/CurrencyInput.svelte index 646441ed..bcfec653 100644 --- a/src/app/components/CurrencyInput.svelte +++ b/src/app/components/CurrencyInput.svelte @@ -6,11 +6,11 @@ import {preventDefault} from "@lib/html" import {createSearch} from "@welshman/app" import {currencyOptions, displayCurrency} from "@lib/currency" - import Suggestions from "@lib/components/Suggestions.svelte" + import Suggestions from "@lib/components2/Suggestions.svelte" import CurrencySuggestion from "@app/components/CurrencySuggestion.svelte" import AltArrowDown from "@assets/icons/alt-arrow-down.svg?dataurl" - import Icon from "@lib/components/Icon.svelte" - import Tippy from "@lib/components/Tippy.svelte" + import Icon from "@lib/components2/Icon.svelte" + import Tippy from "@lib/components2/Tippy.svelte" interface Props { value: string @@ -66,22 +66,18 @@ -
      + diff --git a/src/app/components/EventActivity.svelte b/src/app/components/EventActivity.svelte index 3f2dac4d..b644b392 100644 --- a/src/app/components/EventActivity.svelte +++ b/src/app/components/EventActivity.svelte @@ -8,7 +8,8 @@ import {repository} from "@welshman/app" import {deriveChecked} from "@app/notifications" import Reply from "@assets/icons/reply-2.svg?dataurl" - import Icon from "@lib/components/Icon.svelte" + import Icon from "@lib/components2/Icon.svelte" + import Badge from "@lib/components2/Badge.svelte" const {url, path, event}: {url: string; path: string; event: TrustedEvent} = $props() @@ -22,13 +23,13 @@ }) -
      - + + {$replies.length} {$replies.length === 1 ? "reply" : "replies"} -
      -
      + + {#if gt(lastActive, $checked)} -
      +
      {/if} Active {formatTimestampRelative(lastActive)} -
      + diff --git a/src/app/components/EventDeleteConfirm.svelte b/src/app/components/EventDeleteConfirm.svelte index c2770f1e..a0ae4e0e 100644 --- a/src/app/components/EventDeleteConfirm.svelte +++ b/src/app/components/EventDeleteConfirm.svelte @@ -1,6 +1,6 @@ -
        +
        {#if isRoot} -
      • - -
        • - {/if} -
      • - -
        • + {/if} + {@render customActions?.()} {#if event.pubkey === $pubkey} -
      • - + {:else} + + {#if $userIsAdmin} + -
        • - {:else} -
      • - -
        • - {#if $userIsAdmin} -
      • - -
        • {/if} {/if} -
      +
      diff --git a/src/app/components/EventReply.svelte b/src/app/components/EventReply.svelte index 43d192e8..f806d543 100644 --- a/src/app/components/EventReply.svelte +++ b/src/app/components/EventReply.svelte @@ -5,8 +5,8 @@ import {isMobile, preventDefault} from "@lib/html" import {fly} from "@lib/transition" import Paperclip from "@assets/icons/paperclip-2.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 EditorContent from "@app/editor/EditorContent.svelte" import ChatComposeParent from "@app/components/ChatComposeParent.svelte" import {publishComment} from "@app/comments" @@ -101,7 +101,7 @@ bind:this={form} onsubmit={preventDefault(submit)} class="left-content bottom-sai right-sai fixed z-feature mb-14 md:mb-0 w-full md:w-auto pr-2"> -
      +
      {#if parent} onClearParent?.()} verb="Replying to" /> {/if} @@ -111,18 +111,19 @@
      - - + +
      diff --git a/src/app/components/EventShare.svelte b/src/app/components/EventShare.svelte index 2ae7d64f..7e82f748 100644 --- a/src/app/components/EventShare.svelte +++ b/src/app/components/EventShare.svelte @@ -5,14 +5,14 @@ import AltArrowLeft from "@assets/icons/alt-arrow-left.svg?dataurl" import AltArrowRight from "@assets/icons/alt-arrow-right.svg?dataurl" import {setKey} from "@lib/implicit" - import Icon from "@lib/components/Icon.svelte" - import Button from "@lib/components/Button.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 Modal from "@lib/components/Modal.svelte" - import ModalBody from "@lib/components/ModalBody.svelte" + import Icon from "@lib/components2/Icon.svelte" + import Button from "@lib/components2/Button.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 Modal from "@lib/components2/Modal.svelte" + import ModalBody from "@lib/components2/ModalBody.svelte" import RoomName from "@app/components/RoomName.svelte" import {roomsByUrl} from "@app/groups" import {makeRoomPath} from "@app/routes" @@ -41,23 +41,20 @@
      {#each $roomsByUrl.get(url) || [] as room (room.h)} - + {/each}
      - - diff --git a/src/app/components/GoalActions.svelte b/src/app/components/GoalActions.svelte index c5e3d1c4..ec41babd 100644 --- a/src/app/components/GoalActions.svelte +++ b/src/app/components/GoalActions.svelte @@ -1,7 +1,7 @@ - -

      {event.content}

      - - -
      - - Posted by - {#if h} - in - {/if} - - -
      + + +

      {event.content}

      + + +
      + + Posted by + {#if h} + in + {/if} + + +
      + diff --git a/src/app/components/GoalSummary.svelte b/src/app/components/GoalSummary.svelte index 110bc906..1d27016e 100644 --- a/src/app/components/GoalSummary.svelte +++ b/src/app/components/GoalSummary.svelte @@ -5,7 +5,11 @@ import {deriveItemsByKey, deriveArray} from "@welshman/store" import {repository, getValidZap} from "@welshman/app" import Bolt from "@assets/icons/bolt.svg?dataurl" - import Icon from "@lib/components/Icon.svelte" + import Icon from "@lib/components2/Icon.svelte" + import Stat from "@lib/components2/Stat.svelte" + import Row from "@lib/components2/Row.svelte" + import Col from "@lib/components2/Col.svelte" + import Progress from "@lib/components2/Progress.svelte" import ZapButton from "@app/components/ZapButton.svelte" type Props = { @@ -31,24 +35,17 @@ const daysOld = Math.ceil((now() - event.created_at) / DAY) -
      -
      -
      -

      {zapAmount} sats

      -

      funded of {goalAmount} sats

      -
      -
      -

      {contributorsCount}

      -

      {contributorsCount === 1 ? "contributor" : "contributors"}

      -
      -
      -

      {daysOld}

      -

      {daysOld === 1 ? "day" : "days"} old

      -
      -
      - - + + + + + + + + Contribute to this goal -
      + diff --git a/src/app/components/IconPicker.svelte b/src/app/components/IconPicker.svelte index 32d3750f..3e1eff80 100644 --- a/src/app/components/IconPicker.svelte +++ b/src/app/components/IconPicker.svelte @@ -1,6 +1,18 @@ + + -
      + {/if} diff --git a/src/app/components/PrimaryNav.svelte b/src/app/components/PrimaryNav.svelte index bec49561..0945fc9a 100644 --- a/src/app/components/PrimaryNav.svelte +++ b/src/app/components/PrimaryNav.svelte @@ -6,10 +6,10 @@ import Widget from "@assets/icons/widget-4.svg?dataurl" import UserRounded from "@assets/icons/user-rounded.svg?dataurl" import Settings from "@assets/icons/settings.svg?dataurl" - import ImageIcon from "@lib/components/ImageIcon.svelte" - import Divider from "@lib/components/Divider.svelte" + import ImageIcon from "@lib/components2/ImageIcon.svelte" + import Divider from "@lib/components2/Divider.svelte" import MenuSettings from "@app/components/MenuSettings.svelte" - import PrimaryNavItem from "@lib/components/PrimaryNavItem.svelte" + import PrimaryNavItem from "@lib/components2/PrimaryNavItem.svelte" import PrimaryNavSpaces from "@app/components/PrimaryNavSpaces.svelte" import {userSpaceUrls} from "@app/groups" import {PLATFORM_RELAYS} from "@app/env" @@ -33,7 +33,7 @@