Skip to content

Commit f250378

Browse files
LaurentTreguierLaurentTreguier
committed
List emails
1 parent eb408d7 commit f250378

13 files changed

+219
-7
lines changed

‎Fyreplace.xcodeproj/project.pbxproj

+16
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
4D13AF752C492F4500845FDB /* Config.sh in Resources */ = {isa = PBXBuildFile; fileRef = 4D13AF742C492F4500845FDB /* Config.sh */; };
1818
4D13AF7B2C4E8F4200845FDB /* EnvironmentPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D13AF7A2C4E8F4200845FDB /* EnvironmentPicker.swift */; };
1919
4D13AF812C4E907200845FDB /* Environment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D13AF802C4E907200845FDB /* Environment.swift */; };
20+
4D30D7232CCFAF4E0071B03F /* EmailsScreenProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D30D7222CCFAF440071B03F /* EmailsScreenProtocol.swift */; };
21+
4D30D7262CCFB01B0071B03F /* EmailsScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D30D7252CCFB0170071B03F /* EmailsScreen.swift */; };
2022
4D30DA5F2C986B6C00499450 /* Avatar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D30DA5E2C986B6C00499450 /* Avatar.swift */; };
2123
4D30DA612C98706C00499450 /* Placeholders.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D30DA602C98706C00499450 /* Placeholders.swift */; };
2224
4D351AEB2CA6BD45002EEB8F /* SettingsScreenTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D351AEA2CA6BD3A002EEB8F /* SettingsScreenTests.swift */; };
@@ -55,6 +57,7 @@
5557
4DB10B502C4FEBFC00634BF6 /* HelpCommands.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DB10B4F2C4FEBFC00634BF6 /* HelpCommands.swift */; };
5658
4DB2E36D2C416611007F958D /* SubmitButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DB2E36C2C416611007F958D /* SubmitButton.swift */; };
5759
4DB2E36F2C418F5C007F958D /* DynamicForm.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DB2E36E2C418F5C007F958D /* DynamicForm.swift */; };
60+
4DB367BC2CE364C300853CFE /* EmailsScreenTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DB367BB2CE364BC00853CFE /* EmailsScreenTests.swift */; };
5861
4DC5B1CA2C6FA23000B75A07 /* LoginScreenProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DC5B1C92C6FA23000B75A07 /* LoginScreenProtocol.swift */; };
5962
4DC5B1CD2C6FA28E00B75A07 /* RegisterScreenProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DC5B1CC2C6FA28E00B75A07 /* RegisterScreenProtocol.swift */; };
6063
4DC5B1CF2C6FA2BE00B75A07 /* MainViewProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DC5B1CE2C6FA2BE00B75A07 /* MainViewProtocol.swift */; };
@@ -71,6 +74,7 @@
7174
4DE785952C8B17AE000EC4E5 /* SubmitOrCancel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DE785942C8B17AE000EC4E5 /* SubmitOrCancel.swift */; };
7275
4DFB90702C5908DE00D4DABF /* LoginScreenTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DFB906F2C5908DE00D4DABF /* LoginScreenTests.swift */; };
7376
4DFB90762C59173C00D4DABF /* RegisterScreenTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DFB90752C59173C00D4DABF /* RegisterScreenTests.swift */; };
77+
4DFDBC102CD1080000CCDA4A /* DynamicList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DFDBC0E2CD107FC00CCDA4A /* DynamicList.swift */; };
7478
/* End PBXBuildFile section */
7579

