battlefleet updated

Sources/Pages/Battlefleet.swift

@@ -1,26 +1,37 @@
 import Ignite
+import Foundation
 
 struct Battlefleet: StaticPage {
+    @Environment(\.articles) var articles
     var path = "/battlefleet"
     let title: String
+    let subtitle: String
     
     init() {
-        self.title = "Battlefleet: Subsector Scarus"
+        self.title = "Battlefleet:"
+        self.subtitle = "Subsector Scarus"
     }
     
     var body: some HTML {
         VStack {
-            Logo(barTitle: String(title.split(separator: " ").first ?? ""), underTitle: "Subsector Scarus")
+            Logo(barTitle: title, underTitle: subtitle)
                 .horizontalAlignment(.center)
-            Link("Battlefleet Gothic Remastered Digital Rules", target: "/epubs/BattlefleetGothicDigitalRemaster.epub")
-            Link("Rebels List", target: "article/rebels")
-            Link("About Subsector Scarus", target: "article/scarus")
-            Text("Battlefleet Obscuras: Sector Scarus")
-            Text("Prince Magos Charlemange: Rebel")
-            Text("Prince CuCulain: Eldar Pirates")
-            Text("Chaos Raiders: Thousand Sons")
-            Text("Archeo Xenos: Necrons")
-            Text("Commonwealth: T'au")
+            VStack {
+                Link("Battlefleet Gothic Remastered Digital Rules", target: "/epubs/BattlefleetGothicDigitalRemaster.epub")
+                Text(markdown: "The _Battlefleet: Gothic_ rules formatted for epub.")
+            }
+                .margin(.bottom, .medium)
+            VStack {
+                ForEach(articles.typed("battlefleet").reversed()) { article in
+                    Group {
+                        Link(article)
+                        Text(article.metadata["description"] as? String ?? "")
+                            .margin(.bottom, .medium)
+                    }
+                }
+            }
         }
+        SocialFooter()
+            .margin(.top, .large)
     }
 }

Sources/Pages/Home.swift

@@ -6,8 +6,11 @@ struct Home: StaticPage {
     let buttonHeight = 70
 
     var body: some HTML {
+        let midtitle = String(title.split(separator: " ").first ?? "")
+        let underTitle = String(title.split(separator: " ").last ?? "")
         VStack{
-            Logo()
+            Logo(barTitle: midtitle, underTitle: underTitle)
+                .margin(.top, .medium)
                 .horizontalAlignment(.center)
             Grid(alignment: .center, spacing: 4) {
                 Button(name: "Rory", link: "https://rory.hinnen.us")
@@ -24,6 +27,7 @@ struct Home: StaticPage {
                 Button(name: "Battlefleet: Sector Scarus", link: "/battlefleet/")
             }
             .margin(.top, .xLarge)
+            Footer()
         }
         .horizontalAlignment(.center)
         Mastodon()

Sources/Pages/Theatre.swift

@@ -12,7 +12,11 @@ struct Theatre: StaticPage {
         VStack {
             Logo(barTitle: "Bel Aire", underTitle: "Backyard Theatre")
                 .horizontalAlignment(.center)
-            Text(markdown: """
+            Group {
+                Image("images/SoundOfMusic.jpeg")
+                    .frame(width: 300)
+                    .style(.float(.self, .left))
+                Text(markdown: """
 I *love* movies.
 
 From my very first experiences in a theatre, to hot summer nights at the drive-in, I have always been in love with movies.
@@ -25,6 +29,7 @@ As my site is being rebuilt, you'll have to satisfy yourself with just that stor
 
 *Soon.*
 """)
+            }
         }
     }
 }