Merge remote-tracking branch 'origin/master'

This commit is contained in:
NyxiumYuuki 2021-06-01 15:58:11 +02:00
commit 9e1ce83b81
3 changed files with 5 additions and 5 deletions

View file

@ -58,7 +58,7 @@ services:
- backend/service-privateroom
- backend/service-privateroom/node_modules
ports:
- 3001:3000
- 3002:3000
depends_on:
- mongodb-privateroom
links:

View file

@ -8,7 +8,7 @@
</ul>
</div>
<div class="chat-footer">
<div class="row">
<div class="row col-xl-12 col-lg-12 col-md-12 col-sm-12 col-12">
<div class="col-md-10">
<div class="form-group mb-0">
<input type="text" placeholder="Entrez votre message" (keydown.enter)="sendButtonClick()" class="form-control" [(ngModel)]="msg"/>

View file

@ -1,11 +1,11 @@
<div class="container-fluid">
<div class="container col-xl-12 col-lg-12 col-md-12 col-sm-12 col-12">
<div class="row">
<div class="col-md-4">
<div class="col-xl-4 col-lg-4 col-md-4 col-sm-3 col-3">
<div #userList class="user-list-card" (click)="selectRoom($event)">
<div class="user-card"><p class="username">General</p></div>
</div>
</div>
<div class="col-md-8">
<div class="col-xl-8 col-lg-8 col-md-8 col-sm-9 col-9">
<app-message [room]="roomSelected"></app-message>
</div>
</div>