Front: Fix Merge

This commit is contained in:
Arthur Jamet
2023-04-19 13:06:44 +01:00
53 changed files with 2749 additions and 388 deletions
-5
View File
@@ -1,5 +0,0 @@
interface Metrics {
}
export default Metrics;
-2
View File
@@ -1,4 +1,3 @@
import Metrics from "./Metrics";
import Model from "./Model";
import SongDetails from "./SongDetails";
@@ -8,7 +7,6 @@ interface Song extends Model {
albumId: number | null
genreId: number | null;
cover: string;
metrics: Metrics;
details: SongDetails;
}
+3 -3
View File
@@ -1,13 +1,13 @@
import Metrics from "./Metrics";
import UserData from "./UserData";
import Model from "./Model";
import UserSettings from "./UserSettings";
interface User extends Model {
name: string;
email: string;
xp: number;
isGuest: boolean;
premium: boolean;
metrics: Metrics;
data: UserData;
settings: UserSettings;
}
+8
View File
@@ -0,0 +1,8 @@
interface UserData {
gamesPlayed: number;
xp: number;
avatar: string | undefined;
createdAt: Date;
}
export default UserData;