fix bugs

SE-TINF22B2 · Jun 15, 2024 · c7ac708 · c7ac708
1 parent 774139c
commit c7ac708
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 9 deletions.
diff --git a/frontend/proxy.conf.js b/frontend/proxy.conf.js
@@ -4,12 +4,10 @@ const PROXY_CONFIG = [
         context: [
           "/api/"
         ],
-        target: "https://staging.duo-gradus.de/api",
+        target: "https://staging.duo-gradus.de",
         changeOrigin: true,
         secure: false,
-        pathRewrite: {
-            "^/api": ""
-        }
+
 
       }
     ];

diff --git a/frontend/src/app/components/organisms/statistic-header/statistic-header.component.html b/frontend/src/app/components/organisms/statistic-header/statistic-header.component.html
@@ -19,7 +19,7 @@ <h2>{{ eventservice.steps }}</h2>
 
     <div class="streak">
       <img src="../../../../assets/icons/f7--flame.svg" alt="Icon Streak" />
-      <h2>{{mainpageservice.streak.streak}}</h2>
+      <h2>{{this.mainpageservice.streak.streak}}</h2>
     </div>
   </div>
 </div>
diff --git a/frontend/src/app/components/pages/mainpage/mainpage.component.ts b/frontend/src/app/components/pages/mainpage/mainpage.component.ts
@@ -12,7 +12,7 @@ export class MainpageComponent implements OnInit{
   constructor(private LoaderService: LoaderService) { }
 
   ngOnInit(): void {
-    this.LoaderService.show();
+
 
   }
 

diff --git a/frontend/src/app/services/auth.service.ts b/frontend/src/app/services/auth.service.ts
@@ -31,6 +31,7 @@ export class AuthService {
     });
     this.http.get<any>(this.apiUrl, { headers: headers }).subscribe(
       (data: any) => {
+        console.log('success');
         this.loaderService.hide();
         localStorage.setItem('credentials', JSON.stringify(this.credentials));
         this.router.navigate(['/main']);

diff --git a/frontend/src/app/services/mainpage.service.ts b/frontend/src/app/services/mainpage.service.ts
@@ -23,16 +23,14 @@ export class MainpageService {
    */
   getListOfAllTasks()
   {
+    console.log('getListOfAllTasks');
     const credentials = this.authService.getCredentials();
     const headers = new HttpHeaders({
       'Content-Type': 'application/json',
       'Authorization': `Basic ${credentials}`
     });
     this.http.get<any>(this.apiUrlTask, { headers: headers }).subscribe(
       (data: any) => {
-        setTimeout(() => {
-          this.loaderService.hide();
-        }, 200);
         console.error('datas:', data);
         this.taskdata = data;
       },