fix fortune template

theLastOfCats · Jul 5, 2024 · 28c781e · 28c781e
1 parent d29222a
commit 28c781e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 14 deletions.
diff --git a/frameworks/Swift/vapor/vapor-swifql/Package.swift b/frameworks/Swift/vapor/vapor-swifql/Package.swift
@@ -34,8 +34,6 @@ let package = Package(
                 .product(name: "PostgresBridge", package: "PostgresBridge"),
                 .product(name: "IkigaJSON", package: "IkigaJSON"),
             ],
-            path: "Sources",
-            resources: [.process("Resources/Views/fortune.leaf")],
             swiftSettings: swiftSettings
         )
     ]

diff --git a/frameworks/Swift/vapor/vapor-swifql/Sources/Extensions/Models+Content.swift b/frameworks/Swift/vapor/vapor-swifql/Sources/Extensions/Models+Content.swift
@@ -8,4 +8,12 @@
 import Vapor
 
 extension World: Content {}
-extension Fortune: Content {}
+extension Fortune: Content {}
+
+struct Fortunes: Codable {
+    var fortunes: [Fortune]
+
+    init(_ fortunes: [Fortune]) {
+        self.fortunes = fortunes
+    }
+}
diff --git a/frameworks/Swift/vapor/vapor-swifql/Sources/Resources/Views/fortune.leaf b/frameworks/Swift/vapor/vapor-swifql/Sources/Resources/Views/fortune.leaf
diff --git a/frameworks/Swift/vapor/vapor-swifql/Sources/configure.swift b/frameworks/Swift/vapor/vapor-swifql/Sources/configure.swift
@@ -113,7 +113,7 @@ public func routes(_ app: Application) throws {
 
         fortunes.append(Fortune(id: 0, message: "Additional fortune added at request time."))
 
-        return try await req.view.render("fortune", fortunes)
+        return try await req.view.render("fortune", Fortunes(fortunes))
     }
 }