import réussi

# Conflicts:
#	R-Dash/screens/NewTrack.tsx

R-Dash/App.tsx

@@ -7,7 +7,7 @@ import LoginStack from './navigation/LoginStack';
 import Navigation from './navigation/Navigation';
 import ChangePassword from './screens/ChangePassword';
 import CreateTeam from './screens/CreateTeam';
-import InfoTeam from './screens/InfoTeam';
+import Team_Info from './screens/Team_Info';
 import Login from './screens/Login';
 import ManageAccount from './screens/ManageAccount';
 import NewTrack from './screens/NewTrack';
@@ -15,14 +15,18 @@ import Register from './screens/Register';
 import Session_browser from './screens/Session_browser';
 import Team_Browser from './screens/Team_Browser';
 import Team_Selection from './screens/Team_Selection';
+import { Provider } from 'react-redux';
+import store from './redux/Store';
 
 export default function App() {
     return (
-        <SafeAreaView style={styles.container}>
+        <Provider store={store}>
-            <NavigationContainer independent={true}>
+            <SafeAreaView style={styles.container}>
-                <LoginStack />
+                <NavigationContainer independent={true}>
-            </NavigationContainer>
+                    <LoginStack />
-        </SafeAreaView>
+                </NavigationContainer>
+            </SafeAreaView>
+        </Provider>
   );
 }
 

R-Dash/components/SessionCmp.tsx

@@ -0,0 +1,55 @@
+import React from "react";
+import { View,Image,Text, StyleSheet, Touchable } from "react-native";
+import { TouchableOpacity } from "react-native-gesture-handler";
+import { Session } from "../core/Session";
+
+type SessionListItemProps = {
+    session: Session;
+    onPress: (team: Session) => void;
+  }
+  
+  export default function SessionListItem(props: SessionListItemProps) {
+
+    const timeInSeconds = props.session.getLaps()[props.session.getLaps().length - 1].getTime();
+    return (
+      <TouchableOpacity style={styles.container} 
+                        onPress={()=> props.onPress(props.session)}>
+        <Text style={styles.text_style}> {props.session.getName()}</Text>
+        <View style={styles.container_low}>
+             <Text style={styles.text_under}> {props.session.getType().toString() }</Text>
+            <Text style={styles.text_under}> { timeInSeconds }</Text>
+        </View>
+
+      </TouchableOpacity>
+    )
+  }
+  
+  const styles = StyleSheet.create({
+    container: {
+        borderRadius:30,
+        alignItems:'center',
+        backgroundColor:'#e1e8ee',
+        padding:1,
+        flex: 1,
+        margin:10,
+    },
+    container_low: {
+        borderRadius:30,
+        alignItems:'center',
+        backgroundColor:'#e1e8ee',
+        padding:10,
+        flex: 1,
+        flexDirection: "row",
+        marginBottom:10,
+    },
+    text_style:{
+        textAlign:'center',
+        fontSize:25,
+    },
+    text_under:{
+        marginLeft:15,
+        textAlign:'center',
+        fontSize:20,
+    }
+  });
+  

R-Dash/components/TeamCmp.tsx

@@ -0,0 +1,43 @@
+import React from "react";
+import { View,Image,Text, StyleSheet, Touchable } from "react-native";
+import { TouchableOpacity } from "react-native-gesture-handler";
+import { Team } from "../core/Team";
+
+type TeamListItemProps = {
+    team: Team;
+    onPress: (team: Team) => void;
+  }
+  
+  export default function TeamListItem(props: TeamListItemProps) {
+    return (
+      <TouchableOpacity style={styles.container} 
+                        onPress={()=> props.onPress(props.team)}>
+        <Image style={styles.teaserImage} source={props.team.getLogo()} />
+        <Text style={styles.text_style}> {props.team.getName()}</Text>
+      </TouchableOpacity>
+    )
+  }
+  
+  const styles = StyleSheet.create({
+    container: {
+        alignItems:'center',
+        backgroundColor:'#e1e8ee',
+        padding:10,
+        flex: 1,
+        flexDirection: "row",
+        marginBottom:10,
+    },
+    text_style:{
+        marginLeft:15,
+        textAlign:'center',
+        fontSize:20,
+    },
+    teaserImage: {
+        borderWidth:1,
+        borderColor:'black',
+        borderRadius:50,
+        width: 50,
+        height: 50,
+    }
+  });
+  

R-Dash/core/Geocalisation.ts

