Connect-static works now

helje5 · helje5 · commit 14c7e00b78c0 · 2020-01-12T19:28:43.000+01:00
A very basic example demonstrating how a directory
can be served locally.
diff --git a/Package.swift b/Package.swift
@@ -17,7 +17,7 @@ let package = Package(
   
   dependencies: [
     .package(url: "https://github.com/Macro-swift/Macro.git",
-             from: "0.0.15"),
+             from: "0.0.16"),
     .package(url: "https://github.com/Macro-swift/MacroExpress.git",
              from: "0.0.3")
   ],
diff --git a/Sources/connect-static/main.swift b/Sources/connect-static/main.swift
@@ -7,17 +7,14 @@ let dirname = __dirname()
 
 let app = connect()
 
-app.use { req, _, next in
-  print("request:", req.url)
-  next()
-}
-
-app.use(logger("dev")) // Middleware: logs the request
-
-let servePath = __dirname() + "/public"
-console.log("serving:", servePath)
+app.use(logger("dev"))
 app.use(serveStatic(__dirname() + "/public"))
 
+app.use { req, res, next in
+  guard req.url == "/" else { return next() }
+  res.redirect("/index.html")
+}
+
 app.listen(1337) {
-    console.log("Server listening on http://localhost:1337/")
+    console.log("Server listening on http://localhost:1337")
 }
diff --git a/Sources/connect-static/public/images/logo.svg b/Sources/connect-static/public/images/logo.svg
diff --git a/Sources/connect-static/public/index.html b/Sources/connect-static/public/index.html
@@ -1,9 +1,31 @@
 <html>
   <head>
     <title>Macro</title>
+    <style>
+      html { background: #FFFFFF; }
+      body {
+        color:       #383838;
+        font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+        line-height: 1.5rem;
+        margin:      0 auto;
+      }
+      p {
+        margin-left:  1rem;
+        margin-right: 1rem;
+      }
+      a { text-decoration: none; }
+    </style>
   </head>
   <body>
-    <center><img src="images/logo.svg" width="256" height="256" /></center>
+    
+    <p>
+      <center>
+        <img src="images/logo256x256.png" width="256" height="256" /><br />
+        <a href="https://github.com/Macro-swift" target="gh">Macro</a>
+        is brought to you by
+        <a href="https://zeezide.de/" target="zz">ZeeZide</a>.
+      </center>
+    </p>
 
     <p>Bacon ipsum dolor amet pancetta shankle jerky pork loin venison tri-tip, cupim pastrami capicola beef. Kielbasa swine biltong, jerky corned beef pig pork filet mignon fatback chicken hamburger ball tip. Swine pork belly beef ribs spare ribs kevin pancetta shank beef jerky chuck shoulder capicola tongue pork. Alcatra swine ribeye, kielbasa landjaeger corned beef beef ribs venison fatback bresaola andouille capicola pig meatloaf. Pork loin andouille venison ball tip, kielbasa tenderloin beef ribs biltong prosciutto rump. Short ribs flank boudin strip steak tenderloin brisket andouille kielbasa pork loin rump salami fatback. Sausage pork pork belly ball tip chicken biltong tri-tip hamburger cupim tenderloin pancetta.</p>
 
