- added heist filter group at the market

Kyusung4698 · Sep 19, 2020 · 9fff770 · 9fff770
1 parent c9d0c80
commit 9fff770
Show file tree

Hide file tree

Showing 6 changed files with 131 additions and 5 deletions.
diff --git a/src/app/modules/market/component/index.ts b/src/app/modules/market/component/index.ts
@@ -12,17 +12,19 @@ export * from './market-input-select-option/market-input-select-option.component
 export * from './market-input-select/market-input-select.component';
 export * from './market-input/market-input.component';
 export * from './market-item-search-bar/market-item-search-bar.component';
+export * from './market-item-search-filter-heist/market-item-search-filter-heist.component';
 export * from './market-item-search-filter-misc/market-item-search-filter-misc.component';
+export * from './market-item-search-filter-trade/market-item-search-filter-trade.component';
 export * from './market-item-search-filter-type/market-item-search-filter-type.component';
 export * from './market-item-search-filter/market-item-search-filter.component';
+export * from './market-item-search-result/market-item-search-result.component';
 export * from './market-item-search-stat-group/market-item-search-stat-group.component';
 export * from './market-item-search-stat/market-item-search-stat.component';
 export * from './market-item-search-stats/market-item-search-stats.component';
 export * from './market-item-search/market-item-search.component';
 export * from './market-listing-status/market-listing-status.component';
 export * from './market-panel-group/market-panel-group.component';
 export * from './market-panel/market-panel.component';
-export * from './market-item-search-filter-trade/market-item-search-filter-trade.component';
 export * from './market-settings/market-settings.component';
 export * from './market-tab-group/market-tab-group.component';
 export * from './market-tab/market-tab.component';

