set exact match for home page with empty route path.

release v17.0.1
changhuixu · Jul 14, 2024 · eed93a1 · eed93a1
1 parent b718b49
commit eed93a1
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 42 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,16 +1,18 @@
 {
-    "cSpell.words": [
-        "Changhui",
-        "depts",
-        "devkit",
-        "fontawesome",
-        "fortawesome",
-        "hawkid",
-        "packagr",
-        "submenu",
-        "toastr",
-        "Typeahead",
-        "uiowa",
-        "waitlist"
-    ]
+  "cSpell.words": [
+    "Changhui",
+    "depts",
+    "devkit",
+    "dlrs",
+    "fontawesome",
+    "fortawesome",
+    "hawkid",
+    "packagr",
+    "submenu",
+    "toastr",
+    "Typeahead",
+    "uiowa",
+    "waitlist",
+    "waitlists"
+  ]
 }
diff --git a/projects/uiowa/uiowa-header/package.json b/projects/uiowa/uiowa-header/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@uiowa/uiowa-header",
-  "version": "17.0.0",
+  "version": "17.0.1",
   "author": "Changhui Xu <[email protected]>",
   "description": "An Angular library for uiowa website header, including an IOWA branding bar and a website nav bar.",
   "keywords": [

diff --git a/projects/uiowa/uiowa-header/src/lib/uiowa-header/uiowa-header.component.html b/projects/uiowa/uiowa-header/src/lib/uiowa-header/uiowa-header.component.html
@@ -93,6 +93,7 @@ <h1 class="site-name">
         class="menu-item"
         *ngFor="let item of internalRoutes; let i = index"
         routerLinkActive="is-active"
+        [routerLinkActiveOptions]="{ exact: !item.route }"
       >
         <a
           *ngIf="!item.subMenus"

diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
@@ -6,11 +6,7 @@ import { RouterModule, Routes } from '@angular/router';
 const routes: Routes = [
   {
     path: '',
-    redirectTo: 'home',
     pathMatch: 'full',
-  },
-  {
-    path: 'home',
     component: HomeComponent,
   },
   {

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -24,11 +24,11 @@ export class AppComponent implements OnInit {
   ];
   applicationName = 'Awesome Application Name';
   internalRoutes = [
-    new InternalRoute('Home', 'home'),
+    new InternalRoute('Home', ''),
     new InternalRoute('Page with Tabs', 'page-with-tabs'),
     new InternalRoute('Form Wizards', 'form-wizards'),
     new InternalRoute('Dropdown Menus', '', [
-      new InternalRoute('Printing Orders', 'admin1/printingorders'),
+      new InternalRoute('Printing Orders', 'admin1/printingOrders'),
       new InternalRoute('Wait List', 'admin1/waitlist'),
       new InternalRoute('DLRS', 'admin1/dlrs'),
       new InternalRoute('', ''),

diff --git a/src/app/dropdown-menus/cards/waitlist/offer-card/offer-card.component.html b/src/app/dropdown-menus/cards/waitlist/offer-card/offer-card.component.html
@@ -17,14 +17,14 @@
   <div class="offer-card-footer d-flex justify-content-between">
     <button
       type="button"
-      class="btn btn-danger rounded-0"
+      class="btn btn-outline-danger rounded-0"
       (click)="open(declineModal)"
     >
       Decline
     </button>
     <button
       type="button"
-      class="btn btn-success rounded-0"
+      class="btn btn-outline-success rounded-0"
       (click)="open(acceptModal)"
     >
       Accept

diff --git a/src/app/dropdown-menus/cards/waitlist/offer-card/offer-card.component.ts b/src/app/dropdown-menus/cards/waitlist/offer-card/offer-card.component.ts
@@ -5,7 +5,7 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 @Component({
   selector: 'app-offer-card',
   templateUrl: './offer-card.component.html',
-  styleUrls: ['./offer-card.component.css']
+  styleUrls: ['./offer-card.component.css'],
 })
 export class OfferCardComponent implements OnInit {
   @Input() offer!: Offer;
@@ -14,11 +14,9 @@ export class OfferCardComponent implements OnInit {
 
   ngOnInit() {}
   open(content: any) {
-    this.modalService
-      .open(content, {
-        size: 'lg',
-        ariaLabelledBy: 'modal-title'
-      })
-      .result.then(_ => {}, _ => {});
+    this.modalService.open(content, {
+      size: 'lg',
+      ariaLabelledBy: 'modal-title',
+    });
   }
 }
diff --git a/src/app/dropdown-menus/cards/waitlist/waitlist-card/waitlist-card.component.html b/src/app/dropdown-menus/cards/waitlist/waitlist-card/waitlist-card.component.html
@@ -13,6 +13,8 @@
     </div>
   </div>
   <div class="waitlist-card-footer d-flex justify-content-center">
-    <button type="button" class="btn btn-danger rounded-0">Cancel Request</button>
+    <button type="button" class="btn btn-outline-danger rounded-0">
+      Cancel Request
+    </button>
   </div>
 </div>
diff --git a/src/app/dropdown-menus/dropdown-menus-routing.module.ts b/src/app/dropdown-menus/dropdown-menus-routing.module.ts
@@ -15,34 +15,34 @@ const routes: Routes = [
       {
         path: '',
         redirectTo: 'pendingReviews',
-        pathMatch: 'full'
+        pathMatch: 'full',
       },
       {
         path: 'pendingReviews',
-        component: PendingReviewsComponent
+        component: PendingReviewsComponent,
       },
       {
         path: 'dlrs',
-        component: DlrsComponent
+        component: DlrsComponent,
       },
       {
-        path: 'printingorders',
-        component: PrintingOrdersComponent
+        path: 'printingOrders',
+        component: PrintingOrdersComponent,
       },
       {
         path: 'waitlist',
-        component: ParkingWaitlistComponent
+        component: ParkingWaitlistComponent,
       },
       {
         path: 'my-waitlists',
-        component: WaitlistComponent
-      }
-    ]
-  }
+        component: WaitlistComponent,
+      },
+    ],
+  },
 ];
 
 @NgModule({
   imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule]
+  exports: [RouterModule],
 })
 export class DropdownMenusRoutingModule {}