added gtm and custom event tracking

This commit is contained in:
zach
2026-02-25 14:12:11 -05:00
parent 2ebb8eb127
commit 5d9655e196
15 changed files with 103 additions and 2273 deletions

View File

@@ -1,9 +1,6 @@
// @ts-check
import { defineConfig } from 'astro/config';
import cloudflare from '@astrojs/cloudflare';
// https://astro.build/config
export default defineConfig({
adapter: cloudflare()
});
});

2016
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -9,7 +9,6 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/cloudflare": "^12.6.12",
"astro": "^5.17.1",
"bootstrap": "^5.3.8",
"chalk": "^5.6.2",
@@ -18,8 +17,7 @@
"drizzle-orm": "^1.0.0-beta.15-859cf75",
"mysql2": "^3.16.3",
"sass": "^1.97.3",
"typesense": "^3.0.1",
"wrangler": "^4.68.1"
"typesense": "^3.0.1"
},
"devDependencies": {
"@types/bootstrap": "^5.2.10",

View File

@@ -40,7 +40,7 @@
// @import 'bootstrap/scss/progress';
// @import 'bootstrap/scss/spinners';
@import 'bootstrap/scss/tables';
// @import 'bootstrap/scss/toasts';
@import 'bootstrap/scss/toasts';
// @import 'bootstrap/scss/tooltip';
@import 'bootstrap/scss/transitions';

View File

@@ -75,12 +75,25 @@
}
}
.image-grow {
transition-property: box-shadow, transform;
transition-duration: 350ms;
transition-timing-function: ease;
box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.24);
}
.image-grow:is(:hover, :focus) {
box-shadow: 0px 8px 10px 1px rgba(0, 0, 0, 0.2);
transform: translateY(-.9rem) scale(1.02);
}
.card-modal {
background-color: rgba(1, 11, 18, 0.8);
cursor: default;
}
.card-grid {
.pokedex-page {
position: relative;
@media (min-width: 768px) {
top: 100px !important;
@@ -175,7 +188,6 @@ $tiers: (
.masked-image {
z-index: 1000;
opacity: 100%;
mix-blend-mode: normal;
filter: brightness(0);
}
@@ -565,23 +577,6 @@ $hdr-big-btn-width: $hdr-side-width - $hdr-logo-width - 2 * $hdr-big-btn-margin;
border-radius: 0 0 $border-radius-hdr 0;
}
/* INVERTED ROUNDED CORNER under overhang L */
.header-content:after {
content: "";
display: block;
position: absolute;
/* tuck behind header bg */
z-index: -1;
height: $border-radius-hdr * 2;
width: $border-radius-hdr * 2;
border-top: $border-radius-hdr solid hsl(210, 11%, 15%);
border-left: $border-radius-hdr solid hsl(210, 11%, 15%);
top: $hdr-side-total-height - $border-radius-hdr;
left: -1*$border-radius-hdr;
/* top left */
border-radius: $border-radius-hdr * 2 0 0 0;
}
/* match backgrounds to blend */
.header-logo, .header-social {
background-color: hsl(358, 71%, 48%);
@@ -683,23 +678,6 @@ $hdr-big-btn-width: $hdr-side-width - $hdr-logo-width - 2 * $hdr-big-btn-margin;
background: none;
}
/* INVERTED ROUNDED CORNER under menu - right */
.nav-main:after {
content: "";
display: block;
position: absolute;
/* tuck behind nav-main a:hover */
z-index: -1;
height: $border-radius-hdr * 2;
width: $border-radius-hdr * 2;
border-top: $border-radius-hdr solid hsl(210, 11%, 15%);
border-right: $border-radius-hdr solid hsl(210, 11%, 15%);
bottom: -1*$border-radius-hdr;
right: -1*$border-radius-hdr;
/* top right */
border-radius: 0 $border-radius-hdr * 2 0 0;
}
.nav-main ul {
padding: 0 0 $hdr-menu-item-padding-bottom 2px; /* nudge links right */
background: $body-bg;

View File

@@ -2,12 +2,12 @@
---
<div class="row card-grid my-5">
<div class="row pokedex-page my-5">
<div class="col-md-3 display-sm-none">
<div class="h5 d-none">Inventory management placeholder</div>
</div>
<div class="col-sm-12 col-md-9 mt-0">
<div id="cardGrid" class="row g-xxl-3 g-2 row-cols-2 row-cols-lg-3 row-cols-xl-4">
<div id="cardGrid" class="row g-xxl-3 g-2 row-cols-2 row-cols-lg-3 row-cols-xxl-4 row-cols-xxxl-5">
</div>
</div>
</div>

View File

@@ -32,9 +32,10 @@
<input type="text" name="q" class="form-control w-100 search-box" placeholder="Search cards..." />
</div>
<div class="">
<input type="submit" class="w-100 btn btn-secondary" value="Search" />
<input type="submit" class="w-100 btn btn-secondary search-button" value="Search" onclick="const q = document.querySelector('[name=q]').value; dataLayer.push({ event: 'view_search_results', search_term: q });"/>
</div>
</div>
</form>
</div>
</div>
</div>

View File

@@ -1,6 +1,5 @@
---
import astroLogo from '../assets/astro.svg';
import background from '../assets/background.svg';
import Layout from "../layouts/Layout.astro"
---
<div id="container">
@@ -40,171 +39,3 @@ import background from '../assets/background.svg';
</p>
</a>
</div>
<style>
#background {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
z-index: -1;
filter: blur(100px);
}
#container {
font-family: Inter, Roboto, 'Helvetica Neue', 'Arial Nova', 'Nimbus Sans', Arial, sans-serif;
height: 100%;
}
main {
height: 100%;
display: flex;
justify-content: center;
}
#hero {
display: flex;
align-items: start;
flex-direction: column;
justify-content: center;
padding: 16px;
}
h1 {
font-size: 22px;
margin-top: 0.25em;
}
#links {
display: flex;
gap: 16px;
}
#links a {
display: flex;
align-items: center;
padding: 10px 12px;
color: #111827;
text-decoration: none;
transition: color 0.2s;
}
#links a:hover {
color: rgb(78, 80, 86);
}
#links a svg {
height: 1em;
margin-left: 8px;
}
#links a.button {
color: white;
background: linear-gradient(83.21deg, #3245ff 0%, #bc52ee 100%);
box-shadow:
inset 0 0 0 1px rgba(255, 255, 255, 0.12),
inset 0 -2px 0 rgba(0, 0, 0, 0.24);
border-radius: 10px;
}
#links a.button:hover {
color: rgb(230, 230, 230);
box-shadow: none;
}
pre {
font-family:
ui-monospace, 'Cascadia Code', 'Source Code Pro', Menlo, Consolas, 'DejaVu Sans Mono',
monospace;
font-weight: normal;
background: linear-gradient(14deg, #d83333 0%, #f041ff 100%);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
background-clip: text;
margin: 0;
}
h2 {
margin: 0 0 1em;
font-weight: normal;
color: #111827;
font-size: 20px;
}
p {
color: #4b5563;
font-size: 16px;
line-height: 24px;
letter-spacing: -0.006em;
margin: 0;
}
code {
display: inline-block;
background:
linear-gradient(66.77deg, #f3cddd 0%, #f5cee7 100%) padding-box,
linear-gradient(155deg, #d83333 0%, #f041ff 18%, #f5cee7 45%) border-box;
border-radius: 8px;
border: 1px solid transparent;
padding: 6px 8px;
}
.box {
padding: 16px;
background: rgba(255, 255, 255, 1);
border-radius: 16px;
border: 1px solid white;
}
#news {
position: absolute;
bottom: 16px;
right: 16px;
max-width: 300px;
text-decoration: none;
transition: background 0.2s;
backdrop-filter: blur(50px);
}
#news:hover {
background: rgba(255, 255, 255, 0.55);
}
@media screen and (max-height: 368px) {
#news {
display: none;
}
}
@media screen and (max-width: 768px) {
#container {
display: flex;
flex-direction: column;
}
#hero {
display: block;
padding-top: 10%;
}
#links {
flex-wrap: wrap;
}
#links a.button {
padding: 14px 18px;
}
#news {
right: 16px;
left: 16px;
bottom: 2.5rem;
max-width: 100%;
}
h1 {
line-height: 1.5;
}
}
</style>

