Remove Umami event attributes from site links, add the ones bibi wanted

src/components/pages/AudienceHero.astro

@@ -45,14 +45,13 @@ import PillTag from './PillTag.astro'
       <a
         href={content.primaryCta.href}
         class='btn primary'
-        data-umami-event={content.primaryCta.event}>{content.primaryCta.text}</a
+        >{content.primaryCta.text}</a
       >
       {
         content.secondaryCta && (
           <a
             href={content.secondaryCta.href}
             class='btn secondary'
-            data-umami-event={content.secondaryCta.event}
           >
             {content.secondaryCta.text}
             {content.secondaryCta.icon && <content.secondaryCta.icon />}

src/components/pages/Footer.astro

@@ -18,57 +18,60 @@ const t = useTranslations(lang)
         <li>
           <a
             href='https://community.interledger.org/'
-            data-umami-event='Footer - Community'
             rel='noopener noreferrer'
-            target='_blank'>{t('footer.menu.community')}</a
+            target='_blank'
+            data-umami-event='Footer - Community'
+            >{t('footer.menu.community')}</a
           >
         </li>
         <li>
           <a
             href='https://github.com/WICG/webmonetization'
-            data-umami-event='Footer - GitHub'
             rel='noopener noreferrer'
-            target='_blank'>{t('footer.menu.github')}</a
+            target='_blank'
+            data-umami-event='Footer - GitHub'
+            >{t('footer.menu.github')}</a
           >
         </li>
         <li>
           <a
             href='https://interledger.org/blog'
-            data-umami-event='Footer - Blog'
             rel='noopener noreferrer'
-            target='_blank'>{t('footer.menu.blog')}</a
+            target='_blank'
+            data-umami-event='Footer - Blog'
+            >{t('footer.menu.blog')}</a
           >
         </li>
         <li>
           <a
             href='/faq'
-            data-umami-event='Footer - FAQ page'
             rel='noopener noreferrer'
-            target='_blank'>{t('footer.menu.faq')}</a
+            target='_blank'
+            data-umami-event='Footer - FAQ'
+            >{t('footer.menu.faq')}</a
           >
         </li>
       </ul>
       <ul>
         <li>
           <a
             href='https://interledger.org/'
-            data-umami-event='Footer - Interledger Foundation'
             rel='noopener noreferrer'
-            target='_blank'>Interledger Foundation</a
+            target='_blank'
+            data-umami-event='Footer - Interledger Foundation'
+            >Interledger Foundation</a
           >
         </li>
         <li>
           <a
             href='https://wicg.io/'
-            data-umami-event='Footer - WICG'
             rel='noopener noreferrer'
             target='_blank'>Web Incubator Community Group</a
           >
         </li>
         <li>
           <a
             href='https://interledger.org/summit'
-            data-umami-event='Footer - Summit'
             rel='noopener noreferrer'
             target='_blank'>{t('footer.menu.summit')}</a
           >
@@ -78,23 +81,20 @@ const t = useTranslations(lang)
         <li>
           <a
             href='https://www.iubenda.com/privacy-policy/95080147'
-            data-umami-event='Footer - Privacy Policy'
             rel='noopener noreferrer'
             target='_blank'>{t('footer.menu.privacy_policy')}</a
           >
         </li>
         <li>
           <a
             href='https://www.iubenda.com/privacy-policy/95080147/cookie-policy'
-            data-umami-event='Footer - Cookie Policy'
             rel='noopener noreferrer'
             target='_blank'>{t('footer.menu.cookie_policy')}</a
           >
         </li>
         <li>
           <a
             href='https://www.iubenda.com/terms-and-conditions/95080147'
-            data-umami-event='Footer - T & C'
             rel='noopener noreferrer'
             target='_blank'>{t('footer.menu.terms_conditions')}</a
           >
@@ -107,7 +107,6 @@ const t = useTranslations(lang)
           <a
             href='https://www.linkedin.com/company/interledger-foundation/'
             aria-label='LinkedIn'
-            data-umami-event='Footer - LinkedIn'
             rel='noopener noreferrer'
             target='_blank'
           >
@@ -118,7 +117,6 @@ const t = useTranslations(lang)
           <a
             href='https://communityinviter.com/apps/interledger/interledger-working-groups-slack'
             aria-label='Slack'
-            data-umami-event='Footer - Slack'
             rel='noopener noreferrer'
             target='_blank'
           >
@@ -129,7 +127,6 @@ const t = useTranslations(lang)
           <a
             href='https://www.instagram.com/interledgerfoundation/'
             aria-label='Instagram'
-            data-umami-event='Footer - Instagram'
             rel='noopener noreferrer'
             target='_blank'
           >
@@ -140,7 +137,6 @@ const t = useTranslations(lang)
           <a
             href='https://github.com/WICG/webmonetization'
             aria-label='GitHub'
-            data-umami-event='Footer - GitHub'
             rel='noopener noreferrer'
             target='_blank'
           >
@@ -151,7 +147,6 @@ const t = useTranslations(lang)
           <a
             href='https://www.youtube.com/@InterledgerFoundation'
             aria-label='Youtube'
-            data-umami-event='Footer - YouTube'
             rel='noopener noreferrer'
             target='_blank'
           >
@@ -163,7 +158,6 @@ const t = useTranslations(lang)
       <a
         href='/'
         aria-label={t('footer.menu.home')}
-        data-umami-event='Footer - Home link'
         class='home-link'
       >
         <WmNamedLogo />

src/components/pages/FooterCopyright.astro

@@ -8,7 +8,6 @@ const html = t('footer.copyright.html') as string
 <small class='copyright'>
   <a
     href='https://www.w3.org/policies/#copyright'
-    data-umami-event='Footer - Copyright'
     rel='noopener noreferrer'
     target='_blank'>{t('footer.copyright.link_label')}</a
   > © {new Date().getFullYear()}

src/components/pages/NavToolsDropdown.astro

@@ -18,6 +18,7 @@ const isActive = (path: string): boolean =>
           <a
             href={menuItem.path}
             class:list={[{ active: isActive(menuItem.path) }, 'tool-link']}
+            data-umami-event={`Nav link - ${menuItem.path.split('/')[1]}`}
           >
             <>
               <div class='tool-icon-container'>

src/components/pages/PluginList.astro

@@ -35,7 +35,6 @@ const cardList: Plugin[] = [...cards.slice(0, 3)]
           <a
             href={card.cta.href}
             class='btn flexible secondary'
-            data-umami-event={card.cta.event}
             target='_blank'
             rel='noreferrer noopener'
         >
@@ -50,7 +49,6 @@ const cardList: Plugin[] = [...cards.slice(0, 3)]
       <a
         href={libraryUrl}
         class='btn flexible primary'
-        data-umami-event='Developers page - Full plugin list'
         target='_blank'
         rel='noreferrer noopener'
       >

src/components/pages/SplitLayout.astro

@@ -33,15 +33,13 @@ const { content } = Astro.props
           <a
             href={content.primaryCta.href}
             class='btn primary flexible'
-            data-umami-event={content.primaryCta.event}
             >{content.primaryCta.text}</a
           >
           {
             content.secondaryCta && (
               <a
                 href={content.secondaryCta.href}
                 class='btn secondary flexible'
-                data-umami-event={content.secondaryCta.event}
               >
                 {content.secondaryCta.text}
               </a>

src/components/pages/ToolsHeader.astro

@@ -17,7 +17,6 @@ const toolsUrl = lang === 'en' ? '/developers' : `/${lang}/developers`
     class='btn ghost'
     id='back-btn'
     href={toolsUrl}
-    data-umami-event={`${pageTitle} page link - Tools`}
   >
     <Arrow class='arrow' />
     {backButtonText}

src/components/pages/TopNav.astro

@@ -66,14 +66,10 @@ const isToolsActive = toolsSubmenu.some((menuItem) => {
         <p class='mobile-only menu-label'>{t('nav.technical')}</p>
         <ul class='nav-inline' aria-labelledby='nav-technical-label'>
           <li class='nav-link__docs'>
-            <a href={docsUrl} data-umami-event='Landing page - WebMo docs'
-              >{t('nav.documentation')}</a
-            >
+            <a href={docsUrl} data-umami-event='Nav link - Documentation'>{t('nav.documentation')}</a>
           </li>
           <li class='nav-link__spec'>
-            <a href='/specification' data-umami-event='Landing page - WebMo specs'
-              >{t('nav.specification')}</a
-            >
+            <a href='/specification' data-umami-event='Nav link - Specification'>{t('nav.specification')}</a>
           </li>
         </ul>
       </li>

src/components/pages/UpdateCard.astro

@@ -35,7 +35,6 @@ const { blog, ctaButtonClass, h3Class, imgClass, index } = Astro.props
             href={blog.titleLink}
             target='_blank'
             rel='noreferrer noopener'
-            data-umami-event={blog.titleEvent}
           >
             {blog.title}
             <ExternalLink class='external' />
@@ -67,9 +66,9 @@ const { blog, ctaButtonClass, h3Class, imgClass, index } = Astro.props
     <a
       href={blog.cta.href}
       class={`btn ${ctaButtonClass} flexible carousel-cta`}
-      data-umami-event={blog.cta.event}
       target='_blank'
       rel='noreferrer noopener'
+      data-umami-event={`Homepage - Update - ${blog.cta.text}`}
     >
       {blog.cta.text}
     </a>
@@ -165,4 +164,4 @@ const { blog, ctaButtonClass, h3Class, imgClass, index } = Astro.props
       max-height: max-content;
     }
   }
-</style>
+</style>

src/components/pages/UpdatesSection.astro

@@ -70,6 +70,7 @@ const { updates, heading } = Astro.props
             role='tab'
             aria-labelledby={`carousel-heading-${i}`}
             aria-controls={`carousel-item-${i}`}
+            data-umami-event={`Homepage - Update carousel dot ${i + 1}`}
           />
         ))
       }

src/components/pages/WalletList.astro

@@ -22,9 +22,9 @@ const { cards, ctaText } = Astro.props
       <a
         href={card.link}
         class='btn secondary flexible'
-        data-umami-event={`WalletList - ${card.name}`}
         target='_blank'
         rel='noreferrer noopener'
+        data-umami-event={`Homepage - Compatible wallets - ${card.name}`}
       >
         {ctaText}
         <WalletIcon />

src/data/faq.ts

@@ -41,13 +41,13 @@ const wallets: FaqCategory = {
         'A wallet address is a digital account identifier linked to your wallet, similar to an email address for money. You use it to send or request payments.',
         'Some wallet providers call it a wallet address, while others call it a payment pointer.',
         'Wallet addresses usually start with https://</br>Payment pointers usually start with $</br>',
-        'Not all digital wallets support Web Monetization. For a full list of supported providers, please see <a href="/wallets/" target="_blank" rel="noopener noreferrer" data-umami-event="FAQ page - WebMo docs">our documentation</a>.',
+        'Not all digital wallets support Web Monetization. For a full list of supported providers, please see <a href="/wallets/" target="_blank" rel="noopener noreferrer">our documentation</a>.',
       ],
     },
     {
       question: 'Which wallets can I use?',
       answer: [
-        'Several wallet providers support Web Monetization today. You can find more details <a href="/wallets/" target="_blank" rel="noopener noreferrer data-umami-event="FAQ page - WebMo docs">here</a>.',
+        'Several wallet providers support Web Monetization today. You can find more details <a href="/wallets/" target="_blank" rel="noopener noreferrer">here</a>.',
       ],
     },
   ],
