From ea43a611efcba2f666404cc0a267fa1dc0fb8e7b Mon Sep 17 00:00:00 2001 From: Leandro Nunes dos Santos Date: Tue, 10 May 2016 09:15:35 -0300 Subject: [PATCH] refactoring people block --- src/app/layout/blocks/people-block/index.ts | 2 -- src/app/layout/blocks/people-block/people-block.component.spec.ts | 72 ------------------------------------------------------------------------ src/app/layout/blocks/people-block/people-block.component.ts | 26 -------------------------- src/app/layout/blocks/people-block/people-block.html | 5 ----- src/app/layout/blocks/people-block/people-block.scss | 17 ----------------- src/app/layout/blocks/people/index.ts | 2 ++ src/app/layout/blocks/people/people-block.component.spec.ts | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/app/layout/blocks/people/people-block.component.ts | 26 ++++++++++++++++++++++++++ src/app/layout/blocks/people/people-block.html | 5 +++++ src/app/layout/blocks/people/people-block.scss | 17 +++++++++++++++++ src/app/main/main.component.ts | 2 +- 11 files changed, 123 insertions(+), 123 deletions(-) delete mode 100644 src/app/layout/blocks/people-block/index.ts delete mode 100644 src/app/layout/blocks/people-block/people-block.component.spec.ts delete mode 100644 src/app/layout/blocks/people-block/people-block.component.ts delete mode 100644 src/app/layout/blocks/people-block/people-block.html delete mode 100644 src/app/layout/blocks/people-block/people-block.scss create mode 100644 src/app/layout/blocks/people/index.ts create mode 100644 src/app/layout/blocks/people/people-block.component.spec.ts create mode 100644 src/app/layout/blocks/people/people-block.component.ts create mode 100644 src/app/layout/blocks/people/people-block.html create mode 100644 src/app/layout/blocks/people/people-block.scss diff --git a/src/app/layout/blocks/people-block/index.ts b/src/app/layout/blocks/people-block/index.ts deleted file mode 100644 index b744169..0000000 --- a/src/app/layout/blocks/people-block/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -/* Module Index Entry - generated using the script npm run generate-index */ -export * from "./people-block.component"; diff --git a/src/app/layout/blocks/people-block/people-block.component.spec.ts b/src/app/layout/blocks/people-block/people-block.component.spec.ts deleted file mode 100644 index a64ce95..0000000 --- a/src/app/layout/blocks/people-block/people-block.component.spec.ts +++ /dev/null @@ -1,72 +0,0 @@ -import {TestComponentBuilder} from 'ng-forward/cjs/testing/test-component-builder'; -import {Provider} from 'ng-forward'; -import {ComponentTestHelper, createClass} from './../../../../spec/component-test-helper'; -import {providers} from 'ng-forward/cjs/testing/providers'; -import {PeopleBlockComponent} from './people-block.component'; - -const htmlTemplate: string = ''; - -describe("Components", () => { - - describe("People Block Component", () => { - let serviceMock = { - getEnvironmentPeople: (filters: any): any => { - return Promise.resolve([{ identifier: "person1" }]); - } - }; - let providers = [new Provider('EnvironmentService', { useValue: serviceMock })]; - - let helper: ComponentTestHelper; - - beforeEach(angular.mock.module("templates")); - - /** - * The beforeEach procedure will initialize the helper and parse - * the component according to the given providers. Unfortunetly, in - * this mode, the providers and properties given to the construtor - * can't be overriden. - */ - beforeEach((done) => { - // Create the component bed for the test. Optionally, this could be done - // in each test if one needs customization of these parameters per test - let cls = createClass({ - template: htmlTemplate, - directives: [PeopleBlockComponent], - providers: providers, - properties: {} - }); - helper = new ComponentTestHelper(cls, done); - }); - - /** - * By default the helper will have the component, with all properties - * ready to be used. Here the mock provider 'EnvironmentService' will - * return the given array with one person. - */ - it("get block with one people", () => { - expect(helper.component.people[0].identifier).toEqual("person1"); - }); - - /** - * There are helper functions to access the JQuery DOM like this. - */ - it("render the profile image for each person", () => { - expect(helper.all("noosfero-profile-image").length).toEqual(1); - }); - - /** - * The main debugElement element is also available - */ - it("render the main noosfero people block", () => { - expect(helper.debugElement.children().length).toEqual(1, "The people-block should have a div children"); - }); - - /** - * Just another example of a JQuery DOM helper function - */ - it("render the noosfero people block div", () => { - let div = helper.findChildren("noosfero-people-block", "div"); - expect(div.className).toBe('people-block', "The class should be people-block"); - }); - }); -}); diff --git a/src/app/layout/blocks/people-block/people-block.component.ts b/src/app/layout/blocks/people-block/people-block.component.ts deleted file mode 100644 index 43d4c50..0000000 --- a/src/app/layout/blocks/people-block/people-block.component.ts +++ /dev/null @@ -1,26 +0,0 @@ -import {Input, Inject, Component} from "ng-forward"; -import {EnvironmentService} from "../../../../lib/ng-noosfero-api/http/environment.service"; - -@Component({ - selector: "noosfero-people-block", - templateUrl: 'app/layout/blocks/people-block/people-block.html', -}) -@Inject(EnvironmentService) -export class PeopleBlockComponent { - - @Input() block: noosfero.Block; - @Input() owner: noosfero.Environment; - private type: string = "people"; - - people: noosfero.Person[] = []; - - constructor(private environmentService: EnvironmentService) { - } - - ngOnInit() { - this.environmentService.getEnvironmentPeople({ limit: '6' }).then((people: noosfero.Person[]) => { - this.people = people; - }); - } - -} diff --git a/src/app/layout/blocks/people-block/people-block.html b/src/app/layout/blocks/people-block/people-block.html deleted file mode 100644 index 7f72d92..0000000 --- a/src/app/layout/blocks/people-block/people-block.html +++ /dev/null @@ -1,5 +0,0 @@ -
- - - -
diff --git a/src/app/layout/blocks/people-block/people-block.scss b/src/app/layout/blocks/people-block/people-block.scss deleted file mode 100644 index c5776e0..0000000 --- a/src/app/layout/blocks/people-block/people-block.scss +++ /dev/null @@ -1,17 +0,0 @@ -.members-block { - .member { - img, i.profile-image { - width: 60px; - } - img { - display: inline-block; - vertical-align: top; - } - i.profile-image { - text-align: center; - background-color: #889DB1; - color: #F1F1F1; - font-size: 4.5em; - } - } -} diff --git a/src/app/layout/blocks/people/index.ts b/src/app/layout/blocks/people/index.ts new file mode 100644 index 0000000..b744169 --- /dev/null +++ b/src/app/layout/blocks/people/index.ts @@ -0,0 +1,2 @@ +/* Module Index Entry - generated using the script npm run generate-index */ +export * from "./people-block.component"; diff --git a/src/app/layout/blocks/people/people-block.component.spec.ts b/src/app/layout/blocks/people/people-block.component.spec.ts new file mode 100644 index 0000000..a64ce95 --- /dev/null +++ b/src/app/layout/blocks/people/people-block.component.spec.ts @@ -0,0 +1,72 @@ +import {TestComponentBuilder} from 'ng-forward/cjs/testing/test-component-builder'; +import {Provider} from 'ng-forward'; +import {ComponentTestHelper, createClass} from './../../../../spec/component-test-helper'; +import {providers} from 'ng-forward/cjs/testing/providers'; +import {PeopleBlockComponent} from './people-block.component'; + +const htmlTemplate: string = ''; + +describe("Components", () => { + + describe("People Block Component", () => { + let serviceMock = { + getEnvironmentPeople: (filters: any): any => { + return Promise.resolve([{ identifier: "person1" }]); + } + }; + let providers = [new Provider('EnvironmentService', { useValue: serviceMock })]; + + let helper: ComponentTestHelper; + + beforeEach(angular.mock.module("templates")); + + /** + * The beforeEach procedure will initialize the helper and parse + * the component according to the given providers. Unfortunetly, in + * this mode, the providers and properties given to the construtor + * can't be overriden. + */ + beforeEach((done) => { + // Create the component bed for the test. Optionally, this could be done + // in each test if one needs customization of these parameters per test + let cls = createClass({ + template: htmlTemplate, + directives: [PeopleBlockComponent], + providers: providers, + properties: {} + }); + helper = new ComponentTestHelper(cls, done); + }); + + /** + * By default the helper will have the component, with all properties + * ready to be used. Here the mock provider 'EnvironmentService' will + * return the given array with one person. + */ + it("get block with one people", () => { + expect(helper.component.people[0].identifier).toEqual("person1"); + }); + + /** + * There are helper functions to access the JQuery DOM like this. + */ + it("render the profile image for each person", () => { + expect(helper.all("noosfero-profile-image").length).toEqual(1); + }); + + /** + * The main debugElement element is also available + */ + it("render the main noosfero people block", () => { + expect(helper.debugElement.children().length).toEqual(1, "The people-block should have a div children"); + }); + + /** + * Just another example of a JQuery DOM helper function + */ + it("render the noosfero people block div", () => { + let div = helper.findChildren("noosfero-people-block", "div"); + expect(div.className).toBe('people-block', "The class should be people-block"); + }); + }); +}); diff --git a/src/app/layout/blocks/people/people-block.component.ts b/src/app/layout/blocks/people/people-block.component.ts new file mode 100644 index 0000000..59ae312 --- /dev/null +++ b/src/app/layout/blocks/people/people-block.component.ts @@ -0,0 +1,26 @@ +import {Input, Inject, Component} from "ng-forward"; +import {EnvironmentService} from "../../../../lib/ng-noosfero-api/http/environment.service"; + +@Component({ + selector: "noosfero-people-block", + templateUrl: 'app/layout/blocks/people/people-block.html', +}) +@Inject(EnvironmentService) +export class PeopleBlockComponent { + + @Input() block: noosfero.Block; + @Input() owner: noosfero.Environment; + private type: string = "people"; + + people: noosfero.Person[] = []; + + constructor(private environmentService: EnvironmentService) { + } + + ngOnInit() { + this.environmentService.getEnvironmentPeople({ limit: '6' }).then((people: noosfero.Person[]) => { + this.people = people; + }); + } + +} diff --git a/src/app/layout/blocks/people/people-block.html b/src/app/layout/blocks/people/people-block.html new file mode 100644 index 0000000..7f72d92 --- /dev/null +++ b/src/app/layout/blocks/people/people-block.html @@ -0,0 +1,5 @@ +
+ + + +
diff --git a/src/app/layout/blocks/people/people-block.scss b/src/app/layout/blocks/people/people-block.scss new file mode 100644 index 0000000..c5776e0 --- /dev/null +++ b/src/app/layout/blocks/people/people-block.scss @@ -0,0 +1,17 @@ +.members-block { + .member { + img, i.profile-image { + width: 60px; + } + img { + display: inline-block; + vertical-align: top; + } + i.profile-image { + text-align: center; + background-color: #889DB1; + color: #F1F1F1; + font-size: 4.5em; + } + } +} diff --git a/src/app/main/main.component.ts b/src/app/main/main.component.ts index 1d02eef..9becb2d 100644 --- a/src/app/main/main.component.ts +++ b/src/app/main/main.component.ts @@ -9,7 +9,7 @@ import {BoxesComponent} from "../layout/boxes/boxes.component"; import {BlockComponent} from "../layout/blocks/block.component"; import {EnvironmentComponent} from "../environment/environment.component"; import {EnvironmentHomeComponent} from "../environment/environment-home.component"; -import {PeopleBlockComponent} from "../layout/blocks/people-block/people-block.component"; +import {PeopleBlockComponent} from "../layout/blocks/people/people-block.component"; import {LinkListBlockComponent} from "./../layout/blocks/link-list/link-list-block.component"; import {RecentDocumentsBlockComponent} from "../layout/blocks/recent-documents/recent-documents.component"; import {ProfileImageBlockComponent} from "../layout/blocks/profile-image-block/profile-image-block.component"; -- libgit2 0.21.2