Removed 'color-' and added GoatHunter (#10)

warp-ds · Oct 9, 2023 · 4e3c5e2 · 4e3c5e2
1 parent c5bb991
commit 4e3c5e2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/index.html b/index.html
@@ -10,6 +10,8 @@
   </head>
   <body>
     <div id="app"></div>
+    <script data-goatcounter="https://warp.goatcounter.com/count"
+        async src="//gc.zgo.at/count.js"></script>
     <script type="module" src="/src/main.js"></script>
   </body>
 </html>
diff --git a/src/lib/dataStore.js b/src/lib/dataStore.js
@@ -95,11 +95,19 @@ function flattenTokens(prefix, tokenObj) {
       continue;
     }
 
+    let fullTokenName = prefix
+    ? `${prefix}-${key}`
+    : key;
+
+
+      // Remove "color-" from the token name
+      fullTokenName = fullTokenName.replace("-color-", "-");
+
+
     // if string value
     if (typeof tokenObj[key] === "string") {
-      let fullTokenName = prefix
-        ? `${prefix}-${key}`
-        : key;
+
+
 
       // Remove trailing "-_"
       if (fullTokenName.endsWith("-_")) {
@@ -124,7 +132,8 @@ function flattenTokens(prefix, tokenObj) {
     }
     // If more nested stuff
     else if (typeof tokenObj[key] === "object") {
-      const nextPrefix = prefix ? `${prefix}-${key}` : key;
+      const nextPrefix = fullTokenName; // Use the already cleaned fullTokenName as the next prefix
+
       const nestedResults = flattenTokens(nextPrefix, tokenObj[key]);
 
       // If the object has a "_" property, use its value for the parent token