From d68ce0daba2347d48875c7fda2d741a40344cd47 Mon Sep 17 00:00:00 2001 From: dtonon Date: Tue, 13 Aug 2024 19:29:12 +0200 Subject: [PATCH] Open the main page when clicking on the widget --- calendar_event.templ | 1 + embedded_page.templ | 14 ++++- embedded_profile.templ | 116 +++++++++++++++++++++------------------ file_metadata.templ | 1 + live_event.templ | 1 + live_event_message.templ | 1 + note.templ | 1 + wiki_event.templ | 1 + 8 files changed, 81 insertions(+), 55 deletions(-) diff --git a/calendar_event.templ b/calendar_event.templ index 30ea59f..a1acb64 100644 --- a/calendar_event.templ +++ b/calendar_event.templ @@ -108,6 +108,7 @@ templ calendarEventTemplate(params CalendarPageParams, isEmbed bool) { if isEmbed { @embeddedPageTemplate( params.Event, + params.NeventNaked, isEmbed, ) { @calendarEventInnerBlock(params) diff --git a/embedded_page.templ b/embedded_page.templ index d9e9c1f..cf917f9 100644 --- a/embedded_page.templ +++ b/embedded_page.templ @@ -2,6 +2,7 @@ package main templ embeddedPageTemplate( event EnhancedEvent, + NeventNaked string, isEmbed bool, ) { @@ -15,7 +16,10 @@ templ embeddedPageTemplate( href="/njump/static/tailwind-bundle.min.css" /> - +
@authorHeaderTemplate(event.author) @@ -50,6 +54,14 @@ for (var i = 0; i < links.length; i++) { links[i].setAttribute('target', '_blank'); } +// Open the njump page if the target is not a link +document.onclick = function(event) { + if (event.target.tagName.toLowerCase() !== 'a') { + const neventNaked = JSON.parse(document.body.getAttribute('event-data')); + window.open("/" + neventNaked, '_blank'); + } +}; + window.addEventListener('load', function () { var contentHeight = document.body.scrollHeight window.parent.postMessage({height: contentHeight}, '*') diff --git a/embedded_profile.templ b/embedded_profile.templ index cee69dc..0a8b57c 100644 --- a/embedded_profile.templ +++ b/embedded_profile.templ @@ -13,71 +13,71 @@ templ embeddedProfileTemplate(params ProfilePageParams) { />
- -
-
-
-
-
- -
-
-
{ params.Metadata.Name }
- if params.Metadata.Name != params.Metadata.DisplayName { -
- { params.Metadata.DisplayName } -
- } -
+
+
+
+
+
+
-
- if params.Metadata.Website != "" || params.RenderedAuthorAboutText != "" { -
-
{ params.Metadata.Website }
-
- @templ.Raw(params.RenderedAuthorAboutText) -
- } -
-
-
Public Key
- { params.Metadata.Npub() } -
-
- if params.Metadata.NIP05 != "" { -
NIP-05 Address
- { params.Metadata.NIP05 } - } -
-
- if params.Metadata.LUD16 != "" { -
NIP-57 Address
- { params.Metadata.LUD16 } - } -
- if len(params.AuthorRelays) > 0 { -
-
Publishing to
- for _, element := range params.AuthorRelays { - { element } +
+
{ params.Metadata.Name }
+ if params.Metadata.Name != params.Metadata.DisplayName { +
+ { params.Metadata.DisplayName } +
}
+
+
+ if params.Metadata.Website != "" || params.RenderedAuthorAboutText != "" { +
+
{ params.Metadata.Website }
+
+ @templ.Raw(params.RenderedAuthorAboutText) +
+ } +
+
+
Public Key
+ { params.Metadata.Npub() } +
+
+ if params.Metadata.NIP05 != "" { +
NIP-05 Address
+ { params.Metadata.NIP05 } }
-
+
+ if params.Metadata.LUD16 != "" { +
NIP-57 Address
+ { params.Metadata.LUD16 } + } +
+ if len(params.AuthorRelays) > 0 { +
+
Publishing to
+ for _, element := range params.AuthorRelays { + { element } + } +
+ }
- +
+
+
This note has been published on Nostr and is embedded via Njump, learn more @@ -100,6 +100,14 @@ for (var i = 0; i < links.length; i++) { links[i].setAttribute('target', '_blank'); } +// Open the njump page if the target is not a link +document.onclick = function(event) { + if (event.target.tagName.toLowerCase() !== 'a') { + const npub = JSON.parse(document.body.getAttribute('npub-data')); + window.open("/" + npub, '_blank'); + } +}; + window.addEventListener('load', function () { var contentHeight = document.body.scrollHeight window.parent.postMessage({height: contentHeight}, '*') diff --git a/file_metadata.templ b/file_metadata.templ index 3d02b61..17ea559 100644 --- a/file_metadata.templ +++ b/file_metadata.templ @@ -43,6 +43,7 @@ templ fileMetadataTemplate(params FileMetadataPageParams, isEmbed bool) { if isEmbed { @embeddedPageTemplate( params.Event, + params.NeventNaked, isEmbed, ) { @fileMetadataInnerBlock(params) diff --git a/live_event.templ b/live_event.templ index 12f6d5d..ad111df 100644 --- a/live_event.templ +++ b/live_event.templ @@ -57,6 +57,7 @@ templ liveEventTemplate(params LiveEventPageParams, isEmbed bool) { if isEmbed { @embeddedPageTemplate( params.Event, + params.NeventNaked, isEmbed, ) { @liveEventInnerBlock(params) diff --git a/live_event_message.templ b/live_event_message.templ index dc32273..b869ce7 100644 --- a/live_event_message.templ +++ b/live_event_message.templ @@ -23,6 +23,7 @@ templ liveEventMessageTemplate(params LiveEventMessagePageParams, isEmbed bool) if isEmbed { @embeddedPageTemplate( params.Event, + params.NeventNaked, isEmbed, ) { @liveEventMessageInnerBlock(params) diff --git a/note.templ b/note.templ index 280776b..b1b4133 100644 --- a/note.templ +++ b/note.templ @@ -37,6 +37,7 @@ templ noteTemplate(params NotePageParams, isEmbed bool) { if isEmbed { @embeddedPageTemplate( params.Event, + params.NeventNaked, isEmbed, ) { @noteInnerBlock(params) diff --git a/wiki_event.templ b/wiki_event.templ index c7e70c6..c15f9b4 100644 --- a/wiki_event.templ +++ b/wiki_event.templ @@ -26,6 +26,7 @@ templ wikiEventTemplate(params WikiPageParams, isEmbed bool) { if isEmbed { @embeddedPageTemplate( params.Event, + params.NeventNaked, isEmbed, ) { @wikiInnerBlock(params)