7680
/* Begin PBXContainerItemProxy section */
@@ -102,6 +106,8 @@
102106
4D13AF742C492F4500845FDB /* Config.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = Config.sh; sourceTree = "<group>"; };
103107
4D13AF7A2C4E8F4200845FDB /* EnvironmentPicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnvironmentPicker.swift; sourceTree = "<group>"; };
104108
4D13AF802C4E907200845FDB /* Environment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Environment.swift; sourceTree = "<group>"; };
109+
4D30D7222CCFAF440071B03F /* EmailsScreenProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmailsScreenProtocol.swift; sourceTree = "<group>"; };
110+
4D30D7252CCFB0170071B03F /* EmailsScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmailsScreen.swift; sourceTree = "<group>"; };
105111
4D30DA5E2C986B6C00499450 /* Avatar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Avatar.swift; sourceTree = "<group>"; };
106112
4D30DA602C98706C00499450 /* Placeholders.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Placeholders.swift; sourceTree = "<group>"; };
107113
4D351AEA2CA6BD3A002EEB8F /* SettingsScreenTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsScreenTests.swift; sourceTree = "<group>"; };
@@ -153,6 +159,7 @@
153159
4DB10B4F2C4FEBFC00634BF6 /* HelpCommands.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HelpCommands.swift; sourceTree = "<group>"; };
154160
4DB2E36C2C416611007F958D /* SubmitButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubmitButton.swift; sourceTree = "<group>"; };
155161
4DB2E36E2C418F5C007F958D /* DynamicForm.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DynamicForm.swift; sourceTree = "<group>"; };
162+
4DB367BB2CE364BC00853CFE /* EmailsScreenTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmailsScreenTests.swift; sourceTree = "<group>"; };
156163
4DBF0BD32C9DB2E500E797BF /* .ios-test-model */ = {isa = PBXFileReference; lastKnownFileType = text; path = ".ios-test-model"; sourceTree = "<group>"; };
157164
4DC5B1C92C6FA23000B75A07 /* LoginScreenProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginScreenProtocol.swift; sourceTree = "<group>"; };
158165
4DC5B1CC2C6FA28E00B75A07 /* RegisterScreenProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegisterScreenProtocol.swift; sourceTree = "<group>"; };
@@ -175,6 +182,7 @@
175182
4DF3737F2C99C23D0008AB04 /* .swift-format */ = {isa = PBXFileReference; explicitFileType = text.json; path = ".swift-format"; sourceTree = "<group>"; };
176183
4DFB906F2C5908DE00D4DABF /* LoginScreenTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginScreenTests.swift; sourceTree = "<group>"; };
177184
4DFB90752C59173C00D4DABF /* RegisterScreenTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegisterScreenTests.swift; sourceTree = "<group>"; };
185+
4DFDBC0E2CD107FC00CCDA4A /* DynamicList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DynamicList.swift; sourceTree = "<group>"; };
178186
/* End PBXFileReference section */
179187

