diff --git a/src/FLAD/assets/images/background_home.png b/src/FLAD/assets/images/background.png
similarity index 100%
rename from src/FLAD/assets/images/background_home.png
rename to src/FLAD/assets/images/background.png
diff --git a/src/FLAD/assets/images/Flady.gif b/src/FLAD/assets/images/flady_.gif
similarity index 100%
rename from src/FLAD/assets/images/Flady.gif
rename to src/FLAD/assets/images/flady_.gif
diff --git a/src/FLAD/assets/sounds/click_sound.mp3 b/src/FLAD/assets/sounds/click.mp3
similarity index 100%
rename from src/FLAD/assets/sounds/click_sound.mp3
rename to src/FLAD/assets/sounds/click.mp3
diff --git a/src/FLAD/navigation/AuthNavigation.tsx b/src/FLAD/navigation/AuthNavigation.tsx
index d41aa38..1a4b1a1 100644
--- a/src/FLAD/navigation/AuthNavigation.tsx
+++ b/src/FLAD/navigation/AuthNavigation.tsx
@@ -51,7 +51,7 @@ export default function AuthNavigation() {
{isLogin ? (
) :
-
+
}
)
diff --git a/src/FLAD/redux/reducers/appReducer.tsx b/src/FLAD/redux/reducers/appReducer.tsx
index 57f795a..107dff6 100644
--- a/src/FLAD/redux/reducers/appReducer.tsx
+++ b/src/FLAD/redux/reducers/appReducer.tsx
@@ -3,19 +3,11 @@ import { Spot } from "../../model/Spot";
import { discoveriesTypes } from "../types/discoverieTypes";
import { favoritesTypes } from "../types/favoritesTypes";
import { spotifyTypes } from "../types/spotifyTypes";
-import { spotsData } from '../../data/data';
import { spotTypes } from "../types/spotTypes";
-let tmpMusic: Music[] = [
- new Music("03o8WSqd2K5rkGvn9IsLy2", "Autobahn", "Sch", "https://images.genius.com/83b6c98680d38bde1571f6b4093244b5.1000x1000x1.jpg", "https://p.scdn.co/mp3-preview/c55f95de81b8c3d0df04148da1b03bd38db56e8f?cid=774b29d4f13844c495f206cafdad9c86"),
- new Music("6DPrYPPGYK218iVIZDix3i", "Freeze Raƫl", "Freeze Corleone", "https://intrld.com/wp-content/uploads/2020/08/freeze-corleone-la-menace-fanto%CC%82me.png", "https://p.scdn.co/mp3-preview/a9f9cb19ac1fe6db0d06b67decf8edbb25895a33?cid=774b29d4f13844c495f206cafdad9c86"),
- new Music("5GFHFEASZeJF0gyWuDDjGE", "Kratos", "PNL", "https://upload.wikimedia.org/wikipedia/en/a/a0/PNL_-_Dans_la_l%C3%A9gende.png", "https://p.scdn.co/mp3-preview/9e854f4905c1228482e390169eb76d8520076b8f?cid=774b29d4f13844c495f206cafdad9c86"),
-];
-
-
const initialState = {
- spot: spotsData,
- favoriteMusic: tmpMusic,
+ spot: [] as Spot[],
+ favoriteMusic: [] as Music[],
userCurrentMusic: null
}
diff --git a/src/FLAD/screens/LoginScreen.tsx b/src/FLAD/screens/LoginScreen.tsx
index e47b649..677fe21 100644
--- a/src/FLAD/screens/LoginScreen.tsx
+++ b/src/FLAD/screens/LoginScreen.tsx
@@ -26,7 +26,7 @@ export default function LoginScreen() {
async function playSound() {
console.log('Loading Sound');
const { sound } = await Audio.Sound.createAsync(
- require('../assets/sounds/Click.mp3')
+ require('../assets/sounds/click.mp3')
);
setSound(sound);
await sound.playAsync();
@@ -72,7 +72,7 @@ export default function LoginScreen() {
value={password}
onChangeText={setPassword}
secureTextEntry style={[styles.input, styles.shadow]} />
-
+
diff --git a/src/FLAD/screens/RegisterScreen.tsx b/src/FLAD/screens/RegisterScreen.tsx
index d071753..167c58d 100644
--- a/src/FLAD/screens/RegisterScreen.tsx
+++ b/src/FLAD/screens/RegisterScreen.tsx
@@ -38,7 +38,7 @@ export default function RegisterScreen() {
async function playSound() {
const { sound } = await Audio.Sound.createAsync(
- require('../assets/sounds/click_sound.mp3')
+ require('../assets/sounds/click.mp3')
);
setSound(sound);
await sound.playAsync();
@@ -105,7 +105,7 @@ export default function RegisterScreen() {
return (
-
+
v2.0
diff --git a/src/FLAD/screens/StartScreen.tsx b/src/FLAD/screens/StartScreen.tsx
index fcb9f7c..7bcda2d 100644
--- a/src/FLAD/screens/StartScreen.tsx
+++ b/src/FLAD/screens/StartScreen.tsx
@@ -171,7 +171,7 @@ export default function StartScreen() {
-
+