fix icon

Reviewed-on: #40

.drone.yml

@@ -10,12 +10,11 @@ steps:
   - name: build
     image: swift:latest
     commands:
-        - cd Sources/allin/allin
+        - cd Sources/Model
         - swift build
 
   - name: test
     image: swift:latest
     commands:
-        - cd Sources/allin/allinTests 
+        - cd Sources/Model
         - swift test
-    depends_on: [build]

README.md

@@ -1,3 +1,91 @@
-# Swift
+<div align="center">
 
-Client IOS 
+  <img src="Documentation/Images/Banner-AllIn.png" />
+    
+---
+
+&nbsp; ![Swift](https://img.shields.io/badge/Swift-F05138.svg?style=for-the-badge&logo=Swift&logoColor=white)
+&nbsp; ![iOS](https://img.shields.io/badge/iOS-000000.svg?style=for-the-badge&logo=Apple&logoColor=white)
+
+---
+
+[Présentation](#apple---all-in) | [Répartition du dépôt](#répartition-du-gitlab) | [Structures](#structures) | [Technologies](#technologies) | [Outils](#outils) | [Wiki](https://codefirst.iut.uca.fr/git/AllDev/Gestion_de_projet/wiki)
+
+</div>
+
+### Apple - ALL IN!
+
+**Contexte** : Application Swift et SwiftUI pour le projet universitaire de troisième année (B.U.T Informatique de Clermont-Ferrand) intitulé *All In*.
+</br>
+
+**Description** : Ce dépôt contient l'ensemble du code pour la partie client iOS de l'application *ALL IN*.
+</br>
+
+# Répartition du dépot
+
+[**Sources**](Sources) : **Code de l'application**
+
+[**Documentation**](Documentation) : **Documentation de l'application**
+
+
+# Structures
+
+- MVVM
+
+<div align = center>
+
+<img src="https://codefirst.iut.uca.fr/git/AllDev/Gestion_de_projet/raw/branch/master/Documentation/Diagrammes/AllInMVVM.png" width="600" />
+
+</div>
+
+# Fonctionnement
+
+- ### Comment lancer le projet ? 
+
+:information_source: *Assurez-vous d'avoir un Mac à disposition*
+
+Tout d'abord si ce n'est pas fait cloner le dépôt de la branche **master/main**, pour cela copier le lien URL du dépôt git :
+
+<div align = center>
+
+![Comment cloner](Documentation/Images/HowToClone.png)
+
+</div>
+
+Sur votre Mac, ouvrez l'IDE **Xcode** (disponible via l'App Store), puis cloner le dépôt en utilisant l'URL copiée précédemment  :
+
+<div align = center>
+
+<img src="Documentation/Images/WelcomeToXcode.png" width="500" >
+
+</div>
+
+Vous serez alors redirigé par l'IDE et pourrez lancer l'application sur l'appareil de votre choix :
+
+<div align = center>
+
+<img src="Documentation/Images/LaunchApp.png" width="900" >
+
+</div>
+
+*Si vous souhaitez lancer l'application sur votre appareil personnel, il sera nécessaire de renseigner votre compte iCloud dans l'IDE !*
+
+# Technologies
+
+<img src="" />
+
+Pour réaliser l'interface visuelle, nous avons opté pour **SwiftUI** du fait qu'elle permet de réaliser des interfaces utilisateurs complexes de manière élégante. Le framework est récent, mis à jour régulièrement, et facile à prendre en main pour le développement.
+
+# Outils
+
+Pour la partie API, nous avons utilisé plusieurs outils :
+
+- UserDefaults
+
+Pour stocker le token localement, nous utilisons l'outil fourni par SwiftUI qui est UserDefaults, afin de réaliser une authentification automatique lorsque le client ouvre l'application, en récupérant son token lors de la précédente connexion.
+
+<div align="center">
+
+© AllDev - Apple
+
+</div>

Sources/AllIn.xcworkspace/contents.xcworkspacedata

@@ -2,16 +2,13 @@
 <Workspace
    version = "1.0">
    <FileRef
-      location = "group:Api">
+      location = "group:StubLib">
-   </FileRef>
-   <FileRef
-      location = "group:AllInApp/AllInApp.xcodeproj">
    </FileRef>
    <FileRef
-      location = "group:StubLib">
+      location = "group:Api">
    </FileRef>
    <FileRef
-      location = "group:ViewModel">
+      location = "group:AllInApp/AllInApp.xcodeproj">
    </FileRef>
    <FileRef
       location = "group:DependencyInjection/DependencyInjection.xcodeproj">

Sources/AllInApp/AllIn/AllIn.entitlements

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.security.application-groups</key>
+	<array/>
+</dict>
+</plist>

Sources/AllInApp/AllIn/AllInApp.swift

@@ -8,12 +8,12 @@
 import SwiftUI
 import DependencyInjection
 import Model
-import ViewModel
 
 @main
 struct AllInApp: App {
     
     @UIApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
+    @Environment(\.scenePhase) var phase
     let DI = DependencyInjection.shared
     
     init() {
@@ -23,6 +23,17 @@ struct AllInApp: App {
     var body: some Scene {
         WindowGroup {
             ContentView()
+                .onAppear {
+                    AppStateContainer.shared.notificationState.scheduleNotifications()
+                }
+                .onChange(of: phase) { newPhase in
+                    switch newPhase {
+                    case .background, .inactive:
+                        UIApplication.shared.shortcutItems = QuickAction.allShortcutItems
+                    default:
+                        break
+                    }
+                }
         }
     }
 }

Sources/AllInApp/AllIn/AppDelegate.swift

@@ -1,41 +0,0 @@
-//
-//  AppDelegate.swift
-//  AllIn
-//
-//  Created by Emre on 17/12/2023.
-//
-
-import UIKit
-
-class AppDelegate: UIResponder, UIApplicationDelegate {
-    
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
-        return true
-    }
-    
-    func applicationWillResignActive(_ application: UIApplication) {
-        // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state. // Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game.
-        
-    }
-    
-    func applicationDidEnterBackground(_ application: UIApplication) {
-        // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
-        // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
-        
-    }
-    
-    func applicationWillEnterForeground(_ application: UIApplication) {
-        // Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background.
-        
-    }
-    
-    func applicationDidBecomeActive(_ application: UIApplication) {
-        // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
-        
-    }
-    
-    func applicationWillTerminate(_ application: UIApplication) {
-        // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
-        
-    }
-}

Sources/AllInApp/AllIn/AppState.swift

@@ -12,9 +12,10 @@ class AppStateContainer: ObservableObject {
     static let shared = AppStateContainer()
     let loggedState: LoggedState = LoggedState()
     var onlineStatus: OnlineStatus = OnlineStatus()
-    var user: User?
+    var notificationState: NotificationService = NotificationService()
+    @Published var user: User?
     
-    @AppStorage("authenticationRefresh") var authenticationRefresh: String?
+    @AppStorage("authenticationRefresh", store: UserDefaults(suiteName: "group.alldev.AllIn")!) var authenticationRefresh: String?
 }
 
 class LoggedState: ObservableObject {

Sources/AllInApp/AllIn/Assets.xcassets/Blue200.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xF8",
+          "green" : "0x99",
+          "red" : "0x23"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xF8",
+          "green" : "0x99",
+          "red" : "0x23"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Sources/AllInApp/AllIn/Assets.xcassets/Grey100Color.colorset/Contents.json

@@ -20,7 +20,7 @@
         }
       ],
       "color" : {
-        "color-space" : "srgb",
+        "color-space" : "display-p3",
         "components" : {
           "alpha" : "1.000",
           "blue" : "0x45",

Sources/AllInApp/AllIn/Assets.xcassets/GreyDarkColor.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x24",
+          "green" : "0x24",
+          "red" : "0x24"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x24",
+          "green" : "0x24",
+          "red" : "0x24"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Sources/AllInApp/AllIn/Assets.xcassets/Pink100.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x8A",
+          "green" : "0x2B",
+          "red" : "0xFE"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x8A",
+          "green" : "0x2B",
+          "red" : "0xFE"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Sources/AllInApp/AllIn/Assets.xcassets/Pink200.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xA8",
+          "green" : "0x49",
+          "red" : "0xC2"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xA8",
+          "green" : "0x49",
+          "red" : "0xC2"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Sources/AllInApp/AllIn/Assets.xcassets/Purple200.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xC5",
+          "green" : "0x66",
+          "red" : "0x8A"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xC5",
+          "green" : "0x66",
+          "red" : "0x8A"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Sources/AllInApp/AllIn/Assets.xcassets/PurpleAllCoin.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "Vector (3).png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Sources/AllInApp/AllIn/Assets.xcassets/SecondaryTextColor.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x3C",
+          "green" : "0x3C",
+          "red" : "0x3C"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xFF",
+          "green" : "0xFF",
+          "red" : "0xFF"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Sources/AllInApp/AllIn/Assets.xcassets/WinBannerBackground.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xFF",
+          "green" : "0xE8",
+          "red" : "0xD1"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xFF",
+          "green" : "0xE8",
+          "red" : "0xD1"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Sources/AllInApp/AllIn/Assets.xcassets/allCoinBlackIcon.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "allCoinBlack.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Sources/AllInApp/AllIn/Assets.xcassets/blueAllCoinIcon.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "Group 107 (1).png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Sources/AllInApp/AllIn/Assets.xcassets/blueBadgeIcon.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "Vector.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Sources/AllInApp/AllIn/Assets.xcassets/blueFlameIcon.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "blueFlame.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Sources/AllInApp/AllIn/Assets.xcassets/bluePersonIcon.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "Group 179.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Sources/AllInApp/AllIn/Assets.xcassets/blueTrophyIcon.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "Group 210.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Sources/AllInApp/AllIn/Assets.xcassets/closeIcon.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "Exclude (1).png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Sources/AllInApp/AllIn/Assets.xcassets/giftEarnImage.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "GiftEarn.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Sources/AllInApp/AllIn/Assets.xcassets/giftImage.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "Gift.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Sources/AllInApp/AllIn/Assets.xcassets/globeImage.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "globe.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Sources/AllInApp/AllIn/Assets.xcassets/loadingHeartIcon.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "Group 280.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Sources/AllInApp/AllIn/Assets.xcassets/marquee.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "Mask group (3).png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Sources/AllInApp/AllIn/Assets.xcassets/pinkAllCoinIcon.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "PinkAllCoin.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Sources/AllInApp/AllIn/Assets.xcassets/pinkBadgeIcon.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "PinkBadge.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Sources/AllInApp/AllIn/Assets.xcassets/pinkFlameIcon.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "pinkFlame.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Sources/AllInApp/AllIn/Assets.xcassets/pinkPersonIcon.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "UserPink.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Sources/AllInApp/AllIn/Assets.xcassets/pinkTrophyIcon.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "Trophy.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Sources/AllInApp/AllIn/Components/AllcoinsCapsule.swift

@@ -8,11 +8,12 @@
 import SwiftUI
 
 struct AllcoinsCapsule: View {
+    var gains: Int
     var body: some View {
         Text("Vous remportez")
             .foregroundColor(.white)
         HStack{
-            Text("2340")
+            Text(gains.description)
                 .textStyle(weight: .bold, color: .white, size: 60)
             Image("allcoinWhiteIcon")
                 .resizable()
@@ -30,6 +31,6 @@ struct AllcoinsCapsule: View {
 
 struct AllcoinsCapsule_Previews: PreviewProvider {
     static var previews: some View {
-        AllcoinsCapsule()
+        AllcoinsCapsule(gains: 100)
     }
 }

Sources/AllInApp/AllIn/Components/AllcoinsCounter.swift

@@ -8,17 +8,23 @@
 import SwiftUI
 
 struct AllcoinsCounter: View {
+    
+    var backgroundColor: Color = .white
+    var foregroundColor: Color = AllInColors.primaryColor
+    @ObservedObject var appStateContainer = AppStateContainer.shared
+    
     var body: some View {
         HStack(alignment: .center) {
+            Text(String(appStateContainer.user!.nbCoins))
+                .contentTransition(.numericText())
+                .fontWeight(.black)
+                .foregroundColor(foregroundColor)
             Image("allcoinIcon")
                 .resizable()
                 .frame(width: 17, height: 17, alignment: .leading)
-            Text(String(AppStateContainer.shared.user?.nbCoins ?? 0))
-                .fontWeight(.black)
-                .foregroundColor(AllInColors.primaryColor)
         }
         .frame(width: 90, height: 40)
-        .background(Color.white)
+        .background(backgroundColor)
         .cornerRadius(9999, corners: [.topLeft, .bottomLeft])
         
     }

Sources/AllInApp/AllIn/Components/BetCard.swift

@@ -6,24 +6,35 @@
 //
 
 import SwiftUI
+import Model
 
 struct BetCard: View {
+    
+    var bet: Bet
+    @State var showDetails: Bool = false
+    @State var showParticipate: Bool = false
+    
     var body: some View {
-        VStack(spacing: 0){
+        VStack(spacing: 0) {
             VStack(alignment: .leading,spacing: 2){
                 HStack{
                     Spacer()
-                    Text("proposé par Lucas").font(.system(size: 10)).foregroundColor(AllInColors.grey800Color)
+                    Text("bet_proposed_by_format \(bet.author.capitalized)")
-                    
+                        .font(.system(size: 10))
+                        .foregroundColor(AllInColors.grey800Color)
                 }
-                Text("Etudes").font(.system(size: 15)).foregroundColor(AllInColors.grey800Color)
+                Text(bet.theme)
-                Text("Emre va réussir son TP de CI/CD mercredi?").font(.system(size: 20)).fontWeight(.bold)
+                    .font(.system(size: 15))
+                    .foregroundColor(AllInColors.grey800Color)
+                Text(bet.phrase)
+                    .font(.system(size: 20))
+                    .fontWeight(.bold)
                 HStack{
-                    Text("Commence le").font(.system(size: 15)).foregroundColor(AllInColors.grey800Color)
+                    Text("bet_starting")
-                    TextCapsule()
+                        .font(.system(size: 15))
-                    TextCapsule()
+                        .foregroundColor(AllInColors.grey800Color)
+                    TextCapsule(date: bet.endRegisterDate)
                     Spacer()
-                    
                 }
             }
             .frame(width: .infinity)
@@ -33,36 +44,17 @@ struct BetCard: View {
             VStack(alignment: .leading,spacing: 2){
                 HStack{
                     Spacer()
-                    UsersPreview()
+                    UsersPreview(users: [])
-                    Text(" 4 joueurs en attente").font(.system(size: 15)).foregroundColor(AllInColors.grey800Color).fontWeight(.medium)
+                    Text("bet_players_waiting_format \(bet.invited.count.description)")
-                    
+                        .font(.system(size: 15))
+                        .foregroundColor(AllInColors.grey800Color)
+                        .fontWeight(.medium)
                     Spacer()
                     
-                }.padding(0)
-                Button {
-                    
-                } label: {
-                    Text("Participer")
-                        .font(.system(size: 30))
-                        .fontWeight(.bold)
-                        .frame(maxWidth: .infinity).padding(10)
-                        .multilineTextAlignment(.center)
-                        .overlay {
-                            AllInColors.primaryGradient.frame(width: 170)
-                                .mask(
-                                    Text("Participer")
-                                        .font(.system(size: 30))
-                                        .fontWeight(.bold)
-                                        .frame(maxWidth: .infinity).padding(10)
-                                )
-                        }
                 }
-                .accentColor(AllInColors.componentBackgroundColor)
+                .padding(0)
-                .buttonStyle(.borderedProminent).cornerRadius(4.0)
+                ParticipateButton(isOpen: $showDetails, isParticapatedOpen: $showParticipate, bet: bet)
-                .overlay(
+                    .padding(.top, 5)
-                    RoundedRectangle(cornerRadius: 12).stroke(AllInColors.delimiterGrey, lineWidth: 1)
-                ).padding([.top],5)
-                
             }
             .frame(width: .infinity)
             .padding(.all,8)
@@ -70,12 +62,25 @@ struct BetCard: View {
             .cornerRadius(20, corners: [.bottomLeft,.bottomRight])
             .border(width: 1, edges: [.top], color: AllInColors.delimiterGrey)
         }
+        .onTapGesture {
+            showDetails.toggle()
+        }
+        .fullScreenCover(isPresented: $showDetails) {
+            DetailsView(isModalPresented: $showDetails, isModalParticipated: $showParticipate, id: bet.id)
+        }
     }
 }
 
 struct BetCard_Previews: PreviewProvider {
     static var previews: some View {
-        BetCard()
+        BetCard(bet: BinaryBet(theme: "Football - Finale de la Ligue des Champions",
-            .preferredColorScheme(.dark)
+                               phrase: "Le gagnant de la finale sera l'équipe avec le plus de tirs au but.",
+                               endRegisterDate: Date().addingTimeInterval(86400),
+                               endBetDate: Date().addingTimeInterval(172800),
+                               isPrivate: false,
+                               status: .inProgress,
+                               invited: [],
+                               author: "Imri"))
+        .preferredColorScheme(.dark)
     }
 }

Sources/AllInApp/AllIn/Components/BetLineLoading.swift

@@ -0,0 +1,47 @@
+//
+//  BetLineLoading.swift
+//  AllIn
+//
+//  Created by Lucas Delanier on 19/01/2024.
+//
+
+import SwiftUI
+import Model
+
+struct BetLineLoading: View {
+    
+    @State var showInfos: Bool = false
+    var bet: BetDetail
+    
+    var value: CGFloat {
+        let totalParticipations = bet.participations.count
+        let numberOfYes = bet.participations.filter { $0.answer.uppercased() == "YES" }.count
+        let numberOfNo = bet.participations.filter { $0.answer.uppercased() == "NO" }.count
+        if(numberOfNo == 0 && numberOfYes == 0){
+            return 0.5
+        }
+        
+        return totalParticipations > 0 ? CGFloat(numberOfYes) / CGFloat(totalParticipations) : 0.0
+    }
+    
+    var yesParticipations: [Participation] {
+        bet.participations.filter { $0.answer.uppercased() == "YES" }
+    }
+    
+    var noParticipations: [Participation] {
+        bet.participations.filter { $0.answer.uppercased() == "NO" }
+    }
+    
+    var body: some View {
+        switch bet.bet {
+            case is BinaryBet:
+                BinaryBetLine(bet: bet)
+            case is CustomBet:
+                CustomBetLine(bet: bet)
+            default:
+                BinaryBetLine(bet: bet)
+            }
+    }
+}
+
+

Sources/AllInApp/AllIn/Components/BinaryBetLine.swift

@@ -0,0 +1,168 @@
+//
+//  BinaryBetLine.swift
+//  AllIn
+//
+//  Created by Lucas Delanier on 10/06/2024.
+//
+
+
+import SwiftUI
+import Model
+
+struct BinaryBetLine: View {
+    
+    @State var showInfos: Bool = false
+    var bet: BetDetail
+    
+    var value: CGFloat {
+        let totalParticipations = bet.participations.count
+        let numberOfYes = bet.participations.filter { $0.answer.uppercased() == "YES" }.count
+        let numberOfNo = bet.participations.filter { $0.answer.uppercased() == "NO" }.count
+        if(numberOfNo == 0 && numberOfYes == 0){
+            return 0.5
+        }
+        
+        return totalParticipations > 0 ? CGFloat(numberOfYes) / CGFloat(totalParticipations) : 0.0
+    }
+    
+    var yesParticipations: [Participation] {
+        bet.participations.filter { $0.answer.uppercased() == "YES" }
+    }
+    
+    var noParticipations: [Participation] {
+        bet.participations.filter { $0.answer.uppercased() == "NO" }
+    }
+    
+    var body: some View {
+        VStack(alignment: .leading, spacing: 0) {
+            HStack(spacing: 5) {
+                Text("OUI")
+                    .font(.system(size: 25))
+                    .fontWeight(.bold)
+                    .foregroundColor(AllInColors.blue200)
+                Spacer()
+                Text("NON")
+                    .font(.system(size: 25))
+                    .fontWeight(.bold)
+                    .foregroundColor(AllInColors.pink100)
+            }
+            
+            GeometryReader { geometry in
+                ZStack(alignment: .leading) {
+                    HStack{
+                        Spacer()
+                        Rectangle()
+                            .frame(width: min(CGFloat(1-self.value) * geometry.size.width, geometry.size.width-20), height: 17)
+                            .foregroundStyle(AllInColors.PinkBetGradiant).cornerRadius(999)
+                    }
+                    
+                    HStack(spacing: 0) {
+                        Rectangle()
+                            .frame(width: min(CGFloat(self.value) * geometry.size.width, geometry.size.width-20), height: 17)
+                            .foregroundStyle(AllInColors.BlueBetGradiant)
+                            .cornerRadius(999)
+                        Image("loadingHeartIcon")
+                            .resizable()
+                            .frame(width: 29, height: 32)
+                            .padding(.leading, -10)
+                    }
+                    
+                }
+                .padding(.bottom, 5)
+            }
+            .frame(height: 40)
+
+            HStack {
+                Spacer()
+                Text("bet_status_details_drawer")
+                    .textStyle(weight: .medium, color: AllInColors.primaryTextColor, size: 10)
+                Image(showInfos ? "chevronUpIcon" : "chevronDownIcon")
+                    .resizable()
+                    .frame(width: 10, height: 7)
+                    .scaledToFill()
+            }
+            .onTapGesture {
+                withAnimation {
+                    showInfos.toggle()
+                }
+            }
+            .padding(.bottom, 5)
+            .padding(.trailing, 5)
+            
+            if showInfos {
+                VStack(spacing: 1) {
+                    HStack(spacing: 5) {
+                        Image("blueAllCoinIcon")
+                            .resizable()
+                            .frame(width:12, height: 12)
+                        Text(yesParticipations.reduce(0, {x,y in x + y.stake}).description)
+                            .font(.system(size: 15))
+                            .fontWeight(.bold)
+                            .foregroundColor(AllInColors.blue200)
+                        Spacer()
+                        Text(noParticipations.reduce(0, {x,y in x + y.stake}).description)
+                            .font(.system(size: 15))
+                            .fontWeight(.bold)
+                            .foregroundColor(AllInColors.pink100)
+                        Image("pinkAllCoinIcon")
+                            .resizable()
+                            .frame(width: 12, height: 12)
+                    }
+                    HStack(spacing: 5){
+                        Image("bluePersonIcon")
+                            .resizable()
+                            .frame(width: 12, height: 12)
+                        Text(yesParticipations.count.description)
+                            .font(.system(size: 15))
+                            .fontWeight(.bold)
+                            .foregroundColor(AllInColors.blue200)
+                        Spacer()
+                        Text(noParticipations.count.description)
+                            .font(.system(size: 15))
+                            .fontWeight(.bold)
+                            .foregroundColor(AllInColors.pink100)
+                        Image("pinkPersonIcon")
+                            .resizable()
+                            .frame(width: 12, height: 12)
+                        
+                    }
+                    HStack(spacing: 5){
+                        Image("blueBadgeIcon")
+                            .resizable()
+                            .frame(width: 12, height: 12)
+                        Text(yesParticipations.max(by: { $0.stake < $1.stake })?.stake.description ?? "0")
+                            .font(.system(size: 15))
+                            .fontWeight(.bold)
+                            .foregroundColor(AllInColors.blue200)
+                        Spacer()
+                        Text(noParticipations.max(by: { $0.stake < $1.stake })?.stake.description ?? "0")
+                            .font(.system(size: 15))
+                            .fontWeight(.bold)
+                            .foregroundColor(AllInColors.pink100)
+                        Image("pinkBadgeIcon")
+                            .resizable()
+                            .frame(width: 12, height: 12)
+                        
+                    }
+                    HStack(spacing: 5){
+                        Image("blueTrophyIcon")
+                            .resizable()
+                            .frame(width: 12, height: 12)
+                        Text("1.2")
+                            .font(.system(size: 15))
+                            .fontWeight(.bold)
+                            .foregroundColor(AllInColors.blue200)
+                        Spacer()
+                        Text("1.2")
+                            .font(.system(size: 15))
+                            .fontWeight(.bold)
+                            .foregroundColor(AllInColors.pink100)
+                        Image("pinkTrophyIcon")
+                            .resizable()
+                            .frame(width:12, height: 12)
+                    }
+                }
+            }
+        }
+    }
+}

Sources/AllInApp/AllIn/Components/ChoiceCapsule.swift

@@ -6,22 +6,39 @@
 //
 
 import SwiftUI
+import Model
 
 struct ChoiceCapsule: View {
-    
+    let filter: BetFilter
     @State var pressed = false
+    @ObservedObject var viewModel: BetViewModel
+    
+    var label: String {
+        switch filter {
+        case .isPublic:
+            return String(localized: "bet_public")
+        case .isInvitation:
+            return String(localized: "bet_invitation")
+        case .inProgress:
+            return String(localized: "bet_current")
+        case .isFinished:
+            return String(localized: "bet_finished")
+        default:
+            return "NaN"
+        }
+    }
     
     var body: some View {
         Group {
             if(pressed) {
-                Text("En cours")
+                Text(label)
                     .textStyle(weight: .semibold, color: .white, size: 15)
                     .padding([.leading,.trailing],13.8)
                     .padding([.top,.bottom], 7)
                     .background(AllInColors.lightPurpleColor)
                     .clipShape(Capsule())
             } else {
-                Text("En cours")
+                Text(label)
                     .textStyle(weight: .regular, color: AllInColors.grey800Color, size: 15)
                     .padding([.leading,.trailing], 15)
                     .padding([.top,.bottom], 7)
@@ -35,13 +52,12 @@ struct ChoiceCapsule: View {
         }
         .onTapGesture() {
             pressed.toggle()
+            if(pressed) {
+                viewModel.filters.insert(filter)
+            } else {
+                viewModel.filters.remove(filter)
+            }
         }
         
     }
 }
-
-struct ChoiceCapsule_Previews: PreviewProvider {
-    static var previews: some View {
-        ChoiceCapsule()
-    }
-}

Sources/AllInApp/AllIn/Components/ChoiceFinalAnswerCell.swift

@@ -0,0 +1,43 @@
+//
+//  ChoiceFinalAnswerCell.swift
+//  AllIn
+//
+//  Created by Lucas Delanier on 29/01/2024.
+//
+
+import Foundation
+import SwiftUI
+import Model
+
+struct ChoiceFinalAnswerCell: View {
+    
+    var selected = false
+    var answer: AnswerDetail
+    var rawColor = AllInColors.blueAccentColor
+    
+    var body: some View {
+        ZStack {
+            HStack {
+                Spacer()
+                Text(answer.response)
+                    .textStyle(weight: .bold, color: selected ? .white : rawColor, size: 40)
+                    .padding(.vertical, 10)
+                Spacer()
+            }
+            HStack {
+                Spacer()
+                OddCapsule(
+                    backgroundColor: selected ? .white : AllInColors.purpleAccentColor,
+                    foregroundColor: selected ? AllInColors.purpleAccentColor : .white,
+                    odd: answer.odds
+                )
+                .padding(.trailing, 20)
+                .scaleEffect(0.9)
+            }
+        }
+        .background(selected ? AllInColors.purpleAccentColor : .white)
+        .cornerRadius(17)
+        .scaleEffect(selected ? 1.02 : 1)
+        .animation(.easeInOut(duration: 0.3), value: selected)
+    }
+}

Sources/AllInApp/AllIn/Components/CustomBetLine.swift

@@ -0,0 +1,141 @@
+//
+//  CustomBetLine.swift
+//  AllIn
+//
+//  Created by Lucas Delanier on 10/06/2024.
+//
+
+import SwiftUI
+import Model
+
+struct CustomBetLine: View {
+    
+    @State var showInfos: [String: Bool] = [:]
+    var bet: BetDetail
+    
+    var participationsForAnswer: [String: [Participation]] {
+        Dictionary(grouping: bet.participations, by: { $0.answer.uppercased() })
+    }
+    
+    var sortedAnswers: [AnswerDetail] {
+        bet.answers.sorted { $0.totalParticipants > $1.totalParticipants }
+    }
+    
+    func getTextStyle(for answer: AnswerDetail) -> Font.Weight {
+        return answer == sortedAnswers.first ? .bold : .light
+    }
+    
+    func getColor(for answer: AnswerDetail) -> Color {
+        return answer == sortedAnswers.first ? AllInColors.pinkAccentColor : AllInColors.blueAccentColor
+    }
+    
+    func getGradiant(for answer: AnswerDetail) -> LinearGradient {
+        return answer == sortedAnswers.first ? AllInColors.PinkBetGradiant : AllInColors.BlueBetLineGradiant
+    }
+    
+    func getFlameImage(for answer: AnswerDetail) -> String {
+        return answer == sortedAnswers.first ? "pinkFlameIcon" : "blueFlameIcon"
+    }
+    
+    var body: some View {
+        VStack(alignment: .leading, spacing: 0) {
+            ForEach(sortedAnswers, id: \.response) { answer in
+                let participations = participationsForAnswer[answer.response.uppercased()] ?? []
+                let totalParticipations = bet.participations.count
+                let percentage = totalParticipations > 0 ? CGFloat(participations.count) / CGFloat(totalParticipations) : 0.0
+                
+                VStack {
+                    HStack {
+                        Text(answer.response)
+                            .font(.system(size: 15))
+                            .fontWeight(getTextStyle(for: answer))
+                            .foregroundColor(getColor(for: answer))
+                        Spacer()
+                    }
+                    
+                    GeometryReader { geometry in
+                        ZStack(alignment: .leading) {
+                            HStack(spacing: 0) {
+                                Rectangle()
+                                    .frame(width: min(percentage * geometry.size.width, geometry.size.width-20), height: 17)
+                                    .foregroundStyle(getGradiant(for: answer))
+                                    .cornerRadius(999, corners: [.topLeft, .bottomLeft])
+                                Image(getFlameImage(for: answer))
+                                    .resizable()
+                                    .frame(width: 29, height: 32)
+                                    .padding(.leading, -6)
+                                Text("\(Int(percentage * 100))%")
+                                    .font(.system(size: 15))
+                                    .fontWeight(.bold)
+                                    .foregroundStyle(getColor(for: answer))
+                                    .padding(.leading, 2)
+                            }
+                        }
+                        .padding(.bottom, 5)
+                    }
+                    .frame(height: 40)
+                    
+                    HStack {
+                        Spacer()
+                        Text("bet_status_details_drawer")
+                            .textStyle(weight: .medium, color: AllInColors.primaryTextColor, size: 10)
+                        Image(showInfos[answer.response] ?? false ? "chevronUpIcon" : "chevronDownIcon")
+                            .resizable()
+                            .frame(width: 10, height: 7)
+                            .scaledToFill()
+                    }
+                    .onTapGesture {
+                        withAnimation {
+                            showInfos[answer.response, default: false].toggle()
+                        }
+                    }
+                    .padding(.trailing, 5)
+                    
+                    if showInfos[answer.response] ?? false {
+                        HStack{
+                            VStack(alignment: .leading,spacing: 1) {
+                                HStack(spacing: 5) {
+                                    Image(answer == sortedAnswers.first ? "pinkAllCoinIcon" : "blueAllCoinIcon")
+                                        .resizable()
+                                        .frame(width: 12, height: 12)
+                                    Text(participations.reduce(0, { x, y in x + y.stake }).description)
+                                        .font(.system(size: 15))
+                                        .fontWeight(.bold)
+                                        .foregroundColor(getColor(for: answer))
+                                }
+                                HStack(spacing: 5) {
+                                    Image(answer == sortedAnswers.first ? "pinkPersonIcon" : "bluePersonIcon")
+                                        .resizable()
+                                        .frame(width: 12, height: 12)
+                                    Text(participations.count.description)
+                                        .font(.system(size: 15))
+                                        .fontWeight(.bold)
+                                        .foregroundColor(getColor(for: answer))
+                                }
+                                HStack(spacing: 5) {
+                                    Image(answer == sortedAnswers.first ? "pinkBadgeIcon" : "blueBadgeIcon")
+                                        .resizable()
+                                        .frame(width: 12, height: 12)
+                                    Text(participations.max(by: { $0.stake < $1.stake })?.stake.description ?? "0")
+                                        .font(.system(size: 15))
+                                        .fontWeight(.bold)
+                                        .foregroundColor(getColor(for: answer))
+                                }
+                                HStack(spacing: 5) {
+                                    Image(answer == sortedAnswers.first ? "pinkTrophyIcon" : "blueTrophyIcon")
+                                        .resizable()
+                                        .frame(width: 12, height: 12)
+                                    Text(String(format: "%.2f", answer.odds))
+                                        .font(.system(size: 15))
+                                        .fontWeight(.bold)
+                                        .foregroundColor(getColor(for: answer))
+                                }
+                            }
+                            Spacer()
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

Sources/AllInApp/AllIn/Components/DropDownAnswerMenu.swift

@@ -0,0 +1,66 @@
+//
+//  DropDownMenu.swift
+//  AllIn
+//
+//  Created by Emre on 19/10/2023.
+//
+
+import SwiftUI
+import Model
+
+struct DropDownAnswerMenu: View {
+    
+    @State var expand = false
+    @Binding var selectedAnswer: AnswerDetail
+    var answers: [AnswerDetail]
+    
+    var body: some View {
+        VStack(spacing: 0, content: {
+            Button(action: { withTransaction(Transaction(animation: nil)) { self.expand.toggle() } }) {
+                HStack{
+                    Text(selectedAnswer.response)
+                        .textStyle(weight: .bold, color: AllInColors.blueAccentColor, size: 20)
+                    Text("\(selectedAnswer.odds, specifier: "%.2f")")
+                        .textStyle(weight: .bold, color: AllInColors.lightPurpleColor, size: 10)
+                    
+                    Spacer()
+                    Image(expand ? "chevronUpIcon" : "chevronDownIcon").resizable().frame(width: 15, height: 10).scaledToFill()
+                }
+                .padding([.leading, .trailing], 15)
+                .frame(height: 43)
+            }
+            if expand {
+                Rectangle()
+                    .frame(height: 1)
+                    .foregroundColor(AllInColors.delimiterGrey)
+                    .padding(.bottom, 18)
+                VStack(spacing: 0) {
+                    ForEach(answers) { (answer: AnswerDetail) in
+                        if answer != selectedAnswer {
+                            Button(action: {
+                                self.selectedAnswer = answer
+                                self.expand.toggle()}
+                            ) {
+                                HStack{
+                                    Text(answer.response)
+                                        .textStyle(weight: .bold, color: AllInColors.blueAccentColor, size: 20)
+                                    Text("\(answer.odds, specifier: "%.2f")")
+                                        .textStyle(weight: .bold, color: AllInColors.lightPurpleColor, size: 10)
+                                    Spacer()
+                                }
+                            }
+                            .padding(.bottom, 15)
+                        }
+                    }
+                }
+                .padding([.leading, .trailing], 15)
+            }
+        })
+        .background(AllInColors.componentBackgroundColor)
+        .cornerRadius(8)
+        .overlay(
+            RoundedRectangle(cornerRadius: 8, style: .continuous)
+                .stroke(AllInColors.veryLightPurpleColor, lineWidth: 0.4)
+        )
+    }
+}

Sources/AllInApp/AllIn/Components/DropDownFriends.swift

@@ -6,27 +6,21 @@
 //
 
 import SwiftUI
+import Model
 
 struct DropDownFriends: View {
     
-    @State private var selectedItems: Set<Int> = []
+    @Binding var selectedItems: Set<String>
     @State var expand = false
-    let friends: [(Int, Int, String, String)] = [
+    var friends: [User]
-        (0, 541, "David", "defaultUserImage"),
-        (1, 541, "David", "defaultUserImage"),
-        (2, 541, "David", "defaultUserImage"),
-        (3, 541, "David", "defaultUserImage"),
-        (4, 541, "David", "defaultUserImage"),
-        (5, 541, "David", "defaultUserImage")
-    ]
     
     var body: some View {
         VStack(spacing: 0, content: {
             Button(action: { self.expand.toggle() }) {
                 HStack(spacing: 3){
-                    Text("41")
+                    Text(friends.count.description)
                         .textStyle(weight: .bold, color: AllInColors.primaryTextColor, size: 15)
-                    Text("amis disponibles")
+                    Text("bet_creation_friends_available_format")
                         .textStyle(weight: .regular, color: AllInColors.grey800Color, size: 15)
                     
                     Spacer()
@@ -42,33 +36,33 @@ struct DropDownFriends: View {
                     .foregroundColor(AllInColors.delimiterGrey)
                 ScrollView(.vertical) {
                     VStack(spacing: 0) {
-                        ForEach(0..<friends.count, id: \.self) { item in
+                        ForEach(friends, id: \.self) {  (friend: User) in
                             HStack {
                                 Circle()
-                                    .fill(selectedItems.contains(friends[item].0) ? AllInColors.lightPurpleColor : Color.clear)
+                                    .fill(selectedItems.contains(friend.id) ? AllInColors.lightPurpleColor : Color.clear)
                                     .overlay(
                                         Circle()
-                                            .stroke(selectedItems.contains(friends[item].0) ? Color.clear : AllInColors.skyBlueColor, lineWidth: 1)
+                                            .stroke(selectedItems.contains(friend.id) ? Color.clear : AllInColors.skyBlueColor, lineWidth: 1)
                                     )
                                     .frame(width: 15, height: 15)
                                     .padding(.trailing, 5)
-                                UserInfo()
+                                UserInfo(username: friend.username, value: friend.nbCoins)
                                     .contentShape(Rectangle())
                             }
                             .padding([.leading, .trailing], 15)
                             .padding([.top, .bottom], 5)
                             .overlay(
-                                selectedItems.contains(friends[item].0) ?
+                                selectedItems.contains(friend.id) ?
                                         Rectangle()
                                             .fill(AllInColors.lightPurpleColor.opacity(0.13))
                                         : nil
                             )
                             .opacity(1.0)
                             .onTapGesture {
-                                if selectedItems.contains(friends[item].0) {
+                                if selectedItems.contains(friend.id) {
-                                    selectedItems.remove(friends[item].0)
+                                    selectedItems.remove(friend.id)
                                 } else {
-                                    selectedItems.insert(friends[item].0)
+                                    selectedItems.insert(friend.id)
                                 }
                             }
                             Rectangle()
@@ -90,9 +84,3 @@ struct DropDownFriends: View {
         )
     }
 }
-
-struct DropDownFriends_Previews: PreviewProvider {
-    static var previews: some View {
-        DropDownFriends()
-    }
-}

Sources/AllInApp/AllIn/Components/EmptyInfo.swift

@@ -0,0 +1,27 @@
+//
+//  EmptyInfo.swift
+//  AllIn
+//
+//  Created by Lucas Delanier on 29/05/2024.
+//
+
+import SwiftUI
+
+struct EmptyInfo: View {
+    let emoji: String
+    let title: String
+    let explain: String
+    var body: some View {
+        VStack{
+            Text(emoji).font(.system(size: 120))
+            Text(title).textStyle(weight: .bold, color: AllInColors.primaryTextColor , size: 15)
+            explain.isEmpty ? nil :  Text(explain).textStyle(weight: .light, color: .gray, size: 12)
+        }.opacity(0.55).padding(.horizontal, 20).multilineTextAlignment(.center)
+    }
+}
+
+struct EmptyInfo_Previews: PreviewProvider {
+    static var previews: some View {
+        EmptyInfo(emoji:"👥", title: "Vous n’avez pas encore d’amis", explain: "Ajoutez les depuis cet écran")
+    }
+}

Sources/AllInApp/AllIn/Components/Friend.swift

@@ -6,38 +6,54 @@
 //
 
 import SwiftUI
+import Model
 
 struct Friend: View {
     
-    var image: String
+    var user: User
-    var pseudo: String
+    let isRequest: Bool
+    @ObservedObject var viewModel: FriendsViewModel
+    
+    var StatusValues: (String, Color, Color) {
+        switch user.friendStatus {
+        case .friend:
+            return isRequest ? (String(localized: "generic_decline"), AllInColors.grey400Color, AllInColors.componentBackgroundColor) : (String(localized: "generic_delete"), AllInColors.grey400Color, AllInColors.componentBackgroundColor)
+        case .notFriend:
+            return isRequest ? (String(localized: "generic_acccept"), .white, AllInColors.lightPurpleColor) : (String(localized: "generic_add"), .white, AllInColors.lightPurpleColor)
+        case .requested:
+            return (String(localized: "friends_request_sent"), AllInColors.grey400Color, AllInColors.componentBackgroundColor)
+        default:
+            return ("NaN", AllInColors.grey400Color, AllInColors.componentBackgroundColor)
+        }
+    }
     
     var body: some View {
         HStack{
-            AsyncImage(url: URL(string: image))
+            UserPicture(picture: user.image,username: user.username, size: 45)
-                .frame(width: 50, height: 50)
+            Text(user.username)
-                .cornerRadius(180)
-                .scaledToFit()
-            Text(pseudo)
                 .fontWeight(.medium)
                 .padding(.leading, 5)
                 .font(.system(size: 18))
                 .lineLimit(1)
             Spacer()
-            Button("Supprimer") {}
+            Button(StatusValues.0) {
-                .frame(width: 90, height: 30)
+                viewModel.toggleFriendStatus(for: user, isRequest: isRequest)
-                .foregroundColor(AllInColors.grey400Color)
+            }
-                .font(.system(size: 14))
+            .minimumScaleFactor(0.3)
-                .background(AllInColors.componentBackgroundColor)
+            .lineLimit(2)
-                .cornerRadius(5)
+            .frame(width: 90, height: 30)
-            
+            .foregroundColor(StatusValues.1)
+            .font(.system(size: 14))
+            .background(StatusValues.2)
+            .cornerRadius(5)
+            if(isRequest){
+                Button{
+                    viewModel.declineRequest(username: user.username)
+                }label: {
+                    Image(systemName: "xmark").foregroundColor(.gray)
+                }.padding([.leading], 25)
+            }
         }
         .padding([.trailing,.leading], 25)
     }
 }
-
-struct Friend_Previews: PreviewProvider {
-    static var previews: some View {
-        Friend(image: "https://picsum.photos/536/354", pseudo: "Lucas")
-    }
-}

Sources/AllInApp/AllIn/Components/Menu.swift

@@ -6,19 +6,27 @@
 //
 
 import SwiftUI
+import DependencyInjection
 
 struct Menu: View {
+    
+    @Inject var authService: IAuthService
+    
+    let parameters: [(String, String, String, String)] = [
+        ("videoGameImage", String(localized: "drawer_create_a_bet"), String(localized: "drawer_create_a_bet_subtitle"), "CreationBet"),
+        ("globeImage", String(localized: "drawer_public_bets"), String(localized: "drawer_public_bets_subtitle"), "Bet"),
+        ("moneyImage", String(localized: "drawer_current_bets"), String(localized: "drawer_current_bets_subtitle"), "Current"),
+        ("eyesImage", String(localized: "drawer_bet_history"), String(localized: "drawer_bet_history_subtitle"),"Historic"),
+        ("friendsImage", String(localized: "drawer_friends"), String(localized: "drawer_friends_subtitle"), "Friends"),
+        ("rankingImage", String(localized: "drawer_ranking"), String(localized: "drawer_ranking_subtitle"), "Ranking"),
+    ]
+    
     var body: some View {
         VStack(alignment: .leading, spacing: 10) {
-            
             HStack() {
                 Spacer()
                 VStack(){
-                    Image("defaultUserImage")
+                    UserPicture(picture: AppStateContainer.shared.user?.image, username: (AppStateContainer.shared.user?.username)!,size: 100)
-                        .resizable()
-                        .scaledToFit()
-                        .frame(width: 100, height: 100)
-                        .cornerRadius(180)
                     Text(AppStateContainer.shared.user?.username.capitalized ?? "")
                         .fontWeight(.medium)
                         .font(.system(size: 17))
@@ -31,31 +39,31 @@ struct Menu: View {
             HStack(spacing: 30) {
                 Spacer()
                 VStack(){
-                    Text("114")
+                    Text(AppStateContainer.shared.user?.bestWin ?? 0, format: .number)
                         .fontWeight(.heavy)
                         .font(.system(size: 15))
                         .foregroundColor(.white)
-                    Text("Bets")
+                    Text(String(localized: "drawer_bets"))
                         .fontWeight(.regular)
                         .font(.system(size: 12))
                         .foregroundColor(AllInColors.grey600Color)
                 }
                 VStack(){
-                    Text("343")
+                    Text(AppStateContainer.shared.user!.bestWin, format: .number)
                         .fontWeight(.heavy)
                         .font(.system(size: 15))
                         .foregroundColor(.white)
-                    Text("Meilleur gain")
+                    Text(String(localized: "drawer_best_win"))
                         .fontWeight(.regular)
                         .font(.system(size: 12))
                         .foregroundColor(AllInColors.grey600Color)
                 }
                 VStack(){
-                    Text("5")
+                    Text(AppStateContainer.shared.user!.nbFriends, format: .number)
                         .fontWeight(.heavy)
                         .font(.system(size: 15))
                         .foregroundColor(.white)
-                    Text("Amis")
+                    Text(String(localized: "drawer_nb_friends"))
                         .fontWeight(.regular)
                         .font(.system(size: 12))
                         .foregroundColor(AllInColors.grey600Color)
@@ -64,44 +72,40 @@ struct Menu: View {
             }
             .padding(.bottom, 15)
             
-            NavigationLink(destination: MainView(page: "CreationBet").navigationBarBackButtonHidden(true))
+            ForEach(0..<parameters.count, id: \.self) { index in
-            {
+                NavigationLink(destination: MainView(page: parameters[index].3).navigationBarBackButtonHidden(true)) {
-                ParameterMenu(image: "videoGameImage", title: "CREER UN BET", description: "Créez un nouveau BET et faites participer vos amis.")
+                    ParameterMenu(image: parameters[index].0, title: parameters[index].1, description: parameters[index].2)
-                    .padding([.leading,.trailing], 13)
+                        .padding([.leading, .trailing], 13)
-            }
+                }
-            
-            NavigationLink(destination: MainView(page: "Ranking").navigationBarBackButtonHidden(true))
-            {
-                ParameterMenu(image: "eyesImage", title: "HISTORIQUE DES BETS", description: "Consultez vos paris en cours et terminés.")
-                    .padding([.leading,.trailing], 13)
             }
             
-            NavigationLink(destination: MainView(page: "Friends").navigationBarBackButtonHidden(true))
+            HStack {
-            {
+                Spacer()
-                ParameterMenu(image: "friendsImage", title: "AMIS", description: "Défiez vos porches en les ajoutant en amis.")
+                Button {
-                    .padding([.leading,.trailing], 13)
+                    authService.logout()
+                } label: {
+                    Text("generic_logout")
+                        .foregroundColor(.white)
+                }
+                Spacer()
             }
             
-            NavigationLink(destination: MainView(page: "Bet").navigationBarBackButtonHidden(true))
+            Spacer()
-            {
+            NavigationLink(destination: MainView(page: "Profile")
-                ParameterMenu(image: "moneyImage", title: "BET EN COURS", description: "Gérez vos bets et récompensez les gagnants.")
+                .navigationBarBackButtonHidden(true))
-                    .padding([.leading,.trailing], 13)
-            }
-            NavigationLink(destination: MainView(page: "Ranking").navigationBarBackButtonHidden(true))
             {
-                ParameterMenu(image: "rankingImage", title: "CLASSEMENT", description: "Consultez votre classement parmis vos amis.")
+                Image("gearIcon")
-                    .padding([.leading,.trailing], 13)
+                    .resizable()
+                    .frame(width: 30, height: 30)
+                    .padding([.leading,.bottom], 20)
             }
-            
-            Spacer()
-            Image("gearIcon")
-                .resizable()
-                .frame(width: 30, height: 30)
-                .padding([.leading,.bottom], 20)
         }
         .frame(maxWidth: .infinity,alignment: .leading)
         .background(AllInColors.primaryColor)
         .edgesIgnoringSafeArea(.bottom)
+        .onAppear {
+            authService.refreshAuthentication()
+        }
         
     }
 }

Sources/AllInApp/AllIn/Components/OddCapsule.swift

@@ -0,0 +1,33 @@
+//
+//  OddCapsule.swift
+//  AllIn
+//
+//  Created by Lucas Delanier on 03/02/2024.
+//
+
+import Foundation
+import SwiftUI
+
+struct OddCapsule: View {
+    var backgroundColor: Color = AllInColors.purpleAccentColor
+    var foregroundColor: Color = AllInColors.whiteColor
+    var odd: Float = 0.0
+    var body: some View {
+        HStack(alignment: .center) {
+            Text("x\(odd, specifier: "%.2f")")
+                .fontWeight(.bold)
+                .foregroundColor(foregroundColor)
+        }
+        .padding(.horizontal, 10)
+        .padding(.vertical,5)
+        .background(backgroundColor)
+        .cornerRadius(9999)
+        
+    }
+}
+
+struct OddCapsule_Previews: PreviewProvider {
+    static var previews: some View {
+        OddCapsule()
+    }
+}

Sources/AllInApp/AllIn/Components/ParticipateButton.swift

@@ -0,0 +1,72 @@
+//
+//  ParticipateButton.swift
+//  AllIn
+//
+//  Created by Lucas Delanier on 15/01/2024.
+//
+
+import SwiftUI
+import Model
+
+struct ParticipateButton: View {
+    
+    @Binding var isOpen : Bool
+    @Binding var isParticapatedOpen: Bool
+    var bet: Bet?
+    
+    var isDisabled: Bool {
+        guard bet?.author != AppStateContainer.shared.user?.username else { return true }
+        
+        if let betType = bet?.status {
+            switch betType {
+            case .inProgress:
+                return false
+            default:
+                return true
+            }
+        } else {
+            return true
+        }
+    }
+    
+    var body: some View {
+        Button {
+            isOpen = true
+            isParticapatedOpen = true
+        } label: {
+            Text("bet_participate")
+                .font(.system(size: 27))
+                .fontWeight(.semibold)
+                .frame(maxWidth: .infinity).padding(10)
+                .multilineTextAlignment(.center)
+                .overlay {
+                    switch isDisabled {
+                    case true:
+                        AllInColors.grey700Color.frame(width: 170)
+                            .mask(
+                                Text("bet_participate")
+                                    .font(.system(size: 27))
+                                    .fontWeight(.semibold)
+                                    .frame(maxWidth: .infinity).padding(10)
+                            )
+                    case false:
+                        AllInColors.primaryGradient.frame(width: 170)
+                            .mask(
+                                Text("bet_participate")
+                                    .font(.system(size: 27))
+                                    .fontWeight(.semibold)
+                                    .frame(maxWidth: .infinity).padding(10)
+                            )
+                        
+                    }
+                }
+                .accentColor(AllInColors.componentBackgroundColor)
+                .background(isDisabled ? AllInColors.delimiterGrey.opacity(0.5):AllInColors.whiteColor)
+                .buttonStyle(.borderedProminent).cornerRadius(4.0)
+                .overlay(
+                    RoundedRectangle(cornerRadius: 12).stroke(AllInColors.delimiterGrey, lineWidth: 1)
+                )
+        }
+        .disabled(isDisabled)
+    }
+}

Sources/AllInApp/AllIn/Components/ParticipationModal.swift

@@ -0,0 +1,120 @@
+//
+//  ParticipationModal.swift
+//  AllIn
+//
+//  Created by Lucas Delanier on 16/01/2024.
+//
+
+import SwiftUI
+import Model
+
+struct ParticipationModal: View {
+    
+    @Binding var selectedAnswer: AnswerDetail
+    @Binding var mise: String
+    var phrase: String
+    var answers: [AnswerDetail]
+    var participationAddedCallback: () -> Void
+    var checkAndSetError: () -> Bool
+    
+    var possibleGain: Int {
+        if let stake = Float(mise) {
+            return Int(round(stake * selectedAnswer.odds))
+        } else {
+            return 0
+        }
+    }
+    
+    var body: some View {
+        GeometryReader { geometry in
+            VStack(alignment: .leading){
+                HStack{
+                    Spacer()
+                    Rectangle()
+                        .foregroundStyle(AllInColors.lightGrey300Color)
+                        .frame(maxWidth: 80, maxHeight: 5)
+                        .cornerRadius(999)
+                    Spacer()
+                    
+                }
+                .padding(10)
+                HStack{
+                    Text("bet_status_place_your_bets")
+                        .font(.system(size: 18))
+                        .foregroundColor(AllInColors.primaryTextColor)
+                        .fontWeight(.semibold)
+                    Spacer()
+                    AllcoinsCounter(backgroundColor: AllInColors.lightPurpleColor, foregroundColor: .white)
+                }
+                .padding(.leading, 15)
+                VStack(alignment: .leading){
+                    Text(phrase)
+                        .font(.system(size: 13))
+                        .foregroundColor(AllInColors.primaryTextColor)
+                        .fontWeight(.light)
+                    
+                    DropDownAnswerMenu(selectedAnswer: $selectedAnswer, answers: answers)
+                    
+                    TextField("", text: $mise, prompt: Text("generic_stake")
+                        .foregroundColor(AllInColors.lightGrey300Color)
+                        .font(.system(size: 16))
+                        .fontWeight(.bold))
+                    .padding()
+                    .keyboardType(.numberPad)
+                    .background(
+                        RoundedRectangle(cornerRadius: 9)
+                            .fill(AllInColors.lightGrey200Color)
+                            .frame(height: 40)
+                    )
+                    .frame(height: 40)
+                    .foregroundColor(.black)
+                    .overlay(
+                        RoundedRectangle(cornerRadius: 8, style: .continuous)
+                            .stroke(AllInColors.delimiterGrey, lineWidth: 1)
+                    )
+                    .padding(.bottom, 5)
+                    
+                }
+                .padding(15)
+                Spacer()
+                VStack{
+                    HStack{
+                        Text("participation_possible_winnings")
+                            .font(.system(size: 13))
+                            .foregroundColor(AllInColors.primaryTextColor)
+                            .fontWeight(.medium)
+                        Spacer()
+                        Text(possibleGain.description)
+                            .font(.system(size: 13))
+                            .foregroundColor(AllInColors.primaryTextColor)
+                            .fontWeight(.bold)
+                        Image("allcoinIcon")
+                            .resizable()
+                            .frame(width: 11, height: 12)
+                        
+                    }
+                    .padding(.top, 10)
+                    .padding(.bottom, 0)
+                    Button {
+                        participationAddedCallback()
+                    } label: {
+                        Text("Miser")
+                            .font(.system(size: 23))
+                            .foregroundColor(AllInColors.whiteColor)
+                            .fontWeight(.bold)
+                            .frame(maxWidth: .infinity)
+                            .padding(.vertical, 3)
+                    }
+                    .buttonStyle(.borderedProminent)
+                    .tint(AllInColors.lightPurpleColor)
+                    .disabled(checkAndSetError())
+                    .padding(.bottom, 5)
+                }
+                .padding(.horizontal, 10)
+                .background(AllInColors.whiteColor)
+                .border(width: 1, edges: [.top], color: AllInColors.delimiterGrey)
+            }
+            .background(AllInColors.underComponentBackgroundColor)
+        }
+    }
+}

Sources/AllInApp/AllIn/Components/RankingRow.swift

@@ -10,37 +10,20 @@ import SwiftUI
 struct RankingRow: View {
     
     var number: Int
-    var image: String
+    var image: String?
     var pseudo: String
     var allCoins: Int
     
     var body: some View {
         HStack(){
-            Text(String(number))
+            Text(number.description)
                 .textStyle(weight: .bold, color: AllInColors.lightPurpleColor, size: 18)
-                .padding(.leading, 15)
+            UserInfo(username: pseudo, picture: image, value: allCoins)
-            
-            Image(image)
-                .resizable()
-                .scaledToFit()
-                .frame(width: 40, height: 40)
-                .cornerRadius(180)
-                .padding([.bottom,.top], 10)
-            Text(pseudo)
-                .fontWeight(.medium)
-                .font(.system(size: 16))
-                .lineLimit(1)
-            Spacer()
-            Image("allcoinIcon")
-                .resizable()
-                .frame(width: 17, height: 17, alignment: .leading)
-            Text(String(allCoins))
-                .textStyle(weight: .black, color: AllInColors.lightPurpleColor, size: 16)
-                .padding(.trailing, 15)
         }
+        .padding(10)
+        .padding(.horizontal, 5)
         .background(AllInColors.componentBackgroundColor)
         .cornerRadius(8)
-        .padding([.leading,.trailing],20)
         .frame(maxWidth: 750)
     }
 }

Sources/AllInApp/AllIn/Components/RecapBetCard.swift

@@ -6,33 +6,37 @@
 //
 
 import SwiftUI
+import Model
 
 struct RecapBetCard: View {
     
+    var betResult: BetResultDetail
     @GestureState private var longPressTap = false
     @State private var isPressed = false
+    @State var showDetails: Bool = false
+    @State var showPartipated: Bool = false
+    
     var body: some View {
         VStack(spacing: 0){
             VStack(alignment: .leading,spacing: 2){
                 HStack{
                     Spacer()
-                    Text("proposé par Lucas")
+                    Text("bet_proposed_by_format \(betResult.bet.author)")
                         .font(.system(size: 10))
                         .foregroundColor(AllInColors.grey800Color)
                     
                 }
-                Text("Etudes")
+                Text(betResult.bet.theme)
                     .font(.system(size: 15))
                     .foregroundColor(AllInColors.grey800Color)
-                Text("Emre va réussir son TP de CI/CD mercredi?")
+                Text(betResult.bet.phrase)
                     .font(.system(size: 20))
                     .fontWeight(.bold)
                 HStack{
-                    Text("Fini le ")
+                    Text("bet_ends")
                         .font(.system(size: 15))
                         .foregroundColor(AllInColors.grey800Color)
-                    TextCapsule()
+                    TextCapsule(date: betResult.bet.endBetDate)
-                    TextCapsule()
                     Spacer()
                 }
             }
@@ -46,7 +50,7 @@ struct RecapBetCard: View {
                     Text("Mise")
                         .textStyle(weight: .regular, color: AllInColors.grey800Color, size: 15)
                     Spacer()
-                    Text("1630")
+                    Text(betResult.participation.stake.description)
                         .textStyle(weight: .regular, color: AllInColors.grey800Color, size: 15)
                     Image("Allcoins")
                         .resizable()
@@ -63,13 +67,13 @@ struct RecapBetCard: View {
                     Text("Gains")
                         .textStyle(weight: .medium, color: AllInColors.lightPurpleColor, size: 15)
                     Spacer()
-                    Text("1630")
+                    Text(betResult.amount.description)
                         .font(.system(size: 15))
                         .fontWeight(.medium)
                         .overlay {
                             AllInColors.primaryGradient.frame(width: 50)
                                 .mask(
-                                    Text("1630").font(.system(size: 15)).fontWeight(.medium)
+                                    Text(betResult.amount.description).font(.system(size: 15)).fontWeight(.medium)
                                 )
                         }
                         .padding(0)
@@ -85,37 +89,35 @@ struct RecapBetCard: View {
                 HStack{
                     Text("Côte totale").font(.system(size: 15)).fontWeight(.medium)
                     Spacer()
-                    Text("3,46")
+                    // TODO bind le odd
+                    Text("1,0")
                         .textStyle(weight: .bold, color: .white, size: 18)
                         .padding([.leading,.trailing],10)
                         .padding([.top,.bottom],5)
                         .background(AllInColors.primaryGradient)
                         .cornerRadius(8, corners: .allCorners)
-                    
+                }
-                    
+                .padding([.bottom],10)
-                }.padding([.bottom],10)
+            }
-                
+            .frame(width: .infinity)
-                
+            .padding([.top,.bottom],8)
-            }.frame(width: .infinity)
+            .padding([.leading,.trailing],15)
-                .padding([.top,.bottom],8)
+            .background(AllInColors.underComponentBackgroundColor)
-                .padding([.leading,.trailing],15)
+            .cornerRadius(20, corners: [.bottomLeft,.bottomRight])
-                .background(AllInColors.underComponentBackgroundColor)
+            .padding(.bottom,0).border(width: 1, edges: [.top], color: AllInColors.delimiterGrey)
-                .cornerRadius(20, corners: [.bottomLeft,.bottomRight])
+        }
-                .padding(.bottom,0).border(width: 1, edges: [.top], color: AllInColors.delimiterGrey)
+        .scaleEffect(longPressTap ? 0.97 : 1.0)
-        }.scaleEffect(longPressTap ? 0.97 : 1.0)
+        .animation(.easeInOut, value: longPressTap)
-            .animation(.easeInOut, value: longPressTap)
+        .onTapGesture {
-            .gesture(
+            showDetails.toggle()
-                LongPressGesture(minimumDuration: 0.5)
+        }.fullScreenCover(isPresented: $showDetails) {
-                    .updating($longPressTap) { value, state, _ in
+            DetailsView(isModalPresented: $showDetails, isModalParticipated: $showPartipated, id: betResult.bet.id)
-                        state = value
+        }
-                    }
+        .gesture(
-            )
+            LongPressGesture(minimumDuration: 0.5)
-    }
+                .updating($longPressTap) { value, state, _ in
-}
+                    state = value
-
+                }
-struct RecapBetCard_Previews: PreviewProvider {
+        )
-    static var previews: some View {
-        RecapBetCard()
-            .preferredColorScheme(.dark)
     }
 }

Sources/AllInApp/AllIn/Components/ResultBanner.swift

@@ -0,0 +1,39 @@
+//
+//  ResultBanner.swift
+//  AllIn
+//
+//  Created by Lucas Delanier on 15/01/2024.
+//
+
+import SwiftUI
+import Model
+
+struct ResultBanner: View {
+    var finalAnswer: Participation
+    var odds: Float
+    var body: some View {
+        VStack{
+            HStack{
+                Image(systemName: "trophy.fill").resizable().frame(maxWidth: 70, maxHeight: 60).foregroundColor(AllInColors.blueGrey800Color)
+                Text(finalAnswer.answer).font(.system(size: 70)).fontWeight(.bold).foregroundStyle(AllInColors.blueGrey800Color)
+            }.frame(height: 80)
+            HStack(spacing: 20){
+                HStack{
+                    Image("blueAllCoinIcon").resizable().frame(maxWidth: 12, maxHeight: 12)
+                    Text(finalAnswer.stake.description).font(.system(size: 16)).fontWeight(.semibold).foregroundStyle(AllInColors.blueGrey800Color)
+                }
+                HStack{
+                    Image("bluePersonIcon").resizable().frame(maxWidth: 15, maxHeight: 12)
+                    Text(finalAnswer.username).font(.system(size: 16)).fontWeight(.semibold).foregroundStyle(AllInColors.blueGrey800Color)
+                }
+                HStack{
+                    Image("blueTrophyIcon").resizable().frame(maxWidth: 15, maxHeight: 12)
+                    Text("\(odds, specifier: "%.2f")").font(.system(size: 16)).fontWeight(.semibold).foregroundStyle(AllInColors.blueGrey800Color)
+                }
+            }
+        }
+        .frame(maxWidth: /*@START_MENU_TOKEN@*/.infinity/*@END_MENU_TOKEN@*/)
+        .padding(.vertical, 20).background(AllInColors.winBannerBackground)
+        .border(width: 2, edges: [.top,.bottom], color: AllInColors.blueAccentColor.opacity(0.2))
+    }
+}

Sources/AllInApp/AllIn/Components/ReviewCard.swift

@@ -0,0 +1,113 @@
+//
+//  BetCard.swift
+//  AllIn
+//
+//  Created by Lucas on 24/09/2023.
+//
+
+import SwiftUI
+import Model
+
+struct ReviewCard: View {
+    
+    @State var showDetails: Bool = false
+    @State var showPartipated: Bool = false
+    var bet: Bet
+    var amount: Int
+    var isWin: Bool
+    
+    var body: some View {
+        VStack(spacing: 0){
+            VStack(alignment: .leading,spacing: 2){
+                HStack{
+                    Spacer()
+                    Text("bet_proposed_by_format \(bet.author)")
+                        .font(.system(size: 10))
+                        .foregroundColor(AllInColors.grey800Color)
+                    
+                }
+                Text(bet.theme).font(.system(size: 15)).foregroundColor(AllInColors.grey800Color)
+                Text(bet.phrase).font(.system(size: 20)).fontWeight(.bold)
+                HStack{
+                    Text("bet_ends").font(.system(size: 15)).foregroundColor(AllInColors.grey800Color)
+                    TextCapsule(date: bet.endBetDate)
+                    Spacer()
+                    
+                }
+            }
+            .frame(width: .infinity)
+            .padding(.all,15)
+            .background(AllInColors.componentBackgroundColor)
+            .cornerRadius(20, corners: [.topLeft,.topRight]).padding(.bottom,0)
+            VStack(alignment: .center,spacing:0){
+                HStack(){
+                    Spacer()
+                    if bet.status == .finished {
+                        Text(amount.description)
+                            .foregroundColor(.white)
+                            .font(.system(size: 25))
+                            .fontWeight(.bold)
+                        Image("allcoinWhiteIcon")
+                            .resizable()
+                            .frame(width: 18, height: 20)
+                    }
+                    
+                    switch bet.status {
+                    case .waiting, .inProgress:
+                        Text("bet_status_stake")
+                            .foregroundColor(.white)
+                            .font(.system(size: 25))
+                            .fontWeight(.bold)
+                    case .closing:
+                        Text("bet_status_finished")
+                            .foregroundColor(.white)
+                            .font(.system(size: 25))
+                            .fontWeight(.bold)
+                    case .finished:
+                        Text(isWin ? "Gagnés!" : "Perdus!")
+                            .foregroundColor(.white)
+                            .font(.system(size: 25))
+                            .fontWeight(.bold)
+                    case .cancelled:
+                        Text("cancelled")
+                            .foregroundColor(.white)
+                            .font(.system(size: 25))
+                            .fontWeight(.bold)
+                    }
+                    Spacer()
+                    
+                }
+                .frame(width: .infinity)
+                .padding(.all,10)
+                
+            }
+            .frame(width: .infinity)
+            .padding(.all,2)
+            .background(backgroundColor())
+            .cornerRadius(20, corners: [.bottomLeft,.bottomRight])
+            
+        }
+        .onTapGesture {
+            showDetails.toggle()
+        }.fullScreenCover(isPresented: $showDetails) {
+            DetailsView(isModalPresented: $showDetails, isModalParticipated: $showPartipated, id: bet.id)
+        }
+    }
+    
+    private func backgroundColor() -> some View {
+            Group {
+                if bet.status == .finished && isWin {
+                    AllInColors.primaryGradient
+                } else {
+                    switch bet.status {
+                    case .inProgress, .waiting, .closing:
+                        AllInColors.grey50Color
+                    case .finished:
+                        Color.black
+                    case .cancelled:
+                        Color.red
+                    }
+                }
+            }
+        }
+}

Sources/AllInApp/AllIn/Components/TextCapsule.swift

@@ -8,21 +8,56 @@
 import SwiftUI
 
 struct TextCapsule: View {
+    var date: Date
+    
+    private var formattedDate: String {
+        let dateFormatter = DateFormatter()
+        dateFormatter.dateFormat = "dd MMM"
+        return dateFormatter.string(from: date)
+    }
+
+    private var formattedTime: String {
+        let dateFormatter = DateFormatter()
+        dateFormatter.dateFormat = "HH:mm"
+        return dateFormatter.string(from: date)
+    }
+
     var body: some View {
-        Text("12 sept.").font(.system(size: 15))
+        HStack {
-            .foregroundColor(AllInColors.lightPurpleColor)
+            Text(formattedDate)
-            .fontWeight(.bold)
+                .font(.system(size: 15))
-            .padding([.leading,.trailing],10)
+                .foregroundColor(AllInColors.lightPurpleColor)
-            .padding([.top,.bottom], 5).background(AllInColors.underComponentBackgroundColor)
+                .fontWeight(.bold)
-            .clipShape(Capsule())
+                .padding([.leading, .trailing], 10)
-            .overlay(RoundedRectangle(cornerRadius: 20)
+                .padding([.top, .bottom], 5)
-            .stroke(AllInColors.delimiterGrey, lineWidth: 1)
+                .background(AllInColors.underComponentBackgroundColor)
-        )
+                .clipShape(Capsule())
+                .overlay(
+                    RoundedRectangle(cornerRadius: 20)
+                        .stroke(AllInColors.delimiterGrey, lineWidth: 1)
+                )
+                        
+            Text(formattedTime)
+                .font(.system(size: 15))
+                .foregroundColor(AllInColors.lightPurpleColor)
+                .fontWeight(.bold)
+                .padding([.leading, .trailing], 10)
+                .padding([.top, .bottom], 5)
+                .background(AllInColors.underComponentBackgroundColor)
+                .clipShape(Capsule())
+                .overlay(
+                    RoundedRectangle(cornerRadius: 20)
+                        .stroke(AllInColors.delimiterGrey, lineWidth: 1)
+                )
+            
+            Spacer()
+
+        }
     }
 }
 
 struct TextCapsule_Previews: PreviewProvider {
     static var previews: some View {
-        TextCapsule()
+        TextCapsule(date: Date())
     }
 }

Sources/AllInApp/AllIn/Components/TrendingBetCard.swift

@@ -6,8 +6,14 @@
 //
 
 import SwiftUI
+import Model
 
 struct TrendingBetCard: View {
+    
+    var bet: Bet
+    @State var showDetails: Bool = false
+    @State var showParticipate: Bool = false
+    
     var body: some View {
         VStack(alignment: .leading) {
             HStack {
@@ -15,12 +21,12 @@ struct TrendingBetCard: View {
                     .resizable()
                     .frame(width: 15, height: 15, alignment: .leading)
                 
-                Text("Populaire")
+                Text("bet_popular")
                     .textStyle(weight: .medium, color: AllInColors.pinkAccentColor, size: 17)
             }
             .padding([.leading, .top], 10)
             
-            Text("Emre va réussir son TP de CI/CD mercredi?")
+            Text(bet.theme)
                 .textStyle(weight: .heavy, color: .white, size: 17)
                 .frame(height: 47)
                 .multilineTextAlignment(.leading)
@@ -33,7 +39,7 @@ struct TrendingBetCard: View {
                     Text("12")
                         .textStyle(weight: .bold, color: AllInColors.pinkAccentColor, size: 14)
                     
-                    Text("joueurs")
+                    Text("bet_players_format")
                         .textStyle(weight: .regular, color: .white, size: 14)
                         .padding([.leading], 2)
                     
@@ -41,7 +47,7 @@ struct TrendingBetCard: View {
                         .textStyle(weight: .bold, color: AllInColors.pinkAccentColor, size: 14)
                         .padding([.leading], 10)
                     
-                    Text("points misés")
+                    Text("bet_points_at_stake_format")
                         .textStyle(weight: .regular, color: .white, size: 14)
                         .padding([.leading], 2)
                 }
@@ -56,11 +62,24 @@ struct TrendingBetCard: View {
                 .stroke(AllInColors.primaryGradient, lineWidth: 5)
         )
         .clipShape(RoundedRectangle(cornerRadius: 20, style: .continuous))
+        .onTapGesture {
+            showDetails.toggle()
+        }
+        .fullScreenCover(isPresented: $showDetails) {
+            DetailsView(isModalPresented: $showDetails, isModalParticipated: $showParticipate, id: bet.id)
+        }
     }
 }
 
 struct TrendingBetCard_Previews: PreviewProvider {
     static var previews: some View {
-        TrendingBetCard()
+        TrendingBetCard(bet: BinaryBet(theme: "Football - Finale de la Ligue des Champions",
+                                       phrase: "Le gagnant de la finale sera l'équipe avec le plus de tirs au but.",
+                                       endRegisterDate: Date().addingTimeInterval(86400),
+                                       endBetDate: Date().addingTimeInterval(172800),
+                                       isPrivate: true,
+                                       status: .inProgress,
+                                       invited: [],
+                                       author: "Imri"))
     }
 }

Sources/AllInApp/AllIn/Components/UserInfo.swift

@@ -6,27 +6,29 @@
 //
 
 import SwiftUI
+import Model
 
 struct UserInfo: View {
+    var username: String
+    var picture: String?
+    var value: Int
     var body: some View {
         HStack {
-            Image("defaultUserImage")
+            UserPicture(picture: picture, username: username, size: 35)
-                .resizable()
+                .padding(.trailing, 7)
-                .frame(width: 35, height: 35)
+            Text(username)
-            Text("David")
+                .font(.system(size: 15))
-                .textStyle(weight: .bold, color: AllInColors.primaryTextColor, size: 13)
+                .foregroundStyle(AllInColors.primaryTextColor)
+                .fontWeight(.semibold)
             Spacer()
-            Image("allcoinIcon")
+            Text(value.description)
+                .font(.system(size: 18))
+                .foregroundStyle(AllInColors.lightPurpleColor)
+                .fontWeight(.bold)
+                .padding(.trailing, 4)
+            Image("PurpleAllCoin")
                 .resizable()
-                .frame(width: 17, height: 17, alignment: .leading)
+                .frame(width: 15, height: 16)
-            Text("541")
-                .textStyle(weight: .black, color: AllInColors.lightPurpleColor, size: 16)
         }
     }
 }
-
-struct UserInfo_Previews: PreviewProvider {
-    static var previews: some View {
-        UserInfo()
-    }
-}

Sources/AllInApp/AllIn/Components/UsersPreview.swift

@@ -6,22 +6,19 @@
 //
 
 import SwiftUI
+import Model
 
 struct UsersPreview: View {
+    var users: [User]?
     var body: some View {
-        HStack(spacing: -20){
+        if users != nil {
-            Image("defaultUserImage")
+            HStack(spacing: -20){
-                .resizable()
+                ForEach(users!.prefix(4)) { user in
-                .frame(width: 35, height: 35)
+                    Image("defaultUserImage")
-            Image("defaultUserImage")
+                        .resizable()
-                .resizable()
+                        .frame(width: 35, height: 35)
-                .frame(width: 35, height: 35)
+                }
-            Image("defaultUserImage")
+            }
-                .resizable()
-                .frame(width: 35, height: 35)
-            Image("defaultUserImage")
-                .resizable()
-                .frame(width: 35, height: 35)
         }
     }
 }

Sources/AllInApp/AllIn/Components/WinModal.swift

@@ -6,9 +6,11 @@
 //
 
 import SwiftUI
+import Model
 
 struct WinModal: View {
     @Environment(\.dismiss) var dismiss
+    var betResult: BetResultDetail
     
     @State var xOffset: CGFloat = 0
     var body: some View {
@@ -16,136 +18,9 @@ struct WinModal: View {
             GeometryReader { geometry in
                 let size = geometry.size.width / 20
                 
-                InfiniteScroller(contentWidth: size * 20) {
+                InfiniteScroller(contentWidth: geometry.size.width) {
-                    VStack(spacing: 20) {
+                    
-                        VStack(spacing: 20) {
+                    Image("marquee").resizable().scaledToFit()
-                            HStack(spacing: 20){
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110,height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                            }
-                            HStack(spacing: 20){
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110,height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                            }
-                            HStack(spacing: 20){
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110,height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                            }
-                            HStack(spacing: 20){
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110,height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                            }
-                            HStack(spacing:20){
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110,height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                            }
-                            HStack(spacing: 20){
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110,height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                            }
-                            HStack(spacing: 20){
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110,height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                            }
-                            HStack(spacing: 20){
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110,height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                            }
-                            HStack(spacing: 20){
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110,height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                            }
-                            HStack(spacing: 20){
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110,height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                            }
-                            
-                            
-                        }
-                        VStack(spacing: 20) {
-                            HStack(spacing: 20){
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110,height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                            }
-                            HStack(spacing: 20){
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110,height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                            }
-                            HStack(spacing: 20){
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110,height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                            }
-                            HStack(spacing: 20){
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110,height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                            }
-                            HStack(spacing:20){
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110,height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                            }
-                            HStack(spacing: 20){
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110,height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                            }
-                            HStack(spacing: 20){
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110,height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                            }
-                            HStack(spacing: 20){
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110,height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                            }
-                            HStack(spacing: 20){
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110,height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                            }
-                            HStack(spacing: 20){
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110,height:110)
-                                Image("allcoinWhiteIcon").resizable().frame(width: 110, height:110)
-                            }
-                        }
-                    }
-                    .padding(10)
                 }
                 VStack {
                     ZStack(alignment: .topLeading){
@@ -162,15 +37,15 @@ struct WinModal: View {
                     }
                     HStack{
                         Text("FÉLICITATIONS").font(.system(size: 20)).foregroundColor(.white).fontWeight(.semibold).italic()
-                        Text("PSEUDO!").padding(.top,9).font(.system(size: 33)).fontWeight(.heavy).foregroundColor(.white)
+                        Text(AppStateContainer.shared.user?.username ?? "").padding(.top,9).font(.system(size: 33)).fontWeight(.heavy).foregroundColor(.white)
                     }
                     .rotationEffect(.degrees(-4))
                     .padding(.top,40)
                     
                     Spacer()
-                    AllcoinsCapsule()
+                    AllcoinsCapsule(gains: betResult.amount)
                     Spacer()
-                    RecapBetCard()
+                    RecapBetCard(betResult: betResult)
                     Spacer()
                 }
                 .padding([.all],20)
@@ -185,12 +60,6 @@ struct WinModal: View {
     }
 }
 
-struct WinModal_Previews: PreviewProvider {
-    static var previews: some View {
-        WinModal()
-    }
-}
-
 struct InfiniteScroller<Content: View>: View {
     var contentWidth: CGFloat
     var content: (() -> Content)
@@ -204,13 +73,8 @@ struct InfiniteScroller<Content: View>: View {
                 content()
                 content()
                 content()
-                content()
-                content()
-                content()
-                content()
-                content()
             }
-            .offset(x: xOffset, y: 0)
+            .offset(x: xOffset, y: 0).opacity(0.3)
         }
         .disabled(true)
         .onAppear {
@@ -221,8 +85,9 @@ struct InfiniteScroller<Content: View>: View {
                 xOffset = +contentWidth
             }
         }
-        .frame(width: 1200)
+        .frame(width: 1300, height: 1300)
-        .rotationEffect(.degrees(-30))
+        .padding(.leading, -400)
-        .opacity(0.04)
+        .rotationEffect(.degrees(30))
+        .opacity(0.1)
     }
 }

Sources/AllInApp/AllIn/Components/userPicture.swift

@@ -0,0 +1,58 @@
+//
+//  userPicture.swift
+//  AllIn
+//
+//  Created by Lucas Delanier on 04/06/2024.
+//
+
+import SwiftUI
+struct UserPicture: View {
+    var picture: String?
+    var username: String
+    var size: CGFloat
+    
+    var body: some View {
+        ZStack {
+            if let pictureURL = picture {
+                userImage(url: pictureURL)
+            } else {
+                placeholderImage
+            }
+        }
+    }
+    
+    @MainActor private func userImage(url: String) -> some View {
+        AsyncCachedImage(url: URL(string: url)) { image in
+            image
+                .resizable()
+                .frame(width: size, height: size)
+                .clipShape(Circle())
+                } placeholder: {
+                    placeholderImage
+                }
+    }
+
+    
+    private var placeholderImage: some View {
+        Circle()
+            .foregroundColor(.gray)
+            .frame(width: size, height: size)
+            .overlay(
+                Text(username.prefix(2).uppercased())
+                    .fontWeight(.medium)
+                    .foregroundStyle(.white)
+                    .font(.system(size: fontSize(for: size)))
+            )
+    }
+    
+    private func fontSize(for diameter: CGFloat) -> CGFloat {
+        let fontScaleFactor: CGFloat = 0.45
+        return diameter * fontScaleFactor
+    }
+}
+
+struct UserPicture_Previews: PreviewProvider {
+    static var previews: some View {
+        UserPicture(picture: nil, username: "Lucas", size: 100)
+    }
+}

Sources/AllInApp/AllIn/ContentView.swift

@@ -7,17 +7,25 @@
 
 import SwiftUI
 import DependencyInjection
+import Model
 
 struct ContentView: View {
     
+    @State private var show = false
+    @State private var gain = 0
     @Inject var authService: IAuthService
+    @Inject var manager: Manager
     @ObservedObject var loggedState = AppStateContainer.shared.loggedState
     
     var body: some View {
         VStack {
             if loggedState.connectedUser {
                 NavigationView {
-                    MainView(page: "Bet")
+                    if let name = QuickAction.selectedAction?.userInfo?["name"] as? String {
+                        MainView(page: name)
+                    } else {
+                        MainView(page: "Bet")
+                    }
                 }
                 .navigationViewStyle(StackNavigationViewStyle())
             } else {
@@ -30,6 +38,26 @@ struct ContentView: View {
         .onAppear {
             authService.refreshAuthentication()
         }
+        .onChange(of: loggedState.connectedUser) { _ in
+            if loggedState.connectedUser {
+                manager.getTodayGifts() { status, gained in
+                    if status == 200 {
+                        withAnimation {
+                            show = true
+                            gain = gained
+                        }
+                    }
+                }
+            }
+        }
+        .overlay(
+            Group {
+                if show {
+                    DailyGiftPage(show: $show, gain: $gain)
+                        .transition(.opacity)
+                }
+            }
+        )
     }
 }
 

Sources/AllInApp/AllIn/QuickActions/Delegates.swift

@@ -0,0 +1,25 @@
+//
+//  Delegates.swift
+//  AllIn
+//
+//  Created by Emre on 22/02/2024.
+//
+
+import UIKit
+
+class AppDelegate: NSObject, UIApplicationDelegate {
+    func application(_ application: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options: UIScene.ConnectionOptions) -> UISceneConfiguration {
+        if let selectedAction = options.shortcutItem {
+            QuickAction.selectedAction = selectedAction
+        }
+        let sceneConfiguration = UISceneConfiguration(name: "Quick Action Scene", sessionRole: connectingSceneSession.role)
+        sceneConfiguration.delegateClass = QuickActionSceneDelegate.self
+        return sceneConfiguration
+    }
+}
+
+class QuickActionSceneDelegate: UIResponder, UIWindowSceneDelegate {
+    func windowScene(_ windowScene: UIWindowScene, performActionFor shortcutItem: UIApplicationShortcutItem, completionHandler: @escaping (Bool) -> Void) {
+        QuickAction.selectedAction = shortcutItem
+    }
+}

Sources/AllInApp/AllIn/QuickActions/QuickAction.swift

@@ -0,0 +1,44 @@
+//
+//  QuickAction.swift
+//  AllIn
+//
+//  Created by Emre on 22/02/2024.
+//
+
+import UIKit
+
+enum QuickAction {
+    static var selectedAction: UIApplicationShortcutItem?
+    
+    static var homeuserInfo: [String : NSSecureCoding] {
+        ["name" : "Bet" as NSSecureCoding]
+    }
+    
+    static var createuserInfo: [String : NSSecureCoding] {
+        ["name" : "CreationBet" as NSSecureCoding]
+    }
+    
+    static var frienduserInfo: [String : NSSecureCoding] {
+        ["name" : "Friends" as NSSecureCoding]
+    }
+    
+    static var rankuserInfo: [String : NSSecureCoding] {
+        ["name" : "Ranking" as NSSecureCoding]
+    }
+    
+    static var allShortcutItems: [UIApplicationShortcutItem] = {
+        var shortcuts: [UIApplicationShortcutItem] = []
+        
+        if AppStateContainer.shared.loggedState.connectedUser {
+            shortcuts.append(UIApplicationShortcutItem(type: "home", localizedTitle: "Coins : " + String(AppStateContainer.shared.user?.nbCoins ?? 0), localizedSubtitle: "", icon: UIApplicationShortcutIcon(templateImageName: "allCoinBlackIcon"), userInfo: homeuserInfo))
+        }
+        
+        shortcuts.append(contentsOf: [
+            UIApplicationShortcutItem(type: "create", localizedTitle: "Créer un pari", localizedSubtitle: "", icon: UIApplicationShortcutIcon(systemImageName: "pencil.circle"), userInfo: createuserInfo),
+            UIApplicationShortcutItem(type: "friend", localizedTitle: "Voir mes amis", localizedSubtitle: "", icon: UIApplicationShortcutIcon(systemImageName: "person.2.square.stack"), userInfo: frienduserInfo),
+            UIApplicationShortcutItem(type: "ranking", localizedTitle: "Classement", localizedSubtitle: "Où en suis-je ?", icon: UIApplicationShortcutIcon(systemImageName: "rosette"), userInfo: rankuserInfo)
+        ])
+        
+        return shortcuts
+    }()
+}

Sources/AllInApp/AllIn/Ressources/Colors.swift

@@ -29,6 +29,15 @@ struct AllInColors {
     static let loginPurpleColor = Color("LoginPurpleColor")
     static let whiteColor = Color("WhiteColor")
     
+    // Details
+    static let blue200 = Color("Blue200")
+    static let purple200 = Color("Purple200")
+    static let pink200 = Color("Pink200")
+    static let pink100 = Color("Pink100")
+    
+    // Profile
+    static let secondaryTextColor = Color("SecondaryTextColor")
+
     // Others
     static let backgroundColor = Color("BackgroundColor")
     static let darkBlueColor = Color("DarkBlueColor")
@@ -47,6 +56,8 @@ struct AllInColors {
     static let lightGrey300Color = Color("LightGrey300Color")
     static let componentBackgroundColor = Color("ComponentBackgroundColor")
     static let underComponentBackgroundColor = Color("UnderComponentBackgroundColor")
+    static let winBannerBackground = Color("WinBannerBackground")
+    static let greyDarkColor = Color("GreyDarkColor")
     
     // Gradients
     static let primaryGradient = LinearGradient(
@@ -60,4 +71,22 @@ struct AllInColors {
         endPoint: .top
     )
     
+    static let BlueBetGradiant = LinearGradient(
+        gradient: Gradient(colors: [AllInColors.blue200, AllInColors.purple200]),
+        startPoint: .leading,
+        endPoint: .trailing
+    )
+    
+    static let BlueBetLineGradiant = LinearGradient(
+        gradient: Gradient(colors: [AllInColors.blue200, AllInColors.blueAccentColor]),
+        startPoint: .leading,
+        endPoint: .trailing
+    )
+    
+    static let PinkBetGradiant = LinearGradient(
+        gradient: Gradient(colors: [AllInColors.pink100, AllInColors.pink200]),
+        startPoint: .leading,
+        endPoint: .trailing
+    )
+    
 }

Sources/AllInApp/AllIn/Ressources/Config.swift

@@ -8,5 +8,5 @@
 import Foundation
 
 struct Config {
-    static let allInApi = "https://codefirst.iut.uca.fr/containers/AllDev-api"
+    static let allInApi = "https://codefirst.iut.uca.fr/containers/AllDev-api/"
 }

Sources/AllInApp/AllIn/Ressources/en.lproj/Localizable.strings

@@ -0,0 +1,194 @@
+/* 
+  Localizable.strings
+  AllInApp
+
+  Created by Emre on 15/05/2024.
+  
+*/
+
+/// Core
+
+"generic_username" = "Username";
+"generic_email" = "Email";
+"generic_password" = "Password";
+"generic_login" = "Login";
+"generic_logout" = "Logout";
+"generic_already_have_account" = "Already have an account ?";
+"generic_register" = "Register";
+"generic_validate" = "Validate";
+"generic_ok" = "OK";
+"generic_error" = "Error";
+"generic_in_waiting" = "In waiting";
+"generic_search" = "Search";
+"generic_add" = "Add";
+"generic_acccept"="Accept";
+"generic_decline"="Decline";
+"generic_delete" = "Delete";
+"generic_stake" = "Stake";
+"network_error_text" = "Make sure to be properly connected to the network then try again.";
+
+/// Bet type
+
+"bet_type_binary" = "Yes / No";
+"bet_type_match" = "Sport match";
+"bet_type_custom" = "Custom answers";
+
+/// Field error
+
+"field_error_mandatory" = "This field is mandatory.";
+"field_error_not_identical" = "The fields are not identical.";
+"field_error_bad_email" = "Please enter a valid email.";
+
+/// Drawer
+
+"drawer_bets" = "Bets";
+"drawer_best_win" = "Best win";
+"drawer_nb_friends" = "Friends";
+"drawer_friends" = "FRIENDS";
+"drawer_friends_subtitle" = "Challenge your folks by adding them as friends.";
+"drawer_public_bets" = "PARTICIPATE";
+"drawer_public_bets_subtitle" = "Browse the most popular bets of the moment.";
+"drawer_create_a_bet" = "NEW BET";
+"drawer_create_a_bet_subtitle" = "Create a net bet and get your friends participating.";
+"drawer_bet_history" = "HISTORY";
+"drawer_bet_history_subtitle" = "View your current and finished bets.";
+"drawer_current_bets" = "MY PARTICIPATIONS";
+"drawer_current_bets_subtitle" = "Manage your bets and reward the winners.";
+"drawer_ranking" = "RANKING";
+"drawer_ranking_subtitle" = "Check your ranking among your friends.";
+
+/// Welcome Page
+
+"welcome_title" = "Welcome to,";
+"welcome_subtitle" = "Collect your Allcoins and come bet with your friend to prove who\'s best.";
+"welcome_join" = "Join";
+
+/// Register Page
+
+"register_hello" = "Hello,";
+"register_hello %@" = "Hello %@,";
+"register_title" = "We need this!";
+"register_subtitle" = "Don\'t worry it\'s fast.";
+"register_error_title" = "Error saving";
+"register_error_content" = "Registration failed. Try Again.";
+"register_confirm_password" = "Confirm password";
+"register_already_used" = "Email or nickname already used.";
+
+/// Login Page
+
+"login_title" = "Welcome back !";
+"login_subtitle" = "We missed you.";
+"login_error_title" = "Connection error";
+"login_error_content" = "Failed to login. Please try again.";
+"login_no_account" = "Don't have an account ?";
+"login_forgot_password" = "Forgot password ?";
+"login_bad_credentials" = "Incorrect login or password.";
+
+/// Bet Creation Page
+
+"bet_creation_theme_tooltip" = "Usually a common name describing the overall theme of the bet for reference..";
+"bet_creation_phrase_tooltip" = "Generally the question the participants will answer to.";
+"bet_creation_register_tooltip" = "After this date, nobody will be able to register anymore.";
+"bet_creation_bet_end_tooltip" = "After this date, the result will be announced.";
+"bet_creation_privacy_tooltip" = "Determines who will be able to see the bet.";
+"bet_creation_question" = "Question";
+"bet_creation_answer" = "Answer";
+"bet_creation_publish" = "Publish the bet";
+"bet_creation_theme" = "Theme";
+"bet_creation_theme_placeholder" = "Studies, sports, party…";
+"bet_creation_bet_phrase" = "Bet phrase";
+"bet_creation_bet_phrase_placeholder" = "Will David be missing this Monday in class ?";
+"bet_creation_end_registration_date" = "Registration end date";
+"bet_creation_end_bet_date" = "Bet end date";
+"bet_creation_bet_privacy" = "Bet privacy";
+"bet_creation_friends_available_format" = "friends available";
+"bet_creation_public_bottom_text_1" = "Your BET will be visible by all the users.";
+"bet_creation_public_bottom_text_2" = "Everyone will be able to join the BET.";
+"bet_creation_private_bottom_text_1" = "Your BET will only be visible by your friends.";
+"bet_creation_private_bottom_text_2" = "Only your friends will be able to join the BET.";
+"bet_creation_bottom_text_3" = "You can invite friends at any moment during the registration period.";
+"bet_creation_yes_no_bottom_text_1" = "The participants will have to respond with either YES or NO.";
+"bet_creation_yes_no_bottom_text_2" = "No other answer will be accepted.";
+"bet_creation_custom_bottom_text_1" = "You are going to fill in the different answers available in this bet.";
+"bet_creation_custom_bottom_text_2" = "Be careful to be clear and avoid any uncertainties";
+"bet_creation_error" = "Error while creating the bet.";
+"bet_creation_success_message" = "Bet created !";
+"bet_creation_response_title" = "Response title";
+"bet_creation_max_answers %lld" = "%lld more max.";
+"bet_creation_error_past_date" = "The registration end date must be later than the current date.";
+"bet_creation_error_date_order" = "The betting end date must be later than the registration end date.";
+
+/// Bet page
+
+"bet_popular" = "Popular";
+"bet_public" = "Public";
+"bet_private" = "Private";
+"bet_invitation" = "Invitation";
+"bet_current" = "Current";
+"bet_finished" = "Finished";
+"bet_starting" = "Starting on";
+"bet_started" = "Started on";
+"bet_ends" = "Ends on";
+"bet_ended" = "Ended on";
+"bet_participate" = "Participate";
+"bet_proposed_by_format %@" = "Proposed by %@";
+"bet_proposed_by_format" = "Proposed by";
+"bet_players_waiting_format %@" = "%@ players waiting";
+"bet_players_format" = "players";
+"bet_points_at_stake_format" = "points at stake";
+
+/// Bet status
+
+"bet_status_finished" = "Finished !";
+"bet_status_in_progress" = "In progress…";
+"bet_status_waiting" = "Waiting…";
+"bet_status_unavailable" = "Status unavailable";
+"bet_status_cancelled" = "Cancelled";
+"bet_status_place_your_bets" = "Place your bets";
+"bet_status_participants_list" = "Participants";
+"bet_status_details_drawer" = "Details";
+"participation_possible_winnings" = "Possible winnings";
+"bet_status_stake" = "Gambled";
+
+/// Bet history
+
+"bet_history_current_title" = "Current";
+"bet_history_title" = "History";
+
+/// Bet confirmation
+
+"bet_confirmation_text" = "This bet has now ended. You may now distribute the winnings by selecting the right answer.";
+"bet_confirmation_choose_response" = "Please select the final answer :";
+
+/// Ranking
+
+"ranking_title" = "Ranking";
+
+/// Friends
+
+"friends_title" = "Friends";
+"friends_request_sent" = "Request sent";
+"friends_request"= "Friends Request";
+
+/// Daily reward
+
+"daily_reward_title" = "Daily reward";
+"daily_reward_subtitle" = "Your daily reward is unlocked every day at 00:00 UTC and allows you to get between 10 and 150 Allcoins.";
+
+/// Notification
+
+"notification_title_end_bet_date" = "Who will be the winners?";
+"notification_subtitle_end_bet_date %@" = "The %@ bet has reached its deadline. Go to the app to enter the winning answer.";
+
+/// Empty Views
+
+"empty_ranking_title" = "It's a bit empty around here";
+"empty_ranking_explain" = "Add some friends to display them in the leaderboard";
+"empty_bets_title"= "No bet matches your search";
+"empty_friends_title" = "You don't have any friends yet";
+"empty_friends_explain" = "Add them from this screen";
+
+/// Error Messages
+
+"error_title" = "Error: Failed to Load Content.";
+"error_message" = "The content you are trying to load could not be retrieved. Please check your internet connection and try again";

Sources/AllInApp/AllIn/Ressources/fr.lproj/Localizable.strings

@@ -0,0 +1,194 @@
+/* 
+  Localizable.strings
+  AllInApp
+
+  Created by Emre on 15/05/2024.
+  
+*/
+
+/// Core
+
+"generic_username" = "Pseudo";
+"generic_email" = "Email";
+"generic_password" = "Mot de passe";
+"generic_login" = "Se connecter";
+"generic_logout" = "Déconnexion";
+"generic_already_have_account" = "Tu as déjà un compte ?";
+"generic_register" = "S'inscrire";
+"generic_validate" = "Valider";
+"generic_ok" = "OK";
+"generic_error" = "Erreur";
+"generic_in_waiting" = "En attente";
+"generic_search" = "Rechercher";
+"generic_add" = "Ajouter";
+"generic_acccept"="Accepter";
+"generic_decline"="Decliner";
+"generic_delete" = "Supprimer";
+"generic_stake" = "Mise";
+"network_error_text" = "Assurez-vous d\'être bien connecté au réseau puis réessayez.";
+
+/// Bet type
+
+"bet_type_binary" = "Oui / Non";
+"bet_type_match" = "Match sportif";
+"bet_type_custom" = "Réponses personnalisées";
+
+/// Field error
+
+"field_error_mandatory" = "Ce champ est obligatoire.";
+"field_error_not_identical" = "Les champs ne sont pas identiques.";
+"field_error_bad_email" = "Veuillez saisir un email valide.";
+
+/// Drawer
+
+"drawer_bets" = "Bets";
+"drawer_best_win" = "Meilleur gain";
+"drawer_nb_friends" = "Amis";
+"drawer_friends" = "AMIS";
+"drawer_friends_subtitle" = "Défiez vos proches en les ajoutant en amis.";
+"drawer_public_bets" = "PARTICIPER";
+"drawer_public_bets_subtitle" = "Parcourez les bets les plus populaires du moment.";
+"drawer_create_a_bet" = "NOUVEAU BET";
+"drawer_create_a_bet_subtitle" = "Créez un nouveau bet et faites participer vos amis.";
+"drawer_bet_history" = "HISTORIQUE";
+"drawer_bet_history_subtitle" = "Consultez vos paris en cours et terminés.";
+"drawer_current_bets" = "MES PARTICIPATIONS";
+"drawer_current_bets_subtitle" = "Gérez vos bets et récompensez les gagnants.";
+"drawer_ranking" = "CLASSEMENT";
+"drawer_ranking_subtitle" = "Consultez votre classement parmis vos amis.";
+
+/// Welcome Page
+
+"welcome_title" = "Bienvenue sur,";
+"welcome_subtitle" = "Récupère tes Allcoins et viens parier avec tes amis pour prouver qui est le meilleur.";
+"welcome_join" = "Rejoindre";
+
+/// Register Page
+
+"register_hello" = "Bonjour";
+"register_hello %@" = "Bonjour %@,";
+"register_title" = "On a besoins de ça!";
+"register_subtitle" = "Promis c\'est rapide.";
+"register_error_title" = "Erreur lors de l'enregistrement";
+"register_error_content" = "L'enregistrement a échoué. Veuillez réessayer.";
+"register_confirm_password" = "Confirmation du mot de passe";
+"register_already_used" = "Email ou pseudo déjà utilisé.";
+
+/// Login Page
+
+"login_title" = "Te revoilà !";
+"login_subtitle" = "Bon retour parmis nous tu nous as manqué !";
+"login_error_title" = "Erreur de connexion";
+"login_error_content" = "La connexion a échoué. Veuillez réessayer.";
+"login_no_account" = "Pas encore inscrit ?";
+"login_forgot_password" = "Mot de passe oublié ?";
+"login_bad_credentials" = "Login ou mot de passe incorrects.";
+
+/// Bet Creation Page
+
+"bet_creation_theme_tooltip" = "Généralement un nom commun décrivant le thème global du pari pour servir de référence.";
+"bet_creation_phrase_tooltip" = "Généralement la question à laquelle les participants devront répondre.";
+"bet_creation_register_tooltip" = "Après cette date, plus personne ne pourra s\'inscrire.";
+"bet_creation_bet_end_tooltip" = "Après cette date, les résultats seront annoncés.";
+"bet_creation_privacy_tooltip" = "Détermine qui pourra voir le bet.";
+"bet_creation_question" = "Question";
+"bet_creation_answer" = "Réponse";
+"bet_creation_publish" = "Publier le bet";
+"bet_creation_theme" = "Thème";
+"bet_creation_theme_placeholder" = "Études, sport, soirée…";
+"bet_creation_bet_phrase" = "Phrase du BET";
+"bet_creation_bet_phrase_placeholder" = "David sera-il absent lundi matin en cours ?";
+"bet_creation_end_registration_date" = "Date de fin des inscriptions";
+"bet_creation_end_bet_date" = "Date de fin du BET";
+"bet_creation_bet_privacy" = "Confidentialité du bet";
+"bet_creation_friends_available_format" = "amis disponibles";
+"bet_creation_public_bottom_text_1" = "Votre BET sera visible par tous les utilisateurs.";
+"bet_creation_public_bottom_text_2" = "Tout le monde pourra rejoindre le BET.";
+"bet_creation_private_bottom_text_1" = "Votre BET sera visible uniquement par vos amis.";
+"bet_creation_private_bottom_text_2" = "Seulement vos amis pourront rejoindre le BET.";
+"bet_creation_bottom_text_3" = "Vous pourrez inviter des amis à tout moment pendant la période d’inscription.";
+"bet_creation_yes_no_bottom_text_1" = "Les utilisateurs devront répondre au pari avec OUI ou NON.";
+"bet_creation_yes_no_bottom_text_2" = "Aucune autre réponse ne sera acceptée.";
+"bet_creation_custom_bottom_text_1" = "Vous allez renseigner les différentes réponses disponibles dans ce pari.";
+"bet_creation_custom_bottom_text_2" = "Faites attention a etre claire et éviter toutes incertitudes";
+"bet_creation_error" = "Erreur lors de la création du bet.";
+"bet_creation_success_message" = "Bet créé !";
+"bet_creation_response_title" = "Intitulé de réponse";
+"bet_creation_max_answers %lld" = "encore %lld max.";
+"bet_creation_error_past_date" = "La date de fin des inscriptions doit être ultérieure à la date actuelle.";
+"bet_creation_error_date_order" = "La date de fin des paris doit être ultérieure à la date de fin des inscriptions.";
+
+/// Bet page
+
+"bet_popular" = "Populaire";
+"bet_public" = "Public";
+"bet_private" = "Privé";
+"bet_invitation" = "Invitation";
+"bet_current" = "En cours";
+"bet_finished" = "Terminés";
+"bet_starting" = "Commence le";
+"bet_started" = "A commencé le";
+"bet_ends" = "Prend fin le";
+"bet_ended" = "A pris fin le";
+"bet_participate" = "Participer";
+"bet_proposed_by_format %@" = "Proposé par %@";
+"bet_proposed_by_format" = "Proposé par";
+"bet_players_waiting_format %@" = "%@ joueurs en attente";
+"bet_players_format" = "joueurs";
+"bet_points_at_stake_format" = "points en jeu";
+
+/// Bet status
+
+"bet_status_finished" = "Terminé !";
+"bet_status_in_progress" = "En cours…";
+"bet_status_waiting" = "En attente…";
+"bet_status_unavailable" = "Statut indisponible";
+"bet_status_cancelled" = "Annulé";
+"bet_status_place_your_bets" = "Faites vos paris";
+"bet_status_participants_list" = "Liste des participants";
+"bet_status_details_drawer" = "Détails";
+"participation_possible_winnings" = "Gains possibles";
+"bet_status_stake" = "Pariés";
+
+/// Bet history
+
+"bet_history_current_title" = "En cours";
+"bet_history_title" = "Historique";
+
+/// Bet confirmation
+
+"bet_confirmation_text" = "Ce bet est arrivé à la date de fin. Vous devez à présent distribuer les gains en validant le pari gagnant.";
+"bet_confirmation_choose_response" = "Veuillez choisir la réponse finale :";
+
+/// Ranking
+
+"ranking_title" = "Classement";
+
+/// Friends
+
+"friends_title" = "Amis";
+"friends_request_sent" = "Requête envoyée";
+"friends_request"= "Requêtes d'amis";
+
+/// Daily reward
+
+"daily_reward_title" = "Récompense quotidienne";
+"daily_reward_subtitle" = "Votre récompense quotidienne est débloquée tous les jours à 00:00 UTC et vous permets d’obtenir entre 10 et 150 Allcoins.";
+
+/// Notification
+
+"notification_title_end_bet_date" = "Qui seront les vainqueurs ?";
+"notification_subtitle_end_bet_date %@" = "Le pari %@ a atteint sa date limite. Rendez-vous dans l'application pour renseigner la réponse gagnante.";
+
+/// Empty Views
+
+"empty_ranking_title" = "C’est un peu vide par ici";
+"empty_ranking_explain" = "Ajoutez des amis pour les afficher dans le classement";
+"empty_bets_title"= "Aucun Bet ne correspond à votre recherche";
+"empty_friends_title" = "Vous n’avez pas encore d’amis";
+"empty_friends_explain" = "Ajoutez les depuis cet écran";
+
+/// Error Messages
+
+"error_title" = "Erreur : Échec du chargement du contenu.";
+"error_message" = "Le contenu que vous essayez de charger n'a pas pu être récupéré. Veuillez vérifier votre connexion internet et réessayer.";

Sources/AllInApp/AllIn/Services/AuthService.swift

@@ -7,14 +7,14 @@
 
 import Foundation
 import Model
-import ViewModel
 import DependencyInjection
 import Api
 import StubLib
+import WidgetKit
 
 class AuthService: IAuthService {
     
-    public func login(login: String, password: String, completion : @escaping (Int)-> ()) {
+    public func login(login: String, password: String, completion: @escaping (Int) -> ()) {
         
         let url = URL(string: Config.allInApi + "users/login")!
         var request = URLRequest(url: url)
@@ -26,33 +26,37 @@ class AuthService: IAuthService {
             "password": password,
         ]
         
-        if let jsonData = try? JSONSerialization.data(withJSONObject: json, options: []){
+        if let jsonData = try? JSONSerialization.data(withJSONObject: json, options: []) {
             URLSession.shared.uploadTask(with: request, from: jsonData) { data, response, error in
-                print ("ALLIN : Process LOGIN")
+                print("ALLIN: Process LOGIN")
                 if let httpResponse = response as? HTTPURLResponse {
                     if httpResponse.statusCode == 200 {
                         if let data = data,
                            let json = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
                            let token = json["token"] as? String {
-                            AppStateContainer.shared.authenticationRefresh = token;
+                            AppStateContainer.shared.authenticationRefresh = token
                             self.initializeUser(withToken: token) { status in
+                                print(status)
                                 if status != 200 {
                                     completion(status)
-                                    AppStateContainer.shared.authenticationRefresh = nil;
+                                    AppStateContainer.shared.authenticationRefresh = nil
                                 } else {
                                     self.initManagerVM(token: token)
+                                    completion(httpResponse.statusCode)
                                 }
                             }
                         }
+                    } else {
+                        completion(httpResponse.statusCode)
                     }
-                    completion(httpResponse.statusCode)
                 }
             }.resume()
         }
     }
     
+    
     func register(username: String, email: String, password: String, completion : @escaping (Int)-> ()) {
-        let url = URL(string: Config.allInApi + "/users/register")!
+        let url = URL(string: Config.allInApi + "users/register")!
         var request = URLRequest(url: url)
         request.httpMethod = "POST"
         request.setValue("application/json", forHTTPHeaderField: "Content-Type")
@@ -60,14 +64,14 @@ class AuthService: IAuthService {
         let json = [
             "email": email.lowercased(),
             "username": username.lowercased(),
-            "password": password,
+            "password": password
-            "nbCoins": "0"
         ]
         
         if let jsonData = try? JSONSerialization.data(withJSONObject: json, options: []){
             URLSession.shared.uploadTask(with: request, from: jsonData) { data, response, error in
                 print ("ALLIN : Process REGISTER")
                 if let httpResponse = response as? HTTPURLResponse {
+                    print(httpResponse.statusCode)
                     if httpResponse.statusCode == 201 {
                         if let data = data,
                            let json = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
@@ -79,11 +83,13 @@ class AuthService: IAuthService {
                                     AppStateContainer.shared.authenticationRefresh = nil;
                                 } else {
                                     self.initManagerVM(token: token)
+                                    completion(httpResponse.statusCode)
                                 }
                             }
                         }
+                    } else {
+                        completion(httpResponse.statusCode)
                     }
-                    completion(httpResponse.statusCode)
                 }
             }.resume()
         }
@@ -94,7 +100,7 @@ class AuthService: IAuthService {
         guard let token = AppStateContainer.shared.authenticationRefresh else {
             return
         }
-                
+        
         let url = URL(string: Config.allInApi + "users/token")!
         var request = URLRequest(url: url)
         request.httpMethod = "GET"
@@ -104,13 +110,11 @@ class AuthService: IAuthService {
         URLSession.shared.dataTask(with: request) { data, response, error in
             if let data = data,
                let httpResponse = response as? HTTPURLResponse {
-                if httpResponse.statusCode == 200 {
+                if httpResponse.statusCode == 200, let user = try? JSONDecoder().decode(User.self, from: data) {
-                    if let userJson = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+                    AppStateContainer.shared.user = user
-                       let user = User.mapUser(from: userJson) {
+                    AppStateContainer.shared.loggedState.connectedUser = true
-                        AppStateContainer.shared.user = user
+                    WidgetCenter.shared.reloadAllTimelines()
-                        AppStateContainer.shared.loggedState.connectedUser = true
+                    self.initManagerVM(token: token)
-                        self.initManagerVM(token: token)
-                    }
                 } else {
                     AppStateContainer.shared.authenticationRefresh = nil
                 }
@@ -119,8 +123,10 @@ class AuthService: IAuthService {
     }
     
     private func initializeUser(withToken token: String, completion: @escaping (Int) -> ()) {
+        
         let url = URL(string: Config.allInApi + "users/token")!
         var request = URLRequest(url: url)
+        
         request.httpMethod = "GET"
         request.setValue("application/json", forHTTPHeaderField: "Content-Type")
         request.setValue("Bearer \(token)", forHTTPHeaderField: "Authorization")
@@ -128,12 +134,10 @@ class AuthService: IAuthService {
         URLSession.shared.dataTask(with: request) { data, response, error in
             if let data = data,
                let httpResponse = response as? HTTPURLResponse {
-                if httpResponse.statusCode == 200 {
+                if httpResponse.statusCode == 200, let user = try? JSONDecoder().decode(User.self, from: data) {
-                    if let userJson = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+                    AppStateContainer.shared.user = user
-                       let user = User.mapUser(from: userJson) {
+                    WidgetCenter.shared.reloadAllTimelines()
-                        completion(httpResponse.statusCode)
+                    completion(httpResponse.statusCode)
-                        AppStateContainer.shared.user = user
-                    }
                 } else {
                     completion(httpResponse.statusCode)
                 }
@@ -144,7 +148,14 @@ class AuthService: IAuthService {
     }
     
     private func initManagerVM(token: String) {
-        DependencyInjection.shared.addSingleton(ManagerVM.self, ManagerVM(withModel: Manager(withBetDataManager: BetStubManager(), withUserDataManager: UserApiManager(withUserToken: token))))
+        DependencyInjection.shared.addSingleton(Manager.self, Manager(withBetDataManager: BetApiManager(withUserToken: token, andApiUrl: Config.allInApi), withUserDataManager: UserApiManager(withUserToken: token, andApiUrl: Config.allInApi)))
+    }
+    
+    public func logout() {
+        AppStateContainer.shared.authenticationRefresh = nil
+        AppStateContainer.shared.loggedState.connectedUser = false
+        AppStateContainer.shared.notificationState.removeAllNotifications()
+        WidgetCenter.shared.reloadAllTimelines()
     }
     
 }

Sources/AllInApp/AllIn/Services/NotificationService.swift

@@ -0,0 +1,50 @@
+//
+//  NotificationService.swift
+//  AllIn
+//
+//  Created by Emre on 22/02/2024.
+//
+
+import UserNotifications
+
+struct NotificationItem {
+    var title: String
+    var content: String
+    var interval: TimeInterval
+}
+
+class NotificationService: ObservableObject {
+    
+    @Published var notifications: [NotificationItem] = []
+    
+    func scheduleNotifications() {
+        UNUserNotificationCenter.current().requestAuthorization(options: [.alert, .sound, .badge]) { granted, error in
+            if granted {
+                print("Permission for notifications granted.")
+            } else {
+                print("Permission for notifications denied.")
+            }
+        }
+    }
+    
+    func loadNotifications() {
+        for notification in notifications {
+            scheduleNotification(with: notification)
+        }
+    }
+    
+    func removeAllNotifications() {
+        UNUserNotificationCenter.current().removeAllPendingNotificationRequests()
+    }
+    
+    func scheduleNotification(with item: NotificationItem) {
+        let content = UNMutableNotificationContent()
+        content.title = item.title
+        content.body = item.content
+        
+        let trigger = UNTimeIntervalNotificationTrigger(timeInterval: item.interval, repeats: false)
+        let request = UNNotificationRequest(identifier: UUID().uuidString, content: content, trigger: trigger)
+        
+        UNUserNotificationCenter.current().add(request)
+    }
+}

Sources/AllInApp/AllIn/Services/Protocols/IAuthService.swift

@@ -11,4 +11,5 @@ protocol IAuthService {
     func login(login: String, password: String, completion : @escaping (Int)-> ())
     func register(username: String, email: String, password: String, completion : @escaping (Int)-> ())
     func refreshAuthentication()
+    func logout()
 }

Sources/AllInApp/AllIn/Utils/asyncCachedImage.swift

@@ -0,0 +1,71 @@
+//
+//  asyncCachedImage.swift
+//  AllIn
+//
+//  Created by Lucas Delanier on 06/06/2024.
+//
+
+import SwiftUI
+
+@MainActor
+struct AsyncCachedImage<ImageView: View, PlaceholderView: View>: View {
+    // Input dependencies
+    var url: URL?
+    @ViewBuilder var content: (Image) -> ImageView
+    @ViewBuilder var placeholder: () -> PlaceholderView
+    
+    // Downloaded image
+    @State var image: UIImage? = nil
+    
+    init(
+        url: URL?,
+        @ViewBuilder content: @escaping (Image) -> ImageView,
+        @ViewBuilder placeholder: @escaping () -> PlaceholderView
+    ) {
+        self.url = url
+        self.content = content
+        self.placeholder = placeholder
+    }
+    
+    var body: some View {
+        VStack {
+            if let uiImage = image {
+                content(Image(uiImage: uiImage))
+            } else {
+                placeholder()
+                    .onAppear {
+                        Task {
+                            image = await downloadPhoto()
+                        }
+                    }
+            }
+        }
+    }
+    
+    // Downloads if the image is not cached already
+    // Otherwise returns from the cache
+    private func downloadPhoto() async -> UIImage? {
+        do {
+            guard let url else { return nil }
+            
+            // Check if the image is cached already
+            if let cachedResponse = URLCache.shared.cachedResponse(for: .init(url: url)) {
+                return UIImage(data: cachedResponse.data)
+            } else {
+                let (data, response) = try await URLSession.shared.data(from: url)
+                
+                // Save returned image data into the cache
+                URLCache.shared.storeCachedResponse(.init(response: response, data: data), for: .init(url: url))
+                
+                guard let image = UIImage(data: data) else {
+                    return nil
+                }
+                
+                return image
+            }
+        } catch {
+            print("Error downloading: \(error)")
+            return nil
+        }
+    }
+}

Sources/AllInApp/AllIn/ViewModels/BetEndingValidationViewModel.swift

@@ -0,0 +1,27 @@
+//
+//  BetEndingValidationViewModel.swift
+//  AllIn
+//
+//  Created by Emre on 07/02/2024.
+//
+
+import Foundation
+import DependencyInjection
+import Model
+
+class BetEndingValidationViewModel: ObservableObject {
+    
+    var id: String
+    @Inject var manager: Manager
+    @Published var selectedAnswer : String?
+
+    init(id: String) {
+        self.id = id
+    }
+    
+    func post() {
+        if let answer = selectedAnswer {
+            manager.addResponse(withIdBet: id, andResponse: answer)
+        }
+    }
+}

Sources/AllInApp/AllIn/ViewModels/BetViewModel.swift

@@ -7,29 +7,68 @@
 
 import Foundation
 import DependencyInjection
-import ViewModel
+import Model
+import Combine
 
 class BetViewModel: ObservableObject {
     
-    @Inject var manager: ManagerVM
+    @Inject var manager: Manager
-    
+    @Inject var authService: IAuthService
+    @Published var popularBet: Bet?
+    @Published private(set) var bets: [Bet] = []
+    @Published var betsOver: [BetDetail] = []
+    @Published var betsWon: [BetResultDetail] = []
+    @Published var showingSheetOver: Bool  = false
+    @Published var showingSheetWon: Bool  = false
+    @Published var filters: Set<BetFilter> = [] {
+        didSet {
+            getItems()
+        }
+    }
+        
     init() {
         getItems()
+        getPopularBet()
+        getBetsOver()
+        getBetsWon()
     }
     
     func getItems() {
-        
+        manager.getBets(withIndex: 0, withCount: 20, filters: Array(filters)) { bets in
+            DispatchQueue.main.async {
+                self.bets = bets
+            }
+        }
     }
     
-    func deleteItem(indexSet: IndexSet) {
+    func getBetsOver() {
-        
+        manager.getBetsOver() { bets in
+            DispatchQueue.main.async {
+                self.betsOver = bets
+                if !self.betsOver.isEmpty {
+                    self.showingSheetOver = true
+                }
+            }
+        }
     }
     
-    func moveltem(from: IndexSet, to: Int) {
+    func getBetsWon() {
-        
+        manager.getBetsWon() { bets in
+            DispatchQueue.main.async {
+                self.betsWon = bets
+                if !self.betsWon.isEmpty {
+                    self.showingSheetWon = true
+                    self.authService.refreshAuthentication()
+                }
+            }
+        }
     }
     
-    func addItem(title: String) {
+    func getPopularBet() {
-        
+        manager.getPopularBet() { bet in
+            DispatchQueue.main.async {
+                self.popularBet = bet
+            }
+        }
     }
 }

Sources/AllInApp/AllIn/ViewModels/CreationBetViewModel.swift

@@ -8,71 +8,134 @@
 import Foundation
 import SwiftUI
 import DependencyInjection
-import ViewModel
+import Model
 
 class CreationBetViewModel: ObservableObject {
     
-    @Inject var manager: ManagerVM
+    @Inject var manager: Manager
     @Published var theme: String = ""
     @Published var description: String = ""
-    @Published var isPublic = true
+    @Published var isPrivate = false {
+        didSet {
+            invited.removeAll()
+        }
+    }
     @Published var endRegisterDate = Date()
     @Published var endBetDate = Date()
     @Published var betAdded = false
+    @Published var selectedTypeBet = 0 {
+        didSet {
+            values.removeAll()
+            groupedItems.removeAll()
+            response = ""
+        }
+    }
+    @Published var values: [String] = []
+    @Published var invited: Set<String> = []
     
     @Published var themeFieldError: String?
     @Published var descriptionFieldError: String?
     @Published var endRegisterDateFieldError: String?
     @Published var endBetDateFieldError: String?
+    @Published var responsesFieldError: String?
+    
+    @Published var errorMessage: String?
+    @Published var showErrorMessage = false
+    
+    @Published var friends: [User] = []
+    
+    let options: [(Int, String, String)] = [
+        (0, "questionMarkIcon", String(localized: "bet_type_binary")),
+        (1, "footballIcon", String(localized: "bet_type_match")),
+        (2, "paintbrushIcon", String(localized: "bet_type_custom"))
+    ]
+    
+    @Published var response = ""
+    @Published var groupedItems: [[String]] = [[String]] ()
+    
+    init() {
+        getFriends()
+    }
+    
+    func getFriends() {
+        manager.getFriends() { friends in
+            DispatchQueue.main.async {
+                self.friends = friends
+            }
+        }
+    }
     
     func create() {
         
-        guard checkAndSetError(forTheme: true, forDescription: true, forEndRegisterDate: true, forEndBetDate: true) else {
+        guard checkAndSetError(forTheme: true, forDescription: true, forEndRegisterDate: true, forEndBetDate: true, forResponse: true) else {
             return
         }
         
         resetAllFieldErrors()
         
         if let user = AppStateContainer.shared.user {
-            manager.addBet(theme: theme, description: description, endRegister: endRegisterDate, endBet: endBetDate, isPublic: isPublic, creator: user)
+            manager.addBet(bet: toBet(theme: theme, description: description, endRegister: endRegisterDate, endBet: endBetDate, isPrivate: isPrivate, status: .inProgress, creator: user.username, invited: Array(invited), type: selectedTypeBet)) { statusCode in
+                print(statusCode)
+                switch statusCode {
+                case 201:
+                    self.betAdded = true
+                    let notificationItem = NotificationItem(title: String(localized: "notification_title_end_bet_date"), content: String(localized: "notification_subtitle_end_bet_date \(self.theme)"), interval: self.endBetDate.timeIntervalSinceNow)
+                    
+                    AppStateContainer.shared.notificationState.scheduleNotification(with: notificationItem)
+                default:
+                    self.setErrorMessage(errorMessage: String(localized: "network_error_text"))
+                }
+            }
         }
-        
-        betAdded = true
     }
     
-    func checkAndSetError(forTheme checkTheme: Bool, forDescription checkDescription: Bool, forEndRegisterDate checkEndRegisterDate: Bool, forEndBetDate checkEndBetDate: Bool) -> Bool {
+    func checkAndSetError(forTheme checkTheme: Bool, forDescription checkDescription: Bool, forEndRegisterDate checkEndRegisterDate: Bool, forEndBetDate checkEndBetDate: Bool, forResponse checkResponse: Bool) -> Bool {
         
         var newThemeFieldError: String?
         var newDescriptionFieldError: String?
         var newEndRegisterDateFieldError: String?
         var newEndBetDateFieldError: String?
+        var newResponsesFieldError: String?
         
         var hasError = false
         
         // Theme
         if checkTheme, theme.isEmpty {
-            newThemeFieldError = "Veuillez saisir le thème."
+            newThemeFieldError = String(localized: "field_error_mandatory")
             hasError = true
         }
         
         // Description
         if checkDescription, description.isEmpty {
-            newDescriptionFieldError = "Veuillez saisir la description."
+            newDescriptionFieldError = String(localized: "field_error_mandatory")
             hasError = true
         }
         
         // End Register Date
         if checkEndRegisterDate, endRegisterDate < Date() {
-            newEndRegisterDateFieldError = "La date de fin des inscriptions doit être ultérieure à la date actuelle."
+            newEndRegisterDateFieldError = String(localized: "bet_creation_error_past_date")
             hasError = true
         }
         
         // End Bet Date
         if checkEndBetDate, endBetDate < endRegisterDate {
-            newEndBetDateFieldError = "La date de fin des paris doit être ultérieure à la date de fin des inscriptions."
+            newEndBetDateFieldError = String(localized: "bet_creation_error_date_order")
             hasError = true
         }
         
+        if checkResponse, selectedTypeBet == 2 {
+            if values.count < 2 {
+                newResponsesFieldError = "Il doit y'avoir 2 réponses minimum"
+                hasError = true
+            } else {
+                let uniqueValues = Set(values)
+                if uniqueValues.count != values.count {
+                    newResponsesFieldError = "Les réponses doivent être uniques"
+                    hasError = true
+                }
+            }
+        }
+        
         if !hasError {
             // No error
             return true
@@ -83,6 +146,7 @@ class CreationBetViewModel: ObservableObject {
             descriptionFieldError = newDescriptionFieldError
             endRegisterDateFieldError = newEndRegisterDateFieldError
             endBetDateFieldError = newEndBetDateFieldError
+            responsesFieldError = newResponsesFieldError
         }
         return false
     }
@@ -93,6 +157,29 @@ class CreationBetViewModel: ObservableObject {
             descriptionFieldError = nil
             endRegisterDateFieldError = nil
             endBetDateFieldError = nil
+            responsesFieldError = nil
+        }
+    }
+    
+    func setErrorMessage(errorMessage: String) {
+        self.showErrorMessage = true
+        self.errorMessage = errorMessage
+    }
+    
+    func toBet(theme: String, description: String, endRegister: Date, endBet: Date, isPrivate: Bool, status: BetStatus, creator: String, invited: [String], type: Int) -> Bet {
+        switch type {
+        case 0:
+            return BinaryBet(theme: theme, phrase: description, endRegisterDate: endRegister, endBetDate: endBet, isPrivate: isPrivate, status: status, invited: invited, author: creator)
+        case 1:
+            return MatchBet(theme: theme, phrase: description, endRegisterDate: endRegister, endBetDate: endBet, isPrivate: isPrivate, status: status, invited: invited, author: creator, nameTeam1: "", nameTeam2: "")
+        case 2:
+            var bet = CustomBet(theme: theme, phrase: description, endRegisterDate: endRegister, endBetDate: endBet, isPrivate: isPrivate, status: status, invited: invited, author: creator)
+            for answer in values {
+                bet.addCustomResponse(answer)
+            }
+            return bet
+        default:
+            return BinaryBet(theme: theme, phrase: description, endRegisterDate: endRegister, endBetDate: endBet, isPrivate: isPrivate, status: status, invited: invited, author: creator)
         }
     }
 }

Sources/AllInApp/AllIn/ViewModels/CurrentBetViewModel.swift

@@ -0,0 +1,30 @@
+//
+//  CurrentBetViewModel.swift
+//  AllIn
+//
+//  Created by Emre on 31/01/2024.
+//
+
+import Foundation
+import DependencyInjection
+import Model
+
+class CurrentBetViewModel: ObservableObject {
+    
+    @Inject var manager: Manager
+
+    @Published private(set) var bets: [BetDetail] = []
+
+    init() {
+        getItems()
+    }
+    
+    func getItems() {
+        manager.getCurrentBets(withIndex: 0, withCount: 20) { bets in
+            DispatchQueue.main.async {
+                self.bets = bets
+            }
+        }
+    }
+    
+}

Sources/AllInApp/AllIn/ViewModels/DetailsViewModel.swift

@@ -0,0 +1,77 @@
+//
+//  DetailsViewModel.swift
+//  AllIn
+//
+//  Created by Emre on 16/01/2024.
+//
+
+import Foundation
+import SwiftUI
+import DependencyInjection
+import Model
+import WidgetKit
+
+class DetailsViewModel: ObservableObject {
+    
+    @Inject var manager: Manager
+    var id: String
+    @Published var selectedAnswer = AnswerDetail(response: "", totalStakes: 0, totalParticipants: 0, highestStake: 0, odds: 0)
+    @Published var mise: String = ""
+    
+    @Published var betDetail: BetDetail?
+    
+    init(id: String) {
+        self.id = id
+        getItem(withId: id)
+    }
+    
+    func getItem(withId id: String) {
+        let semaphore = DispatchSemaphore(value: 0)
+        manager.getBet(withId: id) { bet in
+                self.betDetail = bet
+                if let firstAnswer = bet.answers.first {
+                    self.selectedAnswer = firstAnswer
+                }
+                semaphore.signal()
+        }
+        
+        let result = semaphore.wait(timeout: DispatchTime.now() + .seconds(2))
+            
+        if result == .timedOut {
+            print("The request has exceeded the deadline")
+            return
+        }
+    }
+    
+    func addParticipate() {
+        if let stake = Int(mise) {
+            manager.addParticipation(withId: id, withAnswer: selectedAnswer.response, andStake: stake) { statusCode in
+                switch statusCode {
+                case 201:
+                    AppStateContainer.shared.user?.nbCoins -= stake
+                    WidgetCenter.shared.reloadAllTimelines()
+                    
+                    self.getItem(withId: self.id)
+                default:
+                    break
+                }
+            }
+        }
+        mise = ""
+        if let firstAnswer = betDetail!.answers.first {
+            self.selectedAnswer = firstAnswer
+        }
+    }
+    
+    func checkAndSetError() -> Bool {
+        if let stake = Int(mise) {
+            if stake <= AppStateContainer.shared.user?.nbCoins ?? 0 && stake > 0 {
+                return false
+            } else {
+                return true
+            }
+        } else {
+            return true
+        }
+    }
+}

Sources/AllInApp/AllIn/ViewModels/FriendsViewModel.swift

@@ -7,29 +7,107 @@
 
 import Foundation
 import DependencyInjection
-import ViewModel
+import Model
 
 class FriendsViewModel: ObservableObject {
     
-    @Inject var manager: ManagerVM
+    @Inject var manager: Manager
+    
+    @Published private(set) var users: [User] = []
+    @Published private(set) var requests: [User] = []
+    @Published var text: String = "" {
+        didSet {
+            if text.isEmpty {
+                getItems()
+            } else {
+                search()
+            }
+        }
+    }
     
     init() {
         getItems()
+        getRequests()
     }
     
-    func getItems ( ) {
+    func getItems() {
-       
+        manager.getFriends() { friends in
+            DispatchQueue.main.async {
+                self.users = friends
+            }
+        }
     }
     
-    func deleteItem(indexSet: IndexSet) {
+    func getRequests() {
-
+        manager.getRequests() { friends in
+            DispatchQueue.main.async {
+                self.requests = friends
+            }
+        }
+    }
+    
+    func search() {
+        guard text.allSatisfy({ $0.isLetter || $0.isNumber }) else {
+            return
+        }
+        
+        manager.getUsers(withName: text) { users in
+            self.users = users
+        }
     }
     
-    func moveltem(from: IndexSet, to: Int) {
+    func toggleFriendStatus(for user: User, isRequest: Bool) {
+        let targetList = isRequest ? requests : users
         
+        guard let index = targetList.firstIndex(where: { $0.username == user.username }) else { return }
+        var updatedUser = targetList[index]
+        
+        if isRequest {
+            if updatedUser.friendStatus == .requested {
+                updatedUser.friendStatus = .notFriend
+                deleteItem(username: user.username)
+            } else {
+                updatedUser.friendStatus = .friend
+                addItem(username: user.username)
+            }
+            requests.remove(at: index)
+        } else {
+            switch updatedUser.friendStatus {
+            case .friend:
+                updatedUser.friendStatus = .notFriend
+                deleteItem(username: user.username)
+            case .notFriend:
+                updatedUser.friendStatus = .requested
+                addItem(username: user.username)
+            case .requested:
+                updatedUser.friendStatus = .notFriend
+                deleteItem(username: user.username)
+            default:
+                break
+            }
+            users[index] = updatedUser
+        }
     }
     
-    func addItem(title: String) {
+    func declineRequest(username: String){
+        guard let index = requests.firstIndex(where: { $0.username == username }) else { return }
+        manager.removeFriend(withUsername: username) { statusCode in
+            
+        }
+        requests.remove(at: index)
+    }
+
 
+    
+    func deleteItem(username: String) {
+        manager.removeFriend(withUsername: username) { statusCode in
+            
+        }
+    }
+    
+    func addItem(username: String) {
+        manager.addFriend(withUsername: username) { statusCode in
+            
+        }
     }
 }

Sources/AllInApp/AllIn/ViewModels/HistoricBetViewModel.swift

@@ -0,0 +1,27 @@
+//
+//  HistoricBetViewModel.swift
+//  AllIn
+//
+//  Created by Emre on 16/01/2024.
+//
+
+import Foundation
+import DependencyInjection
+import Model
+
+class HistoricBetViewModel: ObservableObject {
+    
+    @Inject var manager: Manager
+
+    @Published private(set) var bets: [BetResultDetail] = []
+
+    init() {
+        getItems()
+    }
+    
+    func getItems() {
+        manager.getHistoricBets(withIndex: 0, withCount: 20) { bets in
+            self.bets = bets
+        }
+    }
+}

Sources/AllInApp/AllIn/ViewModels/LoginViewModel.swift

@@ -36,10 +36,10 @@ class LoginViewModel: ObservableObject {
                 self.onLoginSuccess()
             case 404:
                 AppStateContainer.shared.loggedState.connectedUser = false
-                self.setErrorMessage(errorMessage: "Login ou mot de passe incorrects.")
+                self.setErrorMessage(errorMessage: String(localized: "login_bad_credentials"))
             default:
                 AppStateContainer.shared.loggedState.connectedUser = false
-                self.setErrorMessage(errorMessage: "La connexion a échoué. Veuillez réessayer.")
+                self.setErrorMessage(errorMessage: String(localized: "login_error_content"))
             }
         }
     }
@@ -55,13 +55,13 @@ class LoginViewModel: ObservableObject {
         
         // Login
         if checkLogin, loginIdentifier.isEmpty {
-            newLoginIdentifierFieldError = "Veuillez saisir votre identifiant."
+            newLoginIdentifierFieldError = String(localized: "field_error_mandatory")
             hasError = true
         }
         
         // Password
         if checkPassword, loginPassword.isEmpty {
-            newLoginPasswordFieldError = "Veuillez saisir votre mot de passe."
+            newLoginPasswordFieldError = String(localized: "field_error_mandatory")
             hasError = true
         }