From 53c99cfe68c16c20d51012c78c6886890eecf4b2 Mon Sep 17 00:00:00 2001 From: leejinho Date: Mon, 23 Dec 2019 15:21:48 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EC=84=A4=EC=B9=98=ED=8C=A8=ED=82=A4?= =?UTF-8?q?=EC=A7=80=EC=9D=98=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=ED=99=94?= =?UTF-8?q?=EB=A9=B4=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EB=82=98=EC=98=A4?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=9E=84?= =?UTF-8?q?=EC=8B=9C=EB=A1=9C=20=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/login.page.component.html | 18 +++++++++++++++--- .../components/login.page.component.scss | 6 +++--- .../src/lib/components/login.component.html | 7 ++++++- .../src/lib/components/login.component.scss | 2 +- 4 files changed, 25 insertions(+), 8 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/pages/account/components/login.page.component.html b/projects/ucap-webmessenger-app/src/app/pages/account/components/login.page.component.html index abcb350c..d0371279 100644 --- a/projects/ucap-webmessenger-app/src/app/pages/account/components/login.page.component.html +++ b/projects/ucap-webmessenger-app/src/app/pages/account/components/login.page.component.html @@ -2,7 +2,7 @@
-
+
-
+
DAESANG Messenger diff --git a/projects/ucap-webmessenger-app/src/app/pages/account/components/login.page.component.scss b/projects/ucap-webmessenger-app/src/app/pages/account/components/login.page.component.scss index 6822e1db..af242ff0 100644 --- a/projects/ucap-webmessenger-app/src/app/pages/account/components/login.page.component.scss +++ b/projects/ucap-webmessenger-app/src/app/pages/account/components/login.page.component.scss @@ -237,17 +237,17 @@ $ease-in-out: cubic-bezier(0.785, 0.135, 0.15, 0.86); &:nth-child(1) .slider_back, &:nth-child(1) .slider_inner { - background-image: url(/assets/images/login/bg_login01.png); + // background-image: url(/assets/images/login/bg_login01.png); //background: #eee; } &:nth-child(2) .slider_back, &:nth-child(2) .slider_inner { - background-image: url(/assets/images/login/bg_login02.png); + // background-image: url(/assets/images/login/bg_login02.png); //background: #aaa; } &:nth-child(3) .slider_back, &:nth-child(3) .slider_inner { - background-image: url(/assets/images/login/bg_login03.png); + // background-image: url(/assets/images/login/bg_login03.png); //background: #888; } } diff --git a/projects/ucap-webmessenger-ui-account/src/lib/components/login.component.html b/projects/ucap-webmessenger-ui-account/src/lib/components/login.component.html index 0dd039a4..12e04546 100644 --- a/projects/ucap-webmessenger-ui-account/src/lib/components/login.component.html +++ b/projects/ucap-webmessenger-ui-account/src/lib/components/login.component.html @@ -1,5 +1,10 @@ +
+ +
- + + + {{ curIndex }} / {{ totalCount }} + +
+
+ + + +
+
diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/search.component.scss b/projects/ucap-webmessenger-ui-chat/src/lib/components/search.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/search.component.spec.ts b/projects/ucap-webmessenger-ui-chat/src/lib/components/search.component.spec.ts new file mode 100644 index 00000000..43729199 --- /dev/null +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/search.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { SearchComponent } from './search.component'; + +describe('SearchComponent', () => { + let component: SearchComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ SearchComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(SearchComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/search.component.ts b/projects/ucap-webmessenger-ui-chat/src/lib/components/search.component.ts new file mode 100644 index 00000000..e07dbddd --- /dev/null +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/search.component.ts @@ -0,0 +1,65 @@ +import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; +import { FormGroup, FormBuilder } from '@angular/forms'; +import { NGXLogger } from 'ngx-logger'; + +@Component({ + selector: 'ucap-chat-search', + templateUrl: './search.component.html', + styleUrls: ['./search.component.scss'] +}) +export class SearchComponent implements OnInit { + @Input() + totalCount = 0; + @Input() + curIndex = 0; + + @Output() + searchText = new EventEmitter(); + @Output() + prevSearch = new EventEmitter(); + @Output() + nextSearch = new EventEmitter(); + @Output() + searchAndPrev = new EventEmitter(); + @Output() + closeSearchArea = new EventEmitter(); + + fgSearch: FormGroup; + isSearch = false; + + constructor(private formBuilder: FormBuilder, private logger: NGXLogger) {} + + ngOnInit() { + this.fgSearch = this.formBuilder.group({ + searchInput: null + }); + } + + onClickSearchCancel() { + this.isSearch = false; + this.fgSearch.reset(); + this.closeSearchArea.emit(); + } + + onKeyDownEnter(event: KeyboardEvent, search: string) { + event.preventDefault(); + event.stopPropagation(); + + if (search.trim().length > 0) { + this.isSearch = true; + this.searchText.emit(search.trim()); + } else { + this.isSearch = false; + } + } + + onClickPrevSearch() { + this.prevSearch.emit(); + } + onClickNextSearch() { + this.nextSearch.emit(); + } + onClickSearchAndPrev() { + this.searchAndPrev.emit(); + } +} diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/ucap-ui-chat.module.ts b/projects/ucap-webmessenger-ui-chat/src/lib/ucap-ui-chat.module.ts index 6df9d258..0b239885 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/ucap-ui-chat.module.ts +++ b/projects/ucap-webmessenger-ui-chat/src/lib/ucap-ui-chat.module.ts @@ -31,10 +31,12 @@ import { TextComponent as MBTextComponent } from './components/message-box/text. import { TranslationComponent as MBTranslationComponent } from './components/message-box/translation.component'; import { VideoComponent as MBVideoComponent } from './components/message-box/video.component'; import { VideoConferenceComponent as MBVideoConferenceComponent } from './components/message-box/video-conference.component'; +import { SearchComponent } from './components/search.component'; const COMPONENTS = [ FormComponent, MessagesComponent, + SearchComponent, MBDateSplitterComponent, MBFileComponent,