Merge pull request #949 from WebDevStudios/hotfix/383-update-todos

Hotfix/383 update todos

components/atoms/ExitPreview/ExitPreview.js

@@ -0,0 +1,23 @@
+import Link from 'next/link'
+
+/**
+ * Renders an anchor to exit Preview Mode.
+ *
+ * @param  {object}         props         The component as props.
+ * @param  {object}         props.preview Checks if a preview exists.
+ * @return {Element | null}               The ExitPreview component.
+ */
+export default function ExitPreview({preview}) {
+  if (preview) {
+    return (
+      <p>
+        This page is a preview.
+        <Link href="/api/exit-preview">
+          <a>Exit preview mode</a>
+        </Link>
+      </p>
+    )
+  }
+
+  return null
+}

components/atoms/ExitPreview/index.js

@@ -0,0 +1 @@
+export {default} from './ExitPreview.js'

functions/isLinkActive.js

@@ -12,22 +12,10 @@ export default function isLinkActive(asPath, path) {
     return false
   }
 
-  // TODO: Add functionality to check if link is in the full URL path.
-  // e.g. /portfolio /portfolio/cambells-soup
-
-  return asPath === stripTrailingSlash(path)
-}
-
-/**
- * Remove the last trailing slash from a URL path.
- *
- * @author WebDevStudios
- * @param  {string} str The string to search and remove trailing slash.
- * @return {string}     The formatted string.
- */
-function stripTrailingSlash(str) {
-  if (str.substr(-1) === '/' && str.length > 1) {
-    return str.substr(0, str.length - 1)
+  if (path.length > 1) {
+    const checkSubStr = new RegExp(path)
+    return checkSubStr.test(asPath)
   }
-  return str
+
+  return path === asPath
 }