Fix: use path for navbar and update html utility

vhmartinezm · Feb 28, 2017 · b6200c5 · b6200c5
1 parent 86b2883
commit b6200c5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/app/src/components/Navbar/index.js b/app/src/components/Navbar/index.js
@@ -22,10 +22,10 @@ export default function Navbar(props: {
           }
         </Title>
         <StyledMenu inline direction="row" align="center" responsive={false}>
-          <Anchor href="/" className={pathname === '/' ? 'active' : ''}>
+          <Anchor path="/" className={pathname === '/' ? 'active' : ''}>
             Home
           </Anchor>
-          <Anchor href="/about" className={pathname === '/about' ? 'active' : ''}>
+          <Anchor path="/about" className={pathname === '/about' ? 'active' : ''}>
             About
           </Anchor>
           <Search dropAlign={{ right: 'right' }} />

diff --git a/server/utils/Html.js b/server/utils/Html.js
@@ -16,14 +16,14 @@ function Html({ content, state, scriptHash, vendorHash, cssHash, styles }) {
       </head>
       <body>
         <div id="app" dangerouslySetInnerHTML={{ __html: content }} />
-        <script src={`${scriptHash}`} charSet="UTF-8" />
-        <script src={`${vendorHash}`} type="text/javascript" />
         <script
           dangerouslySetInnerHTML={{
             __html: `window.__APOLLO_STATE__=${serialize(state, { isJSON: true })};`,
           }}
           charSet="UTF-8"
         />
+        <script src={`${scriptHash}`} charSet="UTF-8" />
+        <script src={`${vendorHash}`} type="text/javascript" />
       </body>
     </html>
   );