Переглянути джерело

Partial commit --- add broadcast

master
kj1352 5 роки тому
джерело
коміт
ec7e39e06d
8 змінених файлів з 80 додано та 1 видалено
  1. +2
    -0
      src/app/app.module.ts
  2. +1
    -0
      src/app/chat-page/add-broadcast/add-broadcast.component.html
  3. +0
    -0
      src/app/chat-page/add-broadcast/add-broadcast.component.scss
  4. +25
    -0
      src/app/chat-page/add-broadcast/add-broadcast.component.spec.ts
  5. +21
    -0
      src/app/chat-page/add-broadcast/add-broadcast.component.ts
  6. +8
    -1
      src/app/chat-page/chat-page.component.html
  7. +22
    -0
      src/app/chat-page/chat-page.component.scss
  8. +1
    -0
      src/app/chat-page/chat-page.component.ts

+ 2
- 0
src/app/app.module.ts Переглянути файл

@@ -43,6 +43,7 @@ import { StartComponent } from './tabs/courses/test/start/start.component';
import { EndComponent } from './tabs/courses/test/end/end.component';
import { QuestionSheetComponent } from './tabs/courses/test/question-sheet/question-sheet.component';
import { QuestionComponent } from './tabs/courses/test/question-sheet/question/question.component';
import { AddBroadcastComponent } from './chat-page/add-broadcast/add-broadcast.component';

@NgModule({
declarations: [
@@ -73,6 +74,7 @@ import { QuestionComponent } from './tabs/courses/test/question-sheet/question/q
EndComponent,
QuestionSheetComponent,
QuestionComponent,
AddBroadcastComponent,
],
imports: [
BrowserModule,


+ 1
- 0
src/app/chat-page/add-broadcast/add-broadcast.component.html Переглянути файл

@@ -0,0 +1 @@
<p>add-broadcast works!</p>

+ 0
- 0
src/app/chat-page/add-broadcast/add-broadcast.component.scss Переглянути файл


+ 25
- 0
src/app/chat-page/add-broadcast/add-broadcast.component.spec.ts Переглянути файл

@@ -0,0 +1,25 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';

import { AddBroadcastComponent } from './add-broadcast.component';

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

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

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

it('should create', () => {
expect(component).toBeTruthy();
});
});

+ 21
- 0
src/app/chat-page/add-broadcast/add-broadcast.component.ts Переглянути файл

@@ -0,0 +1,21 @@
import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';

@Component({
selector: 'app-add-broadcast',
templateUrl: './add-broadcast.component.html',
styleUrls: ['./add-broadcast.component.scss']
})
export class AddBroadcastComponent implements OnInit {
@Input() broadcastInfo: any;
@Output() addBroadcastEvents = new EventEmitter();
@Input() friendList: any = [];
searchTerm: string = '';
tempFriendList: any = [];

constructor() { }

ngOnInit(): void {
this.tempFriendList = this.friendList;
}

}

+ 8
- 1
src/app/chat-page/chat-page.component.html Переглянути файл

@@ -46,7 +46,7 @@
</div>

<div *ngIf="selectedSegment === 'broadcasts' && !showSearch">
<ul class="chat-list">
<ul class="chat-list" *ngIf="!showAddBroadCast">
<li *ngFor="let chat of broadCastList; let i = index" (click)="openBroadcastChat(i)">
<img src="{{ chat.user.imgUrl }}">
<div class="content">
@@ -60,6 +60,13 @@
</div>
</li>
</ul>

<button class="add-broadcast-button" (click)="showAddBroadCast = !showAddBroadCast">
<svg-icon [applyClass]="true" class="icon" src="assets/custom-icons/plus.svg"></svg-icon>
</button>

<app-add-broadcast *ngIf="showAddBroadCast"></app-add-broadcast>

</div>

<section class="search-list" *ngIf="showSearch">


+ 22
- 0
src/app/chat-page/chat-page.component.scss Переглянути файл

@@ -84,6 +84,28 @@
padding: 10px 5%;
border-top-left-radius: 30px;
border-top-right-radius: 30px;

.add-broadcast-button {
position: fixed;
right: 20px;
bottom: 20px;
z-index: 1;
background-color: var(--teal-green);
border: 0px;
border-radius: 50%;
width: 50px;
height: 50px;
display: flex;
align-items: center;
justify-content: center;

.icon {
width: 70%;
position: relative;
top: 1px;
fill: white;
}
}
}

.chat-list {


+ 1
- 0
src/app/chat-page/chat-page.component.ts Переглянути файл

@@ -16,6 +16,7 @@ export class ChatPageComponent implements OnInit {
chatList: [],
broadCastList: []
};
showAddBroadCast: boolean = false;

chatList = [{
user: {