Merge pull request #52 from mapachurro/def-reorg-mvp

Definition reorganization v2

Author: mapachurro

.cursor/rules/000_rules_staging.md

@@ -68,4 +68,17 @@ body {
       margin-bottom: 1rem;
     }
   }
+  
+  .additional-definition {
+    margin-bottom: 1rem;
+  }
+  
+  .source-line {
+    margin-top: 0.5rem;
+    font-size: 0.9rem;
+  }
+  
+  .definition-separator {
+    margin: 1rem 0;
+  }
 

.cursor/rules/001_cursor_rules.mdc

@@ -117,10 +117,10 @@
       "partOfSpeech": "noun",
       "termCategory": "",
       "phonetic": "/əˈkaʊnt/",
-      "definition": "An account, in web1 and web2 terms, refers to some sort of identity on some sort of digital platform. It is usually tied to an authentication method, e.g., username and password, which is granted, managed, and secured by the platform or service in question.   By contrast, a web3 or crypto account consists of what is known as a public-private key pair; the public half is generally safe to be shared publicly, and in the case of Ethereum, is further processed to create what is known as the 'public address' of the account, always beginning with '0x'. The private half, meanwhile, gives total control over the account; *total*.",
+      "definition": "An account, in web1 and web2 terms, refers to some sort of identity on some sort of digital platform. It is usually tied to an authentication method, e.g., username and password, which is granted, managed, and secured by the platform or service in question. By contrast, a web3 or crypto account consists of what is known as a public-private key pair; the public half is generally safe to be shared publicly, and in the case of Ethereum, is further processed to create what is known as the 'public address' of the account, always beginning with '0x'. The private half, meanwhile, gives total control over the account.",
       "definitionSource": "Education DAO - mapachurro",
       "sampleSentence": "",
-      "extended": "These public-private key pairs can be generated one at a time, or they can be *derived* from what is known as a **seed phrase** or **secret recovery phrase**; for more on this, see HD wallet.",
+      "extended": "These public-private key pairs can be generated one at a time, or they can be <i>derived</i> from what is known as a <b>seed phrase</b> or <b>secret recovery phrase</b>; for more on this, see HD wallet.",
       "additional": [
         {
           "definition": "A record in the Solana ledger that either holds data or is an executable program. Like an account at a traditional bank, a Solana account may hold funds called lamports. Like a file in Linux, it is addressable by a key, often referred to as a public key or pubkey. The key may be one of: - an ed25519 public key - a program-derived account address (32byte value forced off the ed25519 curve) - a hash of an ed25519 public key with a 32 character string",

css-mods.css

@@ -28,6 +28,19 @@ function logToFile(message) {
 // Clear the log file before starting
 fs.writeFileSync(logFilePath, "", "utf-8");
 
+// Export the function so it's accessible within the module
+export function isValidUrl(string) {
+  const urlPattern = new RegExp('^(https?:\\/\\/)?' + // protocol
+    '((([a-z0-9\\-]+\\.)+[a-z]{2,})|' + // domain name
+    'localhost|' + // localhost
+    '\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}|' + // IP address
+    '\\[?[a-f0-9:\\.]+\\]?)' + // IPv6
+    '(\\:\\d+)?(\\/[-a-z0-9%_.~+]*)*' + // port and path
+    '(\\?[;&a-z0-9%_.~+=-]*)?' + // query string
+    '(\\#[-a-z0-9_]*)?$','i'); // fragment locator
+  return !!urlPattern.test(string);
+}
+
 export default async function buildPages() {
   // Initialize language codes
   await initializeLanguageCodes(); // Make sure language codes are loaded before proceeding
@@ -96,42 +109,55 @@ export default async function buildPages() {
             ? termData.additional
             : null;
 
+        // Function to check if a string is a valid URL
         const additionalDef = additionalDefsArray
           ? additionalDefsArray
-              .map(
-                (alt) =>
-                  `<p><strong>Additional definition:</strong> ${alt.definition} <em>(${alt.source})</em></p>`,
-              )
+              .map((alt) => {
+                // ✅ 'alt' is properly defined here
+                let sourceText = "";
+                if (alt.source) {
+                  if (isValidUrl(alt.source)) {
+                    sourceText = `<a href="${alt.source}" target="_blank" rel="noopener noreferrer">Source</a>`;
+                  } else {
+                    sourceText = `<strong>${alt.source}</strong>`;
+                  }
+                }
+                return `<div class="additional-definition">
+                  <p class="definition-text">${alt.definition}</p>
+                  <p class="source-line">${sourceText}</p>
+                </div>`;
+              })
               .join("")
           : "<p>No additional definitions found. Have another? Submit it!</p>";
 
         const termCategoryValue = termData.termCategory || "To be determined";
-        const definitionSource = termData.definitionSource || "N/A";
-        const defSourceArray =
-        Array.isArray(termData.definitionSource) && termData.definitionSource.length
-          ? termData.definitionSource
-          : null;
-
-      const defSource = defSourceArray
-        ? defSourceArray
-            .map(
-              (alt) =>
-                `<p><strong>Definition source:</strong> ${termSource}</p>`,
-            )
-            .join("")
-        : "<p>Mapachurro probably wrote this.</p>";
+        const definitionSource = termData.definitionSource
+          ? isValidUrl(termData.definitionSource)
+            ? `<a href="${termData.definitionSource}" target="_blank" rel="noopener noreferrer">Source</a>`
+            : `<strong>${termData.definitionSource}</strong>`
+          : "Mapachurro probably wrote this.";
+
+          const defSourceArray =
+          Array.isArray(termData.definitionSource) && termData.definitionSource.length
+            ? termData.definitionSource
+            : termData.definitionSource
+            ? [termData.definitionSource] // Wrap a single string in an array
+            : null;
+        
+        const defSource = defSourceArray
+          ? defSourceArray
+              .map((src) =>
+                isValidUrl(src)
+                  ? `<a href="${src}" target="_blank" rel="noopener noreferrer">Source</a>`
+                  : `<strong>${src}</strong>`
+              )
+              .join(", ") // Separate multiple sources with a comma
+          : "Mapachurro probably wrote this.";
+        
 
         const sampleSentence = termData.sampleSentence || "N/A";
         const extended = termData.extended || "No extended definition. ...yet";
         // Enhanced handling for termSource
-        const isValidUrl = (string) => {
-          try {
-            new URL(string);
-            return true;
-          } catch (_) {
-            return false;
-          }
-        };
 
         const termSource = termData.termSource
           ? isValidUrl(termData.termSource)