fix little stuff

clubs
Raz 1 year ago
parent 80b0e5aa81
commit 6256dc0b9d
  1. 5
      PadelClub/Views/Navigation/MainView.swift
  2. 2
      PadelClub/Views/Tournament/Screen/InscriptionManagerView.swift
  3. 15
      PadelClub/Views/User/AccountView.swift
  4. 53
      PadelClub/Views/User/ChangePasswordView.swift
  5. 1
      PadelClub/Views/User/LoginView.swift

@ -69,16 +69,21 @@ struct MainView: View {
} }
} }
} }
.toolbarBackground(.visible, for: .tabBar)
TournamentOrganizerView() TournamentOrganizerView()
.tabItem(for: .tournamentOrganizer) .tabItem(for: .tournamentOrganizer)
.toolbarBackground(.visible, for: .tabBar)
OngoingView() OngoingView()
.tabItem(for: .ongoing) .tabItem(for: .ongoing)
.badge(self.dataStore.runningMatches().count) .badge(self.dataStore.runningMatches().count)
.toolbarBackground(.visible, for: .tabBar)
ToolboxView() ToolboxView()
.tabItem(for: .toolbox) .tabItem(for: .toolbox)
.toolbarBackground(.visible, for: .tabBar)
UmpireView() UmpireView()
.tabItem(for: .umpire) .tabItem(for: .umpire)
.badge(badgeText) .badge(badgeText)
.toolbarBackground(.visible, for: .tabBar)
// PadelClubView() // PadelClubView()
// .tabItem(for: .padelClub) // .tabItem(for: .padelClub)
} }

@ -776,7 +776,7 @@ struct InscriptionManagerView: View {
} }
.buttonBorderShape(.roundedRectangle) .buttonBorderShape(.roundedRectangle)
.buttonStyle(.borderedProminent) .buttonStyle(.borderedProminent)
.foregroundStyle(.primary) .foregroundStyle(self.filterMode == filterMode ? Color.white : Color.black)
.tint(self.filterMode == filterMode ? .master : .beige) .tint(self.filterMode == filterMode ? .master : .beige)
} }

@ -15,14 +15,17 @@ struct AccountView: View {
var body: some View { var body: some View {
Form { Form {
NavigationLink("Changer de mot de passe") { Section {
ChangePasswordView() NavigationLink("Changer de mot de passe") {
ChangePasswordView()
}
} }
RowButtonView("Déconnexion", role: .destructive) { Section {
DataStore.shared.disconnect() RowButtonView("Déconnexion", role: .destructive) {
handler() DataStore.shared.disconnect()
handler()
}
} }
Section { Section {
RowButtonView("Supprimer mon compte", role: .destructive, confirmationMessage: "Voulez-vous vraiment supprimer définitivement votre compte et ses données associées ?") { RowButtonView("Supprimer mon compte", role: .destructive, confirmationMessage: "Voulez-vous vraiment supprimer définitivement votre compte et ses données associées ?") {
DataStore.shared.deleteAccount() DataStore.shared.deleteAccount()

@ -29,21 +29,15 @@ struct ChangePasswordView: View {
Form { Form {
PasswordField("Old password", text: self.$oldPassword) PasswordField("Ancien mot de passe", text: self.$oldPassword)
PasswordField("Password", text: self.$password1) PasswordField("Nouveau mot de passe", text: self.$password1)
PasswordField("Password again", text: self.$password2) PasswordField("Confirmer du nouveau mot de passe", text: self.$password2)
Section { Section {
Button(action: { RowButtonView("Changer de mot de passe", role: .destructive) {
self._changePassword() await self._changePassword()
}, label: { }
if self.isLoading { .disabled(isLoading)
Text("Changer de mot de passe")
} else {
ProgressView()
}
})
.frame(maxWidth: .infinity)
} footer: { } footer: {
if self.errorMessage.count > 0 { if self.errorMessage.count > 0 {
Text(self.errorMessage).foregroundStyle(.logoRed) Text(self.errorMessage).foregroundStyle(.logoRed)
@ -60,26 +54,25 @@ struct ChangePasswordView: View {
} }
} }
.navigationTitle("Changer de mot de passe") .navigationTitle("Changer de mot de passe")
.navigationBarTitleDisplayMode(.inline)
.toolbarBackground(.visible, for: .navigationBar)
} }
fileprivate func _changePassword() { fileprivate func _changePassword() async {
Task { do {
do { self.isLoading = true
self.isLoading = true let service = try StoreCenter.main.service()
let service = try StoreCenter.main.service() _ = try await service.changePassword(
_ = try await service.changePassword( oldPassword: self.oldPassword,
oldPassword: self.oldPassword, password1: self.password1,
password1: self.password1, password2: self.password2)
password2: self.password2) self.isLoading = false
self.isLoading = false self.showForm = false
self.showForm = false } catch {
} catch { Logger.error(error)
Logger.error(error) self.errorMessage = ErrorUtils.message(error: error)
self.errorMessage = ErrorUtils.message(error: error) self.isLoading = false
self.isLoading = false
}
} }
} }
} }

@ -114,7 +114,6 @@ struct LoginView: View {
focusedField = .password focusedField = .password
} }
PasswordField("Mot de passe", text: self.$password) PasswordField("Mot de passe", text: self.$password)
.textContentType(.init(rawValue: ""))
.submitLabel(.send) .submitLabel(.send)
.onSubmit(of: .text) { .onSubmit(of: .text) {
if password.isEmpty == false && username.isEmpty == false { if password.isEmpty == false && username.isEmpty == false {

Loading…
Cancel
Save