@@ -65,13 +65,13 @@ const supporters: FaqCategory = {
     {
       question: 'How and where can I get the extension?',
       answer: [
-        'The Web Monetization extension is available as a browser extension. Visit <a href="/supporters/" target="_blank" rel="noopener noreferrer" data-umami-event="FAQ page - Supporters">The supporter’s page</a> for the full list of browsers and links to the extension. ',
+        'The Web Monetization extension is available as a browser extension. Visit <a href="/supporters/" target="_blank" rel="noopener noreferrer">The supporter’s page</a> for the full list of browsers and links to the extension. ',
       ],
     },
     {
       question: 'Which browsers are supported?',
       answer: [
-        'The extension works with chromium based browsers (Chrome, Edge, Opera, etc.) and Firefox. The full list can be found <a href="/supporters#supported-browsers" target="_blank" rel="noopener noreferrer" data-umami-event="FAQ page - Supporters">here</a>.',
+        'The extension works with chromium based browsers (Chrome, Edge, Opera, etc.) and Firefox. The full list can be found <a href="/supporters#supported-browsers" target="_blank" rel="noopener noreferrer">here</a>.',
       ],
     },
     {
@@ -101,7 +101,7 @@ const supporters: FaqCategory = {
     {
       question: 'Why does the extension ask for so many invasive permissions?',
       answer: [
-        'The extension checks every page you visit, each time you visit, for Web Monetization. That’s why the extension needs permission to access your browser tabs and certain types of data. You can view the full list of permissions and why they are needed <a href="https://github.com/interledger/web-monetization-extension/blob/main/docs/PERMISSIONS.md" target="_blank" rel="noopener noreferrer" data-umami-event="FAQ page - Github">here</a>.',
+        'The extension checks every page you visit, each time you visit, for Web Monetization. That’s why the extension needs permission to access your browser tabs and certain types of data. You can view the full list of permissions and why they are needed <a href="https://github.com/interledger/web-monetization-extension/blob/main/docs/PERMISSIONS.md" target="_blank" rel="noopener noreferrer">here</a>.',
       ],
     },
   ],
@@ -113,13 +113,13 @@ const publishers: FaqCategory = {
     {
       question: 'How can I monetize my website with Web Monetization?',
       answer: [
-        'Add a Web Monetization <a href="/developers/link-element-webpage/" target="_blank" rel="noopener noreferrer" data-umami-event="FAQ page - WebMo docs">&lt;link&gt; tag</a> to your site that contains your wallet address, and make sure you have a wallet account that supports Web Monetization.',
+        'Add a Web Monetization <a href="/developers/link-element-webpage/" target="_blank" rel="noopener noreferrer">&lt;link&gt; tag</a> to your site that contains your wallet address, and make sure you have a wallet account that supports Web Monetization.',
       ],
     },
     {
       question: 'Can I split the income between multiple recipients?',
       answer: [
-        'Yes, you can split Web Monetization income between multiple recipients. This is done using revenue sharing. You can use <a href="/tools/prob-revshare/" target="_blank" rel="noopener noreferrer" data-umami-event="FAQ page - Tools Revshare">The probabilistic Revenue Share tool</a> to share your earnings between multiple recipients.',
+        'Yes, you can split Web Monetization income between multiple recipients. This is done using revenue sharing. You can use <a href="/tools/prob-revshare/" target="_blank" rel="noopener noreferrer">The probabilistic Revenue Share tool</a> to share your earnings between multiple recipients.',
       ],
     },
     {
@@ -137,7 +137,7 @@ const developers: FaqCategory = {
     {
       question: 'How can I contribute to the standard?',
       answer: [
-        'Web Monetization is being developed as part of a W3C Community Group. You can join discussions, share feedback, or contribute on <a href="https://github.com/WICG/webmonetization" target="_blank" rel="noopener noreferrer" data-umami-event="FAQ page - Github">GitHub</a>.',
+        'Web Monetization is being developed as part of a W3C Community Group. You can join discussions, share feedback, or contribute on <a href="https://github.com/WICG/webmonetization" target="_blank" rel="noopener noreferrer">GitHub</a>.',
       ],
     },
   ],

src/i18n/ui.ts

@@ -47,21 +47,18 @@ export const ui = {
     'footer.copyright.html': `
       the Contributors to the Web Monetization Specification, published by the
       <a href="https://www.w3.org/community/wicg/"
-        data-umami-event="Footer - Web Platform Incubator Community Group"
         rel="noopener noreferrer"
         target="_blank">
         Web Platform Incubator Community Group
       </a>
       under the
       <a href="https://www.w3.org/community/about/process/cla/"
-        data-umami-event="Footer - W3C Community CLA"
         rel="noopener noreferrer"
         target="_blank">
         W3C Community Contributor License Agreement (CLA)
       </a>.
       A human-readable
       <a href="https://www.w3.org/community/about/process/cla-deed/"
-        data-umami-event="Footer - Summary CLA"
         rel="noopener noreferrer"
         target="_blank">
         summary

src/pages/developers.astro

@@ -44,10 +44,7 @@ const t = useTranslations(lang)
             years to enable Web Monetization features on the web, but a lot of
             them need updating to conform to the latest specification. If you
             would like to help out this effort, please check out the{' '}
-            <a
-              href='/developers/libraries/'
-              data-umami-event='Developers page - Full plugin list'
-            >
+            <a href='/developers/libraries/'>
               full list
             </a>
             . These plugins have already been updated: