From 5081f1853a2b8db24fe3ad64719593b06978e7ee Mon Sep 17 00:00:00 2001
From: Lee Cattarin <lee.cattarin@gmail.com>
Date: Mon, 29 Dec 2025 08:44:57 -0800
Subject: [PATCH] big ol reorg

---
 .../2025-solstice}/artists.json               |  16 ++++++++--------
 .../2025-solstice}/index.html                 |  14 +++++++-------
 {directory => events}/index.html              |  18 +++++++++---------
 .../solstice => 2025-solstice}/brooke.jpg     | Bin
 .../solstice => 2025-solstice}/hawke.jpg      | Bin
 img/{2025/solstice => 2025-solstice}/hope.jpg | Bin
 img/{2025/solstice => 2025-solstice}/jon.jpg  | Bin
 .../solstice => 2025-solstice}/karen.jpg      | Bin
 img/{2025/solstice => 2025-solstice}/lee.jpg  | Bin
 img/{2025/solstice => 2025-solstice}/mags.jpg | Bin
 .../solstice => 2025-solstice}/rachel.jpg     | Bin
 index.html                                    |  11 +++++------
 scripts/nav.js                                |   4 ++--
 styles/{directory.css => events.css}          |  18 +++++++++---------
 14 files changed, 40 insertions(+), 41 deletions(-)
 rename {2025/solstice => events/2025-solstice}/artists.json (95%)
 rename {2025/solstice => events/2025-solstice}/index.html (76%)
 rename {directory => events}/index.html (73%)
 rename img/{2025/solstice => 2025-solstice}/brooke.jpg (100%)
 rename img/{2025/solstice => 2025-solstice}/hawke.jpg (100%)
 rename img/{2025/solstice => 2025-solstice}/hope.jpg (100%)
 rename img/{2025/solstice => 2025-solstice}/jon.jpg (100%)
 rename img/{2025/solstice => 2025-solstice}/karen.jpg (100%)
 rename img/{2025/solstice => 2025-solstice}/lee.jpg (100%)
 rename img/{2025/solstice => 2025-solstice}/mags.jpg (100%)
 rename img/{2025/solstice => 2025-solstice}/rachel.jpg (100%)
 rename styles/{directory.css => events.css} (77%)

diff --git a/2025/solstice/artists.json b/events/2025-solstice/artists.json
similarity index 95%
rename from 2025/solstice/artists.json
rename to events/2025-solstice/artists.json
index a26a22f..ad3e511 100644
--- a/2025/solstice/artists.json
+++ b/events/2025-solstice/artists.json
@@ -2,7 +2,7 @@
   {
     "id": "brooke",
     "img": {
-      "src": "/img/2025/solstice/brooke.jpg",
+      "src": "/img/2025-solstice/brooke.jpg",
       "alt": "a triptych of photos of the artist wearing jackets of her own creation. the first jacket is orange and teal wool with a stag graphic appliqued onto the back panel. the second jacket is a woody green leather jacket with fur collar accent, snap epaulettes, and a front lapel detail created from colorful angular leather scraps. the third is a white denim jacket with a central linocut patch stitched in place with intricate topwork and embroidery. pink silk accents, flower details, and direct print work frame the central piece."
     },
     "name": "Brooke Osment",
@@ -17,7 +17,7 @@
   {
     "id": "rachel",
     "img": {
-      "src": "/img/2025/solstice/rachel.jpg",
+      "src": "/img/2025-solstice/rachel.jpg",
       "alt": "a 3 picture collage. 2 pictures show the case and cards of a tarot deck created by Rachel. The third shows Rachel, a white person with turquoise hair, cat eye glasses, and contrasting striped jacket and dress, standing in front of paintings of shorelines."
     },
     "name": "Rachel Guinevere LordKenaga",
@@ -36,7 +36,7 @@
   {
     "id": "mags",
     "img": {
-      "src": "/img/2025/solstice/mags.jpg",
+      "src": "/img/2025-solstice/mags.jpg",
       "alt": "a 3 picture collage. the first shows a miniature dress with white lace, pink bows and rosettes, and tiny maple leaves. the second shows mags, the artist, a white person with shaggy green hair, smiling slightly. third shows a natural-art sculpture with tiny mushroom figures added to real wood and lichen."
     },
     "name": "Mags (Mary) McGinnis",
@@ -51,7 +51,7 @@
   {
     "id": "hawke",
     "img": {
-      "src": "/img/2025/solstice/hawke.jpg",
+      "src": "/img/2025-solstice/hawke.jpg",
       "alt": "4 image collage. image 1: Coulter pinecone with dried oranges, & apples, dried flowers, & bay leaves. image 2: a collage titled 'when the black rock opens'. artist statement on the piece: ntentional Collage: seeds have been planted in the line of the future. There is a promise of what will be growing when it is time for us to understand. image 3: Coulter pinecone with feathers, moon, snail shell, dried flowers, spices, bay leaves, and found sculpted porcelain face. image 4: jennifer hawke, the artist, a white person with a beard and knowing eyes. the top half of their face is painted blue with a white heart, and they are wearing a huge elaborate flower crown, a red shawl, and several chunky pendants."
     },
     "name": "Jennifer Hawke",
@@ -66,7 +66,7 @@
   {
     "id": "hope",
     "img": {
-      "src": "/img/2025/solstice/hope.jpg",
+      "src": "/img/2025-solstice/hope.jpg",
       "alt": "3 picture collage of a white brunette woman. in picture one, she sits on a tall stool with her leg pulled up, holding paintbrushes. in picture 2 she stares at the camera with chanterelles held up to her ears. picture 3, she aims a camera at the camera."
     },
     "name": "Hope Black",
@@ -81,7 +81,7 @@
   {
     "id": "lee",
     "img": {
-      "src": "/img/2025/solstice/lee.jpg",
+      "src": "/img/2025-solstice/lee.jpg",
       "alt": "a four picture collage. two pictures show lee, a white person with curly hair and glasses; in one picture, wearing a colorful knit shawl. the other two frames show lee's work: 1, two leather card wallets with an elegant swoop on the back in vivid colors of leather; 2, a pile of greeting cards with a block-printed loon spread across front and back of the cards."
     },
     "name": "Lee Cattarin",
@@ -96,7 +96,7 @@
   {
     "id": "jon",
     "img": {
-      "src": "/img/2025/solstice/jon.jpg",
+      "src": "/img/2025-solstice/jon.jpg",
       "alt": "2 image collage showing a cast concrete votive candle holder with candle, and a bottle of a tincture made from foraged red belted conk and artist conk mushrooms."
     },
     "name": "Jon Haaland",
@@ -111,7 +111,7 @@
   {
     "id": "karen",
     "img": {
-      "src": "/img/2025/solstice/karen.jpg",
+      "src": "/img/2025-solstice/karen.jpg",
       "alt": "4 photo collage. clockwise from top left: Karen, an older white woman, smiles at the camera while holding a steam press print of leaves; rows of fragrance-free goat milk soap; Karen sits in a greenhouse holding a squash and grins widely; bags of dark chocolate pecan toffee and crispy molasses crisps on a table."
     },
     "name": "Karen Biondo",
diff --git a/2025/solstice/index.html b/events/2025-solstice/index.html
similarity index 76%
rename from 2025/solstice/index.html
rename to events/2025-solstice/index.html
index ed98583..0ec8784 100644
--- a/2025/solstice/index.html
+++ b/events/2025-solstice/index.html
@@ -1,24 +1,24 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Solstice Market at the Beall Greenhouses</title>
+    <title>2025 Solstice Market at the Beall Greenhouses</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta charset="utf-8">
     <!-- Meta -->
     <link rel="icon" type="image/x-icon" href="/favicon.ico">
-    <link rel="canonical" href="/2025/solstice/" />
-    <meta name="description" content="Solstice Market at the Beall Greenhouses" />
+    <link rel="canonical" href="/events/2025-solstice/" />
+    <meta name="description" content="2025 Solstice Market at the Beall Greenhouses" />
     <meta name="robots" content="index,follow" />
-    <meta property="og:title" content="Solstice Market at the Beall Greenhouses" />
+    <meta property="og:title" content="2025 Solstice Market at the Beall Greenhouses" />
     <meta property="og:type" content="article" />
-    <meta property="og:url" content="/2025/solstice/" />
-    <meta property="og:description" content="Solstice Market at the Beall Greenhouses" />
+    <meta property="og:url" content="/events/2025-solstice/" />
+    <meta property="og:description" content="2025 Solstice Market at the Beall Greenhouses" />
     <meta property="og:image" content="/img/logo-light.png" />
     <meta property="og:image:alt" content="Linework icon depicting a sunrise or sunset with two clouds, in a blue and orange color scheme" />
 
     <!-- JS -->
     <script src="/scripts/nav.js" defer></script>
-    <script src="/scripts/artists.js" data-artists="/2025/solstice/artists.json" defer></script>
+    <script src="/scripts/artists.js" data-artists="/events/2025-solstice/artists.json" defer></script>
 
     <!-- CSS -->
     <link rel="stylesheet" href="/styles/main.css">
diff --git a/directory/index.html b/events/index.html
similarity index 73%
rename from directory/index.html
rename to events/index.html
index 38b234a..03172a2 100644
--- a/directory/index.html
+++ b/events/index.html
@@ -1,18 +1,18 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Directory | Markets at the Beall Greenhouses</title>
+    <title>Events | Markets at the Beall Greenhouses</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta charset="utf-8">
     <!-- Meta -->
     <link rel="icon" type="image/x-icon" href="/favicon.ico">
-    <link rel="canonical" href="/directory/" />
-    <meta name="description" content="Directory | Markets at the Beall Greenhouses" />
+    <link rel="canonical" href="/events/" />
+    <meta name="description" content="Events | Markets at the Beall Greenhouses" />
     <meta name="robots" content="index,follow" />
-    <meta property="og:title" content="Directory | Markets at the Beall Greenhouses" />
+    <meta property="og:title" content="Events | Markets at the Beall Greenhouses" />
     <meta property="og:type" content="article" />
-    <meta property="og:url" content="/directory/" />
-    <meta property="og:description" content="Directory | Markets at the Beall Greenhouses" />
+    <meta property="og:url" content="/events/" />
+    <meta property="og:description" content="Events | Markets at the Beall Greenhouses" />
     <meta property="og:image" content="/img/logo-light.png" />
     <meta property="og:image:alt" content="Linework icon depicting a sunrise or sunset with two clouds, in a blue and orange color scheme" />
 
@@ -22,7 +22,7 @@
     <!-- CSS -->
     <link rel="stylesheet" href="/styles/main.css">
     <link rel="stylesheet" href="/styles/nav.css">
-    <link rel="stylesheet" href="/styles/directory.css">
+    <link rel="stylesheet" href="/styles/events.css">
     <link rel="stylesheet" href="/styles/artist.css">
   </head>
   <body>
@@ -36,9 +36,9 @@
       <main>
         <h1>Markets at the Beall Greenhouses</h1>
 
-        <ol id="directory">
+        <ol id="events">
           <li>
-            <a href="/2025/solstice">
+            <a href="/events/2025-solstice">
               <h2>Solstice 2025</h2>
               <img src="/img/filler0.jpg" alt="a filler image for testing" />
             </a>
diff --git a/img/2025/solstice/brooke.jpg b/img/2025-solstice/brooke.jpg
similarity index 100%
rename from img/2025/solstice/brooke.jpg
rename to img/2025-solstice/brooke.jpg
diff --git a/img/2025/solstice/hawke.jpg b/img/2025-solstice/hawke.jpg
similarity index 100%
rename from img/2025/solstice/hawke.jpg
rename to img/2025-solstice/hawke.jpg
diff --git a/img/2025/solstice/hope.jpg b/img/2025-solstice/hope.jpg
similarity index 100%
rename from img/2025/solstice/hope.jpg
rename to img/2025-solstice/hope.jpg
diff --git a/img/2025/solstice/jon.jpg b/img/2025-solstice/jon.jpg
similarity index 100%
rename from img/2025/solstice/jon.jpg
rename to img/2025-solstice/jon.jpg
diff --git a/img/2025/solstice/karen.jpg b/img/2025-solstice/karen.jpg
similarity index 100%
rename from img/2025/solstice/karen.jpg
rename to img/2025-solstice/karen.jpg
diff --git a/img/2025/solstice/lee.jpg b/img/2025-solstice/lee.jpg
similarity index 100%
rename from img/2025/solstice/lee.jpg
rename to img/2025-solstice/lee.jpg
diff --git a/img/2025/solstice/mags.jpg b/img/2025-solstice/mags.jpg
similarity index 100%
rename from img/2025/solstice/mags.jpg
rename to img/2025-solstice/mags.jpg
diff --git a/img/2025/solstice/rachel.jpg b/img/2025-solstice/rachel.jpg
similarity index 100%
rename from img/2025/solstice/rachel.jpg
rename to img/2025-solstice/rachel.jpg
diff --git a/index.html b/index.html
index 55bc570..f5d31c0 100644
--- a/index.html
+++ b/index.html
@@ -1,18 +1,18 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Markets at the Beall Greenhouses</title>
+    <title>the historic Beall Greenhouses</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta charset="utf-8">
     <!-- Meta -->
     <link rel="icon" type="image/x-icon" href="/favicon.ico">
     <link rel="canonical" href="/" />
-    <meta name="description" content="Markets at the Beall Greenhouses" />
+    <meta name="description" content="the historic Beall Greenhouses" />
     <meta name="robots" content="index,follow" />
-    <meta property="og:title" content="Markets at the Beall Greenhouses" />
+    <meta property="og:title" content="the historic Beall Greenhouses" />
     <meta property="og:type" content="article" />
     <meta property="og:url" content="/" />
-    <meta property="og:description" content="Markets at the Beall Greenhouses" />
+    <meta property="og:description" content="the historic Beall Greenhouses" />
     <meta property="og:image" content="/img/logo-light.png" />
     <meta property="og:image:alt" content="Linework icon depicting a sunrise or sunset with two clouds, in a blue and orange color scheme" />
 
@@ -22,7 +22,6 @@
     <!-- CSS -->
     <link rel="stylesheet" href="/styles/main.css">
     <link rel="stylesheet" href="/styles/nav.css">
-    <link rel="stylesheet" href="/styles/artist.css">
   </head>
   <body>
     <div id="content">
@@ -37,7 +36,7 @@
         <h1>Markets at the Beall Greenhouses</h1>
 
         <h2>Status</h2>
-        <p>We've just completed a successful <a href="/2025/solstice">Solstice 2025</a> market. Stay tuned for more!</p>
+        <p>We've just completed a successful <a href="/events/2025-solstice">Solstice 2025</a> market. Stay tuned for more!</p>
       </main>
     </div>
     <footer id="footer"><!-- auto-populated by nav.js --></footer>
diff --git a/scripts/nav.js b/scripts/nav.js
index 6398a9a..695f290 100644
--- a/scripts/nav.js
+++ b/scripts/nav.js
@@ -5,8 +5,8 @@ const navItems = [
     name: "↩ back home"
   },
   {
-    href: "/directory/",
-    name: "🧺 all markets"
+    href: "/events/",
+    name: "📅 all events"
   }
 ];
 
diff --git a/styles/directory.css b/styles/events.css
similarity index 77%
rename from styles/directory.css
rename to styles/events.css
index fc11778..7328027 100644
--- a/styles/directory.css
+++ b/styles/events.css
@@ -1,4 +1,4 @@
-#directory {
+#events {
   display: grid;
   flex-flow: row wrap;
   grid-template-columns: repeat(2, 1fr);
@@ -6,12 +6,12 @@
 }
 
 @media (max-width: 850px) {
-  #directory {
+  #events {
     grid-template-columns: 1fr;
   }
 }
 
-#directory li {
+#events li {
   list-style: none;
   border: solid thin var(--color-accent);
   border-radius: .5rem;
@@ -19,30 +19,30 @@
 }
 
 @media (any-hover: hover) {
-  #directory li:hover {
+  #events li:hover {
     outline: solid .25rem var(--color-accent);
   }
 }
 
-#directory li:focus-within {
+#events li:focus-within {
   outline: solid .25rem var(--color-accent);
 }
 
-#directory a {
+#events a {
   text-decoration: none;
   margin: 0;
 }
 
-#directory a:focus-visible {
+#events a:focus-visible {
   outline: none; /* outline handled by li:focus-within */
 }
 
-#directory h2 {
+#events h2 {
   text-align: center;
   margin-top: 1rem;
 }
 
-#directory img {
+#events img {
   margin: 0;
   border-radius: 0 0 .5rem .5rem;
 }