@rathnasgala/theme 0.0.11 → 0.0.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rathnasgala/theme",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "description": "Managed Gala static-site theme payload",
   "license": "MIT",
   "repository": {

package/payload/.gala/managed-files.json

@@ -2,7 +2,7 @@
   "schemaVersion": 1,
   "themePackage": {
     "name": "@rathnasgala/theme",
-    "version": "0.0.11",
+    "version": "0.0.12",
     "availableDesignThemes": [
       "editorial"
     ],
@@ -25,7 +25,7 @@
     "lib/provider-fixtures/embeds.v1.json": "5f26909fb433135321ddf7fdd14e45aeb702805c88f5676941166c5735143ee2",
     "lib/provider-fixtures/share-intents.v1.json": "66a8eedfcff711253ee45ceb94b53f7d5a6be3ddbbb3d1f0d4e31a114326cc0a",
     "src/404.njk": "be0d44370ac5402156aaf3d32ea581057bc61ec94c1a5f92bb809733af7a8a20",
-    "src/_includes/layouts/base.njk": "b62dea9dcd5eeefc020e1823ce8afc7d5b0105df56d57fdcacbf414f4edb4dd2",
+    "src/_includes/layouts/base.njk": "1bd300b68db1786b593ae5ef4325d68f21a5c79a78ac1cb3aba09fdba57bec9d",
     "src/_includes/layouts/post.njk": "1accd2832064ad19ee7bf18daf5fa1e60569f32c9b7a547934a6361f747d7eb7",
     "src/_includes/components/ui.njk": "de062ca818759edb53dc5e94ab839ac9453fda1fe458c61c04d9d89ef880c6af",
     "src/_data/buildManifest.js": "628163305984e0d3537e27b0d4050f5ba5ead12a834878266d2ce8004ffe1b1e",
@@ -34,7 +34,7 @@
     "src/_data/languages.js": "1358748f7fa2f74406d3295a030827d6229a53e94da72cf712e719d7a356aeac",
     "src/_data/site.js": "d9c001f4cc12a34027dd92303530b11b5402d47613459bb997e22c4bcbea326d",
     "src/assets/theme-mode.js": "3797c84dbaa090b5b21427a31928b5dd97f13d04d99833f5e1e74c6b50e01dcc",
-    "src/assets/interactions.js": "c8ea01683941da3f81536a9c5d33d2e8d09a1f31f6090d33b53b70fa7aad621d",
+    "src/assets/interactions.js": "3cd88a919bde8b894fe8509be8db1b07ddd9459df8b31dac83bf9b0215cd73df",
     "src/assets/embed-codepen.svg": "e9def697f38c466fb2b6652535c4c814e8cbbbefc6e052a69f335aeb27e8356b",
     "src/assets/embed-gist.svg": "fcd9bc2bf29a5c118492b853c0a01390b7539c38ddb985da3c2a6e2f246a39f7",
     "src/assets/embed-x.svg": "0ae74edc6790ec7e933067fe5392bce756e93fa7ad71caacf1c1ca99fa4ec9b6",

package/payload/src/_includes/layouts/base.njk

@@ -56,7 +56,11 @@
     <main id="main-content">{{ content | safe }}</main>
     <footer class="gala-page-footer">
       <p>&copy; {{ site.site.name }}</p>
-      {% if attributionTier != 'PAID' %}<p><a href="https://gala67.com/?utm_source=gala-site&amp;utm_medium=referral" rel="external">Built with Gala</a></p>{% endif %}
+      {# Which footer the click came from, which language it was read in, and whose site it was.
+         site.id is the identifier available to a built page and resolves to its owner. #}
+      {% set galaLinkPlacement = 'article-footer' if post else 'site-footer' %}
+      {% set galaLinkLanguage = post.language or site.site.defaultLanguage %}
+      {% if attributionTier != 'PAID' %}<p><a href="https://gala67.com/?utm_source=gala-site&amp;utm_medium=referral&amp;utm_campaign=built-with-gala&amp;utm_content={{ galaLinkPlacement | urlencode }}&amp;utm_term={{ galaLinkLanguage | urlencode }}&amp;utm_id={{ site.site.id | urlencode }}" rel="external">Built with Gala</a></p>{% endif %}
     </footer>
     <dialog id="gala-settings-dialog" class="gala-dialog" aria-labelledby="gala-settings-title">
       <form method="dialog" class="gala-dialog__close"><button type="submit" aria-label="Close settings">Close</button></form>
@@ -91,7 +95,6 @@
     <dialog id="gala-account-dialog" class="gala-dialog gala-account-dialog" aria-labelledby="gala-account-title">
       <form method="dialog" class="gala-dialog__close"><button type="submit" aria-label="Close account">Close</button></form>
       <h2 id="gala-account-title">Gala account</h2>
-      <p class="gala-account-dialog__invite" data-account-invite hidden>Takes a couple of clicks to authenticate yourself. No passwords, no spam.</p>
       <iframe data-gala-session-frame title="Gala account and sign in" allow="identity-credentials-get" src="{{ site.platform.apiBaseUrl or 'https://api.gala67.com' }}/v1/widget/session?siteId={{ site.site.id | escape }}"></iframe>
     </dialog>
     {% endif %}

package/payload/src/assets/interactions.js

@@ -407,7 +407,6 @@ const pendingEngagementWrites = new Map();
 let pendingIntent = null;
 
 function requestSession(intent) {
-  const dialog = document.getElementById('gala-account-dialog');
   const field = intent.element;
   pendingIntent = {
     kind: intent.kind,
@@ -416,11 +415,20 @@ function requestSession(intent) {
     draft: field && 'value' in field ? field.value : null,
     caret: field && 'selectionStart' in field ? field.selectionStart : null
   };
-  if (!(dialog instanceof HTMLDialogElement)) return;
-  const invite = dialog.querySelector('[data-account-invite]');
-  if (invite) invite.hidden = false;
+  // One window, not three. Asking used to open a modal, containing a frame, containing a
+  // button, that opened a popup. The popup is the only part that has to exist, because it is
+  // the only one running at the top level on the origin the identity providers accept.
+  const frame = document.querySelector('[data-gala-session-frame]');
+  const status = document.querySelector('[data-engagement-status]');
+  if (!frame) return;
+  const source = new URL(frame.getAttribute('src'), window.location.href);
+  const signIn = new URL('/v1/widget/session/sign-in', source.origin);
+  signIn.searchParams.set('siteId', source.searchParams.get('siteId') ?? '');
   if (field && typeof field.blur === 'function') field.blur();
-  if (!dialog.open) dialog.showModal();
+  if (!window.open(signIn, 'gala-sign-in', 'popup,width=520,height=680')) {
+    pendingIntent = null;
+    if (status) status.textContent = 'Allow pop-ups for this site to sign in, then try again.';
+  }
 }
 
 /** Puts the reader back exactly where the sign-in interrupted them. */
@@ -543,13 +551,7 @@ if (sessionFrame) {
     document.querySelectorAll('[data-engagement-url]').forEach((region) => {
       if (changed) refreshEngagement(region);
     });
-    // Signed in on the back of an interrupted action: close the interruption and finish it.
-    if (sessionUser && pendingIntent) {
-      const dialog = document.getElementById('gala-account-dialog');
-      const invite = dialog?.querySelector('[data-account-invite]');
-      if (invite) invite.hidden = true;
-      if (dialog instanceof HTMLDialogElement && dialog.open) dialog.close();
-      resumeIntent();
-    }
+    // Signed in on the back of an interrupted action: finish what they were doing.
+    if (sessionUser && pendingIntent) resumeIntent();
   });
 }