View File

@@ -5,13 +5,27 @@ import '/src/assets/css/main.scss';
<!DOCTYPE html>
<html lang="en" data-bs-theme="dark">
<head>
<script>
window.dataLayer = window.dataLayer || [];
</script>
<!-- Google Tag Manager -->
<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
})(window,document,'script','dataLayer','GTM-PPQMZ4PL');</script>
<!-- End Google Tag Manager -->
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
<link rel="icon" href="/favicon.ico" />
<title>Astro Pokemon</title>
<title>Rigid's App Thing</title>
</head>
<body>
<!-- Google Tag Manager (noscript) -->
<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-PPQMZ4PL"
height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
<!-- End Google Tag Manager (noscript) -->
<slot />
<script>
// Import only what you need
@@ -25,7 +39,7 @@ import '/src/assets/css/main.scss';
// import 'bootstrap/js/dist/popover';
// import 'bootstrap/js/dist/scrollspy';
import 'bootstrap/js/dist/tab';
// import 'bootstrap/js/dist/toast';
import 'bootstrap/js/dist/toast';
// import 'bootstrap/js/dist/tooltip';
</script>
<script src="https://cdn.jsdelivr.net/npm/htmx.org@2.0.8/dist/htmx.min.js"></script>

View File

@@ -1,6 +1,6 @@
---
import Layout from '../layouts/Main.astro';
import StickyFilter from '../components/StickyFilter.astro';
import PokedexHeader from '../components/PokedexHeader.astro';
import Image from 'astro/components/Image.astro';
const searchParams = Astro.url.searchParams;
@@ -11,16 +11,13 @@ const pokedexImage = `/404/pokedex/${randomNumber}.svg?raw`;
---
<Layout>
<StickyFilter />
<style>
</style>
<div class="container">
<PokedexHeader />
<div class="container pokedex-page">
<div class="row col-10 mx-auto mt-5">
<div class="col-12 col-md-5">
<h1 class="mb-4 mt-0">404 - Page Not Found</h1>
<h4 class="my-4">Sorry, the page you are looking for does not exist.</h4>
<p class="copy-big my-4">Return to the <a href="/">home page</a> or search for another Pokémon.</p>
<p class="copy-big my-4">Return to the <a href="/">home page</a> or search for another <a href="/pokemon">Pokémon</a>.</p>
</div>
<div class="col-12 col-md-6 offset-md-1 row">
<div class="alert alert-warning border col-12" role="alert">
@@ -32,7 +29,7 @@ const pokedexImage = `/404/pokedex/${randomNumber}.svg?raw`;
<div class="mx-auto d-flex flex-col-reverse flex-lg-row">
<div class="ratio ratio-1x1 relative">
<img class="w-100 starburst top-0 bottom-0 left-0 right-0" src="/404/glow.png">
<Image class="m-auto position-absolute w-50 top-0 left-25 bottom-10 right-0 d-block img-fluid masked-image top-50 start-50 translate-middle" src={pokedexImage} alt="Who is that Pokémon?" width={100} height={100}></Image>
<Image class="m-auto position-absolute w-75 top-0 left-25 bottom-10 right-0 d-block img-fluid masked-image top-50 start-50 translate-middle" src={pokedexImage} alt="Who is that Pokémon?" width={100} height={100}></Image>
</div>
</div>
</div>

