✔ Router URL

bifeldy · May 20, 2023 · ba81b64 · ba81b64
1 parent c8c6762
commit ba81b64
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 18 deletions.
diff --git a/src/app/_pages/berkas/berkas-detail/berkas-detail.component.ts b/src/app/_pages/berkas/berkas-detail/berkas-detail.component.ts
@@ -120,15 +120,15 @@ export class BerkasDetailComponent implements OnInit, OnDestroy {
   login(): void {
     this.router.navigate(['/login'], {
       queryParams: {
-        returnUrl: this.router.url
+        returnUrl: this.router.url.split('?')[0]
       }
     });
   }
 
   verify(): void {
     this.router.navigate(['/verify'], {
       queryParams: {
-        returnUrl: this.router.url
+        returnUrl: this.router.url.split('?')[0]
       }
     });
   }

diff --git a/src/app/_pages/create/berkas-create/berkas-create.component.ts b/src/app/_pages/create/berkas-create/berkas-create.component.ts
@@ -577,7 +577,7 @@ export class BerkasCreateComponent implements OnInit, OnDestroy {
   verify(): void {
     this.router.navigate(['/verify'], {
       queryParams: {
-        returnUrl: this.router.url
+        returnUrl: this.router.url.split('?')[0]
       }
     });
   }

diff --git a/src/app/_pages/dorama/dorama-detail/dorama-detail.component.ts b/src/app/_pages/dorama/dorama-detail/dorama-detail.component.ts
@@ -121,7 +121,7 @@ export class DoramaDetailComponent implements OnInit, OnDestroy {
               this.fs.initializeFab(
                 null,
                 '/assets/img/logo/mdl.png', 'Buka Di MyDramaList',
-                `https://mydramalist.com/${this.router.url.split('/')[this.router.url.split('/').length - 1]}`,
+                `https://mydramalist.com/${this.router.url.split('?')[0].split('/')[this.router.url.split('?')[0].split('/').length - 1]}`,
                 true
               );
               this.getFansubDorama();

diff --git a/src/app/_pages/fansub/fansub-detail/fansub-detail.component.ts b/src/app/_pages/fansub/fansub-detail/fansub-detail.component.ts
@@ -564,7 +564,7 @@ export class FansubDetailComponent implements OnInit, OnDestroy {
     } else {
       this.router.navigate(['/login'], {
         queryParams: {
-          returnUrl: this.router.url
+          returnUrl: this.router.url.split('?')[0]
         }
       });
     }

diff --git a/src/app/_pages/nihongo/nihongo-belajar/nihongo-belajar.component.ts b/src/app/_pages/nihongo/nihongo-belajar/nihongo-belajar.component.ts
@@ -268,7 +268,7 @@ export class NihongoBelajarComponent implements OnInit, OnDestroy {
         this.toast.warning('Khusus Pengguna Terverifikasi', 'Whoops!', null, true);
         this.router.navigate(['/verify'], {
           queryParams: {
-            returnUrl: this.router.url
+            returnUrl: this.router.url.split('?')[0]
           }
         });
       }

diff --git a/src/app/_shared/components/quiz/quiz.component.ts b/src/app/_shared/components/quiz/quiz.component.ts
@@ -53,7 +53,7 @@ export class QuizComponent implements OnInit, OnDestroy {
   }
 
   get getQuiz(): any {
-    return this.quiz.getCurrentQuizQuestion(this.router.url);
+    return this.quiz.getCurrentQuizQuestion(this.router.url.split('?')[0]);
   }
 
   ngOnDestroy(): void {
@@ -73,7 +73,7 @@ export class QuizComponent implements OnInit, OnDestroy {
 
   selectAnswer(data: any): void {
     this.quiz.answerQuestion({
-      roomId: this.router.url,
+      roomId: this.router.url.split('?')[0],
       randomInteger: this.getQuiz.randomInteger,
       answer: data
     });

diff --git a/src/app/_shared/components/report/report.component.ts b/src/app/_shared/components/report/report.component.ts
@@ -169,8 +169,8 @@ export class ReportComponent implements OnInit, OnDestroy {
 
   ngOnInit(): void {
     if (this.gs.isBrowser) {
-      this.reportTrackType = this.router.url.split('/')[1];
-      this.idSlugUsername = this.router.url.split('/')[2];
+      this.reportTrackType = this.router.url.split('?')[0].split('/')[1];
+      this.idSlugUsername = this.router.url.split('?')[0].split('/')[2];
       this.ss.socketEmit('track-get', {
         trackType: this.reportTrackType,
         idSlugUsername: this.idSlugUsername

diff --git a/src/app/_shared/components/right-panel/live-chat/live-chat.component.ts b/src/app/_shared/components/right-panel/live-chat/live-chat.component.ts
@@ -65,7 +65,7 @@ export class LiveChatComponent implements OnInit, AfterViewInit, OnDestroy {
   ngOnInit(): void {
     if (this.gs.isBrowser) {
       this.liveChatResult = this.ls.getItem(this.gs.localStorageKeys.LiveChatResults, true) || this.liveChatResult;
-      this.liveChatResult.roomId = this.router.url;
+      this.liveChatResult.roomId = this.router.url.split('?')[0];
       this.subsCurrentRoom = this.ss.currentRoom.subscribe({
         next: current => {
           this.currentRoom = current;
@@ -194,7 +194,7 @@ export class LiveChatComponent implements OnInit, AfterViewInit, OnDestroy {
   login(): void {
     this.router.navigate(['/login'], {
       queryParams: {
-        returnUrl: this.router.url
+        returnUrl: this.router.url.split('?')[0]
       }
     });
   }

diff --git a/src/app/_shared/interceptors/http-response.interceptor.ts b/src/app/_shared/interceptors/http-response.interceptor.ts
@@ -100,7 +100,7 @@ export class HttpResponseInterceptor implements HttpInterceptor {
               this.bs.idle();
               this.router.navigate(['/login'], {
                 queryParams: {
-                  returnUrl: this.router.url || '/'
+                  returnUrl: this.router.url.split('?')[0] || '/'
                 }
               });
               break;
@@ -116,7 +116,7 @@ export class HttpResponseInterceptor implements HttpInterceptor {
               this.bs.idle();
               this.router.navigate(['/verify'], {
                 queryParams: {
-                  returnUrl: this.router.url || '/'
+                  returnUrl: this.router.url.split('?')[0] || '/'
                 }
               });
               break;

diff --git a/src/app/_shared/services/page-info.service.ts b/src/app/_shared/services/page-info.service.ts
@@ -60,7 +60,7 @@ export class PageInfoService {
       this.m.updateTag({ name: 'twitter:description', content: this.description });
     }
     this.m.updateTag({ name: 'twitter:image', content: this.image });
-    if (this.router.url.includes('/berkas/') && !this.image.includes(environment.baseUrl)) {
+    if (this.router.url.split('?')[0].includes('/berkas/') && !this.image.includes(environment.baseUrl)) {
       this.m.updateTag({ name: 'twitter:card', content: 'summary_large_image' });
     }
   }

diff --git a/src/app/_shared/services/stats-server.service.ts b/src/app/_shared/services/stats-server.service.ts
@@ -140,7 +140,7 @@ export class StatsServerService {
       this.pingPong();
       this.notif.removeNotif(`${environment.siteName.toUpperCase()}_SOCKET_DISCONNECTED`);
       this.timedOut = setTimeout(() => {
-        this.socketLeaveAndJoinNewRoom(null, this.router.url);
+        this.socketLeaveAndJoinNewRoom(null, this.router.url.split('?')[0]);
       }, 1234);
     });
     this.mySocket.on('connect_error', () => {

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -237,7 +237,7 @@ export class AppComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 
   updateBackgroundImage(): void {
-    const urlPath = this.router.url.substring(1).split('/')[0].split('?')[0];
+    const urlPath = this.router.url.split('?')[0].substring(1).split('/')[0];
     this.gs.bgImgUrlPath = urlPath ? `/assets/img/router/${urlPath}.png` : '';
   }
 
@@ -246,7 +246,7 @@ export class AppComponent implements OnInit, AfterViewInit, OnDestroy {
     this.subsVerify = this.as.verify(this.as.token).subscribe({
       next: success => {
         this.gs.log('[VERIFY_SUCCESS]', success);
-        this.ss.socketLeaveAndJoinNewRoom(this.gs.previousUrl, this.router.url);
+        this.ss.socketLeaveAndJoinNewRoom(this.gs.previousUrl, this.router.url.split('?')[0]);
         this.bs.idle();
       },
       error: error => {