Skip to content

Commit ec86d1d

Browse files
JPToroDevJP Toro
andauthored
Update website to v0.6 APIs. (#101)
* Update to v0.6. * Update to latest APIs. * Update Ignite dependency to use a version tag. Update Package.resolved. --------- Co-authored-by: JP Toro <jp@jptoro.dev>
1 parent 6ed092b commit ec86d1d

File tree

11 files changed

+50
-63
lines changed

11 files changed

+50
-63
lines changed

Website/Package.resolved

Lines changed: 23 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Website/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ let package = Package(
88
defaultLocalization: "en",
99
platforms: [.macOS(.v14)],
1010
dependencies: [
11-
.package(url: "https://github.com/twostraws/Ignite", revision: "df775025a896a7adb26c46563201cc0c6d36d91d"),
11+
.package(url: "https://github.com/twostraws/Ignite", from: "0.6.0"),
1212
.package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.2.0"),
1313
.package(path: "../MyLibrary")
1414
],

Website/Sources/Components/AccessComponent.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Ignite
22

3-
struct AccessComponent: DocumentElement {
3+
struct AccessComponent: HTML {
44
let language: SupportedLanguage
55
private let venueMapUrl = "https://www.google.com/maps/embed?pb=!1m14!1m8!1m3!1d12959.484415464616!2d139.4122493!3d35.7047894!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x6018e16a387013a3%3A0xcd9c50e33a16ff6b!2sTachikawa%20Stage%20Garden!5e0!3m2!1sen!2sjp!4v1720059016768!5m2!1sen!2sjp"
66

Website/Sources/Components/HeaderComponent.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Ignite
22

3-
struct HeaderComponent: DocumentElement {
3+
struct HeaderComponent: HTML {
44
let language: SupportedLanguage
55

66
var body: some HTML {

Website/Sources/Components/LanguageSelector.swift

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
import Ignite
22

3-
struct LanguageSelector: HTML, InlineElement {
3+
struct LanguageSelector: InlineElement {
44
let path: (SupportedLanguage) -> String
55
let currentLanguage: SupportedLanguage
66

7-
var body: some HTML {
8-
Section {
9-
ForEach(SupportedLanguage.allCases) { language in
10-
Link(language.name, target: path(language))
11-
.role(currentLanguage == language ? .light : .secondary)
12-
.fontWeight(currentLanguage == language ? .bold : .regular)
13-
.margin(.trailing, .px(16))
14-
}
7+
var body: some InlineElement {
8+
InlineForEach(SupportedLanguage.allCases) { language in
9+
Link(language.name, target: path(language))
10+
.role(currentLanguage == language ? .light : .secondary)
11+
.fontWeight(currentLanguage == language ? .bold : .regular)
12+
.margin(.trailing, .px(16))
1513
}
1614
}
1715
}

Website/Sources/Components/MainFooter.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Foundation
22
import Ignite
33

4-
struct MainFooter: DocumentElement {
4+
struct MainFooter: HTML {
55
let language: SupportedLanguage
66

77
var body: some HTML {

Website/Sources/Components/MainNavigationBar.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ struct MainNavigationBar: HTML {
2020
} logo: {
2121
LanguageSelector(path: path, currentLanguage: language)
2222
}
23-
.navigationItemAlignment(.center)
2423
.navigationBarStyle(.dark)
2524
.background(.darkBlue.opacity(0.7))
2625
.position(.fixedTop)

Website/Sources/Components/TimetableComponent.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import Foundation
22
import Ignite
33
import SharedModels
44

5-
struct TimetableComponent: DocumentElement {
5+
struct TimetableComponent: HTML {
66
let conference: Conference
77
let language: SupportedLanguage
88
private let imageSize = 50
@@ -55,7 +55,7 @@ private struct SessionTitleComponent: HTML {
5555
let language: SupportedLanguage
5656

5757
var body: some HTML {
58-
let titleHTML = Text(String(session.title, bundle: .scheduleFeature, language: language))
58+
let titleHTML = Span(String(session.title, bundle: .scheduleFeature, language: language))
5959
.font(.lead)
6060
.fontWeight(.bold)
6161

Website/Sources/Layouts/MainLayout.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ struct MainLayout: Layout {
55
let title: String
66
let ogpLink: String
77

8-
var body: some HTML {
8+
var body: some Document {
99
Head {
1010
MetaTag(.openGraphTitle, content: title)
1111
MetaTag(.openGraphImage, content: ogpLink)
@@ -14,7 +14,7 @@ struct MainLayout: Layout {
1414

1515
if currentPage.url.pathComponents.last == "_en" {
1616
let redirectUrl = URL(string: currentPage.url.absoluteString.replacingOccurrences(of: "_", with: ""))!
17-
RedirectMetaTag(to: redirectUrl)
17+
MetaTag(httpEquivalent: "refresh", content: "0;url=\(redirectUrl.absoluteString)")
1818
}
1919
}
2020

Website/Sources/Layouts/RedirectMetaTag.swift

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)