diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer.component.html index 28ff1ca3..3ba4cbd4 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer.component.html @@ -1,5 +1,5 @@ -
- {{ selectedRightDrawer }} +
+

{{ selectedRightDrawer }}

diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.scss index c3c22de5..1311305c 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.scss @@ -7,10 +7,69 @@ } } -.img-item { - cursor: pointer; - max-width: 150px; - min-width: 150px; +::ng-deep .mat-tab-label{ + width:50%; +} + +.select-filebox{ + display:flex; + flex-flow: column; + margin:10px; + padding:10px; + border:1px solid #cccccc; + .select-flie{ + display: flex; + flex-flow: row; + align-items: center; + color: #212121; + align-items: center; + border-bottom: 1px dotted #dddddd; + text-align:center; + ul{ + padding:0; + margin-top:10px; + .name{ + font-weight:600; + } + } + } +} + +.search-list{ + display:flex; + padding:0 10px; + height: calc(100% - 450px); + overflow-y: auto; + flex-wrap: wrap; + justify-content: space-between; + .img-item { + cursor: pointer; + margin-bottom:10px; + position: relative; + dl{ + dt{ + display: flex; + justify-content: center; + align-items: center; + width: 120px; + height: 120px; + background-color: #efefef; + border: 1px dotted #cccccc; + img{ + width:100%; + height:100%; + } + } + dd{ + .btn-download{ + margin-left:auto; + } + } + } + & :nth-child(3n+0){ + margin-right:0; + } + } } .preview-image { @@ -18,6 +77,11 @@ } .btn-box { + position:absolute; + bottom:0; + height:50px; + margin-bottom:10px; + width:100%; button { margin: 5px; } diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.html index 8341207b..5c21477f 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.html @@ -1,35 +1,40 @@ -
-
+
+
-
- +
+ Select File. -
-
+
+
+
+
+
    +
  • name : {{ selectedFile.info.name }}
  • +
  • size : {{ selectedFile.info.size | ucapBytes }}
  • +
  • + date : + {{ selectedFile.info.sendDate | dateToStringFormat: 'YYYY.MM.DD' }} +
  • +
+
+
+ 아이콘
-
    -
  • name : {{ selectedFile.info.name }}
  • -
  • size : {{ selectedFile.info.size | ucapBytes }}
  • -
  • - date : - {{ selectedFile.info.sendDate | dateToStringFormat: 'YYYY.MM.DD' }} -
  • -
-
+
- @@ -77,28 +84,30 @@ (click)="onClickRow(row)" >
@@ -55,19 +60,21 @@ Name -
+
+
{{ element.info.name }}
-
- {{ element.info.size | ucapBytes }} +
+ + {{ element.info.sendDate | dateToStringFormat: 'YYYY.MM.DD' }} ~ 2020.01.23
sendDate - {{ element.info.sendDate | dateToStringFormat: 'YYYY.MM.DD' }} + + {{ element.info.size | ucapBytes }}
- +
+ -
- - -
+ + +
+
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.scss index a6c2e8f4..e7de30c8 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.scss @@ -1,5 +1,87 @@ -table { +@mixin ellipsis($row) { + overflow: hidden; + text-overflow: ellipsis; + @if $row == 1 { + display: block; + white-space: nowrap; + word-wrap: normal; + } @else if $row >= 2 { + display: -webkit-box; + -webkit-line-clamp: $row; + -webkit-box-orient: vertical; + word-wrap: break-word; + } +} + +.rightDrawer-filebox { width: 100%; + height: calc(100% - 60px); + .rightDrawer-tab { + .mat-tab-label { + width: 50%; + } + } +} + +::ng-deep .mat-tab-label { + width: 50%; +} + +.select-filebox { + display: flex; + flex-flow: column; + margin: 10px; + padding: 10px; + border: 1px solid #cccccc; + .select-flie { + display: flex; + flex-flow: row; + align-items: center; + color: #212121; + align-items: center; + border-bottom: 1px dotted #dddddd; + ul { + padding: 0; + .name { + font-weight: 600; + } + } + } +} + +.mat-table { + width: 100%; + position: relative; + th.infos { + padding: 10px; + } + tr.mat-row { + height: 70px; + .file-info { + padding: 16px; + display: grid; + height: 70px; + .file-name { + font-weight: 600; + margin-bottom: 2px; + width: 100%; + @include ellipsis(1); + } + .download-period { + font-size: 12px; + width: 100%; + @include ellipsis(1); + } + } + } +} +.table-box{ + height: calc(100% - 450px); + overflow-y: auto; +} +.mat-paginator-container { + display: flex; + flex-flow: column; } .mat-row:hover { @@ -7,8 +89,42 @@ table { cursor: pointer; } -.btn-box { - button { - margin: 5px; +.footer-fix{ + position: absolute; + bottom: 0; + height:160px; + flex-direction: column; + box-sizing: border-box; + display: flex; + .btn-box { + height: 50px; + padding-bottom: 10px; + width: 100%; + background-color: #ffffff; + button { + margin: 5px; + } + } +} + +::ng-deep .mat-paginator { + .mat-paginator-container { + justify-content: center; + } + .mat-paginator-navigation-first { + order: 1; + } + .mat-paginator-navigation-previous { + order: 2; + } + // override material paginator page switch + .mat-paginator-range-label { + order: 3; + } + .mat-paginator-navigation-next { + order: 4; + } + .mat-paginator-navigation-last { + order: 5; } } diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/room-user-list.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/room-user-list.component.scss index 4269c3e8..e2de3c17 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/room-user-list.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/room-user-list.component.scss @@ -1,5 +1,5 @@ .list { - width: 300px; + width: 100%; height: 100%; overflow: hidden;