diff --git a/src/app/components/AppContainer.svelte b/src/app/components/AppContainer.svelte index 8f1d5ab6..6b6db1a4 100644 --- a/src/app/components/AppContainer.svelte +++ b/src/app/components/AppContainer.svelte @@ -1,8 +1,10 @@
@@ -10,7 +12,7 @@ - {:else} + {:else if !$modals[$page.url.hash.slice(1)]} {/if}
diff --git a/src/app/components/ChannelMessage.svelte b/src/app/components/ChannelMessage.svelte index 38907216..c9c17142 100644 --- a/src/app/components/ChannelMessage.svelte +++ b/src/app/components/ChannelMessage.svelte @@ -1,6 +1,6 @@ - + {:else} +
{/if} -
- - {#if thunk} -
- +
+ {#if showPubkey} +
+ + {formatTimestampAsTime(event.created_at)}
{/if} +
+ + {#if thunk} + + {/if} +
-
- {#if $reactions.length > 0 || $zaps.length > 0} -
- {#each groupBy( e => e.content, uniqBy(e => e.pubkey + e.content, $reactions), ).entries() as [content, events]} - {@const isOwn = events.some(e => e.pubkey === $pubkey)} - {@const onClick = () => onReactionClick(content, events)} - - {/each} -
- {/if} - + {/each} +
+ {/if} + - + diff --git a/src/app/components/ChatMessage.svelte b/src/app/components/ChatMessage.svelte index 3bbd6914..b2b1bd56 100644 --- a/src/app/components/ChatMessage.svelte +++ b/src/app/components/ChatMessage.svelte @@ -1,7 +1,7 @@ -
- - - -
-
-
- {#if showPubkey} - - {/if} -
+ +
+ + + +
+
+
{#if showPubkey} -
- - {formatTimestampAsTime(event.created_at)} -
+ {/if} -
- +
+ {#if showPubkey} +
+ + {formatTimestampAsTime(event.created_at)} +
+ {/if} +
+ +
+ {#if $reactions.length > 0 || $zaps.length > 0} +
+ {#each groupBy( e => e.content, uniqBy(e => e.pubkey + e.content, $reactions), ).entries() as [content, events]} + {@const isOwn = events.some(e => e.pubkey === $pubkey)} + {@const onClick = () => onReactionClick(content, events)} + + {/each} +
+ {/if}
- {#if $reactions.length > 0 || $zaps.length > 0} -
- {#each groupBy( e => e.content, uniqBy(e => e.pubkey + e.content, $reactions), ).entries() as [content, events]} - {@const isOwn = events.some(e => e.pubkey === $pubkey)} - {@const onClick = () => onReactionClick(content, events)} - - {/each} -
- {/if}
-
+
diff --git a/src/app/components/ChatStart.svelte b/src/app/components/ChatStart.svelte index 84992874..fa834685 100644 --- a/src/app/components/ChatStart.svelte +++ b/src/app/components/ChatStart.svelte @@ -22,7 +22,6 @@
Create an encrypted chat room for private conversations.
-

Members

diff --git a/src/app/components/ProfileName.svelte b/src/app/components/ProfileName.svelte index a390c4d6..08fdb89b 100644 --- a/src/app/components/ProfileName.svelte +++ b/src/app/components/ProfileName.svelte @@ -1,11 +1,9 @@ {$profileDisplay} diff --git a/src/app/components/RelayAdd.svelte b/src/app/components/RelayAdd.svelte index 08eeea38..767ffb47 100644 --- a/src/app/components/RelayAdd.svelte +++ b/src/app/components/RelayAdd.svelte @@ -32,13 +32,11 @@ }) -
- -
-
+ +
{#each $relaySearch .searchValues(term) .filter(url => !$relays.includes(url)) diff --git a/src/app/components/SignUp.svelte b/src/app/components/SignUp.svelte index 1bbaf544..95d87760 100644 --- a/src/app/components/SignUp.svelte +++ b/src/app/components/SignUp.svelte @@ -4,14 +4,18 @@ import Icon from "@lib/components/Icon.svelte" import Field from "@lib/components/Field.svelte" import Button from "@lib/components/Button.svelte" + import Divider from "@lib/components/Divider.svelte" import Spinner from "@lib/components/Spinner.svelte" import LogIn from "@app/components/LogIn.svelte" - import InfoNostr from "@app/components/LogIn.svelte" + import InfoNostr from "@app/components/InfoNostr.svelte" + import SignUpKey from "@app/components/SignUpKey.svelte" import {pushModal, clearModals} from "@app/modal" import {pushToast} from "@app/toast" const login = () => pushModal(LogIn) + const signUpWithKey = () => pushModal(SignUpKey) + const trySignup = async () => { const secret = makeSecret() const handle = await loadHandle(`${username}@${handler.domain}`) @@ -83,14 +87,17 @@ @{handler.domain}
-
- -
- Already have an account? - -
+ + Or + +
+ Already have an account? +
diff --git a/src/app/components/SignUpKey.svelte b/src/app/components/SignUpKey.svelte new file mode 100644 index 00000000..c016a01d --- /dev/null +++ b/src/app/components/SignUpKey.svelte @@ -0,0 +1,63 @@ + + +
+ +
Sign Up
+
With a freshly generated private key
+
+ +

Private Key

+ +

+ Make sure to save your private key somewhere safe, like in a password manager. + +

+
+ + + + +
diff --git a/src/lib/components/Delay.svelte b/src/lib/components/Delay.svelte new file mode 100644 index 00000000..fff3b4be --- /dev/null +++ b/src/lib/components/Delay.svelte @@ -0,0 +1,11 @@ + + +{#await sleep(delay)} + +{:then} + +{/await} diff --git a/src/lib/components/Dialog.svelte b/src/lib/components/Dialog.svelte index a5a25cc7..222420f2 100644 --- a/src/lib/components/Dialog.svelte +++ b/src/lib/components/Dialog.svelte @@ -11,7 +11,7 @@ transition:fade on:click={onClose} />
diff --git a/src/lib/components/Drawer.svelte b/src/lib/components/Drawer.svelte index c1102171..c77974d5 100644 --- a/src/lib/components/Drawer.svelte +++ b/src/lib/components/Drawer.svelte @@ -10,7 +10,7 @@ transition:fade on:click={onClose} /> diff --git a/src/lib/editor/SuggestionProfile.svelte b/src/lib/editor/SuggestionProfile.svelte index efc1a172..b1308548 100644 --- a/src/lib/editor/SuggestionProfile.svelte +++ b/src/lib/editor/SuggestionProfile.svelte @@ -1,7 +1,42 @@ - +
+
+ +
+
+
+
+ {$profileDisplay} +
+ +
+
+ {$handle ? displayHandle($handle) : displayPubkey(pubkey)} +
+
+
diff --git a/src/lib/transition.ts b/src/lib/transition.ts index d3084f4c..da14500c 100644 --- a/src/lib/transition.ts +++ b/src/lib/transition.ts @@ -13,6 +13,7 @@ export function slideAndFade( node: any, {delay = 0, duration = 400, easing = cubicOut, axis = "y"} = {}, ) { + console.log('slideAndFade') const style = getComputedStyle(node) const primary_property = axis === "y" ? "height" : "width" const primary_property_value = parseFloat(style[primary_property]) @@ -46,3 +47,6 @@ export function slideAndFade( `border-${secondary_properties[1]}-width: ${t * border_width_end_value}px;`, } } + +export const conditionalTransition = (condition: any, transition: any) => + (node: any, args?: any) => condition ? transtion(node, args) : null diff --git a/src/routes/home/+layout.svelte b/src/routes/home/+layout.svelte index eec99028..18df461f 100644 --- a/src/routes/home/+layout.svelte +++ b/src/routes/home/+layout.svelte @@ -1,7 +1,7 @@