180188
/* Begin PBXFrameworksBuildPhase section */
@@ -250,6 +258,8 @@
250258
4D4D39492C086DA2007196D2 /* PublishedScreen.swift */,
251259
4DC5B1F32C7A137B00B75A07 /* SettingsScreenProtocol.swift */,
252260
4D54C9702BF4EA15001DE071 /* SettingsScreen.swift */,
261+
4D30D7222CCFAF440071B03F /* EmailsScreenProtocol.swift */,
262+
4D30D7252CCFB0170071B03F /* EmailsScreen.swift */,
253263
4DC5B1C92C6FA23000B75A07 /* LoginScreenProtocol.swift */,
254264
4D9B3B372C334B3A00A8F7AD /* LoginScreen.swift */,
255265
4DC5B1CC2C6FA28E00B75A07 /* RegisterScreenProtocol.swift */,
@@ -401,6 +411,7 @@
401411
isa = PBXGroup;
402412
children = (
403413
4DB2E36E2C418F5C007F958D /* DynamicForm.swift */,
414+
4DFDBC0E2CD107FC00CCDA4A /* DynamicList.swift */,
404415
4DB2E36C2C416611007F958D /* SubmitButton.swift */,
405416
4DE785942C8B17AE000EC4E5 /* SubmitOrCancel.swift */,
406417
4D13AF7A2C4E8F4200845FDB /* EnvironmentPicker.swift */,
@@ -457,6 +468,7 @@
457468
children = (
458469
4D351AEC2CA6BE27002EEB8F /* FakeScreenBase.swift */,
459470
4D351AEA2CA6BD3A002EEB8F /* SettingsScreenTests.swift */,
471+
4DB367BB2CE364BC00853CFE /* EmailsScreenTests.swift */,
460472
4DFB906F2C5908DE00D4DABF /* LoginScreenTests.swift */,
461473
4DFB90752C59173C00D4DABF /* RegisterScreenTests.swift */,
462474
);
@@ -637,6 +649,7 @@
637649
files = (
638650
4D40ACB42CC3ECBC00B26FDF /* OpenAPI.swift in Sources */,
639651
4DA04EE22CAEEAD800B70D73 /* Foundation.swift in Sources */,
652+
4D30D7232CCFAF4E0071B03F /* EmailsScreenProtocol.swift in Sources */,
640653
4D9B3B3D2C34B13E00A8F7AD /* LogoHeader.swift in Sources */,
641654
4DA7BFBB2C5FDEC1005CC4FF /* FakeClient.swift in Sources */,
642655
4D4AF71C2C7CE72900621FF3 /* Tokens.swift in Sources */,
@@ -653,6 +666,7 @@
653666
4DE785952C8B17AE000EC4E5 /* SubmitOrCancel.swift in Sources */,
654667
4DE785882C88F392000EC4E5 /* HTTPTypes.swift in Sources */,
655668
4D6A24DD2CAC193F001B4435 /* EditableAvatar.swift in Sources */,
669+
4DFDBC102CD1080000CCDA4A /* DynamicList.swift in Sources */,
656670
4D51F2802C621ADB0018E76E /* ViewProtocol.swift in Sources */,
657671
4DC5B1D92C720B9800B75A07 /* AuthenticationMiddleware.swift in Sources */,
658672
4D9B3B382C334B3A00A8F7AD /* LoginScreen.swift in Sources */,
@@ -667,6 +681,7 @@
667681
4DB2E36F2C418F5C007F958D /* DynamicForm.swift in Sources */,
668682
4DCE062B2C08E5E200F69AF1 /* CompactNavigation.swift in Sources */,
669683
4DCE062D2C08E65300F69AF1 /* RegularNavigation.swift in Sources */,
684+
4D30D7262CCFB01B0071B03F /* EmailsScreen.swift in Sources */,
670685
4D54C9692BF4E8F4001DE071 /* FeedScreen.swift in Sources */,
671686
4DC5B1F42C7A137B00B75A07 /* SettingsScreenProtocol.swift in Sources */,
672687
4DC5B1D62C6FEA2100B75A07 /* Keychain.swift in Sources */,
@@ -691,6 +706,7 @@
691706
files = (
692707
4D351AEB2CA6BD45002EEB8F /* SettingsScreenTests.swift in Sources */,
693708
4D351AED2CA6BE2D002EEB8F /* FakeScreenBase.swift in Sources */,
709+
4DB367BC2CE364C300853CFE /* EmailsScreenTests.swift in Sources */,
694710
4D5348612C6646F80001EFDE /* StoringEventBus.swift in Sources */,
695711
4DFB90702C5908DE00D4DABF /* LoginScreenTests.swift in Sources */,
696712
4DFB90762C59173C00D4DABF /* RegisterScreenTests.swift in Sources */,

‎Fyreplace/Extensions/OpenAPI.swift

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
extension Components.Schemas.User {
22
static let maxBioSize = 3000
33
}
4+
5+
extension Components.Schemas.Email: Identifiable {
6+
}

‎Fyreplace/Fakes/FakeClient.swift

+10-3
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,8 @@ extension FakeClient {
9393
func countEmails(_: Operations.countEmails.Input) async throws
9494
-> Operations.countEmails.Output
9595
{
96-
fatalError("Not implemented")
96+
let emails = try await listEmails(.init()).ok.body.json
97+
return .ok(.init(body: .json(Int64(emails.count))))
9798
}
9899

99100
func createEmail(_: Operations.createEmail.Input) async throws
@@ -108,10 +109,16 @@ extension FakeClient {
108109
fatalError("Not implemented")
109110
}
110111

111-
func listEmails(_: Operations.listEmails.Input) async throws
112+
func listEmails(_ input: Operations.listEmails.Input) async throws
112113
-> Operations.listEmails.Output
113114
{
114-
fatalError("Not implemented")
115+
return switch input.query.page {
116+
case nil, 0:
117+
.ok(.init(body: .json([.make(main: true), .make(), .make()])))
118+
119+
default:
120+
.ok(.init(body: .json([])))
121+
}
115122
}
116123

117124
func setMainEmail(_: Operations.setMainEmail.Input) async throws

‎Fyreplace/Fakes/Placeholders.swift

+13-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ extension Components.Schemas.User {
44
}
55

66
static func make(named username: String) -> Self {
7-
return Self(
7+
return .init(
88
id: .randomUuid,
99
dateCreated: .now,
1010
username: username,
@@ -17,3 +17,15 @@ extension Components.Schemas.User {
1717
)
1818
}
1919
}
20+
21+
extension Components.Schemas.Email {
22+
static func make(verified: Bool = true, main: Bool = false) -> Self {
23+
let id = String.randomUuid
24+
return .init(
25+
id: id,
26+
email: "\(id)@example.org",
27+
verified: verified,
28+
main: main
29+
)
30+
}
31+
}

‎Fyreplace/Resources/Localizable.xcstrings

+40
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,16 @@
124124
}
125125
}
126126
},
127+
"Emails.Main" : {
128+
"localizations" : {
129+
"en" : {
130+
"stringUnit" : {
131+
"state" : "translated",
132+
"value" : "Main address"
133+
}
134+
}
135+
}
136+
},
127137
"Environment.Default" : {
128138
"localizations" : {
129139
"en" : {
@@ -364,6 +374,16 @@
364374
}
365375
}
366376
},
377+
"Main.Emails" : {
378+
"localizations" : {
379+
"en" : {
380+
"stringUnit" : {
381+
"state" : "translated",
382+
"value" : "Emails"
383+
}
384+
}
385+
}
386+
},
367387
"Main.Feed" : {
368388
"localizations" : {
369389
"en" : {
@@ -694,6 +714,26 @@
694714
}
695715
}
696716
},
717+
"Settings.Emails" : {
718+
"localizations" : {
719+
"en" : {
720+
"stringUnit" : {
721+
"state" : "translated",
722+
"value" : "Add or remove email addresses"
723+
}
724+
}
725+
}
726+
},
727+
"Settings.Emails.Header" : {
728+
"localizations" : {
729+
"en" : {
730+
"stringUnit" : {
731+
"state" : "translated",
732+
"value" : "Emails"
733+
}
734+
}
735+
}
736+
},
697737
"Settings.Error.ContentTooLarge.Message" : {
698738
"localizations" : {
699739
"en" : {

‎Fyreplace/Views/Forms/DynamicList.swift

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
import SwiftUI
2+
3+
struct DynamicList<Content>: View where Content: View {
4+
@ViewBuilder
5+
let content: () -> Content
6+
7+
var body: some View {
8+
#if os(macOS)
9+
DynamicForm {
10+
List {
11+
content()
12+
}
13+
}
14+
#else
15+
List {
16+
content()
17+
}
18+
#endif
19+
}
20+
}

‎Fyreplace/Views/Navigation/Destination.swift

+5-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ enum Destination: String, Identifiable {
77
case drafts
88
case published
99
case settings
10+
case emails
1011
case login
1112
case register
1213

@@ -39,6 +40,8 @@ enum Destination: String, Identifiable {
3940
"Main.Published"
4041
case .settings:
4142
"Main.Settings"
43+
case .emails:
44+
"Main.Emails"
4245
case .login:
4346
"Main.Login"
4447
case .register:
@@ -60,7 +63,7 @@ enum Destination: String, Identifiable {
6063
"archivebox"
6164
case .settings:
6265
"person.crop.circle"
63-
case .login, .register:
66+
default:
6467
""
6568
}
6669
}
@@ -102,7 +105,7 @@ enum Destination: String, Identifiable {
102105
.init("5")
103106
case .settings:
104107
.init("6")
105-
case .login, .register:
108+
default:
106109
nil
107110
}
108111
}

‎Fyreplace/Views/Screens/EmailsScreen.swift

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
import SwiftUI
2+
3+
struct EmailsScreen: View, EmailsScreenProtocol {
4+
@EnvironmentObject
5+
var eventBus: EventBus
6+
7+
@Environment(\.api)
8+
var api: any APIProtocol
9+
10+
@State
11+
var emails: [Components.Schemas.Email] = []
12+
13+
var body: some View {
14+
DynamicList {
15+
ForEach(emails) { email in
16+
LabeledContent {
17+
} label: {
18+
Text(verbatim: email.email)
19+
20+
if email.main {
21+
Text("Emails.Main")
22+
} else {
23+
Spacer()
24+
}
25+
}
26+
}
27+
}
28+
.navigationTitle(Destination.emails.titleKey)
29+
.onAppear {
30+
Task {
31+
await loadEmails()
32+
}
33+
}
34+
}
35+
}
36+
37+
#Preview {
38+
NavigationStack {
39+
EmailsScreen()
40+
}
41+
}

‎Fyreplace/Views/Screens/EmailsScreenProtocol.swift

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
@MainActor
2+
protocol EmailsScreenProtocol: APIViewProtocol {
3+
var emails: [Components.Schemas.Email] { get nonmutating set }
4+
}
5+
6+
@MainActor
7+
extension EmailsScreenProtocol {
8+
func loadEmails() async {
9+
emails.removeAll()
10+
var page: Int32 = 0
11+
12+
while await loadEmails(at: page) {
13+
page += 1
14+
}
15+
}
16+
17+
func loadEmails(at page: Int32) async -> Bool {
18+
var hasMore = false
19+
20+
await call {
21+
let response = try await api.listEmails(query: .init(page: page))
22+
23+
switch response {
24+
case let .ok(ok):
25+
switch ok.body {
26+
case let .json(json):
27+
hasMore = !json.isEmpty
28+
emails.append(contentsOf: json)
29+
}
30+
31+
return nil
32+
33+
case .unauthorized:
34+
return .authorizationIssue()
35+
36+
case .forbidden, .default:
37+
return .error()
38+
}
39+
}
40+
41+
return hasMore
42+
}
43+
}

‎Fyreplace/Views/Screens/Screen.swift

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ struct Screen: View {
1717
PublishedScreen()
1818
case .settings:
1919
SettingsScreen()
20+
case .emails:
21+
EmailsScreen()
2022
case .login:
2123
LoginScreen()
2224
case .register:

‎Fyreplace/Views/Screens/SettingsScreen.swift

+6
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,12 @@ struct SettingsScreen: View, SettingsScreenProtocol {
101101
Text("Settings.Bio.Footer:\(bio.count),\(Components.Schemas.User.maxBioSize)")
102102
}
103103

104+
Section("Settings.Emails.Header") {
105+
NavigationLink("Settings.Emails") {
106+
Screen(destination: .emails)
107+
}
108+
}
109+
104110
Section("Settings.About.Header") {
105111
Link(destination: config.app.info.website) {
106112
Label("App.Help.Website", systemImage: "safari")

0 commit comments

Comments
 (0)