View File

@@ -1,14 +1,9 @@
---
import Welcome from '../components/Welcome.astro';
import Layout from '../layouts/Layout.astro';
import Image from 'astro/components/Image.astro';
import Layout from '../layouts/Main.astro';
import PokedexHeader from '../components/PokedexHeader.astro';
export const prerender = false;
// Welcome to Astro! Wondering what to do next? Check out the Astro documentation at https://docs.astro.build
// Don't want to use any of this? Delete everything in this file, the `assets`, `components`, and `layouts` directories, and start fresh.
---
<Layout>
<PokedexHeader />
<Welcome />
</Layout>
<PokedexHeader />

View File

@@ -27,15 +27,12 @@ const card = await db.query.cards.findFirst({
}
});
const nearMint = card?.prices.find(price => price.condition === "Near Mint") || null;
const calculatedAt = new Date(nearMint?.calculatedAt || 0);
function timeAgo(date: Date | null) {
if (!date) return "Not applicable";
function timeAgo(date: any) {
if (date==0) return "never";
const seconds = Math.floor((Date.now() - date.getTime()) / 1000);
const seconds = Math.floor((Date.now() - date) / 1000);
const intervals = {
const intervals: Record<string, number> = {
year: 31536000,
month: 2592000,
day: 86400,
@@ -51,6 +48,22 @@ function timeAgo(date: any) {
return "just now";
}
// Get the most recent calculatedAt across all prices
const calculatedAt = (() => {
if (!card?.prices?.length) return null;
// Extract all valid calculatedAt timestamps
const dates = card.prices
.map(p => p.calculatedAt)
.filter(d => d) // remove null/undefined
.map(d => new Date(d));
if (!dates.length) return null;
// Return the most recent one
return new Date(Math.max(...dates.map(d => d.getTime())));
})();
const conditionOrder = ["Near Mint", "Lightly Played", "Moderately Played", "Heavily Played", "Damaged"];
const conditionAttributes = (price: any) => {
@@ -90,6 +103,7 @@ const ebaySearchUrl = (card: any) => {
return `https://www.ebay.com/sch/i.html?_nkw=${encodeURIComponent(card?.productUrlName)}+${encodeURIComponent(card?.set?.setUrlName)}+${card?.number}&LH_Sold=1&Graded=No&_dcat=183454${card?.productId}`;
};
---
<div class="modal-dialog modal-dialog-centered modal-fullscreen-md-down modal-xl">
<div class="modal-dialog modal-dialog-centered modal-fullscreen-md-down modal-xl">
<div class="modal-content">
@@ -105,7 +119,7 @@ const ebaySearchUrl = (card: any) => {
<div class="row g-4">
<div class="col-sm-12 col-md-3">
<p class="text-secondary">{card?.set?.setName}</p>
<div class="position-relative d-inline-block"><img src={`/cards/${card?.productId}.jpg`} class="card-image img-fluid rounded" alt={card?.productName} onerror="this.onerror=null;this.src='/cards/noImage.webp'"><span class="position-absolute bottom-0 start-0 d-inline"><SetIcon set={card?.set?.setCode} /></span><span class="position-absolute top-0 end-0 d-inline"><EnergyIcon energy={card?.energyType} /></span><span class="rarity-icon-large position-absolute bottom-0 end-0 d-inline"><RarityIcon rarity={card?.rarityName} /></span></div>
<div class="position-relative d-inline-block"><img src={`/cards/${card?.productId}.jpg`} class="card-image img-fluid rounded" alt={card?.productName} onerror="this.onerror=null;this.src='/cards/noImage.webp'" onclick="copyImage(this); dataLayer.push({'event': 'copiedImage'});"><span class="position-absolute bottom-0 start-0 d-inline"><SetIcon set={card?.set?.setCode} /></span><span class="position-absolute top-0 end-0 d-inline"><EnergyIcon energy={card?.energyType} /></span><span class="rarity-icon-large position-absolute bottom-0 end-0 d-inline"><RarityIcon rarity={card?.rarityName} /></span></div>
<div class="d-flex flex-row justify-content-between mt-2">
<div class="p text-secondary">{card?.Artist}</div>
</div>
@@ -187,3 +201,24 @@ const ebaySearchUrl = (card: any) => {
</div>
</div>
</div>
<script is:inline>
async function copyImage(img) {
const canvas = document.createElement("canvas");
const ctx = canvas.getContext("2d");
canvas.width = img.naturalWidth;
canvas.height = img.naturalHeight;
// draw the real image pixels
ctx.drawImage(img, 0, 0);
// convert to blob
canvas.toBlob(async (blob) => {
await navigator.clipboard.write([
new ClipboardItem({ "image/png": blob })
]);
console.log("Copied image via canvas.");
});
}
</script>

View File

@@ -41,6 +41,7 @@ const formatPrice = (price:any) => {
};
const conditionOrder = ["Near Mint", "Lightly Played", "Moderately Played", "Heavily Played", "Damaged"];
---
{(start === 0) &&
<script define:vars={{ totalHits }} is:inline>
@@ -52,8 +53,8 @@ const conditionOrder = ["Near Mint", "Lightly Played", "Moderately Played", "Hea
<div class="inventory-button position-relative float-end shadow-filter text-center d-none">
<div class="inventory-label pt-2">+/-</div>
</div>
<div hx-get={`/partials/card-modal?cardId=${card.cardId}`} hx-target="#cardModal" hx-trigger="click" data-bs-toggle="modal" data-bs-target="#cardModal">
<img src={`/cards/${card.productId}.jpg`} alt={card.productName} loading="lazy" decoding="async" class="img-fluid rounded-3 mb-2 card-image w-100" onerror="this.onerror=null;this.src='/cards/noImage.webp'"/>
<div hx-get={`/partials/card-modal?cardId=${card.cardId}`} hx-target="#cardModal" hx-trigger="click" data-bs-toggle="modal" data-bs-target="#cardModal" onclick="const cardTitle = this.querySelector('#cardImage').getAttribute('alt'); dataLayer.push({'event': 'virtualPageview', 'pageUrl': this.getAttribute('hx-get'), 'pageTitle': cardTitle, 'previousUrl': '/pokemon'});">
<img src={`/cards/${card.productId}.jpg`} alt={card.productName} id="cardImage" loading="lazy" decoding="async" class="img-fluid rounded-3 mb-2 card-image image-grow w-100" onerror="this.onerror=null;this.src='/cards/noImage.webp'"/>
</div>
<div class="row row-cols-5 gx-1 price-row mb-2">
{card.prices
@@ -77,9 +78,10 @@ const conditionOrder = ["Near Mint", "Lightly Played", "Moderately Played", "Hea
</div>
<div>{card.variant}<span class="d-none">{card.productId}</span></div>
</div>
))}
{start + 20 < totalHits &&
<div hx-post="/partials/cards" hx-trigger="revealed" hx-include="#searchform" hx-target="#cardGrid" hx-swap="beforeend" hx-on--after-request="afterUpdate(event)">
Loading...
</div>
}
}

View File

@@ -1,7 +1,6 @@
---
import Layout from '../layouts/Main.astro';
import CardGrid from "../components/CardGrid.astro";
import StickyFilter from '../components/StickyFilter.astro';
import PokedexHeader from '../components/PokedexHeader.astro';
export const prerender = false;
@@ -18,4 +17,5 @@ export const prerender = false;
</div>
</div>
</div>
</Layout>

View File

@@ -1,16 +0,0 @@
{
"main": "dist/_worker.js/index.js",
"name": "pokemon",
"compatibility_date": "2026-02-23",
"compatibility_flags": [
"nodejs_compat",
"global_fetch_strictly_public"
],
"assets": {
"binding": "ASSETS",
"directory": "./dist"
},
"observability": {
"enabled": true
}
}