diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 725c0150..769c11a0 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -19,7 +19,7 @@ import { UIPageLayoutsModule } from './main/ui/page-layouts/page-layouts.module' import { FuseLayoutModule } from './core/components/layout/layout.module'; import { PerfectScrollbarConfigInterface, PerfectScrollbarModule } from 'ngx-perfect-scrollbar'; import { AngularFireModule } from 'angularfire2'; -import { environment } from "environments/environment"; +import { environment } from 'environments/environment'; import { AngularFireDatabaseModule } from 'angularfire2/database'; import { MailListComponent } from './main/apps/mail/mail-list/mail-list.component'; import { MailDetailsComponent } from './main/apps/mail/mail-details/mail-details.component'; diff --git a/src/app/core/modules/shared.module.ts b/src/app/core/modules/shared.module.ts index 6c127e06..25053091 100644 --- a/src/app/core/modules/shared.module.ts +++ b/src/app/core/modules/shared.module.ts @@ -8,11 +8,13 @@ import { FuseMdSidenavTogglerDirective } from '../directives/md-sidenav-helper/md-sidenav-helper.directive'; import {PerfectScrollbarModule} from 'ngx-perfect-scrollbar'; +import {KeysPipe} from '../pipes/keys'; @NgModule({ declarations: [ FuseMdSidenavHelperDirective, - FuseMdSidenavTogglerDirective + FuseMdSidenavTogglerDirective, + KeysPipe ], imports : [ FlexLayoutModule, @@ -28,7 +30,8 @@ import {PerfectScrollbarModule} from 'ngx-perfect-scrollbar'; FormsModule, FuseMdSidenavHelperDirective, FuseMdSidenavTogglerDirective, - PerfectScrollbarModule + PerfectScrollbarModule, + KeysPipe ] }) diff --git a/src/app/core/pipes/keys.ts b/src/app/core/pipes/keys.ts new file mode 100644 index 00000000..e7a03181 --- /dev/null +++ b/src/app/core/pipes/keys.ts @@ -0,0 +1,15 @@ +import {Pipe, PipeTransform} from '@angular/core'; + +@Pipe({name: 'keys'}) +export class KeysPipe implements PipeTransform +{ + transform(value: any, args: string[]): any + { + let keys: any[] = []; + for ( let key in value ) + { + keys.push({key: key, value: value[key]}); + } + return keys; + } +} diff --git a/src/app/main/apps/mail/mail.component.html b/src/app/main/apps/mail/mail.component.html index 983b7139..b7fc6c67 100644 --- a/src/app/main/apps/mail/mail.component.html +++ b/src/app/main/apps/mail/mail.component.html @@ -9,21 +9,7 @@ - - -
- Sidenav header -
- - - -
- - Sidenav - -
- - +
@@ -31,8 +17,22 @@
-
-

Left sidenav with content scroll

+
+ +
+ + + + +
+
@@ -41,11 +41,6 @@
- Content toolbar
@@ -69,4 +64,4 @@ -
\ No newline at end of file +
diff --git a/src/app/main/apps/mail/mail.component.scss b/src/app/main/apps/mail/mail.component.scss index 50947dc6..51512806 100644 --- a/src/app/main/apps/mail/mail.component.scss +++ b/src/app/main/apps/mail/mail.component.scss @@ -1,5 +1,43 @@ +@import "src/app/core/scss/fuse"; + :host, #mail { width: 100%; height: 100%; + + .center { + + .header { + padding: 0 !important; + + .search-wrapper { + @include mat-elevation(7); + + .sidenav-toggle { + margin: 0; + width: 56px; + height: 56px; + background: #FFF; + border-radius: 0; + border-right: 1px solid rgba(0, 0, 0, .12); + } + + .search { + width: 100%; + height: 56px; + line-height: 56px; + padding: 18px; + background: #FFFFFF; + + input { + height: 56px; + padding-left: 16px; + color: rgba(0, 0, 0, 0.54); + border: none; + outline: none; + } + } + } + } + } } diff --git a/src/app/main/apps/mail/sidenavs/main/main-sidenav.component.html b/src/app/main/apps/mail/sidenavs/main/main-sidenav.component.html index 993bbb85..9ba61cdb 100644 --- a/src/app/main/apps/mail/sidenavs/main/main-sidenav.component.html +++ b/src/app/main/apps/mail/sidenavs/main/main-sidenav.component.html @@ -1,3 +1,38 @@ + +
+ + +
+
John Doe
+ +
+ +
+ + + +
+ + Sidenav + +
+ + + +
+ +
+ +

- main sidenav + main sidenav

diff --git a/src/app/main/apps/mail/sidenavs/main/main-sidenav.component.scss b/src/app/main/apps/mail/sidenavs/main/main-sidenav.component.scss index e69de29b..ee4465bf 100644 --- a/src/app/main/apps/mail/sidenavs/main/main-sidenav.component.scss +++ b/src/app/main/apps/mail/sidenavs/main/main-sidenav.component.scss @@ -0,0 +1,21 @@ +:host { + .header { + + .logo { + + .logo-icon { + margin: 0 16px 0 0; + } + + .logo-text { + font-size: 24px; + } + } + + .account { + width: 100%; + .account-selection { + } + } + } +} diff --git a/src/app/main/apps/mail/sidenavs/main/main-sidenav.component.ts b/src/app/main/apps/mail/sidenavs/main/main-sidenav.component.ts index 3e85a097..74cc5861 100644 --- a/src/app/main/apps/mail/sidenavs/main/main-sidenav.component.ts +++ b/src/app/main/apps/mail/sidenavs/main/main-sidenav.component.ts @@ -7,8 +7,17 @@ import {Component, OnInit} from '@angular/core'; }) export class MainSidenavComponent implements OnInit { + accounts: object; + selectedAccount: string; + constructor() { + // Data + this.accounts = { + 'creapond' : 'johndoe@creapond.com', + 'withinpixels': 'johndoe@withinpixels.com' + }; + this.selectedAccount = 'creapond'; } ngOnInit()