Merge branch 'main' of https://stax.alwaysdata.net/gitea/staxriver/PadelClub

PadelClub.xcodeproj/project.pbxproj

@@ -1901,7 +1901,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 59;
+				CURRENT_PROJECT_VERSION = 60;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\"";
@@ -1941,7 +1941,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 59;
+				CURRENT_PROJECT_VERSION = 60;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\"";
 				DEVELOPMENT_TEAM = BQ3Y44M3Q6;

PadelClub/Utils/Network/NetworkManager.swift

@@ -24,7 +24,7 @@ class NetworkManager {
 
         let documentsUrl: URL = SourceFileManager.shared.rankingSourceDirectory        
         let destinationFileUrl = documentsUrl.appendingPathComponent("\(dateString)")
-        let fileURL = URL(string: "https://padelclub.app/static/\(dateString)")
+        let fileURL = URL(string: "https://xlr.alwaysdata.net/static/rankings/\(dateString)")
         
         if FileManager.default.fileExists(atPath: destinationFileUrl.path()) {
             return

PadelClub/ViewModel/AgendaDestination.swift

@@ -80,7 +80,7 @@ enum AgendaDestination: Int, CaseIterable, Identifiable, Selectable, Equatable {
             return nil
         case .tenup:
             if FederalDataViewModel.shared.federalTournaments.isEmpty {
-                return .custom(systemName: "exclamationmark.circle.fill", color: .yellow)
+                return .custom(systemName: "exclamationmark.circle.fill", color: .logoYellow)
             } else {
                 return nil
             }

PadelClub/Views/Navigation/MainView.swift

@@ -54,7 +54,7 @@ struct MainView: View {
     }
 
     var badgeText: Text? {
-        return _isConnected() == false ? Text("!").font(.headline) : nil
+        return (Store.main.userName() != nil && _isConnected() == false) ? Text("!").font(.headline) : nil
     }
 
     var body: some View {

PadelClub/Views/Navigation/Umpire/PadelClubView.swift

@@ -107,8 +107,10 @@ struct PadelClubView: View {
                 } description: {
                     Text("Padel Club peut importer toutes les données publiques de la FFT concernant tous les compétiteurs et compétitrices.")
                 } actions: {
-                    RowButtonView("Démarrer l'importation") {
+                    if lastDataSource != nil {
-                        _startImporting()
+                        RowButtonView("Démarrer l'importation") {
+                            _startImporting()
+                        }
                     }
                 }
             }

PadelClub/Views/Navigation/Umpire/UmpireView.swift

@@ -227,12 +227,12 @@ struct AccountRowView: View {
         LabeledContent {
             if Store.main.hasToken() {
                 Text(self.userName)
-            } else {
+            } else if Store.main.userName() != nil {
                 Image(systemName: "xmark.circle.fill")
                     .foregroundStyle(.logoRed)
             }
         } label: {
-            Label("Mon compte", systemImage: "person.fill")
+            Label("Mon compte Padel Club", systemImage: "person.fill")
             if dataStore.user.email.isEmpty == false {
                 Text(dataStore.user.email)
             }

PadelClub/Views/Shared/SupportButtonView.swift

@@ -80,7 +80,7 @@ struct SupportButtonView: View {
     
     private func _getBody() -> String {
         let separator = "---------------------------------------------"
-        return ["token", Store.main.token(), separator, "userId", Store.main.userId, separator, "dataStore userId", DataStore.shared.user.id].compacted().joined(separator: "\n\n")
+        return ["Décrivez votre problème", "\n\n\n", separator, "token", Store.main.token(), separator, "userId", Store.main.userId, separator, "dataStore userId", DataStore.shared.user.id].compacted().joined(separator: "\n")
     }
     
     private func _getDeviceIdentifier() -> String {

PadelClub/Views/Tournament/Shared/TournamentBroadcastRowView.swift

@@ -16,7 +16,7 @@ struct TournamentBroadcastRowView: View {
             LabeledContent {
                 if Store.main.userId == nil {
                     Image(systemName: "exclamationmark.circle.fill")
-                        .foregroundStyle(.master)
+                        .foregroundStyle(.logoYellow)
                 } else {
                     if tournament.isPrivate {
                         Text("tournoi privé").foregroundStyle(.logoRed)