Merge branch '403-fix' of https://github.com/andreban/gulliver into a…

…ndreban-404-fix
GoogleChromeLabs · Jun 14, 2017 · 73db595 · 73db595
2 parents a2d78b1 + 797b61f
commit 73db595
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/app.js b/app.js
@@ -118,7 +118,8 @@ app.use(require('./controllers'));
 
 // If no route has matched, return 404
 app.use((req, res) => {
-  res.status(404).render('404.hbs', {nonce1: req.nonce1, nonce2: req.nonce2});
+  res.status(404).render('404.hbs',
+    {nonce1: req.nonce1, nonce2: req.nonce2, contentOnly: req.query.contentOnly || false});
 });
 
 // Basic error handler

diff --git a/views/404.hbs b/views/404.hbs
@@ -11,18 +11,24 @@
  See the License for the specific language governing permissions and
  limitations under the License. -->
 
+{{#unless contentOnly}}
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Gulliver - PWA Directory - File Not Found</title>
-
     {{> head}}
   </head>
   <body>
-    {{> header}}    
-    <div class="section-title">File Not Found</div>
-    <main>
-    </main>
+    {{> header}}
+    <div class="page-holder">
+      <main class="page">
+{{/unless}}
+    <div class="section-title">Page Not Found</div>
+{{#unless contentOnly}}
+      </main>
+      <div class='page-loader'>
+      </div>
+    </div>
     {{> footer}}
   </body>
 </html>
+{{/unless}}