Open the main page when clicking on the widget

This commit is contained in:
dtonon
2024-08-13 19:29:12 +02:00
parent 2959005222
commit d68ce0daba
8 changed files with 81 additions and 55 deletions

View File

@@ -108,6 +108,7 @@ templ calendarEventTemplate(params CalendarPageParams, isEmbed bool) {
if isEmbed { if isEmbed {
@embeddedPageTemplate( @embeddedPageTemplate(
params.Event, params.Event,
params.NeventNaked,
isEmbed, isEmbed,
) { ) {
@calendarEventInnerBlock(params) @calendarEventInnerBlock(params)

View File

@@ -2,6 +2,7 @@ package main
templ embeddedPageTemplate( templ embeddedPageTemplate(
event EnhancedEvent, event EnhancedEvent,
NeventNaked string,
isEmbed bool, isEmbed bool,
) { ) {
<!DOCTYPE html> <!DOCTYPE html>
@@ -15,7 +16,10 @@ templ embeddedPageTemplate(
href="/njump/static/tailwind-bundle.min.css" href="/njump/static/tailwind-bundle.min.css"
/> />
</head> </head>
<body class="relative bg-white text-gray-600 dark:bg-neutral-900 dark:text-neutral-50 print:text-black sm:items-center sm:justify-center"> <body
class="relative bg-white text-gray-600 dark:bg-neutral-900 dark:text-neutral-50 print:text-black sm:items-center sm:justify-center cursor-pointer"
event-data={ templ.JSONString(NeventNaked) }
>
<style> ::-webkit-scrollbar { display: none; } </style> <style> ::-webkit-scrollbar { display: none; } </style>
<div class="mx-auto w-full max-w-screen-2xl justify-between gap-10 overflow-visible px-4 pb-4 pt-4 print:w-full sm:w-11/12 md:w-10/12 lg:w-9/12"> <div class="mx-auto w-full max-w-screen-2xl justify-between gap-10 overflow-visible px-4 pb-4 pt-4 print:w-full sm:w-11/12 md:w-10/12 lg:w-9/12">
@authorHeaderTemplate(event.author) @authorHeaderTemplate(event.author)
@@ -50,6 +54,14 @@ for (var i = 0; i < links.length; i++) {
links[i].setAttribute('target', '_blank'); 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 () { window.addEventListener('load', function () {
var contentHeight = document.body.scrollHeight var contentHeight = document.body.scrollHeight
window.parent.postMessage({height: contentHeight}, '*') window.parent.postMessage({height: contentHeight}, '*')

View File

@@ -13,71 +13,71 @@ templ embeddedProfileTemplate(params ProfilePageParams) {
/> />
</head> </head>
<body <body
class="relative bg-white text-gray-600 dark:bg-neutral-900 dark:text-neutral-50 print:text-black" class="relative bg-white text-gray-600 dark:bg-neutral-900 dark:text-neutral-50 print:text-black cursor-pointer"
npub-data={ templ.JSONString(params.Metadata.Npub()) }
> >
<style> ::-webkit-scrollbar { display: none; } </style> <style> ::-webkit-scrollbar { display: none; } </style>
<div <div
class="mx-auto w-full max-w-screen-2xl justify-between gap-10 overflow-visible px-4 pb-4 pt-4 print:w-full sm:w-11/12 md:w-10/12 lg:w-9/12" class="mx-auto w-full max-w-screen-2xl justify-between gap-10 overflow-visible px-4 pb-4 pt-4 print:w-full sm:w-11/12 md:w-10/12 lg:w-9/12"
> >
<a href={ templ.URL("/" + params.Metadata.Npub()) } target="_new" class="no-underline"> <div class="w-full break-words">
<div class="w-full break-words"> <div class="w-full break-words print:w-full">
<div class="w-full break-words print:w-full"> <header class="mb-4 max-w-full">
<header class="mb-4 max-w-full"> <div class="flex items-center">
<div class="flex items-center"> <div
<div class="print:basis-1-12 imgclip mr-2 flex-shrink-0 basis-1/5 overflow-hidden sm:mr-4"
class="print:basis-1-12 imgclip mr-2 flex-shrink-0 basis-1/5 overflow-hidden sm:mr-4" >
> <img
<img class="block h-auto w-full"
class="block h-auto w-full" src={ params.Metadata.Picture }
src={ params.Metadata.Picture } />
/>
</div>
<div class="block print:text-base">
<div class="text-2xl">{ params.Metadata.Name }</div>
if params.Metadata.Name != params.Metadata.DisplayName {
<div class="leading-4 text-stone-400">
{ params.Metadata.DisplayName }
</div>
}
</div>
</div> </div>
</header> <div class="block print:text-base">
if params.Metadata.Website != "" || params.RenderedAuthorAboutText != "" { <div class="text-2xl">{ params.Metadata.Name }</div>
<div class="-ml-4 mb-6 h-1.5 w-1/2 bg-zinc-100 dark:bg-zinc-700 sm:-ml-2.5"></div> if params.Metadata.Name != params.Metadata.DisplayName {
<div class="mb-6 leading-5">{ params.Metadata.Website }</div> <div class="leading-4 text-stone-400">
<div class="prose mb-6 leading-5 dark:prose-invert prose-headings:font-light sm:prose-a:text-justify"> { params.Metadata.DisplayName }
@templ.Raw(params.RenderedAuthorAboutText) </div>
</div>
}
<div class="-ml-4 mb-6 h-1.5 w-1/3 bg-zinc-100 dark:bg-zinc-700 sm:-ml-2.5"></div>
<div class="mb-6 leading-5">
<div class="text-sm text-strongpink">Public Key</div>
{ params.Metadata.Npub() }
</div>
<div class="mb-6 leading-5">
if params.Metadata.NIP05 != "" {
<div class="text-sm text-strongpink">NIP-05 Address</div>
{ params.Metadata.NIP05 }
}
</div>
<div class="mb-6 leading-5">
if params.Metadata.LUD16 != "" {
<div class="text-sm text-strongpink">NIP-57 Address</div>
{ params.Metadata.LUD16 }
}
</div>
if len(params.AuthorRelays) > 0 {
<div class="mb-6 leading-5">
<div class="text-sm text-strongpink">Publishing to</div>
for _, element := range params.AuthorRelays {
<span class="mr-1 mt-2 inline-block max-w-full rounded-lg border border-slate-300 px-2 py-0.5">{ element }</span>
} }
</div> </div>
</div>
</header>
if params.Metadata.Website != "" || params.RenderedAuthorAboutText != "" {
<div class="-ml-4 mb-6 h-1.5 w-1/2 bg-zinc-100 dark:bg-zinc-700 sm:-ml-2.5"></div>
<div class="mb-6 leading-5">{ params.Metadata.Website }</div>
<div class="prose mb-6 leading-5 dark:prose-invert prose-headings:font-light sm:prose-a:text-justify">
@templ.Raw(params.RenderedAuthorAboutText)
</div>
}
<div class="-ml-4 mb-6 h-1.5 w-1/3 bg-zinc-100 dark:bg-zinc-700 sm:-ml-2.5"></div>
<div class="mb-6 leading-5">
<div class="text-sm text-strongpink">Public Key</div>
{ params.Metadata.Npub() }
</div>
<div class="mb-6 leading-5">
if params.Metadata.NIP05 != "" {
<div class="text-sm text-strongpink">NIP-05 Address</div>
{ params.Metadata.NIP05 }
} }
</div> </div>
<div class="-ml-4 mb-6 h-1.5 w-1/3 bg-zinc-100 dark:bg-zinc-700 sm:-ml-2.5"></div> <div class="mb-6 leading-5">
if params.Metadata.LUD16 != "" {
<div class="text-sm text-strongpink">NIP-57 Address</div>
{ params.Metadata.LUD16 }
}
</div>
if len(params.AuthorRelays) > 0 {
<div class="mb-6 leading-5">
<div class="text-sm text-strongpink">Publishing to</div>
for _, element := range params.AuthorRelays {
<span class="mr-1 mt-2 inline-block max-w-full rounded-lg border border-slate-300 px-2 py-0.5">{ element }</span>
}
</div>
}
</div> </div>
</a> <div class="-ml-4 mb-6 h-1.5 w-1/3 bg-zinc-100 dark:bg-zinc-700 sm:-ml-2.5"></div>
</div>
<div class="text-sm leading-3 text-neutral-400"> <div class="text-sm leading-3 text-neutral-400">
This note has been published on Nostr and is embedded via Njump, This note has been published on Nostr and is embedded via Njump,
<a href="/" target="_new" class="underline">learn more</a> <a href="/" target="_new" class="underline">learn more</a>
@@ -100,6 +100,14 @@ for (var i = 0; i < links.length; i++) {
links[i].setAttribute('target', '_blank'); 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 () { window.addEventListener('load', function () {
var contentHeight = document.body.scrollHeight var contentHeight = document.body.scrollHeight
window.parent.postMessage({height: contentHeight}, '*') window.parent.postMessage({height: contentHeight}, '*')

View File

@@ -43,6 +43,7 @@ templ fileMetadataTemplate(params FileMetadataPageParams, isEmbed bool) {
if isEmbed { if isEmbed {
@embeddedPageTemplate( @embeddedPageTemplate(
params.Event, params.Event,
params.NeventNaked,
isEmbed, isEmbed,
) { ) {
@fileMetadataInnerBlock(params) @fileMetadataInnerBlock(params)

View File

@@ -57,6 +57,7 @@ templ liveEventTemplate(params LiveEventPageParams, isEmbed bool) {
if isEmbed { if isEmbed {
@embeddedPageTemplate( @embeddedPageTemplate(
params.Event, params.Event,
params.NeventNaked,
isEmbed, isEmbed,
) { ) {
@liveEventInnerBlock(params) @liveEventInnerBlock(params)

View File

@@ -23,6 +23,7 @@ templ liveEventMessageTemplate(params LiveEventMessagePageParams, isEmbed bool)
if isEmbed { if isEmbed {
@embeddedPageTemplate( @embeddedPageTemplate(
params.Event, params.Event,
params.NeventNaked,
isEmbed, isEmbed,
) { ) {
@liveEventMessageInnerBlock(params) @liveEventMessageInnerBlock(params)

View File

@@ -37,6 +37,7 @@ templ noteTemplate(params NotePageParams, isEmbed bool) {
if isEmbed { if isEmbed {
@embeddedPageTemplate( @embeddedPageTemplate(
params.Event, params.Event,
params.NeventNaked,
isEmbed, isEmbed,
) { ) {
@noteInnerBlock(params) @noteInnerBlock(params)

View File

@@ -26,6 +26,7 @@ templ wikiEventTemplate(params WikiPageParams, isEmbed bool) {
if isEmbed { if isEmbed {
@embeddedPageTemplate( @embeddedPageTemplate(
params.Event, params.Event,
params.NeventNaked,
isEmbed, isEmbed,
) { ) {
@wikiInnerBlock(params) @wikiInnerBlock(params)