diff --git a/.gitignore b/.gitignore index 578ca29..7361e41 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .DS_Store hinnen/Package.resolved +hinnen/Assets/epubs diff --git a/hinnen/Sources/Elements/Button.swift b/hinnen/Sources/Elements/Button.swift index 45bc83e..44fb339 100644 --- a/hinnen/Sources/Elements/Button.swift +++ b/hinnen/Sources/Elements/Button.swift @@ -16,7 +16,7 @@ struct Button: HTML { Link(name, target: link) .linkStyle(.button) .background(.blue) - .border(Color.black, width: 0) + .border(Color.black, width: 1) .font(.custom("Futura", size: .em(1))) .frame(width: buttonWidth, height: buttonHeight) } diff --git a/hinnen/Sources/Pages/Home.swift b/hinnen/Sources/Pages/Home.swift index c3c44cf..5a9b4cb 100644 --- a/hinnen/Sources/Pages/Home.swift +++ b/hinnen/Sources/Pages/Home.swift @@ -9,31 +9,31 @@ struct Home: StaticPage { VStack{ Logo() .horizontalAlignment(.center) - Grid(alignment: .center, spacing: 5) { + Grid(alignment: .center, spacing: 4) { Button(name: "Rory", link: "https://rory.hinnen.us") - .width(4) + //.width(4) Button(name: "Robin", link: "https://robin.hinnen.us") - .width(4) + //.width(4) Button(name: "Robin's Cancer Blog", link: "https://bab.hinnen.us") - .width(4) + //.width(4) Button(name: "MGA", link: "/mga/") - .width(4) + //.width(4) Button(name: "Drive In", link: "/theatre/") - .width(4) + //.width(4) Button(name: "Minecraft", link: "https://treznzelore.hinnen.us") - .width(4) + //.width(4) Button(name: "Legends of Dying Mars", link: "/legends/") - .width(4) + //.width(4) Button(name: "X-Wing Rules", link: "/xwing/") - .width(4) + //.width(4) Button(name: "Adventures in Modern Coding", link: "/adventures/") - .width(4) + //.width(4) Button(name: "The Library", link: "/library/") - .width(4) + //.width(4) Button(name: "Archeological remains", link: "/archeological-remains/") - .width(4) + //.width(4) Button(name: "Battlefleet: Sector Scarus", link: "/battlefleet/") - .width(4) + //.width(4) } Mastodon() } diff --git a/hinnen/Sources/Pages/Library.swift b/hinnen/Sources/Pages/Library.swift index 05c6a3c..5687532 100644 --- a/hinnen/Sources/Pages/Library.swift +++ b/hinnen/Sources/Pages/Library.swift @@ -13,16 +13,45 @@ struct Library: StaticPage { Logo(barTitle: title, underTitle: "") .horizontalAlignment(.center) Text(""" -I love reading. - -I really don’t get enough time to do that anymore. I’m in the process of creating e-books of some of my favorites +I love reading, but I really don’t get enough time to do that anymore. I've become enamoured of the the process of creating e-books. There's something about it that I very much enjoy. """) - Group{ - Text(""" - Edgar Rice Burrough’s Barsoom Series - Burroughs wrote these in the early part of the last century, and a they can be challenging to modern readers, both for the writing style and the content. They’re straightforward action, mostly focused and beating the bad guys and getting the girl, who seems to spend a lot of time not understanding our poor hero’s intentions. + Group { + Text("Edgar Rice Burrough’s Barsoom Series") + .font(.title2) + Text(""" +Burroughs wrote these in the early part of the last century, and a they can be challenging to modern readers, both for the writing style and the content. They’re straightforward action, mostly focused and beating the bad guys and getting the girl, who seems to spend a lot of time not understanding our poor hero’s intentions. """) - Link("Battlefleet Gothic Remastered Digital Rules", target: "epubs/BattlefleetGothicDigitalRemaster.epub") + HStack(alignment: .top ) { + VStack { + Text("The Barsoom Series") + .font(.title3) + List { + Link("A Princess of Mars", target: "/epubs/PrincessOfMars.epub") + Link("The Gods of Mars", target: "/epubs/GodsOfMars.epub") + Link("Warlord of Mars", target: "/epubs/WarlordOfMars.epub") + Link("Thuvia, Maid of Mars", target: "/epubs/ThuviaMaidOfMars.epub") + Link("Chessmen of Mars", target: "/epubs/ChessmenOfMars.epub") + Link("Fighting Man of Mars", target: "/epubs/FightingManOfMars.epub") + Link("Swords of Mars", target: "/epubs/SwordsOfMars.epub") + Link("Synthetic Men of Mars", target: "/epubs/SyntheticMenOfMars.epub") + Link("Llana of Gathol", target: "/epubs/LlanaOfGathol.epub") + Link("The Mastermind Of Mars", target: "/epubs/MastermindOfMars.epub") + Link("John Carter of Mars", target: "/epubs/JohnCarterOfMars.epub") + } + } + VStack { + Text("The Amtor Series") + .font(.title3) + List { + Link("Pirates of Venus", target: "/epubs/PiratesOfVenus.epub") + Link("Lost on Venus", target: "/epubs/LostOnVenus.epub") + Link("Carson of Venus", target: "/epubs/CarsonOfVenus.epub") + Link("Escape on Venus", target: "/epubs/EscapeOnVenus.epub") + Link("The Wizard of Venus", target: "/epubs/WizardOfVenus.epub") + + } + } + } } } }