Merge branch 'develop' into feature/thumbnail_upload

# Conflicts:
#	package-lock.json
#	projects/common/src/fm/common.module.ts

projects/common/src/fm/common.module.ts

@@ -61,6 +61,8 @@ import { NotificationMenuComponent} from './components/notification-menu/notific
 import { HelpMenuComponent} from './components/help-menu/help-menu.component';
 import { BackButtonComponent } from './components/back-button/back-button.component';
 import { ThumbnailUploadModalComponent } from './components/thumbnail-upload-modal/thumbnail-upload-modal.component';
+import { AvatarComponent } from './components/avatar/avatar.component';
+import { AvatarModule } from 'ngx-avatar';
 
 export {
   SafePipe,
@@ -103,7 +105,8 @@ export {
   IDataLayer,
   IColor,
   IGradientstop,
-  BackButtonComponent
+  BackButtonComponent,
+  AvatarComponent
 };
 
 @NgModule({
@@ -116,7 +119,8 @@ export {
     OAuthModule.forRoot(),
     NgbModule,
     FormsModule,
-    UploadxModule
+    UploadxModule,
+    AvatarModule
   ],
   declarations: [
     AppComponent,
@@ -140,7 +144,8 @@ export {
     HelpMenuComponent,
     BackButtonComponent,
     ThumbnailComponent,
-    ThumbnailUploadModalComponent
+    ThumbnailUploadModalComponent,
+    AvatarComponent
   ],
   exports: [
     NgbModule,
@@ -164,7 +169,8 @@ export {
     GradientComponent,
     GradientSelectComponent,
     BackButtonComponent,
-    ThumbnailComponent
+    ThumbnailComponent,
+    AvatarComponent
   ]
 })
 export class AppCommonModule {

projects/common/src/fm/components/avatar/avatar.component.html

@@ -0,0 +1 @@
+<ngx-avatar [size]="size" [round]="round" name="getName()" (clickOnAvatar)="onClick()"></ngx-avatar>

projects/common/src/fm/components/avatar/avatar.component.spec.ts

@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AvatarComponent } from './avatar.component';
+
+describe('AvatarComponent', () => {
+  let component: AvatarComponent;
+  let fixture: ComponentFixture<AvatarComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ AvatarComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AvatarComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

projects/common/src/fm/components/avatar/avatar.component.ts

@@ -0,0 +1,34 @@
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { IUser } from '../../models/user';
+
+@Component({
+  selector: 'fm-avatar',
+  templateUrl: './avatar.component.html',
+  styleUrls: ['./avatar.component.css']
+})
+export class AvatarComponent implements OnInit {
+
+  @Input() user: IUser;
+  @Input() bgColor: string;
+  @Input() fgColor: string;
+  @Input() size: number;
+  @Input() round: boolean;
+
+  @Output() click = new EventEmitter();
+  
+  constructor() { }
+
+  ngOnInit(): void {
+  }
+
+  getName():string {
+    if (!this.user) return null;
+    if (this.user.firstName && this.user.lastName)
+      return this.user.firstName + ' ' + this.user.lastName;
+    return this.user.name;
+  }
+
+  onClick() {
+    this.click.emit();
+  }
+}