diff --git a/bower.json b/bower.json index 7f6d7bd..5f420db 100644 --- a/bower.json +++ b/bower.json @@ -38,7 +38,8 @@ "angular-bind-html-compile": "^1.2.1", "angular-click-outside": "^2.7.1", "ng-ckeditor": "^0.2.1", - "angular-bootstrap-toggle-switch": "^0.5.6" + "angular-bootstrap-toggle-switch": "^0.5.6", + "angular-tag-cloud": "^0.3.0" }, "devDependencies": { "angular-mocks": "~1.5.0" diff --git a/gulp/styles.js b/gulp/styles.js index acc96ae..928234f 100644 --- a/gulp/styles.js +++ b/gulp/styles.js @@ -10,6 +10,7 @@ var $ = require('gulp-load-plugins')(); var wiredep = require('wiredep').stream; var _ = require('lodash'); +var importCss = require('gulp-import-css'); gulp.task('styles-reload', ['styles'], function() { return buildStyles() @@ -55,5 +56,6 @@ var buildStyles = function() { .pipe($.sass(sassOptions)).on('error', conf.errorHandler('Sass')) .pipe($.autoprefixer()).on('error', conf.errorHandler('Autoprefixer')) .pipe($.sourcemaps.write()) + .pipe(importCss()) .pipe(gulp.dest(path.join(conf.paths.tmp, '/serve/app/'))); }; diff --git a/package.json b/package.json index 097126a..0a27944 100644 --- a/package.json +++ b/package.json @@ -47,6 +47,7 @@ "gulp-eslint": "~1.0.0", "gulp-filter": "~3.0.1", "gulp-flatten": "~0.2.0", + "gulp-import-css": "^0.1.2", "gulp-inject": "~3.0.0", "gulp-insert": "^0.5.0", "gulp-load-plugins": "~0.10.0", diff --git a/src/app/layout/blocks/tags/index.ts b/src/app/layout/blocks/tags/index.ts new file mode 100644 index 0000000..845f9bd --- /dev/null +++ b/src/app/layout/blocks/tags/index.ts @@ -0,0 +1 @@ +export * from "./tags-block.component"; diff --git a/src/app/layout/blocks/tags/tags-block.component.spec.ts b/src/app/layout/blocks/tags/tags-block.component.spec.ts new file mode 100644 index 0000000..69ed146 --- /dev/null +++ b/src/app/layout/blocks/tags/tags-block.component.spec.ts @@ -0,0 +1,55 @@ +import {TestComponentBuilder} from 'ng-forward/cjs/testing/test-component-builder'; +import {Provider, Input, provide, Component} from 'ng-forward'; +import {provideFilters} from '../../../../spec/helpers'; +import {TagsBlockComponent} from './tags-block.component'; + +const htmlTemplate: string = ''; + +const tcb = new TestComponentBuilder(); + +describe("Components", () => { + describe("Tags Block Component", () => { + + let settingsObj = {}; + let mockedEnvironmentService = { + getTags: (): any => { + return Promise.resolve({ foo: 10, bar: 20 }); + } + }; + let profile = { name: 'profile-name' }; + beforeEach(angular.mock.module("templates")); + + let state = jasmine.createSpyObj("state", ["go"]); + + + function getProviders() { + return [ + new Provider('$state', { useValue: state }), + new Provider('EnvironmentService', { + useValue: mockedEnvironmentService + }), + ].concat(provideFilters("truncateFilter", "stripTagsFilter")); + } + let componentClass: any = null; + + function getComponent() { + @Component({ selector: 'test-container-component', template: htmlTemplate, directives: [TagsBlockComponent], providers: getProviders() }) + class BlockContainerComponent { + block = { type: 'Block', settings: settingsObj }; + owner = profile; + constructor() { + } + } + return BlockContainerComponent; + } + + + it("get tags from the environment service", done => { + tcb.createAsync(getComponent()).then(fixture => { + let tagsBlock: TagsBlockComponent = fixture.debugElement.componentViewChildren[0].componentInstance; + expect(tagsBlock.tags).toEqual([{ text: "foo", weight: '10', link: '/tag/foo' }, { text: "bar", weight: '20', link: '/tag/bar' }]); + done(); + }); + }); + }); +}); diff --git a/src/app/layout/blocks/tags/tags-block.component.ts b/src/app/layout/blocks/tags/tags-block.component.ts new file mode 100644 index 0000000..8a3165d --- /dev/null +++ b/src/app/layout/blocks/tags/tags-block.component.ts @@ -0,0 +1,45 @@ +import {Component, Inject, Input} from "ng-forward"; +import {EnvironmentService} from "../../../../lib/ng-noosfero-api/http/environment.service"; + +@Component({ + selector: "noosfero-tags-block", + templateUrl: 'app/layout/blocks/tags/tags-block.html' +}) +@Inject(EnvironmentService, "$state") +export class TagsBlockComponent { + + @Input() block: any; + @Input() owner: any; + + profile: any; + tags: any; + tagsLoaded: boolean = false; + + constructor(private environmentService: EnvironmentService, private $state: any) { + this.loadTags(); + } + + loadTags() { + this.tags = []; + let tag = ''; + let tags: any = []; + let that = this; + + this.environmentService.getTags() + .then((result: any) => { + for (tag in result) { + if (result.hasOwnProperty(tag)) { + let size: number = result[tag]; + tags.push({ text: tag.toString(), weight: size.toString(), link: '/tag/' + tag }); + } + } + + that.tagsLoaded = true; + that.tags = tags.slice(); + }); + } + + ngOnInit() { + this.profile = this.owner; + } +} diff --git a/src/app/layout/blocks/tags/tags-block.html b/src/app/layout/blocks/tags/tags-block.html new file mode 100644 index 0000000..d70ae5b --- /dev/null +++ b/src/app/layout/blocks/tags/tags-block.html @@ -0,0 +1 @@ + diff --git a/src/app/layout/blocks/tags/tags-block.scss b/src/app/layout/blocks/tags/tags-block.scss new file mode 100644 index 0000000..402d1fc --- /dev/null +++ b/src/app/layout/blocks/tags/tags-block.scss @@ -0,0 +1,7 @@ +@import url('../../bower_components/angular-tag-cloud/src/css/ng-tag-cloud.css'); + +div.ng-tag-cloud span { + &.w10, &.w8, &.w9 { + color: #1E96D0; + } +} diff --git a/src/app/main/main.component.ts b/src/app/main/main.component.ts index 814b245..76a5e45 100644 --- a/src/app/main/main.component.ts +++ b/src/app/main/main.component.ts @@ -18,6 +18,7 @@ import {ProfileImageBlockComponent} from "../layout/blocks/profile-image/profile import {RawHTMLBlockComponent} from "../layout/blocks/raw-html/raw-html-block.component"; import {StatisticsBlockComponent} from "../layout/blocks/statistics/statistics-block.component"; import {PersonTagsPluginInterestsBlockComponent} from "../layout/blocks/person-tags-plugin-interests/person-tags-plugin-interests-block.component"; +import {TagsBlockComponent} from "../layout/blocks/tags/tags-block.component"; import {CustomContentComponent} from "../profile/custom-content/custom-content.component"; import {MembersBlockComponent} from "../layout/blocks/members/members-block.component"; @@ -105,7 +106,7 @@ export class EnvironmentContent { MainBlockComponent, RecentDocumentsBlockComponent, Navbar, SidebarComponent, ProfileImageBlockComponent, MembersBlockComponent, NoosferoTemplate, DateFormat, RawHTMLBlockComponent, StatisticsBlockComponent, LoginBlockComponent, CustomContentComponent, PermissionDirective, SearchFormComponent, SearchComponent, - PersonTagsPluginInterestsBlockComponent, BlockComponent + PersonTagsPluginInterestsBlockComponent, TagsBlockComponent, BlockComponent ].concat(plugins.mainComponents).concat(plugins.hotspots), providers: [AuthService, SessionService, NotificationService, BodyStateClassesService, "ngAnimate", "ngCookies", "ngStorage", "ngTouch", @@ -114,7 +115,7 @@ export class EnvironmentContent { "angular-bind-html-compile", "angularMoment", "angular.filter", "akoenig.deckgrid", "angular-timeline", "duScroll", "oitozero.ngSweetAlert", "pascalprecht.translate", "tmh.dynamicLocale", "angularLoad", - "angular-click-outside", "toggle-switch", "noosfero.init"] + "angular-click-outside", "toggle-switch", "ngTagCloud", "noosfero.init"] }) @StateConfig([ { diff --git a/src/lib/ng-noosfero-api/http/environment.service.ts b/src/lib/ng-noosfero-api/http/environment.service.ts index db52a01..c1dfd5a 100644 --- a/src/lib/ng-noosfero-api/http/environment.service.ts +++ b/src/lib/ng-noosfero-api/http/environment.service.ts @@ -68,6 +68,14 @@ export class EnvironmentService { return errorFunction; } + getTags(): ng.IPromise<{}> { + let p = this.restangular.one('environment').customGET('tags'); + let deferred = this.$q.defer<{}>(); + p.then(this.getHandleSuccessFunction<{}>(deferred)); + p.catch(this.getHandleErrorFunction<{}>(deferred)); + return deferred.promise; + } + /** * TODO - use restangular service as base class, and this will not be necessary here anymore */ -- libgit2 0.21.2