Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#19 create results layout #22

Merged
merged 6 commits into from
Feb 1, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 2 additions & 16 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
@@ -1,35 +1,21 @@
import { BrowserModule } from '@angular/platform-browser';
import { NgModule } from '@angular/core';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
<<<<<<< HEAD
import { AppRoutingModule } from './app-routing.module';
=======
import { AppComponent } from './app.component';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { HeaderComponent } from './header/header.component';
import { ShellModule } from './shell/shell.module';
>>>>>>> origin/develop
import { FlexLayoutModule } from '@angular/flex-layout';


import { AppState } from './shared/store/app.state';
import { NgxsModule } from '@ngxs/store';
import { NgxsReduxDevtoolsPluginModule } from '@ngxs/devtools-plugin';
import { NgxsLoggerPluginModule } from '@ngxs/logger-plugin';
import { environment } from 'src/environments/environment';

import { AppComponent } from './app.component';
import { HeaderComponent } from './header/header.component';
import { ShellModule } from './shell/shell.module';
import { ShellComponent } from './shell/shell.component';

@NgModule({
declarations: [
AppComponent,
<<<<<<< HEAD
HeaderComponent,
ShellComponent,
=======
HeaderComponent
>>>>>>> origin/develop
],
imports: [
BrowserModule,
Expand Down
4 changes: 4 additions & 0 deletions src/app/shared/result.actions.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
export class UpdateCurrentView {
static readonly type = '[Result] EditView';
constructor(public payload: string) {}
}
1 change: 1 addition & 0 deletions src/app/shell/main/main.component.html
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
<app-filters-list></app-filters-list>
<app-result></app-result>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<p>hobby-groups-list works!</p>
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';

import { HobbyGroupsListComponent } from './hobby-groups-list.component';

describe('HobbyGroupsListComponent', () => {
let component: HobbyGroupsListComponent;
let fixture: ComponentFixture<HobbyGroupsListComponent>;

beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ HobbyGroupsListComponent ]
})
.compileComponents();
});

beforeEach(() => {
fixture = TestBed.createComponent(HobbyGroupsListComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});

it('should create', () => {
expect(component).toBeTruthy();
});
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { Component, OnInit } from '@angular/core';
import { Observable } from 'rxjs';
import { Store } from '@ngxs/store';

@Component({
selector: 'app-hobby-groups-list',
templateUrl: './hobby-groups-list.component.html',
styleUrls: ['./hobby-groups-list.component.scss']
})
export class HobbyGroupsListComponent implements OnInit {
stateCards: Observable<Object[]>;
public cards: Array<Object> = [];

constructor(private store: Store) {
this.stateCards = this.store.select(state => state.ShowData);
// To do: change "state.ShowData" when state will be configured
}

ngOnInit(): void {
this.stateCards.subscribe((data) => this.cards = data);
}

}
1 change: 1 addition & 0 deletions src/app/shell/main/result/map/map.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<p>map works!</p>
Empty file.
25 changes: 25 additions & 0 deletions src/app/shell/main/result/map/map.component.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';

import { MapComponent } from './map.component';

describe('MapComponent', () => {
let component: MapComponent;
let fixture: ComponentFixture<MapComponent>;

beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ MapComponent ]
})
.compileComponents();
});

beforeEach(() => {
fixture = TestBed.createComponent(MapComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});

it('should create', () => {
expect(component).toBeTruthy();
});
});
23 changes: 23 additions & 0 deletions src/app/shell/main/result/map/map.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { Component, OnInit } from '@angular/core';
import { Observable } from 'rxjs';
import { Store } from '@ngxs/store';

