v60

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/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

@@ -228,11 +228,11 @@ struct AccountRowView: View {
             if Store.main.hasToken() {
                 Text(self.userName)
             } else {
-                Image(systemName: "xmark.circle.fill")
+                Image(systemName: "exclamationmark.circle.fill")
-                    .foregroundStyle(.logoRed)
+                    .foregroundStyle(.master)
             }
         } label: {
-            Label("Mon compte", systemImage: "person.fill")
+            Label(Store.main.userName() == nil ? "Créer votre compte Padel Club" : "Mon compte", 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/Subscription/Guard.swift

@@ -140,14 +140,14 @@ import LeStorage
     }
     
     var currentPlan: StoreItem? {
-        return .monthlyUnlimited
+//        return .monthlyUnlimited
 //        #if DEBUG
 //            return .monthlyUnlimited
 //        #else
-//        if let currentBestPlan = self.currentBestPlan, let plan = StoreItem(rawValue: currentBestPlan.productID) {
+        if let currentBestPlan = self.currentBestPlan, let plan = StoreItem(rawValue: currentBestPlan.productID) {
-//            return plan
+            return plan
-//        }
+        }
-//        return nil
+        return nil
 //        #endif
     }