From ff8c113bfc00576f90c0c414f6ce7fc1efe7a01a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Phillip=20K=C3=BChne?= <mail@phillipkuehne.de>
Date: Sat, 30 Sep 2023 00:43:19 +0000
Subject: [PATCH] Evrything is working.

Existing parts of frontend can access backend.
---
 backend/app.py                                         | 3 +++
 backend/requirements.txt                               | 1 +
 frontend/ng-karaoqueue/src/app/app.component.ts        | 5 ++---
 frontend/ng-karaoqueue/src/app/app.module.ts           | 2 --
 frontend/ng-karaoqueue/src/app/song-service.service.ts | 8 ++++----
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/backend/app.py b/backend/app.py
index a535b5a..3b22c16 100644
--- a/backend/app.py
+++ b/backend/app.py
@@ -7,7 +7,10 @@ import os
 import json
 from flask_basicauth import BasicAuth
 from helpers import nocache
+from flask_cors import CORS
+
 app = Flask(__name__, static_url_path='/static')
+CORS(app)
 
 basic_auth = BasicAuth(app)
 accept_entries = True
diff --git a/backend/requirements.txt b/backend/requirements.txt
index 01dcd23..e45448a 100644
--- a/backend/requirements.txt
+++ b/backend/requirements.txt
@@ -34,3 +34,4 @@ tomli==2.0.1
 typing_extensions==4.5.0
 urllib3==1.26.15
 Werkzeug==2.2.3
+flask_cors==4.0.0
diff --git a/frontend/ng-karaoqueue/src/app/app.component.ts b/frontend/ng-karaoqueue/src/app/app.component.ts
index de0b04e..3df27a6 100644
--- a/frontend/ng-karaoqueue/src/app/app.component.ts
+++ b/frontend/ng-karaoqueue/src/app/app.component.ts
@@ -1,5 +1,4 @@
 import { Component, OnInit } from '@angular/core';
-import { RuntimeConfigLoaderService } from 'runtime-config-loader';
  
 
 @Component({
@@ -9,9 +8,9 @@ import { RuntimeConfigLoaderService } from 'runtime-config-loader';
 })
 export class AppComponent implements OnInit{
 
-  constructor(private configSvc: RuntimeConfigLoaderService) {}
+  constructor() {}
   ngOnInit(): void {
-    console.log("API at ",this.configSvc.getConfigObjectKey("api"));
+    
   }
   title = 'KaraoQueue';
 }
diff --git a/frontend/ng-karaoqueue/src/app/app.module.ts b/frontend/ng-karaoqueue/src/app/app.module.ts
index 5ff2a2a..42e9e74 100644
--- a/frontend/ng-karaoqueue/src/app/app.module.ts
+++ b/frontend/ng-karaoqueue/src/app/app.module.ts
@@ -1,6 +1,5 @@
 import { BrowserModule, DomSanitizer } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
-import { RuntimeConfigLoaderModule } from 'runtime-config-loader';
 
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
@@ -94,7 +93,6 @@ import { debounceTime, distinctUntilChanged } from "rxjs/operators";
     MatTooltipModule,
     MatTreeModule,
     HttpClientModule,
-    RuntimeConfigLoaderModule
   ],
   providers: [],
   bootstrap: [AppComponent]
diff --git a/frontend/ng-karaoqueue/src/app/song-service.service.ts b/frontend/ng-karaoqueue/src/app/song-service.service.ts
index e808af8..dabe1f5 100644
--- a/frontend/ng-karaoqueue/src/app/song-service.service.ts
+++ b/frontend/ng-karaoqueue/src/app/song-service.service.ts
@@ -4,9 +4,8 @@ import { Song } from './models/song.model';
 import { Artist } from './models/artist.model';
 import { Genre } from './models/genre.model';
 import { Language } from './models/language.model';
-import { RuntimeConfigLoaderService} from 'runtime-config-loader';
  
-import { Observable } from 'rxjs';
+import { ConnectableObservable, Observable } from 'rxjs';
 
 @Injectable({
   providedIn: 'root'
@@ -16,9 +15,9 @@ export class SongServiceService {
   private api: string;
   constructor(
     private http: HttpClient,
-    private configSvc: RuntimeConfigLoaderService
   ) {
-    this.api=configSvc.getConfigObjectKey("api");
+    // TODO: get api from config
+    this.api= "http://localhost:5000/api";
   }
 
   searchSongByText(text: string): Observable<Array<Song>> {
@@ -28,6 +27,7 @@ export class SongServiceService {
 
     this.http.get(this.api +"/songs/compl?search="+text).subscribe((data: Observable<JSON>) => {
       data.forEach(element => {
+        console.log(element);
         out.push(new Song(element["title"],element["artist"],element["karafun_id"],element["duo"],element["explicit"],element["_id"],element["styles"],element["languages"]));
       });
     });