diff --git a/.../component/market-item-search-filter-heist/market-item-search-filter-heist.component.html b/.../component/market-item-search-filter-heist/market-item-search-filter-heist.component.html
@@ -0,0 +1,82 @@
+<div class="market-row">
+    <div class="market-col">
+        <app-market-input-range label="Wings Revealed" path="heist_filters.filters.heist_wings" [request]="request">
+        </app-market-input-range>
+    </div>
+    <div class="market-col">
+        <app-market-input-range label="Total Wings" path="heist_filters.filters.heist_max_wings" [request]="request">
+        </app-market-input-range>
+    </div>
+</div>
+<div class="market-row">
+    <div class="market-col">
+        <app-market-input-range label="Escape Routes Revealed" path="heist_filters.filters.heist_escape_routes" [request]="request">
+        </app-market-input-range>
+    </div>
+    <div class="market-col">
+        <app-market-input-range label="Total Escape Routes" path="heist_filters.filters.heist_max_escape_routes" [request]="request">
+        </app-market-input-range>
+    </div>
+</div>
+<div class="market-row">
+    <div class="market-col">
+        <app-market-input-range label="Reward Rooms Revealed" path="heist_filters.filters.heist_reward_rooms" [request]="request">
+        </app-market-input-range>
+    </div>
+    <div class="market-col">
+        <app-market-input-range label="Total Reward Rooms" path="heist_filters.filters.heist_max_reward_rooms" [request]="request">
+        </app-market-input-range>
+    </div>
+</div>
+<div class="market-row">
+    <div class="market-col">
+        <app-market-input-range label="Area Level" path="heist_filters.filters.area_level" [request]="request">
+        </app-market-input-range>
+    </div>
+</div>
+<div class="market-row">
+    <div class="market-col">
+        <app-market-input-range label="Lockpicking Level" path="heist_filters.filters.heist_lockpicking" [request]="request">
+        </app-market-input-range>
+    </div>
+    <div class="market-col">
+        <app-market-input-range label="Brute Force Level" path="heist_filters.filters.heist_brute_force" [request]="request">
+        </app-market-input-range>
+    </div>
+</div>
+<div class="market-row">
+    <div class="market-col">
+        <app-market-input-range label="Perception Level" path="heist_filters.filters.heist_perception" [request]="request">
+        </app-market-input-range>
+    </div>
+    <div class="market-col">
+        <app-market-input-range label="Demolition Level" path="heist_filters.filters.heist_demolition" [request]="request">
+        </app-market-input-range>
+    </div>
+</div>
+<div class="market-row">
+    <div class="market-col">
+        <app-market-input-range label="Counter-Thaum. Level" path="heist_filters.filters.heist_counter_thaumaturgy" [request]="request">
+        </app-market-input-range>
+    </div>
+    <div class="market-col">
+        <app-market-input-range label="Trap Disarmament Level" path="heist_filters.filters.heist_trap_disarmament" [request]="request">
+        </app-market-input-range>
+    </div>
+</div>
+<div class="market-row">
+    <div class="market-col">
+        <app-market-input-range label="Agility Level" path="heist_filters.filters.heist_agility" [request]="request">
+        </app-market-input-range>
+    </div>
+    <div class="market-col">
+        <app-market-input-range label="Deception Level" path="heist_filters.filters.heist_deception" [request]="request">
+        </app-market-input-range>
+    </div>
+</div>
+<div class="market-row">
+    <div class="market-col">
+        <app-market-input-range label="Engineering Level" path="heist_filters.filters.heist_engineering" [request]="request">
+        </app-market-input-range>
+    </div>
+</div>
diff --git a/...mponent/market-item-search-filter-heist/market-item-search-filter-heist.component.spec.ts b/...mponent/market-item-search-filter-heist/market-item-search-filter-heist.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { MarketItemSearchFilterHeistComponent } from './market-item-search-filter-heist.component';
+
+describe('MarketItemSearchFilterHeistComponent', () => {
+  let component: MarketItemSearchFilterHeistComponent;
+  let fixture: ComponentFixture<MarketItemSearchFilterHeistComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ MarketItemSearchFilterHeistComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(MarketItemSearchFilterHeistComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/...et/component/market-item-search-filter-heist/market-item-search-filter-heist.component.ts b/...et/component/market-item-search-filter-heist/market-item-search-filter-heist.component.ts
@@ -0,0 +1,12 @@
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { TradeSearchRequest } from '@shared/module/poe/trade';
+
+@Component({
+  selector: 'app-market-item-search-filter-heist',
+  templateUrl: './market-item-search-filter-heist.component.html',
+  changeDetection: ChangeDetectionStrategy.OnPush
+})
+export class MarketItemSearchFilterHeistComponent {
+  @Input()
+  public request: TradeSearchRequest;
+}
diff --git a/...dules/market/component/market-item-search-filter/market-item-search-filter.component.html b/...dules/market/component/market-item-search-filter/market-item-search-filter.component.html
@@ -198,7 +198,12 @@
                             </app-market-input>
                         </div>
                     </div>
+                </app-market-panel> 
+
+                <app-market-panel label="Heist Filters">
+                    <app-market-item-search-filter-heist [request]="request"></app-market-item-search-filter-heist>
                 </app-market-panel>
+
                 <app-market-panel label="Misc Filters">
                     <app-market-item-search-filter-misc [request]="request"></app-market-item-search-filter-misc>
                 </app-market-panel>

diff --git a/src/app/modules/market/market.module.ts b/src/app/modules/market/market.module.ts
@@ -2,11 +2,10 @@ import { NgModule } from '@angular/core';
 import { Hotkey } from '@app/config';
 import { Feature, FeatureConfig, FeatureModule, FEATURE_MODULES } from '@app/feature';
 import { SharedModule } from '@shared/shared.module';
-import { MarketExchangeBarComponent, MarketExchangeComponent, MarketExchangeFilterComponent, MarketExchangeFilterItemComponent, MarketExchangePriceComponent, MarketFrameComponent, MarketInfiniteScrollComponent, MarketInputBooleanComponent, MarketInputComponent, MarketInputNumberComponent, MarketInputRangeComponent, MarketInputSelectComponent, MarketInputSelectOptionComponent, MarketItemSearchBarComponent, MarketItemSearchComponent, MarketItemSearchFilterComponent, MarketItemSearchFilterMiscComponent, MarketItemSearchFilterTradeComponent, MarketItemSearchFilterTypeComponent, MarketItemSearchStatComponent, MarketItemSearchStatGroupComponent, MarketItemSearchStatsComponent, MarketListingStatusComponent, MarketPanelComponent, MarketPanelGroupComponent, MarketSettingsComponent, MarketTabComponent, MarketTabGroupComponent } from './component';
+import { MarketExchangeBarComponent, MarketExchangeComponent, MarketExchangeFilterComponent, MarketExchangeFilterItemComponent, MarketExchangePriceComponent, MarketFrameComponent, MarketInfiniteScrollComponent, MarketInputBooleanComponent, MarketInputComponent, MarketInputNumberComponent, MarketInputRangeComponent, MarketInputSelectComponent, MarketInputSelectOptionComponent, MarketItemSearchBarComponent, MarketItemSearchComponent, MarketItemSearchFilterComponent, MarketItemSearchFilterHeistComponent, MarketItemSearchFilterMiscComponent, MarketItemSearchFilterTradeComponent, MarketItemSearchFilterTypeComponent, MarketItemSearchResultComponent, MarketItemSearchStatComponent, MarketItemSearchStatGroupComponent, MarketItemSearchStatsComponent, MarketListingStatusComponent, MarketPanelComponent, MarketPanelGroupComponent, MarketSettingsComponent, MarketTabComponent, MarketTabGroupComponent } from './component';
 import { MarketFeatureSettings } from './market-feature-settings';
 import { MarketWindowService } from './service';
 import { MarketWindowComponent } from './window';
-import { MarketItemSearchResultComponent } from './component/market-item-search-result/market-item-search-result.component';
 
 @NgModule({
     providers: [{ provide: FEATURE_MODULES, useClass: MarketModule, multi: true }],
@@ -32,6 +31,7 @@ import { MarketItemSearchResultComponent } from './component/market-item-search-
         MarketListingStatusComponent,
 
         MarketItemSearchComponent,
+        MarketItemSearchResultComponent,
         MarketItemSearchBarComponent,
         MarketItemSearchStatsComponent,
         MarketItemSearchStatGroupComponent,
@@ -40,13 +40,13 @@ import { MarketItemSearchResultComponent } from './component/market-item-search-
         MarketItemSearchFilterTypeComponent,
         MarketItemSearchFilterMiscComponent,
         MarketItemSearchFilterTradeComponent,
+        MarketItemSearchFilterHeistComponent,
 
         MarketExchangeComponent,
         MarketExchangeBarComponent,
         MarketExchangePriceComponent,
         MarketExchangeFilterComponent,
-        MarketExchangeFilterItemComponent,
-        MarketItemSearchResultComponent,
+        MarketExchangeFilterItemComponent
     ],
     exports: [MarketWindowComponent],
     imports: [SharedModule]