Leaf trailing slash fixes [wip]

tib · tib · commit 6f080ae6f10f · 2020-10-31T16:51:04.000+01:00
diff --git a/Chapter 03/myProject/Resources/Views/blog.html b/Chapter 03/myProject/Resources/Views/blog.html
@@ -4,7 +4,7 @@ <h2>Blog</h2>
 
     #for(post in posts):
     <article>
-        <a href="/#(post.slug)">
+        <a href="/#(post.slug)/">
             <img src="#(post.image)">
             <h3>#(post.title)</h3>
             <p>#(post.excerpt)</p>
diff --git a/Chapter 03/myProject/Resources/Views/index.html b/Chapter 03/myProject/Resources/Views/index.html
@@ -16,7 +16,7 @@ <h1>myPage</h1>
 
             <nav id="navigation">
                 <a href="/">Home</a> &middot;
-                <a href="/blog">Blog</a> &middot;
+                <a href="/blog/">Blog</a> &middot;
                 <a href="#" onClick="javascript:about();">About</a>
             </nav>
         </header>
diff --git a/Chapter 03/myProject/Sources/App/Middlewares/ExtendPathMiddleware.swift b/Chapter 03/myProject/Sources/App/Middlewares/ExtendPathMiddleware.swift
@@ -10,7 +10,7 @@ import Vapor
 struct ExtendPathMiddleware: Middleware {
 
     func respond(to request: Request, chainingTo next: Responder) -> EventLoopFuture<Response> {
-        if !request.url.path.hasSuffix("/") {
+        if !request.url.path.hasSuffix("/") && !request.url.path.contains(".") {
             let response = request.redirect(to: request.url.path + "/", type: .permanent)
             return request.eventLoop.makeSucceededFuture(response)
         }
diff --git a/Chapter 03/myProject/Sources/App/configure.swift b/Chapter 03/myProject/Sources/App/configure.swift
@@ -25,6 +25,7 @@ public func configure(_ app: Application) throws {
         FrontendRouter(),
         BlogRouter(),
     ]
+    
     for router in routers {
         try router.boot(routes: app.routes)
     }
diff --git a/Chapter 04/myProject/Resources/Views/blog.html b/Chapter 04/myProject/Resources/Views/blog.html
@@ -4,7 +4,7 @@ <h2>Blog</h2>
 
     #for(post in posts):
     <article>
-        <a href="/#(post.slug)">
+        <a href="/#(post.slug)/">
             <img src="#(post.image)">
             <h3>#(post.title)</h3>
             <p>#(post.excerpt)</p>
diff --git a/Chapter 04/myProject/Resources/Views/index.html b/Chapter 04/myProject/Resources/Views/index.html
@@ -16,7 +16,7 @@ <h1>myPage</h1>
 
             <nav id="navigation">
                 <a href="/">Home</a> &middot;
-                <a href="/blog">Blog</a> &middot;
+                <a href="/blog/">Blog</a> &middot;
                 <a href="#" onClick="javascript:about();">About</a>
             </nav>
         </header>
diff --git a/Chapter 05/myProject/Sources/App/Modules/Blog/Views/Frontend/Blog.html b/Chapter 05/myProject/Sources/App/Modules/Blog/Views/Frontend/Blog.html
@@ -4,7 +4,7 @@ <h2>Blog</h2>
 
     #for(post in posts):
     <article>
-        <a href="/#(post.slug)">
+        <a href="/#(post.slug)/">
             <img src="#(post.image)">
             <h3>#(post.title)</h3>
             <p>#(post.excerpt)</p>
diff --git a/Chapter 05/myProject/Sources/App/Modules/Frontend/Views/Index.html b/Chapter 05/myProject/Sources/App/Modules/Frontend/Views/Index.html
@@ -16,7 +16,7 @@ <h1>myPage</h1>
 
             <nav id="navigation">
                 <a href="/">Home</a> &middot;
-                <a href="/blog">Blog</a> &middot;
+                <a href="/blog/">Blog</a> &middot;
                 <a href="#" onClick="javascript:about();">About</a>
             </nav>
         </header>
diff --git a/Chapter 06/myProject/Sources/App/Modules/Blog/Views/Frontend/Blog.html b/Chapter 06/myProject/Sources/App/Modules/Blog/Views/Frontend/Blog.html
@@ -4,7 +4,7 @@ <h2>Blog</h2>
 
     #for(post in posts):
     <article>
-        <a href="/#(post.slug)">
+        <a href="/#(post.slug)/">
             <img src="#(post.image)">
             <h3>#(post.title)</h3>
             <p>#(post.excerpt)</p>
diff --git a/Chapter 06/myProject/Sources/App/Modules/Frontend/Views/Index.html b/Chapter 06/myProject/Sources/App/Modules/Frontend/Views/Index.html
@@ -16,7 +16,7 @@ <h1>myPage</h1>
 
             <nav id="navigation">
                 <a href="/">Home</a> &middot;
-                <a href="/blog">Blog</a> &middot;
+                <a href="/blog/">Blog</a> &middot;
                 <a href="#" onClick="javascript:about();">About</a>
             </nav>
         </header>
diff --git a/Chapter 07/myProject/Sources/App/Modules/Blog/Views/Frontend/Blog.html b/Chapter 07/myProject/Sources/App/Modules/Blog/Views/Frontend/Blog.html
@@ -4,7 +4,7 @@ <h2>Blog</h2>
 
     #for(post in posts):
     <article>
-        <a href="/#(post.slug)">
+        <a href="/#(post.slug)/">
             <img src="#(post.image)">
             <h3>#(post.title)</h3>
             <p>#(post.excerpt)</p>
diff --git a/Chapter 07/myProject/Sources/App/Modules/Frontend/Views/Index.html b/Chapter 07/myProject/Sources/App/Modules/Frontend/Views/Index.html
@@ -16,7 +16,7 @@ <h1>myPage</h1>
 
             <nav id="navigation">
                 <a href="/">Home</a> &middot;
-                <a href="/blog">Blog</a> &middot;
+                <a href="/blog/">Blog</a> &middot;
                 <a href="#" onClick="javascript:about();">About</a>
             </nav>
         </header>
diff --git a/Chapter 08/myProject/Sources/App/Modules/Blog/Views/Frontend/Blog.html b/Chapter 08/myProject/Sources/App/Modules/Blog/Views/Frontend/Blog.html
@@ -4,7 +4,7 @@ <h2>Blog</h2>
 
     #for(post in posts):
     <article>
-        <a href="/#(post.slug)">
+        <a href="/#(post.slug)/">
             <img src="#(post.image)">
             <h3>#(post.title)</h3>
             <p>#(post.excerpt)</p>
diff --git a/Chapter 08/myProject/Sources/App/Modules/Frontend/Views/Index.html b/Chapter 08/myProject/Sources/App/Modules/Frontend/Views/Index.html
@@ -16,7 +16,7 @@ <h1>myPage</h1>
 
             <nav id="navigation">
                 <a href="/">Home</a> &middot;
-                <a href="/blog">Blog</a> &middot;
+                <a href="/blog/">Blog</a> &middot;
                 <a href="#" onClick="javascript:about();">About</a>
             </nav>
         </header>
diff --git a/Chapter 09/myProject/Sources/App/Modules/Blog/Views/Frontend/Blog.html b/Chapter 09/myProject/Sources/App/Modules/Blog/Views/Frontend/Blog.html
@@ -4,7 +4,7 @@ <h2>Blog</h2>
 
     #for(post in posts):
     <article>
-        <a href="/#(post.slug)">
+        <a href="/#(post.slug)/">
             <img src="#(post.image)">
             <h3>#(post.title)</h3>
             <p>#(post.excerpt)</p>
diff --git a/Chapter 09/myProject/Sources/App/Modules/Frontend/Views/Index.html b/Chapter 09/myProject/Sources/App/Modules/Frontend/Views/Index.html
@@ -16,7 +16,7 @@ <h1>myPage</h1>
 
             <nav id="navigation">
                 <a href="/">Home</a> &middot;
-                <a href="/blog">Blog</a> &middot;
+                <a href="/blog/">Blog</a> &middot;
                 <a href="#" onClick="javascript:about();">About</a>
             </nav>
         </header>
diff --git a/Chapter 10/myProject/Sources/App/Modules/Blog/Views/Frontend/Blog.html b/Chapter 10/myProject/Sources/App/Modules/Blog/Views/Frontend/Blog.html
@@ -4,7 +4,7 @@ <h2>Blog</h2>
 
     #for(post in posts):
     <article>
-        <a href="/#(post.slug)">
+        <a href="/#(post.slug)/">
             <img src="#(post.image)">
             <h3>#(post.title)</h3>
             <p>#(post.excerpt)</p>
diff --git a/Chapter 10/myProject/Sources/App/Modules/Frontend/Views/Index.html b/Chapter 10/myProject/Sources/App/Modules/Frontend/Views/Index.html
@@ -16,7 +16,7 @@ <h1>myPage</h1>
 
             <nav id="navigation">
                 <a href="/">Home</a> &middot;
-                <a href="/blog">Blog</a> &middot;
+                <a href="/blog/">Blog</a> &middot;
                 <a href="#" onClick="javascript:about();">About</a>
             </nav>
         </header>
diff --git a/Chapter 11/myProject/Sources/App/Modules/Blog/Views/Frontend/Blog.html b/Chapter 11/myProject/Sources/App/Modules/Blog/Views/Frontend/Blog.html
@@ -4,7 +4,7 @@ <h2>Blog</h2>
 
     #for(post in posts):
     <article>
-        <a href="/#(post.slug)">
+        <a href="/#(post.slug)/">
             <img src="#(post.image)">
             <h3>#(post.title)</h3>
             <p>#(post.excerpt)</p>
diff --git a/Chapter 11/myProject/Sources/App/Modules/Frontend/Views/Index.html b/Chapter 11/myProject/Sources/App/Modules/Frontend/Views/Index.html
@@ -16,7 +16,7 @@ <h1>myPage</h1>
 
             <nav id="navigation">
                 <a href="/">Home</a> &middot;
-                <a href="/blog">Blog</a> &middot;
+                <a href="/blog/">Blog</a> &middot;
                 <a href="#" onClick="javascript:about();">About</a>
             </nav>
         </header>
diff --git a/Chapter 12/myProject/Sources/App/Modules/Blog/Views/Frontend/Blog.html b/Chapter 12/myProject/Sources/App/Modules/Blog/Views/Frontend/Blog.html
@@ -4,7 +4,7 @@ <h2>Blog</h2>
 
     #for(post in posts):
     <article>
-        <a href="/#(post.slug)">
+        <a href="/#(post.slug)/">
             <img src="#(post.image)">
             <h3>#(post.title)</h3>
             <p>#(post.excerpt)</p>
diff --git a/Chapter 12/myProject/Sources/App/Modules/Frontend/Views/Index.html b/Chapter 12/myProject/Sources/App/Modules/Frontend/Views/Index.html
@@ -16,7 +16,7 @@ <h1>myPage</h1>
 
             <nav id="navigation">
                 <a href="/">Home</a> &middot;
-                <a href="/blog">Blog</a> &middot;
+                <a href="/blog/">Blog</a> &middot;
                 <a href="#" onClick="javascript:about();">About</a>
             </nav>
         </header>

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import Vapor`
`10`	`10`	`struct ExtendPathMiddleware: Middleware {`
`11`	`11`
`12`	`12`	`func respond(to request: Request, chainingTo next: Responder) -> EventLoopFuture<Response> {`
`13`		`- if !request.url.path.hasSuffix("/") {`
	`13`	`+ if !request.url.path.hasSuffix("/") && !request.url.path.contains(".") {`
`14`	`14`	`let response = request.redirect(to: request.url.path + "/", type: .permanent)`
`15`	`15`	`return request.eventLoop.makeSucceededFuture(response)`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ public func configure(_ app: Application) throws {`
`25`	`25`	`FrontendRouter(),`
`26`	`26`	`BlogRouter(),`
`27`	`27`	`]`
	`28`	`+`
`28`	`29`	`for router in routers {`
`29`	`30`	`try router.boot(routes: app.routes)`
`30`	`31`	`}`