Merge pull request 'view/historic-page' (#10) from view/historic-page into master

Reviewed-on: #10

Sources/AllInApp/AllIn/Components/Menu.swift

@@ -70,7 +70,7 @@ struct Menu: View {
                     .padding([.leading,.trailing], 13)
             }
             
-            NavigationLink(destination: MainView(page: "Ranking").navigationBarBackButtonHidden(true))
+            NavigationLink(destination: MainView(page: "Historic").navigationBarBackButtonHidden(true))
             {
                 ParameterMenu(image: "eyesImage", title: "HISTORIQUE DES BETS", description: "Consultez vos paris en cours et terminés.")
                     .padding([.leading,.trailing], 13)

Sources/AllInApp/AllIn/Components/ReviewCard.swift

@@ -0,0 +1,71 @@
+//
+//  BetCard.swift
+//  AllIn
+//
+//  Created by Lucas on 24/09/2023.
+//
+
+import SwiftUI
+
+struct ReviewCard: View {
+    
+    var amountBetted: Int
+    var isAWin: Bool
+    var body: some View {
+        VStack(spacing: 0){
+            VStack(alignment: .leading,spacing: 2){
+                HStack{
+                    Spacer()
+                    Text("proposé par Lucas").font(.system(size: 10)).foregroundColor(AllInColors.grey800Color)
+                    
+                }
+                Text("Etudes").font(.system(size: 15)).foregroundColor(AllInColors.grey800Color)
+                Text("Emre va réussir son TP de CI/CD mercredi?").font(.system(size: 20)).fontWeight(.bold)
+                HStack{
+                    Text("Fini le").font(.system(size: 15)).foregroundColor(AllInColors.grey800Color)
+                    TextCapsule()
+                    TextCapsule()
+                    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()
+                    Text(amountBetted.description)
+                        .foregroundColor(AllInColors.whiteColor)
+                        .font(.system(size: 25))
+                        .fontWeight(.bold)
+                    Image("allcoinWhiteIcon")
+                        .resizable()
+                        .frame(width: 20, height: 20, alignment: .bottom)
+                    Text(isAWin ? "Gagnés!" : "Perdus!")
+                        .foregroundColor(AllInColors.whiteColor)
+                        .font(.system(size: 25))
+                        .fontWeight(.bold)
+                    Spacer()
+
+                }
+                .frame(width: .infinity)
+                .padding(.all,10)
+                
+                    
+                        
+                
+                
+            }
+            .frame(width: .infinity)
+            .padding(.all,2)
+            .background(
+                isAWin ?
+                AnyView(AllInColors.primaryGradient) :
+                AnyView(Color.black)
+            )            .cornerRadius(20, corners: [.bottomLeft,.bottomRight])
+            .border(width: 1, edges: [.top], color: AllInColors.delimiterGrey)
+        }
+    }
+}

Sources/AllInApp/AllIn/Views/HistoricBetView.swift

@@ -0,0 +1,37 @@
+//
+//  BetView.swift
+//  AllIn
+//
+//  Created by Lucas on 22/09/2023.
+//
+
+import SwiftUI
+
+struct HistoricBetView: View {
+    
+    @StateObject private var viewModel = BetViewModel()
+    @Binding var showMenu: Bool
+    @State private var showingSheet = false
+    
+    var body: some View {
+        
+        VStack(alignment: .center, spacing: 0) {
+            
+            TopBar(showMenu: self.$showMenu)
+            ScrollView(showsIndicators: false) {
+                Text("Historique")
+                    .textStyle(weight: .bold, color: AllInColors.grey500Color, size: 25)
+                    .padding([.top],15)
+                VStack(spacing: 20){
+                    ReviewCard(amountBetted: 110, isAWin: true)
+                    ReviewCard(amountBetted: 3, isAWin: false)
+                }
+                .padding([.trailing, .leading, .bottom],25)
+            }
+            Spacer()
+        }
+        .edgesIgnoringSafeArea(.bottom)
+        .background(AllInColors.backgroundColor)
+    }
+}
+

Sources/AllInApp/AllIn/Views/MainView.swift

@@ -37,16 +37,14 @@ struct MainView: View {
                     switch page {
                     case "Bet":
                         BetView(showMenu: self.$showMenu)
-                        
+                    case "Historic":
+                        HistoricBetView(showMenu: self.$showMenu)
                     case "Ranking":
                         RankingView(showMenu: self.$showMenu)
-                        
                     case "Friends":
                         FriendsView(showMenu: self.$showMenu)
-                        
                     case "CreationBet":
                         CreationBetView(showMenu: self.$showMenu)
-                        
                     default:
                         BetView(showMenu: self.$showMenu)
                     }

Sources/AllInApp/AllInApp.xcodeproj/project.pbxproj

@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		1244EF602B4EC31E00374ABF /* HistoricBetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1244EF5F2B4EC31E00374ABF /* HistoricBetView.swift */; };
+		1244EF622B4EC67000374ABF /* ReviewCard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1244EF612B4EC67000374ABF /* ReviewCard.swift */; };
 		EC0193782B25BF16005D81E6 /* AllcoinsCapsule.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC0193772B25BF16005D81E6 /* AllcoinsCapsule.swift */; };
 		EC01937A2B25C12B005D81E6 /* BetCard.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC0193792B25C12B005D81E6 /* BetCard.swift */; };
 		EC01937C2B25C2A8005D81E6 /* AllcoinsCounter.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC01937B2B25C2A8005D81E6 /* AllcoinsCounter.swift */; };
