✔ Fix Side Nav ~

bifeldy · Apr 30, 2023 · dd17a72 · dd17a72
1 parent 5213f65
commit dd17a72
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 20 deletions.
diff --git a/dist/fansubid/browser/index.html b/dist/fansubid/browser/index.html
@@ -63,7 +63,7 @@
       <noscript>🎉 Harap Menyalakan JavaScript Untuk Dapat Mengakses Website Ini ✨</noscript>
     </div>
     <app-root></app-root>
-  <script src="runtime.c58400fc93d5aa8a.js" type="module"></script><script src="polyfills.325a71d3e423341a.js" type="module"></script><script src="scripts.03e7a8120a25f41a.js" defer></script><script src="main.df254bfe33f73690.js" type="module"></script>
+  <script src="runtime.c58400fc93d5aa8a.js" type="module"></script><script src="polyfills.325a71d3e423341a.js" type="module"></script><script src="scripts.03e7a8120a25f41a.js" defer></script><script src="main.438081f82b3be59f.js" type="module"></script>
 
 
 </body></html>
diff --git a/dist/fansubid/browser/main.438081f82b3be59f.js b/dist/fansubid/browser/main.438081f82b3be59f.js
diff --git a/dist/fansubid/browser/main.df254bfe33f73690.js b/dist/fansubid/browser/main.df254bfe33f73690.js
diff --git a/dist/fansubid/browser/ngsw.json b/dist/fansubid/browser/ngsw.json
@@ -1,6 +1,6 @@
 {
   "configVersion": 1,
-  "timestamp": 1682844036803,
+  "timestamp": 1682845245918,
   "index": "/index.html",
   "assetGroups": [
     {
@@ -39,7 +39,7 @@
         "/common.352e8983d5b95d05.js",
         "/favicon.ico",
         "/index.html",
-        "/main.df254bfe33f73690.js",
+        "/main.438081f82b3be59f.js",
         "/manifest.webmanifest",
         "/polyfills.325a71d3e423341a.js",
         "/runtime.c58400fc93d5aa8a.js",
@@ -110,8 +110,8 @@
     "/938.ff68b5c4111cea5e.js": "080c0a983ed364772d347904ee047a1536afb931",
     "/common.352e8983d5b95d05.js": "177e7ac9ed10a52b1fcd43bf59721e0ede7d7bec",
     "/favicon.ico": "071facb8fab2e4b3493dcfbb0b02d7bd21bca97e",
-    "/index.html": "8c2acc697722525c076e4c14cfd4bfdfd33d313b",
-    "/main.df254bfe33f73690.js": "89a509e372b1f548ab1391767a30bed4aeae3211",
+    "/index.html": "a334a9a96662eff02f1f05ed46bfb702aaf9a7d8",
+    "/main.438081f82b3be59f.js": "9b898712df4206442dd6e18c48113f025246ca53",
     "/manifest.webmanifest": "eafb5426cdc9fd714787e5453af315b9972875a3",
     "/polyfills.325a71d3e423341a.js": "18f8a8b77e7d11be1385d438c6d218cc68c0edb3",
     "/runtime.c58400fc93d5aa8a.js": "451c08e996608473517fbcb54fc183a43d278473",

diff --git a/dist/fansubid/server/main.js b/dist/fansubid/server/main.js
diff --git a/src/app/_shared/components/left-menu/left-menu.component.html b/src/app/_shared/components/left-menu/left-menu.component.html
@@ -8,7 +8,7 @@
     <div *ngIf="AS.currentUserSubject?.value; then sudahLogin; else belumLogin;"></div>
     <ng-template #sudahLogin>
       <mat-nav-list>
-        <a mat-list-item routerLink="/user" routerLinkActive="side-menu-link-active" (click)="LMS.onMouseHoverOut()">
+        <a mat-list-item routerLink="/user" routerLinkActive="side-menu-link-active" (click)="forceCloseSideNav()">
           <img class="jim" src="{{ AS.currentUserSubject?.value?.image_url }}" />
           <span [@animateText]="linkText ? 'show' : 'hide'" style="padding-left: 1.2em; padding-right: 0.2em;" class="text-truncate">
             {{ AS.currentUserSubject?.value?.kartu_tanda_penduduk_.nama }} <br /> {{ AS.currentUserSubject?.value?._email }}
@@ -24,13 +24,13 @@
     </ng-template>
     <ng-template #belumLogin>
       <mat-nav-list>
-        <a mat-list-item routerLink="/login" (click)="LMS.onMouseHoverOut()" routerLinkActive="side-menu-link-active">
+        <a mat-list-item routerLink="/login" (click)="forceCloseSideNav()" routerLinkActive="side-menu-link-active">
           <mat-icon style="padding-left: 0.2em;">login</mat-icon>
           <span [@animateText]="linkText ? 'show' : 'hide'" style="padding-left: 1.75em; padding-right: 0.2em;">Masuk</span>
         </a>
       </mat-nav-list>
       <mat-nav-list>
-        <a mat-list-item routerLink="/register" (click)="LMS.onMouseHoverOut()" routerLinkActive="side-menu-link-active">
+        <a mat-list-item routerLink="/register" (click)="forceCloseSideNav()" routerLinkActive="side-menu-link-active">
           <mat-icon style="padding-left: 0.2em;">group_add</mat-icon>
           <span [@animateText]="linkText ? 'show' : 'hide'" style="padding-left: 1.75em; padding-right: 0.2em;">Daftar</span>
         </a>
@@ -40,8 +40,7 @@
     <mat-divider style="margin-top: 8px;"></mat-divider>
 
     <mat-nav-list>
-      <a mat-list-item routerLink="{{ menu.link }}" *ngFor="let menu of mainMenus" routerLinkActive="side-menu-link-active"
-        (click)="LMS.onMouseHoverOut()">
+      <a mat-list-item routerLink="{{ menu.link }}" *ngFor="let menu of mainMenus" routerLinkActive="side-menu-link-active" (click)="forceCloseSideNav()">
         <mat-icon style="padding-left: 0.2em;" [matBadge]="menu.badge" matBadgeColor="warn" matBadgePosition="before">{{ menu.icon }}</mat-icon>
         <span [@animateText]="linkText ? 'show' : 'hide'" style="padding-left: 1.75em; padding-right: 0.2em;">{{ menu.name }}</span>
       </a>
@@ -50,7 +49,7 @@
     <mat-divider style="margin-top: 8px;"></mat-divider>
 
     <mat-nav-list>
-      <a mat-list-item routerLink="{{ menu.link }}" *ngFor="let menu of contentMenus" routerLinkActive="side-menu-link-active" (click)="LMS.onMouseHoverOut()">
+      <a mat-list-item routerLink="{{ menu.link }}" *ngFor="let menu of contentMenus" routerLinkActive="side-menu-link-active" (click)="forceCloseSideNav()">
         <mat-icon style="padding-left: 0.2em;" [matBadge]="menu.badge" matBadgeColor="warn" matBadgePosition="before">{{ menu.icon }}</mat-icon>
         <span [@animateText]="linkText ? 'show' : 'hide'" style="padding-left: 1.75em; padding-right: 0.2em;">{{ menu.name }}</span>
       </a>
@@ -63,7 +62,7 @@
         <mat-icon style="padding-left: 0.2em;">sailing</mat-icon>
         <span [@animateText]="linkText ? 'show' : 'hide'" style="padding-left: 1.75em; padding-right: 0.2em;">Web Torrent</span>
       </a>
-      <a mat-list-item routerLink="{{ menu.link }}" *ngFor="let menu of miscMenus" routerLinkActive="side-menu-link-active" (click)="LMS.onMouseHoverOut()">
+      <a mat-list-item routerLink="{{ menu.link }}" *ngFor="let menu of miscMenus" routerLinkActive="side-menu-link-active" (click)="forceCloseSideNav()">
         <mat-icon style="padding-left: 0.2em;" [matBadge]="menu.badge" matBadgeColor="warn" matBadgePosition="before">{{ menu.icon }}</mat-icon>
         <span [@animateText]="linkText ? 'show' : 'hide'" style="padding-left: 1.75em; padding-right: 0.2em;">{{ menu.name }}</span>
       </a>

diff --git a/src/app/_shared/components/left-menu/left-menu.component.ts b/src/app/_shared/components/left-menu/left-menu.component.ts
@@ -42,10 +42,6 @@ export class LeftMenuComponent implements OnInit, OnDestroy {
     return this.gs;
   }
 
-  get LMS(): LeftMenuService {
-    return this.lms;
-  }
-
   get mainMenus(): Menu[] {
     return this.lms.mainMenus;
   }
@@ -88,17 +84,21 @@ export class LeftMenuComponent implements OnInit, OnDestroy {
     }
   }
 
+  forceCloseSideNav(): void {
+    this.lms.forceCloseSideNav();
+  }
+
   logout(): void {
     this.as.logout();
   }
 
   openDocumentation(): void {
-    this.onMouseHoverOut();
+    this.forceCloseSideNav();
     this.router.navigateByUrl('/docs');
   }
 
   openWebTorrent(): void {
-    this.onMouseHoverOut();
+    this.forceCloseSideNav();
     if (!this.gs.isDesktop) {
       this.subsDialog = this.ds.openInfoDialog({
         data: {

diff --git a/src/app/_shared/services/left-menu.service.ts b/src/app/_shared/services/left-menu.service.ts
@@ -104,6 +104,13 @@ export class LeftMenuService {
     this.linkText = this.sideNavExpanded;
   }
 
+  forceCloseSideNav() {
+    if (!this.gs.isDesktop && this.sideNav.opened) {
+      this.sideNav.close();
+    }
+    this.onMouseHoverOut();
+  }
+
   onSideNavToggleView(): void {
     if (this.sideNav.opened) {
       this.sideNav.close();