Resolve merge conflicts with dev

Author: Stephen-Hamilton-C

src/jsMain/kotlin/com/github/stephenhamiltonc/timecard_web/page/credits/CreditCard.kt

@@ -8,17 +8,17 @@ import io.kvision.html.link
 import io.kvision.panel.SimplePanel
 
 // Heheh, like the play on words?
-class CreditCard(project: String, author: String? = null, license: String, website: String) : SimplePanel() {
+class CreditCard(data: CreditData) : SimplePanel() {
     init {
-        card(title = project) {
-            if(author != null) {
-                +"Written by $author"
+        card(title = data.project) {
+            if(data.author != null) {
+                +"Written by ${data.author}"
                 br()
             }
 
-            +"Protected under the $license license"
+            +"Protected under the ${data.license} license"
             br()
-            link(label = "Source Code", url = website, className = "btn btn-outline-primary") {
+            link(label = "Source Code", url = data.website, className = "btn btn-outline-primary") {
                 target = "_blank"
                 setAttribute("rel", "noopener noreferrer")
 
@@ -28,6 +28,6 @@ class CreditCard(project: String, author: String? = null, license: String, websi
     }
 }
 
-fun Container.creditCard(project: String, author: String? = null, license: String, website: String): CreditCard {
-    return CreditCard(project, author, license, website).also { add(it) }
+fun Container.creditCard(data: CreditData): CreditCard {
+    return CreditCard(data).also { add(it) }
 }

src/jsMain/kotlin/com/github/stephenhamiltonc/timecard_web/page/credits/CreditData.kt

@@ -0,0 +1,8 @@
+package com.github.stephenhamiltonc.timecard_web.page.credits
+
+data class CreditData(
+    val project: String,
+    val author: String? = null,
+    val license: String,
+    val website: String
+)

src/jsMain/kotlin/com/github/stephenhamiltonc/timecard_web/page/credits/CreditsPage.kt

@@ -8,31 +8,48 @@ class CreditsPage : SimplePanel() {
     init {
         marginTop = 12.px
 
-        creditCard(
-            project = "timecard-web",
-            author = "Stephen Hamilton",
-            license = "GPL-3.0",
-            website = "https://github.com/Stephen-Hamilton-C/timecard-web",
-        )
-        div(className = "mt-3")
-        creditCard(
-            project = "timecard-lib",
-            author = "Stephen Hamilton",
-            license = "GPL-3.0",
-            website = "https://github.com/Stephen-Hamilton-C/timecard-lib",
-        )
-        div(className = "mt-3")
-        creditCard(
-            project = "kotlinx.serialization",
-            license = "Apache-2.0",
-            website = "https://github.com/Kotlin/kotlinx.serialization"
-        )
-        div(className = "mt-3")
-        creditCard(
-            project = "KVision",
-            author = "Robert Jaros",
-            license = "MIT",
-            website = "https://github.com/rjaros/kvision"
+        val credits = listOf(
+            CreditData(
+                project = "timecard-web",
+                author = "Stephen Hamilton",
+                license = "GPL-3.0",
+                website = "https://github.com/Stephen-Hamilton-C/timecard-web",
+            ),
+            CreditData(
+                project = "timecard-lib",
+                author = "Stephen Hamilton",
+                license = "GPL-3.0",
+                website = "https://github.com/Stephen-Hamilton-C/timecard-lib",
+            ),
+            CreditData(
+                project = "kotlinx.serialization",
+                author = "Jetbrains",
+                license = "Apache-2.0",
+                website = "https://github.com/Kotlin/kotlinx.serialization",
+            ),
+            CreditData(
+                project = "KVision",
+                author = "Robert Jaros",
+                license = "MIT",
+                website = "https://github.com/rjaros/kvision",
+            ),
+            CreditData(
+                project = "Bootswatch Darkly",
+                author = "Thomas Park",
+                license = "MIT",
+                website = "https://github.com/thomaspark/bootswatch/",
+            ),
+            CreditData(
+                project = "Bootswatch Flatly",
+                author = "Thomas Park",
+                license = "MIT",
+                website = "https://github.com/thomaspark/bootswatch/"
+            ),
         )
+
+        credits.forEach { data ->
+            creditCard(data)
+            div(className = "mt-3")
+        }
     }
 }