merge fix

README.md

@@ -30,7 +30,7 @@
 
 :information_source: Ce projet est un travail universitaire pour la deuxième année du B.U.T Informatique de Clermont-Ferrand. 
 
-## Répartition du Gitlab
+## Répartition du Git
 
 La racine de notre gitlab est composée de deux dossiers essentiels au projet:
 

src/FLAD/redux/store.tsx

@@ -16,7 +16,7 @@ const store = configureStore({
   reducer: reducer,
   middleware: (getDefaultMiddleware) => getDefaultMiddleware({
     serializableCheck: {
-      ignoredActions: [spotTypes.FETCH_SPOT, spotifyTypes.GET_USER_CURRENT_MUSIC, favoritesTypes.ADD_FAVORITE_MUSICS, favoritesTypes.REMOVE_FAVORITE_MUSICS, spotTypes.REMOVE_SPOT ],
+      ignoredActions: [spotTypes.FETCH_SPOT, spotifyTypes.GET_USER_CURRENT_MUSIC, favoritesTypes.ADD_FAVORITE_MUSICS, favoritesTypes.REMOVE_FAVORITE_MUSICS, spotTypes.REMOVE_SPOT, userTypes.LOGIN, userTypes.SIGNUP ],
       ignoredActionPaths: ['appReducer'],
       ignoredPaths: ['appReducer', 'userReducer']
     }

src/FLAD/screens/Register.tsx

@@ -10,6 +10,8 @@ import { useDispatch, useSelector } from 'react-redux';
 import { Audio } from 'expo-av';
 import { CredentialsRegister } from '../redux/actions/userActions';
 import * as WebBrowser from 'expo-web-browser';
+import { spotArray2 } from '../data/data';
+import { setSpotList } from '../redux/actions/spotActions';
 
 // @ts-ignore
 const DismissKeyboard = ({ children }) => (
@@ -48,21 +50,38 @@ export default function InscriptionPage() {
 
   const dispatch = useDispatch();
 
+  function addMockSpots() {
+    dispatch(setSpotList(spotArray2))
+  }
+
   const submitForm = () => {
     const credentials: CredentialsRegister = {
       email: email,
       password: password,
       idSpotify: spotifyToken,
       name: username,
-      idFlad: "9835698"
+      idFlad: generateRandomString()
     };
 
     //@ts-ignore
     dispatch(registerUser(credentials))
-
+    addMockSpots()
     playSound()
   }
 
+  function generateRandomString(): string {
+    const alphabet = 'abcdefghijklmnopqrstuvwxyz';
+    let randomString = '';
+  
+    for (let i = 0; i < 8; i++) {
+      const randomIndex = Math.floor(Math.random() * alphabet.length);
+      const randomChar = alphabet[randomIndex];
+      randomString += randomChar;
+    }
+  
+    return randomString;
+  }
+
   const getTokens2 = async () => {
     try {
       const redirectUri = AuthSession.makeRedirectUri();

src/FLAD/screens/Setting.tsx

@@ -320,6 +320,8 @@ export default function Setting() {
                                 </View>
                             </View>
                         </View>
+                        {currentMusic ? (
+                            <>
                                 <View style={styles.titleMusic}>
                                     <Svg width="32" height="23" viewBox="0 0 28 21">
                                         <Path d="M5.84463 0.36924C5.37582 -0.0995746 4.59968 -0.13966 4.10723 0.35111C1.57056 2.8792 0 6.37809 0 10.243C0 14.2583 1.69511 17.8783 4.40753 20.4254C4.90303 20.8906 5.65829 20.8413 6.11707 20.3826C6.65205 19.8476 6.58697 18.9969 6.07118 18.5038C3.89425 16.4228 2.53916 13.4914 2.53916 10.243C2.53916 7.11727 3.79368 4.28541 5.82764 2.22202C6.3189 1.72366 6.36867 0.893273 5.84463 0.36924Z" fill={style.Text} />
@@ -332,10 +334,11 @@ export default function Setting() {
                                 </View>
 
                                 <View style={styles.musicActually}>
-                            
                                     <CardMusic image={currentMusic.image} title={currentMusic.title} description={currentMusic.bio} id='1' />
                                     <Image source={require("../assets/images/FladyShadow.png")} style={styles.mascot} />
                                 </View>
+                            </>
+                        ) : <></>}
 
                         <View style={styles.deconnectedOption}>
                             <View style={styles.buttonDeconectedOption}>

src/FLAD/screens/spot.tsx

@@ -159,7 +159,7 @@ export default function SpotPage() {
             <FladLoading />
           </View>
           <Text style={{ color: "grey", fontWeight: "400", textAlign: "center", top: 100 }}>Vous avez explorer toutes les spot autour de vous.
-            {"\n"}Continuer dans discoverie pour découvrir de nouvelles music basées dur vos gouts musicaux.</Text>
+            {"\n"}Continuer dans discoverie pour découvrir de nouvelles music basées sur vos gouts musicaux.</Text>
         </View>)
       }
     </View>