set rev version

SpectralDragon · SpectralDragon · commit 371f40740e1b · 2025-05-13T01:37:41.000+03:00
diff --git a/Package.resolved b/Package.resolved
diff --git a/Package.swift b/Package.swift
@@ -9,7 +9,7 @@ let package = Package(
         .executable(name: "AdaEngineWebsite", targets: ["AdaEngineWebsite"])
     ],
     dependencies: [
-        .package(url: "https://github.com/twostraws/Ignite.git", branch: "main"),
+        .package(url: "https://github.com/twostraws/Ignite.git", revision: "024f32c00352e3bd3f9ad9ab86db12bbccd0ec00"),
         .package(url: "https://github.com/pointfreeco/swift-dependencies.git", from: "1.9.2")
     ],
     targets: [
diff --git a/Sources/AdaEngineWebsite/Components/AEImage.swift b/Sources/AdaEngineWebsite/Components/AEImage.swift
@@ -8,7 +8,7 @@
 import Dependencies
 import Ignite
 
-struct AEImage: DocumentElement {
+struct AEImage: HTML {
     
     let path: String
     let description: String?
diff --git a/Sources/AdaEngineWebsite/Components/DonateButton.swift b/Sources/AdaEngineWebsite/Components/DonateButton.swift
@@ -7,7 +7,7 @@
 
 import Ignite
 
-struct DonateButton: DocumentElement {
+struct DonateButton: HTML {
     
     var isPrimitive: Bool = true
     
diff --git a/Sources/AdaEngineWebsite/Components/PreviousArticles.swift b/Sources/AdaEngineWebsite/Components/PreviousArticles.swift
@@ -7,7 +7,7 @@
 
 import Ignite
 
-struct PreviousArticles: DocumentElement {
+struct PreviousArticles: HTML {
     
     let item: Article
     
diff --git a/Sources/AdaEngineWebsite/Components/SocialList.swift b/Sources/AdaEngineWebsite/Components/SocialList.swift
@@ -8,7 +8,7 @@
 import Dependencies
 import Ignite
 
-struct SocialList: DocumentElement {
+struct SocialList: HTML {
     
     let socials: [AuthorDTO.Social]
     
@@ -19,9 +19,7 @@ struct SocialList: DocumentElement {
         List(self.socials) { social in
             ListItem {
                 Link(target: social.path) {
-                    Div {
-                        AEImage(path: social.social.logoPath, description: social.social.rawValue)
-                    }
+                    Image(context.image(for: social.social.logoPath) ?? "", description: social.social.rawValue)
                     
                     Span {
                         social.username
diff --git a/Sources/AdaEngineWebsite/Components/TagList.swift b/Sources/AdaEngineWebsite/Components/TagList.swift
@@ -7,7 +7,7 @@
 
 import Ignite
 
-struct TagList: DocumentElement {
+struct TagList: HTML {
     
     let item: Article
     
diff --git a/Sources/AdaEngineWebsite/Components/WrittenByAuthor.swift b/Sources/AdaEngineWebsite/Components/WrittenByAuthor.swift
@@ -8,7 +8,7 @@
 import Dependencies
 import Ignite
 
-struct WrittenByAuthor: DocumentElement {
+struct WrittenByAuthor: HTML {
     
     let author: AuthorEntity
     
@@ -29,9 +29,9 @@ struct WrittenByAuthor: DocumentElement {
                 
                 Div {
                     Link(target: self.author.path) {
-                        Text(self.author.name)
-                            .font(.title2)
+                        self.author.name
                     }
+                    .font(.title2)
                       
                     SocialList(socials: self.author.socials)
                 }
diff --git a/Sources/AdaEngineWebsite/Extensions/HTML+Extensions.swift b/Sources/AdaEngineWebsite/Extensions/HTML+Extensions.swift
@@ -15,6 +15,12 @@ extension HTML {
     }
 }
 
+extension InlineElement {
+    func avatarModifier() -> some InlineElement {
+        self.class("avatar")
+    }
+}
+
 extension HTML {
     func background<Content: HTML>(alignment: Alignment = .center, @HTMLBuilder content: () -> Content) -> some HTML {
         ZStack(alignment: alignment) {
@@ -42,7 +48,7 @@ extension HTML {
 }
 
 extension Link {
-    init<Content: HTML>(target: URL, @HTMLBuilder content: @escaping () -> Content) {
-        self.init(target: target.absoluteString, content: content)
+    init<Content: HTML>(targetURL: URL, @HTMLBuilder content: @escaping () -> Content) {
+        self.init(target: targetURL.absoluteString, content: content)
     }
-}
+}
diff --git a/Sources/AdaEngineWebsite/Layout/AEFooter.swift b/Sources/AdaEngineWebsite/Layout/AEFooter.swift
@@ -103,14 +103,14 @@ extension AEFooter {
                     .width(2)
 
                 HStack(spacing: 12) {
-                    Link(target: URL.github) {
+                    Link(targetURL: URL.github) {
                         Image(systemName: "github", description: "GitHub")
                     }
-                    Link(target: URL.mastodon) {
+                    Link(targetURL: URL.mastodon) {
                         Image(systemName: "mastodon", description: "Mastodon")
                     }
                     // Link(target: URL.discord) { Tag("i").class("bi bi-discord") }
-                    Link(target: URL.reddit) {
+                    Link(targetURL: URL.reddit) {
                         Image(systemName: "reddit", description: "Reddit")
                     }
                     // Link(target: "#") { Tag("i").class("bi bi-rss") }
diff --git a/Sources/AdaEngineWebsite/Layout/SafeAreaContainer.swift b/Sources/AdaEngineWebsite/Layout/SafeAreaContainer.swift
@@ -7,7 +7,7 @@
 
 import Ignite
 
-struct SafeAreaContainer<Content: HTML>: DocumentElement {
+struct SafeAreaContainer<Content: HTML>: HTML {
     var content: () -> Content
     
     init(@HTMLBuilder content: @escaping () -> Content) {
diff --git a/Sources/AdaEngineWebsite/Modifiers/HTMLModifiers/ArticleInfoAfterFirstHeader.swift b/Sources/AdaEngineWebsite/Modifiers/HTMLModifiers/ArticleInfoAfterFirstHeader.swift
@@ -38,9 +38,9 @@ struct ArticleHTMLModifier: HTMLModifier {
             
             Div {
                 Link(target: author.path) {
-                    Text(author.name)
-                        .font(.title2)
+                    author.name
                 }
+                .font(.title2)
                 
                 Div {
                     Span(context.dateFormatter.string(from: item.date))
diff --git a/Sources/AdaEngineWebsite/Pages/CommunitySectionPage.swift b/Sources/AdaEngineWebsite/Pages/CommunitySectionPage.swift
@@ -65,18 +65,18 @@ struct CommunitySectionPage: StaticPage {
         Section("Official communities") {
             Div {
                 ForEach(self.socials) { item in
-                    Link(target: item.path) {
+                    Tag("a") {
                         CommunitySocialRow(item: item)
                     }
+                    .attribute("href", item.path)
                 }
             }
             .class("collection-grid grid-two-columns")
         }
     }
 }
 
-struct CommunitySocialRow: DocumentElement {
-    
+struct CommunitySocialRow: HTML {
     let item: CommunitySocial
     
     @Environment(\.themes)
@@ -114,4 +114,4 @@ struct CommunitySocialRow: DocumentElement {
         }
         .class("community-card column")
     }
-}
+}
diff --git a/Sources/AdaEngineWebsite/Pages/MainPage.swift b/Sources/AdaEngineWebsite/Pages/MainPage.swift
@@ -166,7 +166,7 @@ extension MainPage {
                     }
                     .class("header-buttons")
 
-                    Link(target: .github) {
+                    Link(targetURL: .github) {
                         Image(systemName: "github", description: "github")
                             .frame(height: 20)
                             .padding(.trailing, 10)

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,12 @@ extension HTML {`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`
	`18`	`+extension InlineElement {`
	`19`	`+ func avatarModifier() -> some InlineElement {`
	`20`	`+ self.class("avatar")`
	`21`	`+ }`
	`22`	`+}`
	`23`	`+`
`18`	`24`	`extension HTML {`
`19`	`25`	`func background<Content: HTML>(alignment: Alignment = .center, @HTMLBuilder content: () -> Content) -> some HTML {`
`20`	`26`	`ZStack(alignment: alignment) {`
`@@ -42,7 +48,7 @@ extension HTML {`
`42`	`48`	`}`
`43`	`49`
`44`	`50`	`extension Link {`
`45`		`- init<Content: HTML>(target: URL, @HTMLBuilder content: @escaping () -> Content) {`
`46`		`- self.init(target: target.absoluteString, content: content)`
	`51`	`+ init<Content: HTML>(targetURL: URL, @HTMLBuilder content: @escaping () -> Content) {`
	`52`	`+ self.init(target: targetURL.absoluteString, content: content)`
`47`	`53`	`}`
`48`		`-}`
	`54`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -103,14 +103,14 @@ extension AEFooter {`
`103`	`103`	`.width(2)`
`104`	`104`
`105`	`105`	`HStack(spacing: 12) {`
`106`		`- Link(target: URL.github) {`
	`106`	`+ Link(targetURL: URL.github) {`
`107`	`107`	`Image(systemName: "github", description: "GitHub")`
`108`	`108`	`}`
`109`		`- Link(target: URL.mastodon) {`
	`109`	`+ Link(targetURL: URL.mastodon) {`
`110`	`110`	`Image(systemName: "mastodon", description: "Mastodon")`
`111`	`111`	`}`
`112`	`112`	`// Link(target: URL.discord) { Tag("i").class("bi bi-discord") }`
`113`		`- Link(target: URL.reddit) {`
	`113`	`+ Link(targetURL: URL.reddit) {`
`114`	`114`	`Image(systemName: "reddit", description: "Reddit")`
`115`	`115`	`}`
`116`	`116`	`// Link(target: "#") { Tag("i").class("bi bi-rss") }`