HTML rendering support for the Website service (#5)
This PR contains the work done to replace the use of static _HTML_ files with type-safe HTML rendered server-side via **Elementary** through **Hummingbird**. To provide further details about the work done: * Added the **Elementary** dependencies. * Added the `IndexPage` and `ErrorPage` pages, ported from the old HTML boilerplate; removed the static files. * Added the `RootController` controller serving GET / using the `IndexPage` page, wired into the router. * Reworked the `NotFoundMiddleware` middleare to render `ErrorPage` page directly; non-notFound errors still propagate. * the `FileMiddleware` middleware no longer searches for any static `index.html` file. * Simplified the `StaticFile` enumeration, dropped unused constants and now-unnecessary throws. Reviewed-on: rock-n-code/loud-amsterdam#5 Co-authored-by: Javier Cicchelli <javier@rock-n-code.com> Co-committed-by: Javier Cicchelli <javier@rock-n-code.com>
This commit is contained in:
@@ -82,7 +82,7 @@ struct StaticFileTests {
|
||||
|
||||
@Test
|
||||
func `all cases`() {
|
||||
#expect(File.allCases.count == 9)
|
||||
#expect(File.allCases.count == 7)
|
||||
}
|
||||
|
||||
}
|
||||
@@ -95,44 +95,36 @@ private extension StaticFileTests {
|
||||
|
||||
static let contentTypes: [String] = [
|
||||
"text/javascript",
|
||||
"text/html",
|
||||
"image/vnd.microsoft.icon",
|
||||
"image/png",
|
||||
"image/svg+xml",
|
||||
"text/html",
|
||||
"text/plain",
|
||||
"application/manifest+json",
|
||||
"text/css"
|
||||
]
|
||||
static let fileExtensions: [FileExtension] = [
|
||||
.js,
|
||||
.html,
|
||||
.ico,
|
||||
.png,
|
||||
.svg,
|
||||
.html,
|
||||
.txt,
|
||||
.webmanifest,
|
||||
.css
|
||||
]
|
||||
static let fileNames: [String] = [
|
||||
"app",
|
||||
"404",
|
||||
"favicon",
|
||||
"icon",
|
||||
"icon",
|
||||
"index",
|
||||
"robots",
|
||||
"site",
|
||||
"style"
|
||||
]
|
||||
static let relativePaths: [String] = [
|
||||
"js/app.js",
|
||||
"404.html",
|
||||
"favicon.ico",
|
||||
"icon.png",
|
||||
"icon.svg",
|
||||
"index.html",
|
||||
"robots.txt",
|
||||
"site.webmanifest",
|
||||
"css/style.css"
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
import Elementary
|
||||
import Testing
|
||||
|
||||
@testable import WebsiteCore
|
||||
|
||||
@Suite("ErrorPage page")
|
||||
struct ErrorPageTests {
|
||||
|
||||
// MARK: Functional tests
|
||||
|
||||
@Test
|
||||
func `renders its markup`() {
|
||||
let html = ErrorPage().render()
|
||||
|
||||
#expect(html.contains("<!DOCTYPE html>"))
|
||||
#expect(html.contains("Page Not Found"))
|
||||
#expect(html.contains("does not exist"))
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
import Elementary
|
||||
import Testing
|
||||
|
||||
@testable import WebsiteCore
|
||||
|
||||
@Suite("IndexPage page")
|
||||
struct IndexPageTests {
|
||||
|
||||
// MARK: Functional tests
|
||||
|
||||
@Test
|
||||
func `renders its markup`() {
|
||||
let html = IndexPage().render()
|
||||
|
||||
#expect(html.contains("<!DOCTYPE html>"))
|
||||
#expect(html.contains("Hello world!"))
|
||||
#expect(html.contains("css/style.css"))
|
||||
#expect(html.contains("js/app.js"))
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user