@@ -1,18 +1,12 @@
 export class Geocalisation {
-    readonly id: number;
     private gpsLat: number;
     private gpsLong: number;
 
-    constructor(id: number, gpsLat: number, gpsLong: number) {
+    constructor(gpsLat: number, gpsLong: number) {
-        this.id = id;
         this.gpsLat = gpsLat;
         this.gpsLong = gpsLong;
     }
 
-    getId() {
-        return this.id;
-    }
-
     getGpsLat() {
         return this.gpsLat;
     }

R-Dash/core/Iloader.ts

@@ -0,0 +1,7 @@
+import { Session } from "./Session";
+
+
+export interface ILoader{
+    Load() : Session
+    LoadFromFile(file : File) : Session
+}

R-Dash/core/Lap.ts

@@ -1,24 +1,27 @@
 import { Point } from "./Point";
 
 export class Lap {
-    readonly id: number;
+    private number : number;
     private points: Point[];
-    private time: number;
+    private time: string;
 
-    constructor(id: number, points: Point[], time: number) {
+    constructor(number: number,points: Point[], time: string) {
-        this.id = id;
+        this.number = number;
         this.points = points;
         this.time = time;
     }
 
-    getId() {
+    getNumber(){
-        return this.id;
+        return this.number;
+    }
+    setNumber(number :number){
+        this.number = number;
     }
 
     getPoints() {
         return this.points;
     }
-
+    
     setPoints(points: Point[]) {
         this.points = points;
     }
@@ -26,8 +29,53 @@ export class Lap {
     getTime() {
         return this.time;
     }
+    
+    getFormattedTime(){
+        // const timeInSeconds = this.time;
+        // const timeInMs = timeInSeconds * 1000;
+        // const date = new Date(timeInMs);
+        // const minutes = date.getMinutes().toString().padStart(2, "0");
+        // const seconds = date.getSeconds().toString().padStart(2, "0");
+        // const milliseconds = date.getMilliseconds().toString().padStart(2, "0");
+        // const formattedTime = `${minutes}:${seconds}:${milliseconds}`;
+        // return formattedTime;
+    }
 
-    setTime(time: number) {
+    setTime(time: string) {
         this.time = time;
     }
+    getAverageSpeed(){
+        var sum = 0;
+        this.points.forEach(pt => {
+            sum += pt.getVCar();
+        });
+        return sum/this.points.length;
+    }
+
+    getMaxSpeed(){
+        var max = 0.0;
+        this.points.forEach(pt => {
+            if(max < pt.getVCar()){
+                max = pt.getVCar();
+            }
+        });
+        return max;
+    }
+
+    getLocationLat(){
+        var sum = 0.0;
+        this.points.forEach(pt => {
+            sum += pt.getGeo().getGpsLat();
+        });
+        return sum/this.points.length;
+    }
+
+    getLocationLong(){
+        var sum = 0.0;
+        this.points.forEach(pt => {
+            sum += pt.getGeo().getGpsLong();
+        });
+        return sum/this.points.length;
+    }
+
 }

R-Dash/core/LoadDB.ts

@@ -0,0 +1,12 @@
+import { ILoader } from "./ILoader";
+import { Session } from "./Session";
+
+export class LoadDB implements ILoader{
+    LoadFromFile(file: File): Session {
+        throw new Error("file argument is not accepted !."); // GARDER EN NON IMPLEMENTED !
+    }
+    Load(): Session {
+        throw new Error("Method not implemented."); // APPEL API
+    }
+    
+}

R-Dash/core/LoadXLS.ts

@@ -0,0 +1,13 @@
+import { ILoader } from "./ILoader";
+import { Session } from "./Session";
+
+
+export class LoadXLS implements ILoader{
+    LoadFromFile(file: File): Session {
+        throw new Error("Method not implemented."); // APPEL API RETOUR JSON
+    }
+    Load(): Session {
+        throw new Error("Cannot load without a file."); // GARDER EN NON IMPLEMENTED !
+    }
+    
+}

R-Dash/core/Member.ts

@@ -3,7 +3,7 @@ import { Team } from "./Team";
 import { User } from "./User";
 
 export class Member extends User {
-    constructor(id: number, pseudo: string, password: string, email: string, sessions: Session[], team: Team) {
+    constructor(username: string, password: string, email: string, sessions: Session[],image : HTMLImageElement= require('../assets/images/user.jpg')) {
-        super(id, pseudo, password, email, sessions, team);
+        super(username, password, email, sessions, image);
     }
 }

R-Dash/core/Owner.ts

@@ -3,7 +3,11 @@ import { Team } from "./Team";
 import { User } from "./User";
 
 export class Owner extends User {
-    constructor(id: number, pseudo: string, password: string, email: string, sessions: Session[], team: Team) {
+    constructor( username: string, password: string, email: string, sessions: Session[],image : HTMLImageElement= require('../assets/images/user.jpg')) {
-        super(id, pseudo, password, email, sessions, team);
+        super(username, password, email, sessions,image);
+    }
+
+    IsOwner(): boolean{
+        return true;
     }
 }

R-Dash/core/Point.ts

@@ -1,7 +1,6 @@
 import { Geocalisation } from "./Geocalisation";
 
 export class Point {
-    readonly id: number;
     private geo: Geocalisation;
     private timer: number;
     private distance: number;
@@ -13,8 +12,7 @@ export class Point {
     private gLat: number;
     private vCar: number;
 
-    constructor(id: number, geo: Geocalisation, timer: number, distance: number, nGear: number, pBrakeF: number, aSteer: number, rPedal: number, gLong: number, gLat: number, vCar: number) {
+    constructor( geo: Geocalisation, timer: number, distance: number, nGear: number, pBrakeF: number, aSteer: number, rPedal: number, gLong: number, gLat: number, vCar: number) {
-        this.id = id;
         this.geo = geo;
         this.timer = timer;
         this.distance = distance;
@@ -26,11 +24,7 @@ export class Point {
         this.gLat = gLat;
         this.vCar = vCar;
     }
-
+    
-    getId() {
-        return this.id;
-    }
-
     getGeo() {
         return this.geo;
     }
@@ -47,6 +41,17 @@ export class Point {
         return this.timer;
     }
 
+    getFormattedTime(){
+        const timeInSeconds = this.timer;
+        const timeInMs = timeInSeconds * 1000;
+        const date = new Date(timeInMs);
+        const minutes = date.getMinutes().toString().padStart(2, "0");
+        const seconds = date.getSeconds().toString().padStart(2, "0");
+        const milliseconds = date.getMilliseconds().toString().padStart(2, "0");
+        const formattedTime = `${minutes}:${seconds}:${milliseconds}`;
+        return formattedTime;
+    }
+
     getDistance() {
         return this.distance;
     }

R-Dash/core/Session.ts

@@ -1,20 +1,24 @@
 import { Lap } from "./Lap";
+import { SessionType } from "./SessionType";
 
 export class Session {
-    readonly id: number;
     private name: string;
+    private type: SessionType;
     private laps: Lap[];
 
-    constructor(id: number, name: string, laps: Lap[]) {
+    constructor( name: string, laps: Lap[], type: SessionType = SessionType.Unknown) {
-        this.id = id;
+        this.type = type
         this.name = name;
         this.laps = laps;
     }
-
+    getType() {
-    getId() {
+        return this.type;
-        return this.id;
     }
 
+    setType(type: SessionType) {
+        this.type = type;
+    }
+    
     getName() {
         return this.name;
     }

R-Dash/core/SessionType.ts

@@ -1,8 +1,8 @@
-enum SessionType {
+export enum SessionType {
-    Test,
+    Test = "Test",
-    PrivateTest,
+    PrivateTest = "Private Test",
-    Qualification,
+    Qualification = "Qualification",
-    ShortStroke,
+    ShortStroke = "Short Stroke",
-    LongStroke,
+    LongStroke = "Long Stroke",
-    Unknown,
+    Unknown = "Unknown",
-}
+  }

R-Dash/core/StandardSessionBuilder.ts

@@ -3,11 +3,11 @@ import { SessionBuilder } from "./SessionBuilder";
 
 export class StandartSessionBuilder extends SessionBuilder {
     BuildSession() {
-        PointBuilder();
+        //PointBuilder();
     }
 
     PointBuilder() {
-        new Point();
+        //new Point();
     }
 
 }

R-Dash/core/Team.ts

@@ -1,24 +1,17 @@
 import { User } from "./User";
+import { WaitingMember } from "./WaitingMember";
 
 export class Team {
-    readonly id: number;
     private name: string;
     private owner: User;
-    private members: User[];
+    private users: User[];
-    private logo: File;
+    private logo: HTMLImageElement;
-    private waitList: User[];
 
-    constructor(id: number, name: string, owner: User,members: User[] = null, logo: File = null, waitList: User[] = null) {
+    constructor(name: string, owner: User ,users: User[] = [], logo: HTMLImageElement = require('../assets/images/people.jpg')) {
-        this.id = id;
         this.name = name;
         this.owner = owner;
-        this.members = members;
+        this.users = users;
         this.logo = logo;
-        this.waitList = waitList;
-    }
-
-    getId() {
-        return this.id;
     }
 
     getName() {
@@ -37,27 +30,37 @@ export class Team {
         this.owner = owner;
     }
 
-    getMembers() {
+    getusers() {
-        return this.members;
+        return this.users;
     }
 
-    setMembers(members: User[]) {
+    setusers(users: User[]) {
-        this.members = members;
+        this.users = users;
     }
 
     getLogo() {
         return this.logo;
     }
 
-    setLogo(logo: File) {
+    setLogo(logo: HTMLImageElement) {
         this.logo = logo;
     }
 
     getWaitList() {
-        return this.waitList;
+        var waitList : User[] = [];
+        this.users.forEach(user => {
+            if(user as WaitingMember){
+                waitList.concat(user);
+            }
+        });
+        return waitList;
     }
 
-    setWaitList(waitList: User[]) {
+    addToWaitList(user: User) : boolean{
-        this.waitList = waitList;
+        if(!this.users.includes(user)){
+            this.users.concat(user);
+            return true;
+        }
+        return false;
     }
 }

R-Dash/core/Track.ts

@@ -1,16 +1,10 @@
 export class Track {
-    readonly id: number;
     private name: string;
 
-    constructor(id: number, name: string) {
+    constructor(name: string) {
-        this.id = id;
         this.name = name;
     }
 
-    getId() {
-        return this.id;
-    }
-
     getName() {
         return this.name;
     }

R-Dash/core/User.ts

@@ -2,31 +2,35 @@ import { Session } from "./Session";
 import { Team } from "./Team";
 
 export abstract class User {
-    readonly id: number;
+    private username: string;
-    private pseudo: string;
     private password: string;
     private email: string;
     private sessions: Session[];
-    private team: Team;
+    private image : HTMLImageElement;
 
-    constructor(id: number, pseudo: string, password: string, email: string, sessions: Session[] = null, team: Team = null) {
+    constructor(username: string, password: string, email: string, sessions: Session[] = [], image : HTMLImageElement) {
-        this.pseudo = pseudo;
+        this.username = username;
         this.password = password;
         this.email = email;
         this.sessions = sessions;
-        this.team = team;
+        this.image = image;
+
+    }
+
+    getImage(){
+        return this.image;
     }
 
-    getId() {
+    setImage(image: HTMLImageElement){
-        return this.id;
+        this.image = image;
     }
 
-    getPseudo() {
+    getUsername() {
-        return this.pseudo;
+        return this.username;
     }
 
-    setPseudo(pseudo: string) {
+    setUsername(username: string) {
-        this.pseudo = pseudo;
+        this.username = username;
     }
 
     getPassword() {
@@ -53,12 +57,4 @@ export abstract class User {
         this.sessions = sessions;
     }
 
-    getTeam() {
-        return this.team;
-    }
-
-    setTeam(team: Team) {
-        this.team = team;
-    }
-
 }

R-Dash/core/WaitingMember.ts

@@ -1,9 +1,8 @@
 import { Session } from "./Session";
-import { Team } from "./Team";
 import { User } from "./User";
 
 export class WaitingMember extends User {
-    constructor(id: number, pseudo: string, password: string, email: string, sessions: Session[], team: Team) {
+    constructor( pseudo: string, password: string, email: string, sessions: Session[],image : HTMLImageElement= require('../assets/images/user.jpg')) {
-        super(id, pseudo, password, email, sessions, team);
+        super(pseudo, password, email, sessions, image);
     }
 }

R-Dash/navigation/MainStack.tsx

@@ -1,6 +1,7 @@
 import { createStackNavigator } from "@react-navigation/stack";
 import Lap from "../screens/Lap";
 import NewTrack from "../screens/NewTrack";
+import Point_Viewer from "../screens/Point_Viewer";
 import Session_browser from "../screens/Session_browser";
 import SettingsStack from "./SettingsStack";
 
@@ -11,6 +12,7 @@ export default function MainStack() {
             <Stack.Screen name="Home" component={Session_browser} />
             <Stack.Screen name="Add" component={NewTrack} />
             <Stack.Screen name="Lap" component={Lap} />
+            <Stack.Screen name="PointInfo" component={Point_Viewer} />
             <Stack.Screen name="Settings" component={SettingsStack} />
         </Stack.Navigator>
     )

R-Dash/navigation/TeamInfoStack.tsx

@@ -1,6 +1,6 @@
 import { createStackNavigator } from "@react-navigation/stack";
 import CreateTeam from "../screens/CreateTeam";
-import InfoTeam from "../screens/InfoTeam";
+import Team_Info from "../screens/Team_Info";
 import Team_Browser from "../screens/Team_Browser";
 import Team_Selection from "../screens/Team_Selection";
 
@@ -10,7 +10,7 @@ export default function TeamInfoStack() {
     return (
         <Stack.Navigator initialRouteName="Home" screenOptions={{ headerShown: false }}>
             <Stack.Screen name="Home" component={Team_Browser} />
-            <Stack.Screen name="Info" component={InfoTeam} />
+            <Stack.Screen name="Info" component={Team_Info} />
         </Stack.Navigator>
     )
 }

R-Dash/package.json

@@ -13,18 +13,25 @@
     "@react-navigation/bottom-tabs": "^6.5.5",
     "@react-navigation/native": "^6.1.6",
     "@react-navigation/stack": "^6.3.16",
+    "@reduxjs/toolkit": "^1.9.3",
     "@rneui/base": "^4.0.0-rc.7",
     "expo": "~48.0.6",
-    "expo-document-picker": "~11.2.1",
+    "expo-document-picker": "~11.2.2",
     "expo-status-bar": "~1.4.4",
     "jsonwebtoken": "^9.0.0",
     "react": "18.2.0",
-    "react-native": "0.71.3",
+    "react-native": "0.71.4",
-    "react-native-document-picker": "^8.1.4",
+    "react-native-document-picker": "^8.2.0",
+    "react-native-fs": "^2.20.0",
     "react-native-gesture-handler": "^2.9.0",
     "react-native-maps": "1.3.2",
     "react-native-safe-area-context": "^4.5.0",
-    "typescript": "^4.9.4"
+    "react-redux": "^8.0.5",
+    "redux": "^4.2.1",
+    "typescript": "^4.9.4",
+    "react-native-web": "~0.18.10",
+    "react-dom": "18.2.0",
+    "@expo/webpack-config": "^18.0.1"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",

R-Dash/redux/Constants.ts

@@ -0,0 +1,7 @@
+export const FETCH_USERS = 'FETCH_USERS';
+export const FETCH_TEAMS = 'FETCH_TEAMS';
+export const FETCH_SESSIONS = 'FETCH_SESSIONS';
+export const ADD_TEAM = 'ADD_TEAM';
+export const ADD_FILE = 'ADD_FILE';
+//export const server_link = "https://codefirst.iut.uca.fr/containers/enzojolys-r-dash_container";
+export const server_link = "https://r-dash.azurewebsites.net";

R-Dash/redux/Store.ts

@@ -0,0 +1,18 @@
+import { configureStore, getDefaultMiddleware } from '@reduxjs/toolkit'
+import appReducer from './reducers/appReducer';
+
+// Reference here all your application reducers
+const reducer = {
+    appReducer: appReducer,
+}
+
+const middleware = getDefaultMiddleware({
+    serializableCheck: false, // Disable serializableCheck
+    immutableCheck: false
+  });
+  
+  const store = configureStore({
+    reducer,
+    middleware,
+  });
+export default store;

R-Dash/redux/actions/sessions.ts

@@ -0,0 +1,74 @@
+import { Alert } from "react-native";
+import { Geocalisation } from "../../core/Geocalisation";
+import { Lap } from "../../core/Lap";
+import { Point } from "../../core/Point";
+import { Session } from "../../core/Session";
+import { User } from "../../core/User";
+import { FETCH_SESSIONS, server_link } from "../Constants";
+
+export const setSessionsList = (sessionsList: Session[]) => {
+    return {
+        type: FETCH_SESSIONS,
+        payload: sessionsList,
+    };
+}
+
+// export const addXlsFile = async (file: File) => {
+//     try {
+//         const formData = new FormData();
+//         formData.append('file', file);
+//         const response = await fetch(
+//             'https://r-dash.azurewebsites.net/File?' + "pseudoPilote=test_PILOTE" + "&Email=test@gmail.com" + "&password=test123" + "&nameSession=test_SESSION" + "&nameCircuit=test_CIRCUIT" + "&typeSession=Unknown", {
+//             method: 'POST',
+//             body: formData
+//         });
+//         const data = await response.json();
+//         return data;
+//     } catch (error) {
+//         console.log('Error---------', error);
+//     }
+// };
+
+export const addXlsFile = (file: File, pseudoPilote: string, email: string, password: string, nameSession: string, nameCircuit: string, typeSession: string) => {
+    return async dispatch => {
+        try {
+            const formData = new FormData();
+            formData.append('file', file);
+            const response = await fetch(
+                server_link+`/File?pseudoPilote=${pseudoPilote}&Email=${email}&password=${password}&nameSession=${nameSession}&nameCircuit=${nameCircuit}&typeSession=${typeSession}`, 
+                {
+                    method: 'POST',
+                    body: formData
+                }
+            );
+            const data = await response.json();
+            return data;
+        } catch (error) {
+            console.log('Error - POST FILE', error);
+            Alert.alert('Error', 'An error occured while adding a session. (server might be down)');
+        }
+    }
+};
+export const getSessionsList = () => {
+    return async dispatch => {
+        try {
+            const sessionsPromise = await fetch(server_link+'/FullSession');
+            const sessionsListJson = await sessionsPromise.json();
+            const sessionsList: Session[] = sessionsListJson.map(elt => {
+                const laps: Lap[] = elt["tours"].map(lap => {
+                    const points: Point[] = lap["points"].map(point => {
+                        const geo = new Geocalisation(point["longitude"], point["latitude"]);
+                        return new Point(geo, point["timer"] , point["distance"], point["nGear"], point["pBrakeF"], point["aSteer"], point["rPedal"], point["gLong"], point["gLat"], point["vCar"]);
+                    });
+                    return new Lap(lap["numero"], points, lap["temps"]);
+                });
+                return new Session(elt["name"], laps, elt["type"]);
+            });
+            dispatch(setSessionsList(sessionsList));
+        } catch (error) {
+            console.log('Error -- GET SESSIONS', error);
+            Alert.alert('Error', 'An error occured while getting sessions. (server might be down)');
+            //dispatch(fetchDataRejected(error))
+        }
+    }
+}

R-Dash/redux/actions/teams.ts

@@ -0,0 +1,45 @@
+import { Team } from "../../core/Team";
+import { FETCH_TEAMS, ADD_TEAM, server_link } from "../Constants";
+
+export const setTeamsList = (teamsList: Team[]) => {
+    return {
+        type: FETCH_TEAMS,
+        payload: teamsList,
+    };
+}
+
+export const addNewTeam = (newTeam: Team) => {
+    return async dispatch => {
+        try {
+            const response = await fetch(server_link + '/Ecuries?' + "Email=test@gmail.com" + "&password=test123" + "&pseudoPilote=test_PILOTE", {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json'
+                },
+                body: JSON.stringify(newTeam)
+            });
+            const team = await response.json();
+            dispatch({
+                type: ADD_TEAM,
+                payload: team
+            });
+        } catch (error) {
+            console.log('Error---------', error);
+            //dispatch(fetchDataRejected(error))
+        }
+    }
+}
+
+export const getTeamsList = () => {
+    return async dispatch => {
+        try {
+            const teamsPromise = await fetch(server_link+'/Ecuries');
+            const teamsListJson = await teamsPromise.json();
+            const teamsList: Team[] = teamsListJson.map(elt => new Team(elt["name"], elt["owner"], elt["users"], elt["logo"]));
+            dispatch(setTeamsList(teamsList));
+        } catch (error) {
+            console.log('Error---------', error);
+            //dispatch(fetchDataRejected(error))
+        }
+    }
+} 

R-Dash/redux/actions/users.ts

@@ -0,0 +1,36 @@
+import { Member } from "../../core/Member";
+import { Owner } from "../../core/Owner";
+import { Team } from "../../core/Team";
+import { User } from "../../core/User";
+import { WaitingMember } from "../../core/WaitingMember";
+import { FETCH_USERS } from "../Constants";
+import { DtoUserEcurie } from "../dto/dtoUserEcurie";
+
+export const setUsersList = (usersList: User[]) => {
+    return {
+        type: FETCH_USERS,
+        payload: usersList,
+    };
+}
+
+export const getUsersList = (team: Team) => {
+    return async dispatch => {
+        try {
+            const usersPromise = await fetch(server_link+'/Pilotes/'+team);
+            const usersListJson = await usersPromise.json();
+            const dto: DtoUserEcurie = usersListJson.map(elt => new DtoUserEcurie(elt["owner"], elt["members"], elt["waitingMember"]));
+            const usersList: User[] = []
+            usersList.push(dto.getOwner())
+            dto.getMembers().forEach(element => {
+                usersList.push(element);
+            });
+            dto.getWaitingMember().forEach(element => {
+                usersList.push(element)
+            });
+            dispatch(setUsersList(usersList)); 
+        } catch (error) {
+            console.log('Error---------', error);
+            //dispatch(fetchDataRejected(error))
+        }
+    }
+}

R-Dash/redux/dto/dtoUserEcurie.ts

@@ -0,0 +1,37 @@
+import { Member } from "../../core/Member";
+import { Owner } from "../../core/Owner";
+import { WaitingMember } from "../../core/WaitingMember";
+
+export class DtoUserEcurie {
+    private owner: Owner;
+    private members: Member[];
+    private waitingMember: WaitingMember[];
+
+    constructor(owner: Owner, members: Member[], waitingMember: WaitingMember[]) {
+        this.owner = owner;
+        this.members = members;
+        this.waitingMember = waitingMember;
+    }
+
+    getOwner() {
+        return this.owner;
+    }
+    setOwner(owner: Owner) {
+        this.owner = owner;
+    }
+
+    getMembers() {
+        return this.members;
+    }
+    setMembers(members: Member[]) {
+        this.members = members;
+    }
+
+    getWaitingMember() {
+        return this.waitingMember;
+    }
+    setWaitingMember(waitingMember: WaitingMember[]) {
+        this.waitingMember = waitingMember;
+    }
+
+}

R-Dash/redux/reducers/appReducer.ts

@@ -0,0 +1,28 @@
+import { addXlsFile } from "../actions/sessions";
+import { addNewTeam } from "../actions/teams";
+import { FETCH_SESSIONS, FETCH_TEAMS, FETCH_USERS, ADD_TEAM, ADD_FILE } from "../Constants";
+
+const initialState = {
+    teams: [],
+    users: [],
+    sessions: [],
+};
+
+const appReducer = (state = initialState, action: { type: any; payload: any; }) => {
+    switch (action.type) {
+        case ADD_TEAM:
+            return { ...state, teams: [...state.teams, addNewTeam] };
+        case ADD_FILE:
+            return { ...state, sessions: [...state.sessions, addXlsFile] };
+        case FETCH_TEAMS:
+            return { ...state, teams: action.payload };
+        case FETCH_USERS:
+            return { ...state, users: action.payload };
+        case FETCH_SESSIONS:
+            return { ...state, sessions: action.payload };
+        default:
+            return state;
+    }
+};
+
+export default appReducer;

R-Dash/screens/ChangePassword.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Button, Pressable } from 'react-native';
+import { Pressable } from 'react-native';
 import { StyleSheet, Text, View, Image, TextInput } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
 

R-Dash/screens/CreateTeam.tsx

@@ -1,10 +1,34 @@
-import React from 'react';
+import React, { useEffect, useState } from 'react';
-import { Button, Pressable } from 'react-native';
+import { Pressable } from 'react-native';
 import { StyleSheet, Text, View, Image, TextInput } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
+import * as DocumentPicker from 'expo-document-picker';
+import { useDispatch, useSelector } from 'react-redux';
+import { addNewTeam } from '../redux/actions/teams';
 
 export default function CreateTeam(props: { navigation: any }) {
     const { navigation } = props;
+
+    const [pickedDocument, setPickedDocument] = useState<DocumentPicker.DocumentResult | null>(null);
+
+    const handlePickDocument = async () => {
+        try {
+            const result = await DocumentPicker.getDocumentAsync({ type: ['image/png', 'image/jpeg', 'image/jpg'] });
+            if (result.type === 'success') {
+                setPickedDocument(result);
+            }
+        } catch (err) {
+            console.log(err);
+        }
+    };
+
+    const dispatch = useDispatch();
+
+    const onPressAddTeam = async () => {
+        dispatch();
+        navigation.goBack();
+    };
+
     return (
         <SafeAreaView style={styles.container}>
             <View style={styles.maincard}>
@@ -15,11 +39,11 @@ export default function CreateTeam(props: { navigation: any }) {
                             style={styles.logo}
                             source={require('../assets/images/image.png')}
                         />
-                        <Pressable>
+                        <Pressable onPress={handlePickDocument}>
-                            <Image
+                            <Image style={styles.import} source={require('../assets/images/import.png')} />
-                                style={styles.import}
+                            <Text>
-                                source={require('../assets/images/import.png')}
+                                Picked document: {pickedDocument ? pickedDocument.name : 'none'}
-                            />
+                            </Text>
                         </Pressable>
                     </View>
 
@@ -39,7 +63,7 @@ export default function CreateTeam(props: { navigation: any }) {
                                 source={require('../assets/images/return.png')}
                             />
                         </Pressable>
-                        <Pressable style={styles.button} onPress={() => navigation.goBack()}>
+                        <Pressable style={styles.button} onPress={onPressAddTeam}>
                             <Image
                                 style={styles.return}
                                 source={require('../assets/images/checked.png')}

R-Dash/screens/Lap.tsx

@@ -1,50 +1,59 @@
 import { BackgroundImage } from '@rneui/base';
-import { FlatList, StyleSheet, Text, View, Image, TouchableOpacity } from 'react-native';
+import { StyleSheet, Text, View, TouchableOpacity } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
-import MapView from 'react-native-maps';
+import MapView, { Polyline } from 'react-native-maps';
-import PROVIDER_OPENSTREETMAP, { Marker } from 'react-native-maps';
+import React from 'react';
+import { Lap as LapModel}   from '../core/Lap';
+import TopBar from '../components/TopBar';
 
-export default function Lap() {
+export default function Lap(props: { navigation: any, route : any}) {
+    const { session } = props.route.params;
+    const { navigation } = props;
 
+    const laps: LapModel[] = session.getLaps().sort((lap1 : LapModel, lap2 : LapModel) => lap1.getNumber() - lap2.getNumber());
+
+
+    const [currentLapIndex, setCurrentLapIndex] = React.useState(0);
+    const currentLap: LapModel | undefined = laps[currentLapIndex];
+
+    const goToPreviousLap = () => {
+        if (currentLapIndex > 0) {
+            setCurrentLapIndex(currentLapIndex - 1);
+        }
+    };
+
+    const goToNextLap = () => {
+        if (currentLapIndex < laps.length - 1) {
+            setCurrentLapIndex(currentLapIndex + 1);
+        }
+    };
+
+    const points : any = [];
+    currentLap.getPoints().forEach(pt => {
+        points.push({ latitude: pt.getGeo().getGpsLat(), longitude: pt.getGeo().getGpsLong() });
+            
+    });
+
+    //var currentLap : undefined; // Penser à vérifier si la session ne possède pas de tour !! si c'est le cas afficher une popup d'erreur
     return (
         <SafeAreaView style={styles.container}>
             <View style={styles.container}>
                 {/* Header */}
-                <View style={styles.topbar}>
+                <TopBar navigation={navigation} />
-                    <View>
+                
-                        <TouchableOpacity style={styles.accountContainerButton}>
-                            <View style={styles.ImageContainer}>
-                                <Image source={require('../assets/images/pfp.png')} style={styles.accountImage} />
-                            </View>
-                            <Text style={styles.accountName}>Mr X</Text>
-                        </TouchableOpacity>
-                    </View>
-                    <View style={styles.topbarRight}>
-                        <View style={styles.iconContainer}>
-                            <Image source={require('../assets/images/settings.png')} style={styles.accountSettings} />
-                        </View>
-                        <TouchableOpacity style={styles.accountContainerButton}>
-                            <View style={styles.ImageContainer}>
-                                <Image source={require('../assets/images/rdash.png')} style={styles.accountImage} />
-                            </View>
-                        </TouchableOpacity>
-                    </View>
-                </View>
-
                 {/* Body */}
                 <View style={styles.container}>
-                    <BackgroundImage source={require('../assets/images/rdash.png')} resizeMode="contain" style={styles.backgroundImage}>
 
                         <View style={styles.top_lap}>
-                            <TouchableOpacity style={styles.LapBrowserButton} >
+                            <TouchableOpacity style={[styles.LapBrowserButton, currentLapIndex === 0 ? styles.disabled : null]} onPress={goToPreviousLap}>
                                 <View>
                                     <Text style={styles.button_text} >Previous lap</Text>
                                 </View>
                             </TouchableOpacity>
 
-                            <Text style={styles.text_title}>Lap X</Text>
+                            <Text style={styles.text_title}>Lap {currentLap?.getNumber()} </Text>
 
-                            <TouchableOpacity style={styles.LapBrowserButton}>
+                            <TouchableOpacity style={[styles.LapBrowserButton, currentLapIndex === laps.length - 1 ? styles.disabled : null]} onPress={goToNextLap}>
                                 <View>
                                     <Text style={styles.button_text} >Next lap</Text>
                                 </View>
@@ -52,54 +61,61 @@ export default function Lap() {
 
                         </View>
 
-                        <View style={styles.container}>
+                        <View style={styles.containerBody}>
+                            <TouchableOpacity
+                                style={styles.addContainerButton}
+                                onPress={() => navigation.navigate("PointInfo",{"currentLap": currentLap})}
+                                >
+                                <View>
+                                    <Text style={styles.button_text}>Point Viewer Mode</Text>
+                                </View>
+                            </TouchableOpacity>
                             <MapView
                                 style={styles.map}
+                                mapType="satellite"
                                 region={{
-                                    latitude: 46.863415273862,
+                                    latitude:  currentLap.getLocationLat(),
-                                    longitude: 3.161789595537,
+                                    longitude: currentLap.getLocationLong(),
                                     latitudeDelta: 0.001,
-                                    longitudeDelta: 0.01,
+                                    longitudeDelta: 0.015,
                                 }}
                             >
-                                <Marker
+                                <Polyline
-                                    coordinate={{
+                                    coordinates={points}
-                                        latitude: 46.863415273862,
+                                    strokeColor="red" // set the color of the line
-                                        longitude: 3.161789595537
+                                    strokeWidth={3} // set the width of the line
-                                    }}
+                                    />
-                                    title="Marker Title"
+                                {/* <Marker
-                                    description="Marker Description"
-                                />
-                                <Marker
-                                    coordinate={{
-                                        latitude: 46.861927477535,
-                                        longitude: 3.160353322067
-                                    }}
-                                    title="Marker Title"
-                                    description="Marker Description"
-                                />
-                                <Marker
                                     coordinate={{
-                                        latitude: 46.859745172448,
+                                        latitude: 45.76013484856403,
-                                        longitude: 3.164897426081
+                                        longitude: 3.112214188782891,
                                     }}
-                                    title="Marker Title"
+                                    onPress={() => console.log('pressed')}
-                                    description="Marker Description"
+                                /> */}
-                                />
-                            </MapView>
-
-                            <Text style={styles.textStyle} >Time: 1 30,62 seconds</Text>
-
-                            <View style={styles.infoContainer}>
-                                <Text style={styles.textStyle} >Average Speed: {"\n"} 102 km/h</Text>
-                                <Text style={styles.textStyle} >G: {"\n"} 0.001 G</Text>
 
+                            </MapView>
+                            <BackgroundImage source={require('../assets/images/rdash.png')} resizeMode="contain" >
+                                <View style={styles.container2}>
+
+                                <Text style={styles.header}>Lap Information</Text>
+                                
+                                <View style={styles.infoContainer}>
+                                    <Text style={styles.infoItem}>Lap Time:</Text>
+                                    <Text style={styles.infoValue}>{currentLap.getTime()}</Text>
+                                </View>
 
-                            </View>
+                                <View style={styles.infoContainer}>
-                            <Text style={styles.textStyle} ></Text>
+                                    <Text style={styles.infoItem}>Average Speed:</Text>
+                                    <Text style={styles.infoValue}>{currentLap.getAverageSpeed().toFixed()} km/h</Text>
+                                </View>
 
+                                <View style={styles.infoContainer}>
+                                    <Text style={styles.infoItem}>Max Speed:</Text>
+                                    <Text style={styles.infoValue}>{currentLap.getMaxSpeed().toFixed()} km/h</Text>
+                                </View>
+                                </View>
+                            </BackgroundImage>
                         </View>
-                    </BackgroundImage>
                 </View>
 
             </View>
@@ -107,57 +123,72 @@ export default function Lap() {
     );
 }
 
-// TROUBLE SHOOTING BORDER :
-//borderColor:'red',
-//borderWidth:3,
-
 const styles = StyleSheet.create({
-    card: {
+    disabled: {
-        flexDirection: 'column',
+        opacity: 0.5,
-        height: "80%",
+        },
-        width: "80%",
+    addContainerButton: {
-        backgroundColor: "#fff",
+        margin:5,
-        borderRadius: 15,
+        alignItems: "center",
+        justifyContent: "center",
+        height: "8%",
+        borderRadius: 10,
+        elevation: 3,
+        backgroundColor: "#BF181F",
+      },
+    containerBody:{
+        flex: 1,
+        justifyContent: 'space-between',
+        alignItems: 'stretch',
+    },
+    container2: {
+        backgroundColor: 'rgba(255, 255, 255, 0.9)',
+        borderColor:'black',
+        borderWidth:2,
         padding: 10,
-        elevation: 10,
+        borderRadius: 10,
+        marginBottom: 20,
         shadowColor: '#000',
-        shadowOffset: { width: 0, height: 3 },
+        shadowOffset: {
-        shadowOpacity: 0.5,
+            width: 0,
-        shadowRadius: 5,
+            height: 2,
+            },
+        shadowOpacity: 0.25,
+        shadowRadius: 3.84,
+        elevation: 5,
+    },
+    header: {
+        fontSize: 24,
+        fontWeight: 'bold',
+        marginBottom: 10,
     },
     infoContainer: {
-        margin: 3,
-        flex: 1,
         flexDirection: 'row',
-        justifyContent: 'space-around',
+        justifyContent: 'space-between',
+        marginBottom: 5,
+    },
+    infoItem: {
+        fontSize: 18,
+        fontWeight: 'bold',
+    },
+    infoValue: {
+        fontSize: 18,
     },
     map: {
-        height: "40%",
+        flex:1,
     },
     top_lap: {
         height: "8%",
         flexDirection: 'row',
-        justifyContent: 'space-between'
+        justifyContent: 'space-between',
     },
     backgroundImage: {
         flex: 1,
         width: '100%',
     },
-
     container: {
         flex: 1,
     },
-
-    accountSettings: {
-        width: '100%',
-        height: '100%',
-    },
-
-    accountContainerButton: {
-        flexDirection: 'row',
-        alignItems: 'center',
-    },
-
     LapBrowserButton: {
         width: "30%",
         margin: 5,
@@ -171,60 +202,9 @@ const styles = StyleSheet.create({
         color: '#fff',
         fontSize: 20,
     },
-
-    ImageContainer: {
-        backgroundColor: '#fff',
-        borderRadius: 50,
-        width: 40,
-        height: 40,
-        overflow: 'hidden',
-        marginRight: 10,
-
-    },
-    accountImage: {
-        width: '100%',
-        height: '100%',
-    },
-    topbar: {
-        backgroundColor: '#BF181D',
-        flexDirection: 'row',
-        alignItems: 'center',
-        justifyContent: 'space-between',
-        paddingHorizontal: 20,
-        height: "8%",
-    },
-    accountName: {
-        color: '#fff',
-        fontSize: 20,
-    },
-    topbarRight: {
-        flex: 1,
-        alignItems: 'flex-end',
-    },
-    textStyle: {
-        margin: 3,
-        fontSize: 20,
-        backgroundColor: '#BF181D',
-        color: 'white',
-        padding: "2%",
-        borderRadius: 5,
-
-    },
     text_title: {
-        fontWeight: 'bold',
         fontSize: 30,
         textAlign: 'center',
-        padding: 10,
-        textShadowColor: '#fff',
-        textShadowOffset: { width: 0, height: 0 },
-        textShadowRadius: 10,
-    },
-    iconContainer: {
-        position: 'absolute',
-        bottom: 0,
-        right: 0,
-        backgroundColor: 'transparent',
-        width: 24,
-        height: 24,
     },
+
 });

R-Dash/screens/Login.tsx

@@ -1,9 +1,9 @@
 import { useState } from 'react';
 import React from 'react';
-import { Button, Pressable } from 'react-native';
+import { Pressable } from 'react-native';
 import { StyleSheet, Text, View, Image, TextInput } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
-import { AsyncStorage } from 'react-native';
+// import { AsyncStorage } from 'react-native';
 
 
 export default function Login(props: { navigation: any }) {
@@ -26,7 +26,7 @@ export default function Login(props: { navigation: any }) {
     const secretKey = 'SECRET'; // appele API pour récupérer une clé secrete
 
     const handleLogin = () => {
-        const isCorrect = false // envoi email + password a l'API, retour bool de l'API
+        const isCorrect = true // envoi email + password a l'API, retour bool de l'API
          // If the email and password are correct, generate a JWT
 
         if(isCorrect){

R-Dash/screens/ManageAccount.tsx

@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { Button, Pressable } from 'react-native';
+import { Pressable } from 'react-native';
 import { StyleSheet, Text, View, Image, TextInput } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
 import * as DocumentPicker from 'expo-document-picker';

R-Dash/screens/NewTrack.tsx

@@ -1,32 +1,149 @@
-import { StatusBar } from 'expo-status-bar';
+import React, { useState } from 'react';
-import React from 'react';
+import { Pressable, StyleSheet, Text, View, Image, TouchableOpacity, TextInput } from 'react-native';
-import { Button, Pressable, StyleSheet, Text, View, Image, TouchableOpacity, TextInput } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
+import TopBar from '../components/TopBar';
+import { addXlsFile } from '../redux/actions/sessions';
+import { useDispatch } from 'react-redux';
+import * as DocumentPicker from 'expo-document-picker';
+import { uploadFiles, DocumentDirectoryPath } from 'react-native-fs';
 
 export default function NewTrack(props: { navigation: any }) {
     const { navigation } = props;
+    const dispatch = useDispatch();
+
+    const [pickedDocument, setPickedDocument] = useState<DocumentPicker.DocumentResult | null>(null);
+    const [trackName, setTrackName] = useState('');
+    const [sessionName, setSessionName] = useState('');
+
+    const handlePickDocument = async () => {
+        try {
+            const result = await DocumentPicker.getDocumentAsync({});
+            if (result.type === 'success') {
+                setPickedDocument(result);
+            }
+            else if(result.type === 'cancel'){
+                console.log("AAA");
+                setPickedDocument(null);
+            }
+        } catch (err) {
+            console.log(err);
+        }
+    };
+
+    // var files = [
+    //     {
+    //       name: "file",
+    //       filename: "file.jpg",
+    //       filepath: pickedDocument.uri,
+    //       filetype: "image/jpeg",
+    //     },
+    //   ];
+   
+
+    // const handleConfirm = async () => {
+    //     if (!pickedDocument || !trackName || !sessionName) {
+    //         return;
+    //     }
+    //     const formData = new FormData();
+    //     formData.append('file', {
+    //         uri: pickedDocument.uri,
+    //         type: pickedDocument.type,
+    //         name: pickedDocument.name,
+    //     });
+    //     try {
+    //         await dispatch(addXlsFile(formData, 'test_PILOTE', 'test@gmail.com', 'test123', sessionName, trackName, 'Training'));
+    //         navigation.goBack();
+    //     } catch (error) {
+    //         console.log('Error - POST FILE', error);
+    //     }
+    // };
+    // const handleConfirm = async () => {
+    //     if (!pickedDocument || !trackName || !sessionName) {
+    //         return;
+    //     }
+    //     try {
+    //         const file = new File([await pickedDocument.uri], pickedDocument.name, { type: pickedDocument.type });
+    //         const url = 'https://r-dash.azurewebsites.net/File?pseudoPilote=test_PILOTE&nameSession=weekend&nameCircuit=test_CIRCUIT&typeSession=Training';
+    //         const options = {
+    //             method: 'POST',
+    //             body: file,
+    //             headers: {
+    //                 'Content-Type': 'application/octet-stream',
+    //             },
+    //         };
+    //         await fetch(url, options);
+    //         navigation.goBack();
+    //     } catch (error) {
+    //         console.log('Error - POST FILE', error);
+    //     }
+    // };
+    // const handleConfirm = async () => {
+    //     if (!pickedDocument || !trackName || !sessionName) {
+    //         return;
+    //     }
+    //     try {
+    //         const file = new File([await pickedDocument.uri], pickedDocument.name, { type: pickedDocument.type });
+    //         const url = 'https://r-dash.azurewebsites.net/File?pseudoPilote=test_PILOTE&nameSession=weekend&nameCircuit=test_CIRCUIT&typeSession=Training';
+    //         const options = {
+    //             method: 'POST',
+    //             body: file,
+    //             headers: {
+    //                 'Content-Type': 'application/octet-stream',
+    //             },
+    //         };
+    //         const response = await fetch(url, options);
+    //         const responseData = await response.text(); // or response.text() or response.blob() depending on the expected response type
+    //         navigation.goBack();
+    //         console.log(responseData);
+    //     } catch (error) {
+    //         console.log('Error - POST FILE', error);
+    //     }
+    // };
+    const handleConfirm = async () => {
+        if (!pickedDocument || !trackName || !sessionName) {
+            return;
+        }
+        try {
+            //const file = new File([await pickedDocument.uri], pickedDocument.name, { type: pickedDocument.type });
+            const url = 'https://r-dash.azurewebsites.net/File?pseudoPilote=test_PILOTE&nameSession=test%20import&nameCircuit=test_CIRCUIT&typeSession=Training';
+            const formData = new FormData();
+            console.log(pickedDocument.type);
+            console.log(pickedDocument.uri);
+            formData.append('file', 
+            {
+                name: pickedDocument.name,
+                type: "application/vnd.ms-excel",
+                uri : pickedDocument.uri,
+
+            });
+            
+            const response = await fetch(url, {
+                method: 'POST',
+                body: formData,
+                headers: {
+                    'accept':'*/*',
+                    'Content-Type': 'multipart/form-data',
+                },
+            });
+            const data = await response.json();
+            console.log('API response:', data);
+            if (!response.ok) {
+                throw new Error( JSON.stringify(response) + 'Failed to upload file');
+            }
+    
+
+            navigation.goBack();
+        } catch (error) {
+            console.log('Error - POST FILE', error);
+        }
+    };
+    
+    
     return (
         <SafeAreaView>
             <View style={styles.container}>
-                <View style={styles.topbar}>
+                {/* Header */}
-                    <View>
+                <TopBar navigation={navigation} />
-                        <TouchableOpacity style={styles.accountContainerButton}>
-                            <View style={styles.ImageContainer}>
-                            </View>
-                            <Text style={styles.accountName}>Name</Text>
-                        </TouchableOpacity>
-                    </View>
-                    <View style={styles.topbarRight}>
-                        <View style={styles.iconContainer}>
-                            <Image source={require('../assets/images/settings.png')} style={styles.accountSettings} />
-                        </View>
-                        <TouchableOpacity style={styles.accountContainerButton}>
-                            <View style={styles.ImageContainer}>
-                                <Image source={require('../assets/images/image.png')} style={styles.accountImage} />
-                            </View>
-                        </TouchableOpacity>
-                    </View>
-                </View>
 
                 {/* Page */}
                 <View style={{ alignItems: 'center', width: "100%", height: "80%", justifyContent: 'space-around' }}>
@@ -35,7 +152,8 @@ export default function NewTrack(props: { navigation: any }) {
                             <Text style={{ paddingTop: 20 }}>Track name: </Text>
                             <TextInput
                                 style={styles.textInput}
-                                secureTextEntry={true}
+                                onChangeText={setTrackName}
+                                value={trackName}
                                 placeholder="Track name"
                             />
                         </View>
@@ -44,18 +162,19 @@ export default function NewTrack(props: { navigation: any }) {
                             <Text style={{ paddingTop: 20 }}>Session name: </Text>
                             <TextInput
                                 style={styles.textInput}
-                                secureTextEntry={true}
+                                onChangeText={setSessionName}
+                                value={sessionName}
                                 placeholder="Session name"
                             />
                         </View>
 
                         <View style={styles.placement}>
                             <Text style={{ paddingTop: 30 }}>Import file: </Text>
-                            <Pressable>
+                            <Pressable onPress={handlePickDocument}>
-                                <Image
+                                <Image style={styles.import} source={require('../assets/images/import.png')} />
-                                    style={styles.import}
+                                <Text>
-                                    source={require('../assets/images/import.png')}
+                                    Picked document: {pickedDocument ? pickedDocument.name : 'none'}
-                                />
+                                </Text>
                             </Pressable>
                         </View>
 
@@ -69,7 +188,7 @@ export default function NewTrack(props: { navigation: any }) {
                             source={require('../assets/images/return.png')}
                         />
                     </Pressable>
-                    <Pressable style={styles.button} onPress={() => navigation.goBack()}>
+                    <Pressable style={styles.button} onPress={handleConfirm}>
                         <Image
                             style={styles.return}
                             source={require('../assets/images/checked.png')}

R-Dash/screens/Point_Viewer.tsx

@@ -0,0 +1,256 @@
+import { BackgroundImage } from '@rneui/base';
+import { StyleSheet, Text, View, TouchableOpacity, ScrollView } from 'react-native';
+import { SafeAreaView } from 'react-native-safe-area-context';
+import MapView, { MapCallout, Marker } from 'react-native-maps';
+import React from 'react';
+import TopBar from '../components/TopBar';
+import { Point } from '../core/Point';
+
+export default function Lap(props: { navigation: any, route : any}) {
+    const { currentLap } = props.route.params;
+    const { navigation } = props;
+
+    const points: Point[] =  currentLap.getPoints();
+    points.sort((pt1, pt2) => pt1.getTimer() - pt2.getTimer());
+
+
+    const [currentPointIndex, setCurrentPointIndex] = React.useState(0);
+    const currentPoint: Point | undefined = points[currentPointIndex];
+
+    const goToPreviousPoint = () => {
+        if (currentPointIndex > 0) {
+            setCurrentPointIndex(currentPointIndex - 1);
+            
+        }
+    };
+
+    const goToNextPoint = () => {
+        if (currentPointIndex < points.length - 1) {
+            setCurrentPointIndex(currentPointIndex + 1);
+        }
+    };
+
+    const markers: { id: number; name: string; coordinate: { latitude: number; longitude: number }, image: HTMLImageElement }[] = points.map((pt, index) => {
+        var img;
+        const brake = pt.getPBreakF();
+        if(brake <= 0)
+        {
+            img = require("../assets/images/noBrake.png");
+        }else if(brake > 0 && brake <= 30){
+            img = require("../assets/images/startBrake.png");
+        }else if(brake > 0 && brake <= 100){
+            img = require("../assets/images/midBrake.png");
+        }else{
+            img = require("../assets/images/fullBrake.png");
+        }
+        return {
+          id: index,
+          name: pt.getDistance() + 'm',
+          coordinate: { latitude: pt.getGeo().getGpsLat(), longitude: pt.getGeo().getGpsLong() },
+          image: img,
+        };
+      });
+
+    const handleMarker = (index : number) => {
+        setCurrentPointIndex(index);
+    }
+
+    // currentLap.getPoints().forEach(pt => {
+    //     points.push({ latitude: pt.getGeo().getGpsLat(), longitude: pt.getGeo().getGpsLong() });
+            
+    // });
+
+    //var currentLap : undefined; // Penser à vérifier si la session ne possède pas de tour !! si c'est le cas afficher une popup d'erreur
+    return (
+        <SafeAreaView style={styles.container}>
+            <View style={styles.container}>
+                {/* Header */}
+                <TopBar navigation={navigation} />
+                
+                {/* Body */}
+                <View style={styles.container}>
+
+                        <View style={styles.top_lap}>
+                            <TouchableOpacity style={[styles.LapBrowserButton, currentPointIndex === 0 ? styles.disabled : null]} onPress={goToPreviousPoint}>
+                                <View>
+                                    <Text style={styles.button_text} >Previous Point</Text>
+                                </View>
+                            </TouchableOpacity>
+
+                            <Text style={styles.text_title}>Point {currentPointIndex + 1 } </Text>
+
+                            <TouchableOpacity style={[styles.LapBrowserButton, currentPointIndex === points.length - 1 ? styles.disabled : null]} onPress={goToNextPoint}>
+                                <View>
+                                    <Text style={styles.button_text} >Next Point</Text>
+                                </View>
+                            </TouchableOpacity>
+
+                        </View>
+
+                        <View style={styles.containerBody}>
+                            <MapView
+                                style={styles.map}
+                                mapType="satellite"
+                                region={{
+                                    latitude:  currentLap.getLocationLat(),
+                                    longitude: currentLap.getLocationLong(),
+                                    latitudeDelta: 0.001,
+                                    longitudeDelta: 0.015,
+                                }}
+                            >
+                                {markers.map(({ id, name, coordinate,image }) => (
+                                    <Marker key={id} title={name} coordinate={coordinate} onPress={() => handleMarker(id)} icon={image} style={{ width: 1, height: 1 }} />
+                                ))}
+                                 
+
+                            </MapView>
+                            <ScrollView style={ styles.scrollView}>
+                            <BackgroundImage source={require('../assets/images/rdash.png')} resizeMode="contain" >   
+                                
+                                <View style={styles.container2}>
+
+                                    <Text style={styles.header}>Point { currentPointIndex + 1} / { points.length} of Lap {currentLap.getNumber()}</Text>
+                                    
+                                    <View style={styles.infoContainer}>
+                                        <Text style={styles.infoItem}>Time:</Text>
+                                        <Text style={styles.infoValue}>{currentPoint.getFormattedTime()}</Text>
+                                    </View>
+                                    
+                                    <View style={styles.infoContainer}>
+                                        <Text style={styles.infoItem}>Distance:</Text>
+                                        <Text style={styles.infoValue}>{currentPoint.getDistance()} m</Text>
+                                    </View>
+
+                                    <View style={styles.infoContainer}>
+                                        <Text style={styles.infoItem}>Speed (vCar):</Text>
+                                        <Text style={styles.infoValue}>{currentPoint.getVCar()} km/h</Text>
+                                    </View>
+
+                                    
+                                    
+                                    <View style={styles.infoContainer}>
+                                        <Text style={styles.infoItem}>nGear:</Text>
+                                        <Text style={styles.infoValue}>{currentPoint.getNGear()} gear</Text>
+                                    </View>
+
+                                    <View style={styles.infoContainer}>
+                                        <Text style={styles.infoItem}>pBreakF:</Text>
+                                        <Text style={styles.infoValue}>{currentPoint.getPBreakF()} bar</Text>
+                                    </View>
+                                    <View style={styles.infoContainer}>
+                                        <Text style={styles.infoItem}>aSteer:</Text>
+                                        <Text style={styles.infoValue}>{currentPoint.getASteer()} deg</Text>
+                                    </View>
+                                    <View style={styles.infoContainer}>
+                                        <Text style={styles.infoItem}>rPedal:</Text>
+                                        <Text style={styles.infoValue}>{currentPoint.getRPedal()} %</Text>
+                                    </View>
+                                    <View style={styles.infoContainer}>
+                                        <Text style={styles.infoItem}>gLong:</Text>
+                                        <Text style={styles.infoValue}>{currentPoint.getGLong()} g</Text>
+                                    </View>
+                                    <View style={styles.infoContainer}>
+                                        <Text style={styles.infoItem}>gLat:</Text>
+                                        <Text style={styles.infoValue}>{currentPoint.getGLat()} g</Text>
+                                    </View>
+                                </View>
+                            </BackgroundImage>
+                            </ScrollView>
+                        </View>
+                </View>
+
+            </View>
+        </SafeAreaView>
+    );
+}
+
+
+const styles = StyleSheet.create({
+    scrollView: {
+        flex:1,
+    },
+    disabled: {
+        opacity: 0.5,
+        },
+    addContainerButton: {
+        margin:5,
+        alignItems: "center",
+        justifyContent: "center",
+        height: "8%",
+        borderRadius: 10,
+        elevation: 3,
+        backgroundColor: "#BF181F",
+      },
+    containerBody:{
+        flex: 1,
+        justifyContent: 'space-between',
+        alignItems: 'stretch',
+    },
+    container2: {
+        backgroundColor: 'rgba(255, 255, 255, 0.9)',
+        borderColor:'black',
+        borderWidth:2,
+        padding: 10,
+        borderRadius: 10,
+        marginBottom: 20,
+        shadowColor: '#000',
+        shadowOffset: {
+            width: 0,
+            height: 2,
+            },
+        shadowOpacity: 0.25,
+        shadowRadius: 3.84,
+        elevation: 5,
+    },
+    header: {
+        fontSize: 24,
+        fontWeight: 'bold',
+        marginBottom: 10,
+    },
+    infoContainer: {
+        flexDirection: 'row',
+        justifyContent: 'space-between',
+        marginBottom: 5,
+    },
+    infoItem: {
+        fontSize: 18,
+        fontWeight: 'bold',
+    },
+    infoValue: {
+        fontSize: 18,
+    },
+    map: {
+        flex:1,
+    },
+    top_lap: {
+        height: "8%",
+        flexDirection: 'row',
+        justifyContent: 'space-between',
+    },
+    backgroundImage: {
+        flex: 1,
+        width: '100%',
+    },
+    container: {
+        flex: 1,
+    },
+    LapBrowserButton: {
+        width: "30%",
+        marginTop:5,
+        marginBottom:5,
+        alignContent: 'center',
+        justifyContent: 'center',
+        borderRadius: 10,
+        backgroundColor: '#BF181F',
+    },
+    button_text: {
+        textAlign: 'center',
+        color: '#fff',
+        fontSize: 20,
+    },
+    text_title: {
+        fontSize: 30,
+        textAlign: 'center',
+    },
+
+});

R-Dash/screens/Register.tsx

@@ -1,9 +1,7 @@
-import { useState } from 'react';
 import React from 'react';
-import { Button, Pressable, Touchable } from 'react-native';
+import { Pressable } from 'react-native';
 import { StyleSheet, Text, View, Image, TextInput } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
-import Navigation from '../navigation/Navigation';
 
 export default function Register(props: { navigation: any }) {
     const { navigation } = props;

R-Dash/screens/Session_browser.tsx

@@ -1,91 +1,102 @@
-import { BackgroundImage } from '@rneui/base';
+import { BackgroundImage, SearchBar } from "@rneui/base";
-import React from 'react';
+import React, { useEffect, useState } from "react";
-import { FlatList, StyleSheet, Text, View, Image, TouchableOpacity, TouchableHighlight } from 'react-native';
+import {
-import TopBar from '../components/TopBar';
+  FlatList,
+  StyleSheet,
+  Text,
+  View,
+  TouchableOpacity,
+  ActivityIndicator,
+} from "react-native";
+import { useDispatch, useSelector } from "react-redux";
+import SessionListItem from "../components/SessionCmp";
+import TopBar from "../components/TopBar";
+import { Session } from "../core/Session";
+import { getSessionsList } from "../redux/actions/sessions";
+import { SESSIONS } from "../stub/stub";
 
-export default function Session_browser(props: {navigation: any}) {
+export default function Session_browser(props: { navigation: any }) {
-    type ItemProps = { title: string };
+  const { navigation } = props;
-    const { navigation } = props;
+  const [search, setSearch] = useState("");
-  const Item = ({title}: ItemProps) => (
+  const [loading, setLoading] = useState(false);
-    <View style={styles.item}>
-      <Text style={styles.title}>{title}</Text>
-    </View>
-    );
-  const DATA = [
-    {
-      id: 'bd7acbea-c1b1-46c2-aed5-3ad53abb28ba',
-      title: 'First Item',
-    },
-    {
-      id: '3ac68afc-c605-48d3-a4f8-fbd91aa97f63',
-      title: 'Second Item',
-    },
-    {
-      id: '58694a0f-3da1-471f-bd96-145571e29d71',
-      title: 'Third Item',
-    },
-    {
-      id: '58694a0f-3da1-471f-bd96-145571e29d78',
-      title: 'c Item',
-    },
-    {
-      id: '58694a0f-3da1-471f-bd96-145571e29d76',
-      title: 'b Item',
-    },
-    {
-      id: '58694a0f-3da1-471f-bd96-145571e29d75',
-      title: 'a Item',
-    },
-    {
-      id: '58694a0f-3da1-471f-bd96-145571e29d73',
-      title: 's Item',
-    },
-    {
-      id: '58694a0f-3da1-471f-bd96-145571e29d13',
-      title: 's Item',
-    },
-  ];
-  
-  return (
-    <View style={styles.container}>
-          <View style={styles.container}>
-                  {/* Header */}
-                  <TopBar navigation={navigation} />
 
-          {/* Body */}
+  const handlePress = (item: Session) => {
-          <View style={styles.container}>
+    setSearch("");
-            <BackgroundImage source={require('../assets/images/rdash.png')} resizeMode="contain" style={styles.backgroundImage}>
+    navigation.navigate("Lap", { "session" : item });
+  };
 
-              <Text style={styles.text_title}>Sessions</Text>
-              
-                      <FlatList data={DATA} renderItem={({ item }) =>
-                          <TouchableHighlight onPress={() => navigation.navigate('Lap', { "lap": item })}>
-                              <Item title={item.title} />
-                          </TouchableHighlight>
-                      } keyExtractor={(Item) => Item.title} />
 
-             <TouchableOpacity style={styles.addContainerButton} onPress={() => navigation.navigate('Add')}>
+    const sessions = useSelector(state => state.appReducer.sessions);
-                <View>
-                  <Text style={styles.button_text} >Add a session</Text>
-                </View>
-             </TouchableOpacity>
-              
-            </BackgroundImage>
-            
-          </View>
 
+    const dispatch = useDispatch();
+    useEffect(() => {
+      setLoading(true);
+        const loadTeams = async () => {
+            await dispatch(getSessionsList());
+            setLoading(false);
+        };
+        loadTeams();
+    }, [dispatch]);
 
-        </View>
+    const filteredData =
+    search !== ""
+      ? sessions.filter((item) =>
+          item.getName().toLowerCase().includes(search.toLowerCase())
+        )
+      : sessions;
+  return (
+    <View style={styles.container}>
+      <View style={styles.container}>
+        {/* Header */}
+        <TopBar navigation={navigation} />
+
+        {/* Body */}
+        <View style={styles.container}>
+          <BackgroundImage
+            source={require("../assets/images/rdash.png")}
+            resizeMode="contain"
+            style={styles.backgroundImage}
+          >
 
+            <Text style={styles.text_title}>Sessions</Text>
+            <SearchBar
+              platform="default"
+              lightTheme
+              value={search}
+              onChangeText={setSearch}
+            />
+            {loading ? (
+              <ActivityIndicator size="large" color="#BF181F" />
+            ) : (
+              <FlatList
+                data={filteredData}
+                renderItem={({ item }) => (
+                  <SessionListItem session={item} onPress={handlePress} />
+                )}
+                keyExtractor={(Item) => Item.getName()}
+              />
+            )}
+
+            <TouchableOpacity
+              style={styles.addContainerButton}
+              onPress={() => navigation.navigate("Add")}
+            >
+              <View>
+                <Text style={styles.button_text}>Add a session</Text>
+              </View>
+            </TouchableOpacity>
+          </BackgroundImage>
+        </View>
+      </View>
     </View>
   );
 }
 
 const styles = StyleSheet.create({
   item: {
-    borderRadius:10,
+    borderRadius: 10,
-    opacity:0.9,
+    opacity: 0.9,
-    backgroundColor: '#C5C5C5',
+    backgroundColor: "#C5C5C5",
     padding: 20,
     marginVertical: 8,
     marginHorizontal: 16,
@@ -94,51 +105,50 @@ const styles = StyleSheet.create({
     fontSize: 32,
   },
   backgroundImage: {
-    flex:1,
+    flex: 1,
-    width:'100%',
+    width: "100%",
   },
 
   container: {
-    flex:1,
+    flex: 1,
   },
-  
+
-  addImageContainer:{
+  addImageContainer: {
-    backgroundColor: '#fff',
+    backgroundColor: "#fff",
     borderRadius: 50,
     width: 40,
     height: 40,
-    overflow: 'hidden',
+    overflow: "hidden",
-    alignItems:'center'
+    alignItems: "center",
   },
-  
+
-  addContainerButton:{
+  addContainerButton: {
-      margin:10,
+    margin: 10,
-      alignItems:'center',
+    alignItems: "center",
-      justifyContent:'center',
+    justifyContent: "center",
-      height: "10%",
+    height: "10%",
-      paddingVertical: 12,
+    paddingVertical: 12,
-      paddingHorizontal: 32,
+    paddingHorizontal: 32,
-      borderRadius: 10,
+    borderRadius: 10,
-      elevation: 3,
+    elevation: 3,
-      backgroundColor: '#BF181F',
+    backgroundColor: "#BF181F",
   },
   button_text: {
-    color:'#fff',
+    color: "#fff",
-    fontSize:20,
+    fontSize: 20,
   },
-  
+
   text_title: {
-    fontWeight: 'bold',
+    fontWeight: "bold",
     fontSize: 30,
-    textAlign:'center',
+    textAlign: "center",
-    padding:10,
+    padding: 10,
-    textShadowColor: '#fff',
+    textShadowColor: "#fff",
     textShadowOffset: { width: 0, height: 0 },
     textShadowRadius: 10,
-    },
+  },
 
-    topbar: {
+  topbar: {
-        height: '10%',
+    height: "10%",
-    }
+  },
-  
 });

R-Dash/screens/Team_Browser.tsx

@@ -1,49 +1,39 @@
-import { Button, FlatList, Pressable, StyleSheet, Text, View } from 'react-native';
+import {  FlatList,  StyleSheet, Text, View } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
 import { SearchBar } from '@rneui/base';
-import { TouchableHighlight } from 'react-native-gesture-handler';
+import React, { useState, useEffect } from 'react';
-import React from 'react';
+import { TEAMS } from '../stub/stub';
-
+import TeamListItem from '../components/TeamCmp';
+import { Team } from '../core/Team';
+import { useDispatch, useSelector } from 'react-redux';
+import { getTeamsList } from "../redux/actions/teams";
 
 
 export default function Team_Browser(props: { navigation: any }) {
     const { navigation } = props;
-    type ItemProps = { title: string };
+    const [search, setSearch] = useState('');
-  const Item = ({title}: ItemProps) => (
+
-    <View style={styles.item}>
+    const handlePress = (item: Team) => {
-      <Text style={styles.title}>{title}</Text>
+      setSearch('');
-    </View>
+      navigation.navigate('Info', { "": item }); // A revoir
-  );
+    };
-  const DATA = [
+
-    {
+    const filteredData = search !== '' ? TEAMS.filter((item) =>
-      id: 'bd7acbea-c1b1-46c2-aed5-3ad53abb28ba',
+        item.getName().toLowerCase().includes(search.toLowerCase())
-      title: 'First Item',
+    ) : TEAMS;
-    },
+
-    {
+    const nList = useSelector(state => state.appReducer.teams);
-      id: '3ac68afc-c605-48d3-a4f8-fbd91aa97f63',
+
-      title: 'Second Item',
+    const dispatch = useDispatch();
-    },
+
-    {
+    useEffect(() => {
-      id: '58694a0f-3da1-471f-bd96-145571e29d71',
+        const loadTeams = async () => {
-      title: 'Third Item',
+            await dispatch(getTeamsList());
-    },
+        };
-    {
+        loadTeams();
-      id: '58694a0f-3da1-471f-bd96-145571e29d78',
+    }, [dispatch]);
-      title: 'c Item',
+
-    },
+    
-    {
-      id: '58694a0f-3da1-471f-bd96-145571e29d76',
-      title: 'b Item',
-    },
-    {
-      id: '58694a0f-3da1-471f-bd96-145571e29d75',
-      title: 'a Item',
-    },
-    {
-      id: '58694a0f-3da1-471f-bd96-145571e29d73',
-      title: 's Item',
-    },
-  ];
   return (
     <SafeAreaView style={styles.container}>
         <View style={styles.card}>
@@ -51,12 +41,12 @@ export default function Team_Browser(props: { navigation: any }) {
           <SearchBar
             platform="default"
             lightTheme
+            value={search}
+            onChangeText={setSearch}
           />
-              <FlatList data={DATA} renderItem={({ item }) =>
+          <FlatList
-                  <TouchableHighlight onPress={() => navigation.navigate('Info', { "team": item })}>
+            data={nList}
-                      <Item title={item.title} />
+            renderItem={({ item }) => <TeamListItem team={item} onPress={handlePress}/>} />
-                  </TouchableHighlight>
-              }/>
         </View>
         
     </SafeAreaView>

R-Dash/screens/Team_Info.tsx

@@ -1,9 +1,9 @@
 import React from 'react';
-import { Button, Pressable } from 'react-native';
+import { Pressable } from 'react-native';
 import { StyleSheet, Text, View, Image } from 'react-native';
 import { SafeAreaView } from 'react-native-safe-area-context';
 
-export default function InfoTeam(props: { navigation: any }) {
+export default function Team_Info(props: { navigation: any }) {
     const { navigation } = props;
     return (
         <SafeAreaView style={styles.container}>

R-Dash/screens/Team_Selection.tsx

@@ -1,6 +1,5 @@
 import React from 'react';
-import { Button, Pressable, StyleSheet, Text, View } from 'react-native';
+import { Pressable, StyleSheet, Text, View } from 'react-native';
-import { SafeAreaView } from 'react-native-safe-area-context';
 import TopBar from '../components/TopBar';
 
 export default function Team_Selection(props: { navigation: any }) {

R-Dash/stub/stub.tsx

@@ -0,0 +1,53 @@
+import { Geocalisation } from "../core/Geocalisation";
+import { Lap } from "../core/Lap";
+import { Member } from "../core/Member";
+import { Owner } from "../core/Owner";
+import { Point } from "../core/Point";
+import { Session } from "../core/Session";
+import { SessionType } from "../core/SessionType";
+import { Team } from "../core/Team";
+import { User } from "../core/User";
+import { WaitingMember } from "../core/WaitingMember";
+
+const owner1 = new Owner("eric","PASSWORD123","eric@gmail.com",[]);
+const owner2 = new Owner("castor","PASSWORD123","castor@gmail.com",[]);
+
+export const USERS1 : User[] = [
+    new Member("jean","PASSWORD123","jean@gmail.com",[]),
+    new WaitingMember("anas","PASSWORD123","anas@gmail.com",[]),
+] 
+export const USERS2 : User[] = [
+    new Member("stickman","PASSWORD123","stickman@gmail.com",[]),
+    new Member("crapaud","PASSWORD123","crapaud@gmail.com",[]),
+    new WaitingMember("mcdo","PASSWORD123","mcdo@gmail.com",[]),
+    new WaitingMember("bucheron","PASSWORD123","bucheron@gmail.com",[]),
+]
+
+export const TEAMS : Team[] = [
+    new Team("La team 1",owner1, USERS1),
+    new Team("Bat INFO",owner2,USERS2)
+]
+
+
+const geo1 = new Geocalisation(40.7128, -74.0060);
+const geo2 = new Geocalisation(51.5074, -0.1278);
+const geo3 = new Geocalisation(35.6895, 139.6917);
+
+
+const point1 = new Point(geo1, 120, 10, 3, 50, 90, 20, 10, 20, 100);
+const point2 = new Point(geo2, 130, 15, 4, 60, 100, 30, 15, 25, 120);
+const point3 = new Point(geo3, 140, 20, 5, 70, 110, 40, 20, 30, 140);
+
+
+const lap1 = new Lap(1, [point1, point2], 250);
+const lap2 = new Lap(2, [point2, point3], 300);
+const lap3 = new Lap(3, [point3, point1], 350);
+
+
+const session1 = new Session("First Session", [lap1, lap2], SessionType.PrivateTest);
+const session2 = new Session("Second Session", [lap2, lap3], SessionType.Qualification);
+const session3 = new Session("Third Session", [lap3, lap1], SessionType.Unknown);
+
+export const SESSIONS : Session[] = [ 
+    session1,session2,session3
+]