fix merge

1 files changed, 16 insertions, 3 deletions

diff --git a/client/index.js b/client/index.js
index 1a80e74f..c72fd02c 100644
--- a/client/index.js
+++ b/client/index.js
@@ -139,14 +139,27 @@ function buildWaypoints() {
 }
 
 function main() {
-  const paras = document.querySelectorAll('section p')
+  // const paras = document.querySelectorAll('section p')
   // if (paras.length) {
   //   paras[0].classList.add('first_paragraph')
   // }
-  toArray(document.querySelectorAll('header .links a')).forEach(tag => {
-    if (window.location.href.match(tag.href)) {
+  let active = ''
+  const { href } = window.location
+  if (href.match('news')) {
+    active = 'news'
+  } else if (href.match('about')) {
+    active = 'about'
+  } else if (href.match('datasets')) {
+    active = 'datasets'
+  } else {
+    active = href
+  }
+  toArray(document.querySelectorAll('header .links a')).some(tag => {
+    if (tag.href.match(active)) {
       tag.classList.add('active')
+      return true
     }
+    return false
   })
   runApplets()
   buildWaypoints()