fix(ui): show bonjour masters inline
This commit is contained in:
@@ -125,9 +125,6 @@ struct GeneralSettings: View {
|
|||||||
TextField("user@host[:22]", text: self.$state.remoteTarget)
|
TextField("user@host[:22]", text: self.$state.remoteTarget)
|
||||||
.textFieldStyle(.roundedBorder)
|
.textFieldStyle(.roundedBorder)
|
||||||
.frame(maxWidth: .infinity)
|
.frame(maxWidth: .infinity)
|
||||||
MasterDiscoveryMenu(discovery: self.masterDiscovery) { master in
|
|
||||||
self.applyDiscoveredMaster(master)
|
|
||||||
}
|
|
||||||
Button {
|
Button {
|
||||||
Task { await self.testRemote() }
|
Task { await self.testRemote() }
|
||||||
} label: {
|
} label: {
|
||||||
@@ -142,6 +139,11 @@ struct GeneralSettings: View {
|
|||||||
.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty)
|
.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
MasterDiscoveryInlineList(discovery: self.masterDiscovery) { master in
|
||||||
|
self.applyDiscoveredMaster(master)
|
||||||
|
}
|
||||||
|
.padding(.leading, 58)
|
||||||
|
|
||||||
self.remoteStatusView
|
self.remoteStatusView
|
||||||
.padding(.leading, 58)
|
.padding(.leading, 58)
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,55 @@
|
|||||||
import SwiftUI
|
import SwiftUI
|
||||||
|
|
||||||
|
struct MasterDiscoveryInlineList: View {
|
||||||
|
@ObservedObject var discovery: MasterDiscoveryModel
|
||||||
|
var onSelect: (MasterDiscoveryModel.DiscoveredMaster) -> Void
|
||||||
|
|
||||||
|
var body: some View {
|
||||||
|
VStack(alignment: .leading, spacing: 6) {
|
||||||
|
HStack(spacing: 6) {
|
||||||
|
Image(systemName: "dot.radiowaves.left.and.right")
|
||||||
|
.foregroundStyle(.secondary)
|
||||||
|
Text(self.discovery.statusText)
|
||||||
|
.font(.caption)
|
||||||
|
.foregroundStyle(.secondary)
|
||||||
|
Spacer()
|
||||||
|
}
|
||||||
|
|
||||||
|
if self.discovery.masters.isEmpty {
|
||||||
|
Text("No masters found yet.")
|
||||||
|
.font(.caption)
|
||||||
|
.foregroundStyle(.secondary)
|
||||||
|
} else {
|
||||||
|
VStack(alignment: .leading, spacing: 6) {
|
||||||
|
ForEach(self.discovery.masters.prefix(6)) { master in
|
||||||
|
Button {
|
||||||
|
self.onSelect(master)
|
||||||
|
} label: {
|
||||||
|
HStack(spacing: 8) {
|
||||||
|
Text(master.displayName)
|
||||||
|
.lineLimit(1)
|
||||||
|
Spacer()
|
||||||
|
if let host = master.tailnetDns ?? master.lanHost {
|
||||||
|
Text(host)
|
||||||
|
.font(.caption2)
|
||||||
|
.foregroundStyle(.secondary)
|
||||||
|
.lineLimit(1)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.buttonStyle(.plain)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.padding(10)
|
||||||
|
.background(
|
||||||
|
RoundedRectangle(cornerRadius: 10, style: .continuous)
|
||||||
|
.fill(Color(NSColor.controlBackgroundColor)))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.help("Discover Clawdis masters on your LAN")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
struct MasterDiscoveryMenu: View {
|
struct MasterDiscoveryMenu: View {
|
||||||
@ObservedObject var discovery: MasterDiscoveryModel
|
@ObservedObject var discovery: MasterDiscoveryModel
|
||||||
var onSelect: (MasterDiscoveryModel.DiscoveredMaster) -> Void
|
var onSelect: (MasterDiscoveryModel.DiscoveredMaster) -> Void
|
||||||
|
|||||||
@@ -154,13 +154,14 @@ struct OnboardingView: View {
|
|||||||
if self.state.connectionMode == .remote {
|
if self.state.connectionMode == .remote {
|
||||||
VStack(alignment: .leading, spacing: 8) {
|
VStack(alignment: .leading, spacing: 8) {
|
||||||
LabeledContent("SSH target") {
|
LabeledContent("SSH target") {
|
||||||
HStack(spacing: 8) {
|
VStack(alignment: .leading, spacing: 8) {
|
||||||
TextField("user@host[:22]", text: self.$state.remoteTarget)
|
TextField("user@host[:22]", text: self.$state.remoteTarget)
|
||||||
.textFieldStyle(.roundedBorder)
|
.textFieldStyle(.roundedBorder)
|
||||||
.frame(width: 300)
|
.frame(width: 300)
|
||||||
MasterDiscoveryMenu(discovery: self.masterDiscovery) { master in
|
MasterDiscoveryInlineList(discovery: self.masterDiscovery) { master in
|
||||||
self.applyDiscoveredMaster(master)
|
self.applyDiscoveredMaster(master)
|
||||||
}
|
}
|
||||||
|
.frame(width: 360)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -487,6 +488,7 @@ struct OnboardingView: View {
|
|||||||
.buttonStyle(.borderedProminent)
|
.buttonStyle(.borderedProminent)
|
||||||
}
|
}
|
||||||
.padding(.horizontal, 20)
|
.padding(.horizontal, 20)
|
||||||
|
.padding(.bottom, 12)
|
||||||
.frame(height: 60)
|
.frame(height: 60)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user