Skip to content

Commit

Permalink
BRS-1088: moving pass search to Pass Management route (#272)
Browse files Browse the repository at this point in the history
  • Loading branch information
cameronpettit authored May 15, 2023
1 parent 34da494 commit f0ef464
Show file tree
Hide file tree
Showing 49 changed files with 1,418 additions and 776 deletions.
2 changes: 1 addition & 1 deletion src/app/home/home.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@ describe('HomeComponent', () => {
fakeKeyCloakService.isAllowed();
expect(component).toBeTruthy();
let cardElement = fixture.debugElement.nativeElement.getElementsByTagName('app-nav-card');
expect(cardElement.length).toEqual(2);
expect(cardElement.length).toEqual(3);
});
});
18 changes: 8 additions & 10 deletions src/app/home/home.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,28 +14,26 @@ export class HomeComponent {
cardHeader: 'Parks Management',
cardTitle: 'Parks Management',
cardText: 'Manage parks, facilities and passes.',
navigation: 'parks',
navigation: '/parks',
},
];
constructor(
protected keyCloakService: KeycloakService,
protected configService: ConfigService
) {
if (this.configService.config.QR_CODE_ENABLED) {
this.cardConfig.push({
cardHeader: 'Pass Management',
cardTitle: 'Pass Management',
cardText: 'Check-in park guests via QR Code.',
navigation: 'pass-management',
});
}
this.cardConfig.push({
cardHeader: 'Pass Management',
cardTitle: 'Pass Management',
cardText: 'Check-in park guests via QR Code.',
navigation: '/pass-management',
});

if (keyCloakService.isAllowed('metrics')) {
this.cardConfig.push({
cardHeader: 'Site Metrics',
cardTitle: 'Site Metrics',
cardText: 'See pass counts for various states.',
navigation: 'metrics',
navigation: '/metrics',
});
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,49 +115,4 @@
</div>
</div>
</div>
</section>

<!-- Pass List -->
<section>
<app-fancy-header
[mainText]="'Passes'"
[headerColour1]="'#C55115'"
[headerColour2]="'#E86825'"
[buttonSettings1]="{
active: false,
text: '',
nav: '',
hidden: true
}"
[buttonSettings2]="{
active: false,
text: '',
nav: '',
hidden: true
}"
></app-fancy-header>
<div class="mx-4 mt-4">
<div class="row">
<div class="col-12">
<app-passes-capacity-bar></app-passes-capacity-bar>
</div>
</div>
</div>
<div class="mt-4">
<app-passes-filter></app-passes-filter>
</div>
<div class="mx-4 mt-4">
<div class="row">
<div class="col-12 col-lg-4">
<h3>Search Results</h3>
</div>
<div class="col-12 col-lg-8">
<app-passes-utility-buttons class="d-flex justify-content-lg-end"></app-passes-utility-buttons>
</div>
</div>
</div>
<div class="mt-4">
<app-passes-list></app-passes-list>
</div>
</section>
</div>
</section>

This file was deleted.

This file was deleted.

10 changes: 0 additions & 10 deletions src/app/parks-management/parks-management.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ import { ParkDetailsComponent } from './park-details/park-details.component';
import { ParksManagementComponent } from './parks-management.component';
import { FacilityEditComponent } from './facility-edit/facility-edit.component';
import { FacilityDetailsComponent } from './facility-details/facility-details.component';
import { PassesFilterFieldsComponent } from './facility-details/passes-filter/passes-filter-fields/passes-filter-fields.component';
import { PassesFilterComponent } from './facility-details/passes-filter/passes-filter.component';
import { PassesListComponent } from './facility-details/passes-list/passes-list.component';
import { BsModalService, ModalModule } from 'ngx-bootstrap/modal';
import { DsModalModule } from '../shared/components/modal/ds-modal.module';
import { ReactiveFormsModule } from '@angular/forms';
Expand All @@ -20,9 +17,7 @@ import { FacilityEditFormDetailsComponent } from './facility-edit/facility-edit-
import { FacilityEditFormPassRequirementsComponent } from './facility-edit/facility-edit-form/facility-edit-form-pass-requirements/facility-edit-form-pass-requirements.component';
import { FacilityEditFormPublishingDetailsComponent } from './facility-edit/facility-edit-form/facility-edit-form-publishing-details/facility-edit-form-publishing-details.component';
import { FacilityEditFormComponent } from './facility-edit/facility-edit-form/facility-edit-form.component';
import { PassesCapacityBarComponent } from './facility-details/passes-capacity-bar/passes-capacity-bar.component';
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
import { PassesUtilityButtonsComponent } from './facility-details/passes-utility-buttons/passes-utility-buttons.component';
import { ModifiersListComponent } from './modifiers-list/modifiers-list.component';
import { ModifiersFormComponent } from './modifiers-form/modifiers-form.component';
import { ParkEditFormComponent } from './park-edit-form/park-edit-form.component';
Expand All @@ -37,15 +32,10 @@ import { TextWithIconsModule } from '../shared/components/text-with-icons/text-w
ParkDetailsComponent,
FacilityDetailsComponent,
FacilityEditComponent,
PassesListComponent,
PassesFilterComponent,
PassesFilterFieldsComponent,
FacilityEditFormComponent,
FacilityEditFormPublishingDetailsComponent,
FacilityEditFormDetailsComponent,
FacilityEditFormPassRequirementsComponent,
PassesCapacityBarComponent,
PassesUtilityButtonsComponent,
ModifiersListComponent,
ModifiersFormComponent,
ParkEditFormComponent,
Expand Down
Loading

0 comments on commit f0ef464

Please sign in to comment.