@Component({
selector: 'app-map',
templateUrl: './map.component.html',
styleUrls: ['./map.component.scss']
})
export class MapComponent implements OnInit {
stateMarkers: Observable<Object[]>;
public markers: Array<Object> = [];

constructor(private store: Store) {
this.stateMarkers = this.store.select(state => state.ShowData);
// To do: change "state.ShowData" when state will be configured
}

ngOnInit(): void {
this.stateMarkers.subscribe((data) => this.markers = data);
}

}
14 changes: 14 additions & 0 deletions src/app/shell/main/result/result.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<mat-button-toggle-group #group="matButtonToggleGroup" [value]="currentView" (change)="SetCurrentView(group.value)">
<mat-button-toggle value="show-data" aria-label="show-data">
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

aria-label must be meaningful

Список
</mat-button-toggle>
<mat-button-toggle value="map" aria-label="map">
Карта
</mat-button-toggle>
</mat-button-toggle-group>
<div *ngIf="group.value==='map'; else ShowData">
<app-map></app-map>
</div>
<ng-template #ShowData>
<app-hobby-groups-list></app-hobby-groups-list>
</ng-template>
Empty file.
25 changes: 25 additions & 0 deletions src/app/shell/main/result/result.component.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';

import { ResultComponent } from './result.component';

describe('ResultComponent', () => {
let component: ResultComponent;
let fixture: ComponentFixture<ResultComponent>;

beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ ResultComponent ]
})
.compileComponents();
});

beforeEach(() => {
fixture = TestBed.createComponent(ResultComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});

it('should create', () => {
expect(component).toBeTruthy();
});
});
25 changes: 25 additions & 0 deletions src/app/shell/main/result/result.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { Component, OnInit } from '@angular/core';
import { UpdateCurrentView } from '../../../shared/result.actions';
import { Store } from '@ngxs/store';

@Component({
selector: 'app-result',
templateUrl: './result.component.html',
styleUrls: ['./result.component.scss']
})
export class ResultComponent implements OnInit {
public currentView: string;

constructor(private store: Store) {}

ngOnInit(): void {
this.currentView ='show-data';
}

public SetCurrentView(view: string) {
this.currentView = view;
this.store.dispatch(new UpdateCurrentView(view));
// To do: finish action when state will be configured
}

}
4 changes: 3 additions & 1 deletion src/app/shell/shell-routing.module.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { MainComponent } from './main/main.component';
import { ResultComponent } from './main/result/result.component';

const routes: Routes = [
{ path: '', component: MainComponent }
{ path: '', component: MainComponent },
{ path: 'result', component: ResultComponent }
];

@NgModule({
Expand Down
2 changes: 1 addition & 1 deletion src/app/shell/shell.component.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<router-outlet></router-outlet>
<router-outlet></router-outlet>
16 changes: 8 additions & 8 deletions src/app/shell/shell.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ import { FlexLayoutModule } from '@angular/flex-layout';

import { ShellRoutingModule } from './shell-routing.module';
import { ShellComponent } from './shell.component';
import { ResultComponent } from './main/result/result.component';
import { HobbyGroupsListComponent } from './main/result/hobby-groups-list/hobby-groups-list.component';
import { MapComponent } from './main/result/map/map.component';
import {MatButtonToggleModule} from '@angular/material/button-toggle';

import { MainComponent } from './main/main.component';
import { FiltersListComponent } from './main/filters-list/filters-list.component';
Expand All @@ -18,29 +22,25 @@ import { CategoriesFilterComponent } from './main/filters-list/categories-filter
@NgModule({
declarations: [
MainComponent,
<<<<<<< HEAD
ShellComponent,
ResultComponent,
HobbyGroupsListComponent,
MapComponent,
FiltersListComponent,
AgeFilterComponent,
SearchbarComponent,
OwnershipTypeFilterComponent,
CategoriesFilterComponent
=======
ShellComponent
>>>>>>> origin/develop
],
imports: [
CommonModule,
RouterModule,
<<<<<<< HEAD
ShellRoutingModule,
MatButtonModule,
FlexLayoutModule
=======
ShellRoutingModule
],
exports: [
ShellComponent
>>>>>>> origin/develop
]
})
export class ShellModule { }