@@ -97,6 +99,8 @@
 		122278B72B4BDE1100E632AA /* DependencyInjection.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = DependencyInjection.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		122278B92B4BDE9500E632AA /* Package.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Package.swift; path = ../Model/Package.swift; sourceTree = "<group>"; };
 		122278BB2B4BDEC300E632AA /* Sources */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Sources; path = ../StubLib/Sources; sourceTree = "<group>"; };
+		1244EF5F2B4EC31E00374ABF /* HistoricBetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoricBetView.swift; sourceTree = "<group>"; };
+		1244EF612B4EC67000374ABF /* ReviewCard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReviewCard.swift; sourceTree = "<group>"; };
 		EC0193772B25BF16005D81E6 /* AllcoinsCapsule.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AllcoinsCapsule.swift; sourceTree = "<group>"; };
 		EC0193792B25C12B005D81E6 /* BetCard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BetCard.swift; sourceTree = "<group>"; };
 		EC01937B2B25C2A8005D81E6 /* AllcoinsCounter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AllcoinsCounter.swift; sourceTree = "<group>"; };
@@ -285,6 +289,7 @@
 				EC650A4B2B25E9C7003AFCAD /* RankingView.swift */,
 				EC650A512B2794DD003AFCAD /* BetView.swift */,
 				EC7A882C2B28D8A1004F226A /* CreationBetView.swift */,
+				1244EF5F2B4EC31E00374ABF /* HistoricBetView.swift */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -310,6 +315,7 @@
 				EC7A882E2B28E6BE004F226A /* ConfidentialityButton.swift */,
 				ECA9D1C82B2D9ADA0076E0EC /* UserInfo.swift */,
 				ECA9D1CA2B2DA2320076E0EC /* DropDownFriends.swift */,
+				1244EF612B4EC67000374ABF /* ReviewCard.swift */,
 			);
 			path = Components;
 			sourceTree = "<group>";
@@ -502,6 +508,7 @@
 				EC7A882B2B28D1E0004F226A /* DropDownMenu.swift in Sources */,
 				EC7A882D2B28D8A1004F226A /* CreationBetView.swift in Sources */,
 				EC6B96CF2B24B8D900FC1C58 /* Config.swift in Sources */,
+				1244EF602B4EC31E00374ABF /* HistoricBetView.swift in Sources */,
 				EC30770B2B24D9160060E34D /* WelcomeView.swift in Sources */,
 				EC30770D2B24DB7A0060E34D /* Extensions.swift in Sources */,
 				EC6B96D82B24BF2100FC1C58 /* Menu.swift in Sources */,
@@ -513,6 +520,7 @@
 				ECA9D1CB2B2DA2320076E0EC /* DropDownFriends.swift in Sources */,
 				ECB26A1B2B40746C00FE06B3 /* FriendsViewModel.swift in Sources */,
 				ECB7BC682B2F1ADF002A6654 /* LoginViewModel.swift in Sources */,
+				1244EF622B4EC67000374ABF /* ReviewCard.swift in Sources */,
 				EC6B96D52B24BE0E00FC1C58 /* MainView.swift in Sources */,
 				EC650A562B279D68003AFCAD /* WinModal.swift in Sources */,
 				EC6B96D12B24BAE800FC1C58 /* AuthService.swift in Sources */,