Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

First Speakers #111

Merged
merged 7 commits into from
Jul 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:5.5
// swift-tools-version:5.10

import PackageDescription

Expand All @@ -12,12 +12,14 @@ let package = Package(
)
],
dependencies: [
.package(name: "Publish", url: "https://github.com/johnsundell/publish.git", from: "0.8.0")
.package(url: "https://github.com/johnsundell/publish.git", from: "0.8.0")
],
targets: [
.executableTarget(
name: "Conference",
dependencies: ["Publish"]
dependencies: [
.product(name: "Publish", package: "publish")
]
)
]
)
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 10 additions & 1 deletion Resources/App/YearX/images/icons/feather-sprite.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions Resources/App/YearX/images/icons/mastodon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 27 additions & 1 deletion Resources/App/YearX/styles/layout.css
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,32 @@ body {
fill: none;
}

.footer {
.feather-replacement {
filter: invert(100%) sepia(0%) saturate(7483%) hue-rotate(294deg) brightness(101%) contrast(101%);
}
}

.profile {
.feather-replacement {
filter: invert(47%) sepia(74%) saturate(6012%) hue-rotate(199deg) brightness(100%) contrast(103%);
}

.feather-replacement:hover {
filter: invert(20%) sepia(92%) saturate(2263%) hue-rotate(200deg) brightness(91%) contrast(101%);
}
}

.feather-replacement {
width: 24px;
height: 24px;
stroke: currentColor;
stroke-width: 2;
stroke-linecap: round;
stroke-linejoin: round;
fill: none;
}

/* Icons (Linea Basic) */
@font-face {
font-family: "linea-basic-10";
Expand Down Expand Up @@ -163,7 +189,7 @@ a.sales-banner {
text-align: center;
}

a.sales-banner: hover {
a.sales-banner:hover {
font-weight: 400;
color: #ffffff;
}
Expand Down
6 changes: 6 additions & 0 deletions Sources/Conference/Components/SiteFooter.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ struct SiteFooter: Component {
SVG(url: "/App/YearX/images/icons/feather-sprite.svg#github").class("feather text-white")
}.class("icon")
}.linkTarget(.blank)
Link(url: "https://hachyderm.io/@swiftserverconf") {
Span {
Image(url: "/App/YearX/images/icons/mastodon.svg", description: "Mastodon")
.class("feather-replacement")
}.class("icon")
}.linkTarget(.blank)
Link(url: "https://twitter.com/SwiftServerConf") {
Span {
SVG(url: "/App/YearX/images/icons/feather-sprite.svg#twitter").class("feather text-white")
Expand Down
18 changes: 16 additions & 2 deletions Sources/Conference/Components/SpeakerDetail.swift
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,14 @@ struct SpeakerDetail: Component {
}.linkTarget(.blank).class("icon")
}
}
if let mastodonURL = speaker.mastodon {
Link(url: mastodonURL) {
Span {
Image(url: "/App/YearX/images/icons/mastodon.svg", description: "Mastodon")
.class("feather-replacement")
}.linkTarget(.blank).class("icon")
}
}
}
.class("social-media")
}
Expand Down Expand Up @@ -66,8 +74,14 @@ struct SpeakerDetail: Component {
H3("About the Speaker")
Div {
H4("Position").class("f-gradient")
H6("\(speaker.role) at \(speaker.company)")
.class("f-weight-300")
if let company = speaker.company {
H6("\(speaker.role) at \(company)")
.class("f-weight-300")
} else {
H6("\(speaker.role)")
.class("f-weight-300")

}
}
.class("section")
Div {
Expand Down
8 changes: 5 additions & 3 deletions Sources/Conference/Components/SpeakerList.swift
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,11 @@ struct SpeakerOverview: Component {
.class("h3")
H4(speaker.role)
.class("f-weight-300 mb-0")
H4(speaker.company)
.class("f-weight-300")
.style("font-style: italic")
if let company = speaker.company {
H4(company)
.class("f-weight-300")
.style("font-style: italic")
}
}
.class("description p-2")
}
Expand Down
21 changes: 11 additions & 10 deletions Sources/Conference/Components/Speakers.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ struct Speakers: Component {
.class("text-center")
H4("We host a diverse selection of inspiring speakers.")
.class("text-center mb-5")
H4("Speakers will be announced soon").class("text-center mb-5")
// SpeakerList<Conference>(speakers: AllSpeakers.speakers)
SpeakerList<Conference>(speakers: AllSpeakers.speakers)
H4("More speakers to be announced soon!")
.class("text-center mb-5")
}.class("container")
// Div {
// H1("Lightning Talk Speakers")
Expand All @@ -28,14 +29,14 @@ struct Speakers: Component {
Div {
H3("Call For Proposals")
.class("h3 text-center")
// Paragraph("Our CFP is now closed - please check back next year!")
// .class("text-center")
Paragraph {
Text("If you'd like to speak at this years ServerSide.swift, please apply via our CFP. We welcome and encourage talks from all abilities!")
}.class("text-center")
Div {
Link("Apply To Speak", url: "https://www.papercall.io/server-side-swift-2024").linkTarget(.blank).class("btn btn-default btn-gradient")
}.class("action-buttons pt-3 pb-3 text-center")
Paragraph("Our CFP is now closed - please check back next year!")
.class("text-center")
// Paragraph {
// Text("If you'd like to speak at this years ServerSide.swift, please apply via our CFP. We welcome and encourage talks from all abilities!")
// }.class("text-center")
// Div {
// Link("Apply To Speak", url: "https://www.papercall.io/server-side-swift-2024").linkTarget(.blank).class("btn btn-default btn-gradient")
// }.class("action-buttons pt-3 pb-3 text-center")
}.class("col")
}.class("container")
}.class("cfp page-block no-height bg-white")
Expand Down
Loading
Loading