resolved conflicts

backend/dist/admin/admin.controller.d.ts

@@ -0,0 +1,10 @@
+import { AdminService } from './providers/admin.service';
+import { AdminDTO } from './dtos/create-admin.dto';
+export declare class AdminController {
+    private readonly adminService;
+    constructor(adminService: AdminService);
+    signUp(adminDto: AdminDTO): Promise<import("./admin.entity").Admin[]>;
+    getPlatformStats(): void;
+    manageUsers(): void;
+    addSong(): Promise<void>;
+}

backend/dist/admin/admin.entity.d.ts

@@ -0,0 +1,13 @@
+export declare class Admin {
+    id: string;
+    name: string;
+    email: string;
+    password: string;
+    avatar: string;
+    tokens: number;
+    totalScore: number;
+    gamesPlayed: number;
+    gamesWon: number;
+    createdAt: Date;
+    updatedAt: Date;
+}

backend/dist/admin/dtos/create-admin.dto.d.ts

@@ -0,0 +1,10 @@
+export declare class AdminDTO {
+    id?: string;
+    name: string;
+    email: string;
+    password: string;
+    avatar?: string;
+    tokens: number;
+    createdAt?: Date;
+    updatedAt?: Date;
+}

backend/dist/admin/providers/admin.service.d.ts

@@ -0,0 +1,22 @@
+import { AuthService } from './../../auth/providers/auth.service';
+import { UserService } from 'src/user/providers/user.service';
+import { SongService } from 'src/song/providers/song.service';
+import { Admin } from '../admin.entity';
+import { Repository } from 'typeorm';
+import { CreateAdminProvider } from './create-admin.services';
+import { AdminDTO } from '../dtos/create-admin.dto';
+export declare class AdminService {
+    private readonly authService;
+    private readonly userService;
+    private readonly songService;
+    private readonly adminRepository;
+    private readonly createAdminProvider;
+    constructor(authService: AuthService, userService: UserService, songService: SongService, adminRepository: Repository<Admin>, createAdminProvider: CreateAdminProvider);
+    signUp(adminDTO: AdminDTO): Promise<Admin[]>;
+    getPlatformStats(): void;
+    manageUsers(): void;
+    getUser(email: string): Promise<import("../../user/user.entity").User>;
+    addSong(): Promise<void>;
+    getSongs(): Promise<void>;
+    deleteSong(): Promise<void>;
+}