Merge 2.1.1 fix into master

auth0-extensions · Jan 23, 2018 · 8607ba7 · 8607ba7
2 parents e587b60 + aeeb538
commit 8607ba7
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 14 deletions.
diff --git a/build/bundle.js b/build/bundle.js
diff --git a/public/admin.js b/public/admin.js
@@ -325,12 +325,11 @@ export default function() {
     });
   }
 
-  switch (window.location.pathname) {
-    case '/admin':
-      return mainAdminPanel();
-      break;
-    case '/admin/locale':
-      return localeAdminPanel();
-      break;
-  }
+  var path = window.location.pathname;
+
+  if (path.endsWith('/admin')) {
+    return mainAdminPanel();
+  } else if (path.endsWith('/admin/locale')) {
+    return localeAdminPanel();
+  } 
 }
diff --git a/templates/server/admin.js b/templates/server/admin.js
@@ -18,7 +18,7 @@ export default ({ stylesheetTag, baseURL }) => `
 </head>
 <body>
 
-${header}
+${header(baseURL)}
 
 <main class="container app-container">
     <form action="">

diff --git a/templates/server/locale.js b/templates/server/locale.js
@@ -19,7 +19,7 @@ export default ({ stylesheetTag, baseURL }) => `
 </head>
 <body>
 
-${header}
+${header(baseURL)}
 
 <main class="container app-container">
     <div class="row">

diff --git a/templates/utils/header.js b/templates/utils/header.js
@@ -1,12 +1,12 @@
-export default `
+export default baseURL => `
 <header class="site-header">
  <nav class="navbar navbar-default" role="navigation">
     <div class="container">
       <div class="navbar-header">
         <button class="navbar-toggle" type="button" data-toggle="collapse" data-target="#navbar-collapse"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span>
         </button>
         <span>
-            <h1 class="navbar-brand"><a href="/admin"><span>Auth0</span> <div class="product-name">Account Linking Extension</div></a></h1>
+            <h1 class="navbar-brand"><a href="${baseURL}/admin"><span>Auth0</span> <div class="product-name">Account Linking Extension</div></a></h1>
         </span>
       </div>
       <div class="collapse navbar-collapse" id="navbar-collapse">
@@ -17,7 +17,7 @@ export default `
             <img src="" alt="" class="avatar">
             <i class="icon-budicon-460"></i></span>
             <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
-              <li><a href="/admin/locale" target="_blank">Manage locales</a></li>
+              <li><a href="${baseURL}/admin/locale" target="_blank">Manage locales</a></li>
               <li><a href="https://github.com/auth0-extensions/auth0-account-link-extension/issues/new" target="_blank">Report an issue</a></li>
               <li class="separator"></li>
               <li><a href="#" id="logout-btn">Logout</a>