Merge pull request #475 from openforge/fix/navbar-ourwork

fix(navbar): our work active state

Author: Wholloran

src/components/app-nav-header/app-nav-header.tsx

@@ -73,7 +73,7 @@ export class AppNavHeader {
             <div class="collapse navbar-collapse justify-content-between" id="navbarSupportedContent">
               <ul class="navbar-nav">
                 <li class="nav-item" data-target="#navbarSupportedContent">
-                  <stencil-route-link url="/our-work" exact={true} anchorClass="nav-link" activeClass="active">
+                  <stencil-route-link url="/our-work" anchorClass="nav-link" activeClass="active">
                     {translate('nav.links.ourWork')}
                   </stencil-route-link>
                 </li>

src/pages/app-our-work-single/app-our-work-single.tsx

@@ -156,7 +156,7 @@ export class AppOurWorkSingle {
           </div>
           <p class="d-none d-md-block">{project.header.title}</p>
           <div class="other-button">
-            <stencil-route-link url={`/our-work-single/${project.key}`} exact={true}>
+            <stencil-route-link url={`/our-work/${project.key}`} exact={true}>
               <button>
                 <app-translate keyword="ourWork.cards.button" />
               </button>

src/pages/app-our-work/app-our-work.tsx

@@ -42,7 +42,7 @@ export class AppOurWork {
               <p>
                 <app-translate keyword="ourWork.cards.mobile_measures.text" />
               </p>
-              <stencil-route-link url="/our-work-single/mobilemeasures" exact={true}>
+              <stencil-route-link url="/our-work/mobilemeasures" exact={true}>
                 <button>
                   <app-translate keyword="ourWork.cards.button" />
                 </button>
@@ -74,7 +74,7 @@ export class AppOurWork {
               <p>
                 <app-translate keyword="ourWork.cards.loudcloud.text" />
               </p>
-              <stencil-route-link url="/our-work-single/loudcloud" exact={true}>
+              <stencil-route-link url="/our-work/loudcloud" exact={true}>
                 <button>
                   <app-translate keyword="ourWork.cards.button" />
                 </button>
@@ -106,7 +106,7 @@ export class AppOurWork {
               <p>
                 <app-translate keyword="ourWork.cards.voyage.text" />
               </p>
-              <stencil-route-link url="/our-work-single/voyage" exact={true}>
+              <stencil-route-link url="/our-work/voyage" exact={true}>
                 <button>
                   <app-translate keyword="ourWork.cards.button" />
                 </button>

src/pages/open-forge-app/open-forge-app.tsx

@@ -54,8 +54,8 @@ export class OpenForgeApp {
           <stencil-route url="/about/:member" component="app-team-landing" />
           <stencil-route url="/juntoscope" component="app-case-study" />
           <stencil-route url="/terms-of-service" component="app-tos" />
-          <stencil-route url="/our-work" component="app-our-work" />
-          <stencil-route url="/our-work-single/:project" component="app-our-work-single" />
+          <stencil-route url="/our-work" component="app-our-work" exact={true} />
+          <stencil-route url="/our-work/:project" component="app-our-work-single" />
           <stencil-route url="/service-level-agreement" component="app-service-level-agreement" />
           <stencil-route url="/blog" component="app-blog" exact={true} />
           <stencil-route url="/blog/" component="app-blog" exact={true} />