Skip to content

Commit 9302118

Browse files
tibtib
committed
Chapter 1-11 Leaf updates, Chapter 12 [wip]
1 parent 6f080ae commit 9302118

File tree

131 files changed

+132
-144
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+132
-144
lines changed

‎Chapter 03/myProject/Package.swift‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ let package = Package(
99
dependencies: [
1010
// 💧 A server-side Swift web framework.
1111
.package(url: "https://github.com/vapor/vapor", from: "4.34.0"),
12-
//.package(url: "https://github.com/vapor/leaf", from: "4.0.0"),
13-
.package(url: "https://github.com/tib/leaf", from: "4.0.0-rc"),
12+
.package(url: "https://github.com/vapor/leaf", from: "4.0.0-tau"),
1413
.package(url: "https://github.com/lukaskubanek/LoremSwiftum", from: "2.2.1")
1514
],
1615
targets: [

‎Chapter 04/myProject/Package.swift‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ let package = Package(
99
dependencies: [
1010
// 💧 A server-side Swift web framework.
1111
.package(url: "https://github.com/vapor/vapor", from: "4.34.0"),
12-
//.package(url: "https://github.com/vapor/leaf", from: "4.0.0"),
13-
.package(url: "https://github.com/tib/leaf", from: "4.0.0-rc"),
12+
.package(url: "https://github.com/vapor/leaf", from: "4.0.0-tau"),
1413
.package(url: "https://github.com/vapor/fluent", from: "4.0.0"),
1514
.package(url: "https://github.com/vapor/fluent-sqlite-driver", from: "4.0.0"),
1615
.package(url: "https://github.com/lukaskubanek/LoremSwiftum", from: "2.2.1"),

‎Chapter 04/myProject/Sources/App/Middlewares/ExtendPathMiddleware.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import Vapor
1010
struct ExtendPathMiddleware: Middleware {
1111

1212
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(".") {
1414
let response = request.redirect(to: request.url.path + "/", type: .permanent)
1515
return request.eventLoop.makeSucceededFuture(response)
1616
}

‎Chapter 05/myProject/Package.swift‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ let package = Package(
99
dependencies: [
1010
// 💧 A server-side Swift web framework.
1111
.package(url: "https://github.com/vapor/vapor", from: "4.34.0"),
12-
//.package(url: "https://github.com/vapor/leaf", from: "4.0.0"),
13-
.package(url: "https://github.com/tib/leaf", from: "4.0.0-rc"),
12+
.package(url: "https://github.com/vapor/leaf", from: "4.0.0-tau"),
1413
.package(url: "https://github.com/vapor/fluent", from: "4.0.0"),
1514
.package(url: "https://github.com/vapor/fluent-sqlite-driver", from: "4.0.0"),
1615
.package(url: "https://github.com/lukaskubanek/LoremSwiftum", from: "2.2.1"),

‎Chapter 05/myProject/Sources/App/Middlewares/ExtendPathMiddleware.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import Vapor
1010
struct ExtendPathMiddleware: Middleware {
1111

1212
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(".") {
1414
let response = request.redirect(to: request.url.path + "/", type: .permanent)
1515
return request.eventLoop.makeSucceededFuture(response)
1616
}

‎Chapter 05/myProject/Sources/App/Modules/Blog/Migrations/BlogMigration_v1_0_0.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ struct BlogMigration_v1_0_0: Migration {
1313
.field(BlogPostModel.FieldKeys.title, .string, .required)
1414
.field(BlogPostModel.FieldKeys.slug, .string, .required)
1515
.field(BlogPostModel.FieldKeys.image, .string, .required)
16-
.field(BlogPostModel.FieldKeys.excerpt, .string, .required)
16+
.field(BlogPostModel.FieldKeys.excerpt, .data, .required)
1717
.field(BlogPostModel.FieldKeys.date, .datetime, .required)
18-
.field(BlogPostModel.FieldKeys.content, .string, .required)
18+
.field(BlogPostModel.FieldKeys.content, .data, .required)
1919
.field(BlogPostModel.FieldKeys.categoryId, .uuid)
2020
.foreignKey(BlogPostModel.FieldKeys.categoryId,
2121
references: BlogCategoryModel.schema, .id,

‎Chapter 06/myProject/Package.swift‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ let package = Package(
99
dependencies: [
1010
// 💧 A server-side Swift web framework.
1111
.package(url: "https://github.com/vapor/vapor", from: "4.34.0"),
12-
//.package(url: "https://github.com/vapor/leaf", from: "4.0.0"),
13-
.package(url: "https://github.com/tib/leaf", from: "4.0.0-rc"),
12+
.package(url: "https://github.com/vapor/leaf", from: "4.0.0-tau"),
1413
.package(url: "https://github.com/vapor/fluent", from: "4.0.0"),
1514
.package(url: "https://github.com/vapor/fluent-sqlite-driver", from: "4.0.0"),
1615
.package(url: "https://github.com/lukaskubanek/LoremSwiftum", from: "2.2.1"),

‎Chapter 06/myProject/Sources/App/Middlewares/ExtendPathMiddleware.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import Vapor
1010
struct ExtendPathMiddleware: Middleware {
1111

1212
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(".") {
1414
let response = request.redirect(to: request.url.path + "/", type: .permanent)
1515
return request.eventLoop.makeSucceededFuture(response)
1616
}

‎Chapter 06/myProject/Sources/App/Modules/Admin/Views/Home.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#define(title, "Admin home")
1+
#let(title = "Admin home")
22
#define(body):
33
<section class="wrapper">
44
<h2>#(header)</h2>

‎Chapter 06/myProject/Sources/App/Modules/Admin/Views/Index.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="utf-8">
55
<meta name="viewport" content="width=device-width, initial-scale=1">
66
<meta name="robots" content="noindex">
7-
<title>#evaluate(title)</title>
7+
<title>#(title)</title>
88
<link rel="stylesheet" href="/css/frontend.css">
99
<link rel="stylesheet" href="/css/admin.css">
1010

@@ -14,7 +14,7 @@
1414
<header>
1515
<a href="/" id="logo">
1616
<img src="/images/logo.png">
17-
<h1>#evaluate(title)</h1>
17+
<h1>#(title)</h1>
1818
</a>
1919

2020
<nav id="navigation">
@@ -26,7 +26,7 @@ <h1>#evaluate(title)</h1>
2626

2727
<main>
2828
<div id="main-content">
29-
#evaluate(body)
29+
#body()
3030
</div>
3131
</main>
3232

0 commit comments

Comments
 (0)