From 51a6e864dd28a192afa6eee38480a85f5b2ef06a Mon Sep 17 00:00:00 2001 From: mustafahlvc Date: Thu, 17 Aug 2017 10:40:25 +0300 Subject: [PATCH] Reformatting. --- src/app/app.module.ts | 2 +- .../demo-content/demo-content.component.html | 120 +- .../navigation/nav-item/nav-item.component.ts | 2 +- .../nav-subheader/nav-subheader.component.ts | 2 +- .../navigation/navigation.module.ts | 16 +- .../md-sidenav-helper.directive.ts | 6 +- src/app/core/modules/material.module.ts | 6 +- src/app/core/pipes/htmlToPlaintext.pipe.ts | 2 +- src/app/core/scss/core.scss | 2 - src/app/core/scss/fuse.scss | 1 - src/app/core/scss/mixins/_breakpoints.scss | 1 - src/app/core/scss/partials/_normalize.scss | 2 +- .../scss/partials/plugins/_highlight.scss | 20 +- src/app/core/services/match-media.service.ts | 3 +- src/app/fuse-fake-db/chat.ts | 40 +- .../content/apps/calendar/calendar.service.ts | 5 +- .../main/content/apps/calendar/event.model.ts | 1 - .../chat/chat-start/chat-start.component.scss | 2 +- .../chat/chat-start/chat-start.component.ts | 2 +- .../chat/chat-view/chat-view.component.ts | 1 - src/app/main/content/apps/chat/chat.module.ts | 18 +- .../main/content/apps/chat/chat.service.ts | 2 +- .../sidenavs/left/chats/chats.component.ts | 8 +- .../chat/sidenavs/left/left.component.html | 8 +- .../sidenavs/left/user/user.component.scss | 2 +- .../chat/sidenavs/left/user/user.component.ts | 14 +- .../right/contact/contact.component.scss | 2 +- .../chat/sidenavs/right/right.component.html | 4 +- .../dashboards/project/project.component.html | 2 +- .../file-manager/file-manager.component.scss | 2 +- .../mail/mail-list/mail-list.component.scss | 4 +- .../content/apps/todo/todo.component.scss | 2 +- .../main/content/apps/todo/todo.service.ts | 25 +- src/app/main/content/content.component.ts | 14 +- .../authentication/lock/lock.component.ts | 11 +- .../maintenance/maintenance.component.html | 18 +- src/app/main/content/pages/pages.module.ts | 2 +- .../pages/search/search.component.scss | 4 +- .../search/tabs/table/table.component.html | 10 +- .../search/tabs/table/table.component.scss | 3 +- .../main/content/ui/forms/forms.component.ts | 7 +- .../padding-margin.component.html | 4 +- .../width-height/width-height.component.html | 4 +- .../tabs/helpers/helpers.component.html | 20 +- src/app/main/footer/footer.component.html | 2 +- src/app/main/footer/footer.component.ts | 18 +- src/app/main/navbar/navbar.component.html | 3 +- src/app/main/toolbar/toolbar.component.scss | 2 +- .../icons/meteocons/demo-files/demo.css | 336 ++- src/assets/icons/meteocons/demo-files/demo.js | 24 +- src/assets/icons/meteocons/demo.html | 1573 +++++----- .../icons/meteocons/fonts/meteocons.svg | 157 +- src/assets/icons/meteocons/selection.json | 2598 ++++++++--------- src/environments/environment.prod.ts | 2 +- src/environments/environment.ts | 6 +- src/main.ts | 5 +- src/polyfills.ts | 7 +- src/test.ts | 11 +- src/tsconfig.app.json | 22 +- src/tsconfig.spec.json | 34 +- src/typings.d.ts | 6 +- 61 files changed, 2672 insertions(+), 2560 deletions(-) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 1900abdd..6413d7bd 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -55,7 +55,7 @@ const appRoutes: Routes = [ @NgModule({ declarations: [ - AppComponent, + AppComponent ], imports : [ BrowserModule, diff --git a/src/app/core/components/demo/demo-content/demo-content.component.html b/src/app/core/components/demo/demo-content/demo-content.component.html index 14d474b3..a8075ec0 100644 --- a/src/app/core/components/demo/demo-content/demo-content.component.html +++ b/src/app/core/components/demo/demo-content/demo-content.component.html @@ -1,75 +1,75 @@
- beach + beach -

Early Sunrise

-

Demo Content

+

Early Sunrise

+

Demo Content

-

- One morning, when Gregor Samsa woke from troubled dreams, he found himself transformed in his bed into a - horrible vermin. He lay on his armour-like back, and if he lifted his head a little he could see his - brown belly, slightly domed and divided by arches into stiff sections. -

- -

- The bedding was hardly able to cover it and seemed ready to slide off any moment. His many legs, - pitifully thin compared with the size of the rest of him, waved about helplessly as he looked. "What's - happened to me? " he thought. It wasn't a dream. + One morning, when Gregor Samsa woke from troubled dreams, he found himself transformed in his bed into a + horrible vermin. He lay on his armour-like back, and if he lifted his head a little he could see his + brown belly, slightly domed and divided by arches into stiff sections.

-
- John Doe -
-
-

- His room, a proper human room although a little too small, lay peacefully between its four familiar - walls. A collection of textile samples lay spread out on the table - Samsa was a travelling salesman - - and above it there hung a picture that he had recently cut out of an illustrated magazine and housed in - a nice, gilded frame. -

+
+

+ The bedding was hardly able to cover it and seemed ready to slide off any moment. His many legs, + pitifully thin compared with the size of the rest of him, waved about helplessly as he looked. "What's + happened to me? " he thought. It wasn't a dream. +

+
+ John Doe +
+
-

- It showed a lady fitted out with a fur hat and fur boa who sat upright, raising a heavy fur muff that - covered the whole of her lower arm towards the viewer. Gregor then turned to look out the window at the - dull weather. Drops of rain could be heard hitting the pane, which made him feel quite sad. -

+

+ His room, a proper human room although a little too small, lay peacefully between its four familiar + walls. A collection of textile samples lay spread out on the table - Samsa was a travelling salesman - + and above it there hung a picture that he had recently cut out of an illustrated magazine and housed in + a nice, gilded frame. +

-

- "How about if I sleep a little bit longer and forget all this nonsense", he thought, but that was - something he was unable to do because he was used to sleeping on his right, and in his present state - couldn't get into that position. However hard he threw himself onto his right, he always rolled back to - where he was. -

+

+ It showed a lady fitted out with a fur hat and fur boa who sat upright, raising a heavy fur muff that + covered the whole of her lower arm towards the viewer. Gregor then turned to look out the window at the + dull weather. Drops of rain could be heard hitting the pane, which made him feel quite sad. +

-

- He must have tried it a hundred times, shut his eyes so that he wouldn't have to look at the floundering - legs, and only stopped when he began to feel a mild, dull pain there that he had never felt before. "Oh, - God", he thought, "what a strenuous career it is that I've chosen! -

+

+ "How about if I sleep a little bit longer and forget all this nonsense", he thought, but that was + something he was unable to do because he was used to sleeping on his right, and in his present state + couldn't get into that position. However hard he threw himself onto his right, he always rolled back to + where he was. +

-

- Travelling day in and day out. Doing business like this takes much more effort than doing your own - business at home, and on top of that there's the curse of travelling, worries about making train - connections, bad and irregular food, contact with different people all the time so that you can never - get to know anyone or become friendly with them. -

+

+ He must have tried it a hundred times, shut his eyes so that he wouldn't have to look at the floundering + legs, and only stopped when he began to feel a mild, dull pain there that he had never felt before. "Oh, + God", he thought, "what a strenuous career it is that I've chosen! +

-

- "He felt a slight itch up on his belly; pushed himself slowly up on his back towards the headboard so - that he could lift his head better; found where the itch was, and saw that it was covered with lots of - little white spots which he didn't know what to make of; and when he tried to feel the place with one of - his legs he drew it quickly back because as soon as he touched it he was overcome by a cold shudder. He - slid back into his former position. -

+

+ Travelling day in and day out. Doing business like this takes much more effort than doing your own + business at home, and on top of that there's the curse of travelling, worries about making train + connections, bad and irregular food, contact with different people all the time so that you can never + get to know anyone or become friendly with them. +

-

- "Getting up early all the time", he thought, "it makes you stupid. You've got to get enough sleep. Other - travelling salesmen live a life of luxury. For instance, whenever I go back to the guest house during - the morning to copy out the contract, these gentlemen are always still sitting there eating their - breakfasts. I ought to just try that with my boss; I'd get kicked out on the spot. But who knows, maybe - that would be the best thing for me... -

+

+ "He felt a slight itch up on his belly; pushed himself slowly up on his back towards the headboard so + that he could lift his head better; found where the itch was, and saw that it was covered with lots of + little white spots which he didn't know what to make of; and when he tried to feel the place with one of + his legs he drew it quickly back because as soon as he touched it he was overcome by a cold shudder. He + slid back into his former position. +

+ +

+ "Getting up early all the time", he thought, "it makes you stupid. You've got to get enough sleep. Other + travelling salesmen live a life of luxury. For instance, whenever I go back to the guest house during + the morning to copy out the contract, these gentlemen are always still sitting there eating their + breakfasts. I ought to just try that with my boss; I'd get kicked out on the spot. But who knows, maybe + that would be the best thing for me... +

- \ No newline at end of file + diff --git a/src/app/core/components/navigation/nav-item/nav-item.component.ts b/src/app/core/components/navigation/nav-item/nav-item.component.ts index 1c0a4917..511d6455 100644 --- a/src/app/core/components/navigation/nav-item/nav-item.component.ts +++ b/src/app/core/components/navigation/nav-item/nav-item.component.ts @@ -1,4 +1,4 @@ -import {Component, HostBinding, Input, OnInit} from '@angular/core'; +import { Component, HostBinding, Input, OnInit } from '@angular/core'; @Component({ selector : 'fuse-nav-item', diff --git a/src/app/core/components/navigation/nav-subheader/nav-subheader.component.ts b/src/app/core/components/navigation/nav-subheader/nav-subheader.component.ts index 4c7dbc59..d2ed28b9 100644 --- a/src/app/core/components/navigation/nav-subheader/nav-subheader.component.ts +++ b/src/app/core/components/navigation/nav-subheader/nav-subheader.component.ts @@ -1,4 +1,4 @@ -import {Component, HostBinding, Input, OnInit} from '@angular/core'; +import { Component, HostBinding, Input, OnInit } from '@angular/core'; @Component({ selector : 'fuse-nav-subheader', diff --git a/src/app/core/components/navigation/navigation.module.ts b/src/app/core/components/navigation/navigation.module.ts index 15816e1a..3e7f2fd6 100644 --- a/src/app/core/components/navigation/navigation.module.ts +++ b/src/app/core/components/navigation/navigation.module.ts @@ -1,10 +1,10 @@ -import {NgModule} from '@angular/core'; -import {SharedModule} from '../../modules/shared.module'; -import {RouterModule} from '@angular/router'; -import {FuseNavSubheaderComponent} from './nav-subheader/nav-subheader.component'; -import {FuseNavigationComponent} from './navigation.component'; -import {FuseNavItemComponent} from './nav-item/nav-item.component'; -import {FuseNavCollapseComponent} from './nav-collapse/nav-collapse.component'; +import { NgModule } from '@angular/core'; +import { SharedModule } from '../../modules/shared.module'; +import { RouterModule } from '@angular/router'; +import { FuseNavSubheaderComponent } from './nav-subheader/nav-subheader.component'; +import { FuseNavigationComponent } from './navigation.component'; +import { FuseNavItemComponent } from './nav-item/nav-item.component'; +import { FuseNavCollapseComponent } from './nav-collapse/nav-collapse.component'; @NgModule({ imports : [ @@ -19,7 +19,7 @@ import {FuseNavCollapseComponent} from './nav-collapse/nav-collapse.component'; FuseNavSubheaderComponent, FuseNavItemComponent, FuseNavCollapseComponent - ], + ] }) export class FuseNavigationModule { diff --git a/src/app/core/directives/md-sidenav-helper/md-sidenav-helper.directive.ts b/src/app/core/directives/md-sidenav-helper/md-sidenav-helper.directive.ts index 020cc02b..5d1fe774 100644 --- a/src/app/core/directives/md-sidenav-helper/md-sidenav-helper.directive.ts +++ b/src/app/core/directives/md-sidenav-helper/md-sidenav-helper.directive.ts @@ -44,8 +44,7 @@ export class FuseMdSidenavHelperDirective implements OnInit, AfterViewInit, OnDe this.mdSidenav.close(); } - this.matchMediaSubscription = this.fuseMatchMedia.onMediaChange.subscribe(() => - { + this.matchMediaSubscription = this.fuseMatchMedia.onMediaChange.subscribe(() => { if ( this.observableMedia.isActive(this.mdIsLockedOpenBreakpoint) ) { this.isLockedOpen = true; @@ -64,8 +63,7 @@ export class FuseMdSidenavHelperDirective implements OnInit, AfterViewInit, OnDe ngAfterViewInit() { - setTimeout(() => - { + setTimeout(() => { this.stopTransition = false; }, 0); } diff --git a/src/app/core/modules/material.module.ts b/src/app/core/modules/material.module.ts index 1f45035f..adeef984 100644 --- a/src/app/core/modules/material.module.ts +++ b/src/app/core/modules/material.module.ts @@ -1,4 +1,4 @@ -import {NgModule} from '@angular/core'; +import { NgModule } from '@angular/core'; import { MdAutocompleteModule, MdButtonModule, @@ -30,7 +30,7 @@ import { MdSnackBarModule, MdSortModule, MdTableModule, - MdTabsModule, + MdTabsModule } from '@angular/material'; import { CdkTableModule } from '@angular/cdk'; @@ -102,7 +102,7 @@ import { CdkTableModule } from '@angular/cdk'; MdToolbarModule, MdTooltipModule, CdkTableModule - ], + ] }) export class MaterialModule { diff --git a/src/app/core/pipes/htmlToPlaintext.pipe.ts b/src/app/core/pipes/htmlToPlaintext.pipe.ts index 2dfb64d2..e7c5d56c 100644 --- a/src/app/core/pipes/htmlToPlaintext.pipe.ts +++ b/src/app/core/pipes/htmlToPlaintext.pipe.ts @@ -1,4 +1,4 @@ -import {Pipe, PipeTransform} from '@angular/core'; +import { Pipe, PipeTransform } from '@angular/core'; @Pipe({name: 'htmlToPlaintext'}) export class HtmlToPlaintextPipe implements PipeTransform diff --git a/src/app/core/scss/core.scss b/src/app/core/scss/core.scss index 173750f9..cc972b4f 100644 --- a/src/app/core/scss/core.scss +++ b/src/app/core/scss/core.scss @@ -2,10 +2,8 @@ @import '~@swimlane/ngx-datatable/release/index.css'; @import '~@swimlane/ngx-datatable/release/themes/material.css'; @import '~@swimlane/ngx-datatable/release/assets/icons.css'; - // Perfect Scrollbar @import "~perfect-scrollbar/src/css/main"; - // Fuse @import "fuse"; diff --git a/src/app/core/scss/fuse.scss b/src/app/core/scss/fuse.scss index 184e2c33..f73440c3 100644 --- a/src/app/core/scss/fuse.scss +++ b/src/app/core/scss/fuse.scss @@ -1,5 +1,4 @@ // Variables @import "variables/theme"; - // Mixins @import "mixins/breakpoints"; diff --git a/src/app/core/scss/mixins/_breakpoints.scss b/src/app/core/scss/mixins/_breakpoints.scss index c5e38ba7..2122af9c 100644 --- a/src/app/core/scss/mixins/_breakpoints.scss +++ b/src/app/core/scss/mixins/_breakpoints.scss @@ -76,7 +76,6 @@ $grid-breakpoints: ( @return if(breakpoint-min($name, $breakpoints) == null, "", "-#{$name}"); } - // Media of at least the minimum breakpoint width. No query for the smallest breakpoint. // Makes the @content apply to the given breakpoint and wider. @mixin media-breakpoint-up($name, $breakpoints: $grid-breakpoints) { diff --git a/src/app/core/scss/partials/_normalize.scss b/src/app/core/scss/partials/_normalize.scss index 6d95002c..67e5f92a 100644 --- a/src/app/core/scss/partials/_normalize.scss +++ b/src/app/core/scss/partials/_normalize.scss @@ -159,7 +159,7 @@ dfn { */ mark { - background-color: #ff0; + background-color: #FF0; color: #000; } diff --git a/src/app/core/scss/partials/plugins/_highlight.scss b/src/app/core/scss/partials/plugins/_highlight.scss index a721a67c..10755cf0 100644 --- a/src/app/core/scss/partials/plugins/_highlight.scss +++ b/src/app/core/scss/partials/plugins/_highlight.scss @@ -4,13 +4,13 @@ github.com style (c) Vasily Polovnyov */ -hljs , +hljs, [hljs] { display: block; overflow-x: auto; -// padding: 0.5em; + // padding: 0.5em; color: #333; - background: #f8f8f8; + background: #F8F8F8; -webkit-text-size-adjust: none; } @@ -41,7 +41,7 @@ hljs , .hljs-tag .hljs-value, .hljs-doctag, .tex .hljs-formula { - color: #d14; + color: #D14; } .hljs-title, @@ -94,7 +94,7 @@ hljs , } .hljs-built_in { - color: #0086b3; + color: #0086B3; } .hljs-preprocessor, @@ -108,17 +108,17 @@ hljs , } .hljs-deletion { - background: #fdd; + background: #FDD; } .hljs-addition { - background: #dfd; + background: #DFD; } .diff .hljs-change { - background: #0086b3; + background: #0086B3; } .hljs-chunk { - color: #aaa; -} \ No newline at end of file + color: #AAA; +} diff --git a/src/app/core/services/match-media.service.ts b/src/app/core/services/match-media.service.ts index b7ab8ece..43fcf723 100644 --- a/src/app/core/services/match-media.service.ts +++ b/src/app/core/services/match-media.service.ts @@ -12,8 +12,7 @@ export class FuseMatchMedia { this.activeMediaQuery = ''; - this.observableMedia.subscribe((change: MediaChange) => - { + this.observableMedia.subscribe((change: MediaChange) => { if ( this.activeMediaQuery !== change.mqAlias ) { this.activeMediaQuery = change.mqAlias; diff --git a/src/app/fuse-fake-db/chat.ts b/src/app/fuse-fake-db/chat.ts index 62771c02..a92634d1 100644 --- a/src/app/fuse-fake-db/chat.ts +++ b/src/app/fuse-fake-db/chat.ts @@ -43,98 +43,98 @@ export class ChatFakeDb 'name' : 'Christy', 'avatar': 'assets/images/avatars/Christy.jpg', 'status': 'offline', - 'mood' : 'We always hold hands. If I let go, she shops.', + 'mood' : 'We always hold hands. If I let go, she shops.' }, { 'id' : '5725a680bc670af746c435e2', 'name' : 'Copeland', 'avatar': 'assets/images/avatars/Copeland.jpg', 'status': 'online', - 'mood' : 'I get enough exercise just pushing my luck.', + 'mood' : 'I get enough exercise just pushing my luck.' }, { 'id' : '5725a680e7eb988a58ddf303', 'name' : 'Estes', 'avatar': 'assets/images/avatars/Estes.jpg', 'status': 'away', - 'mood' : 'What comes after the man bun hairstyle? The he-hive!', + 'mood' : 'What comes after the man bun hairstyle? The he-hive!' }, { 'id' : '5725a680dcb077889f758961', 'name' : 'Harper', 'avatar': 'assets/images/avatars/Harper.jpg', 'status': 'offline', - 'mood' : 'Always try to be modest and be proud of it!', + 'mood' : 'Always try to be modest and be proud of it!' }, { 'id' : '5725a6806acf030f9341e925', 'name' : 'Helen', 'avatar': 'assets/images/avatars/Helen.jpg', 'status': 'away', - 'mood' : 'Why are there stitch marks on zombies? Who\'s giving them medical attention?', + 'mood' : 'Why are there stitch marks on zombies? Who\'s giving them medical attention?' }, { 'id' : '5725a680ae1ae9a3c960d487', 'name' : 'Henderson', 'avatar': 'assets/images/avatars/Henderson.jpg', 'status': 'offline', - 'mood' : 'I can\'t decide if people who wear pajamas in public have given up on life or are living it to the fullest.', + 'mood' : 'I can\'t decide if people who wear pajamas in public have given up on life or are living it to the fullest.' }, { 'id' : '5725a680b8d240c011dd224b', 'name' : 'Josefina', 'avatar': 'assets/images/avatars/Josefina.jpg', 'status': 'online', - 'mood' : 'The fastest way to being happy is to make other people happy. You go first', + 'mood' : 'The fastest way to being happy is to make other people happy. You go first' }, { 'id' : '5725a68034cb3968e1f79eac', 'name' : 'Katina', 'avatar': 'assets/images/avatars/Katina.jpg', 'status': 'away', - 'mood' : 'If I was a rat,,, I wouldn\'t give anyone my ass.', + 'mood' : 'If I was a rat,,, I wouldn\'t give anyone my ass.' }, { 'id' : '5725a6801146cce777df2a08', 'name' : 'Lily', 'avatar': 'assets/images/avatars/Lily.jpg', 'status': 'do-not-disturb', - 'mood' : 'A zip line but from the sofa to the fridge', + 'mood' : 'A zip line but from the sofa to the fridge' }, { 'id' : '5725a6808a178bfd034d6ecf', 'name' : 'Mai', 'avatar': 'assets/images/avatars/Mai.jpg', 'status': 'away', - 'mood' : 'If a girl tells you she has a nipple ring, the only correct response is \'I don\'t believe you.\'', + 'mood' : 'If a girl tells you she has a nipple ring, the only correct response is \'I don\'t believe you.\'' }, { 'id' : '5725a680653c265f5c79b5a9', 'name' : 'Nancy', 'avatar': 'assets/images/avatars/Nancy.jpg', 'status': 'do-not-disturb', - 'mood' : 'Prison counts as a gated community, right?', + 'mood' : 'Prison counts as a gated community, right?' }, { 'id' : '5725a680bbcec3cc32a8488a', 'name' : 'Nora', 'avatar': 'assets/images/avatars/Nora.jpg', 'status': 'do-not-disturb', - 'mood' : 'I never date left handed women. Righty tighty, lefty loosey.', + 'mood' : 'I never date left handed women. Righty tighty, lefty loosey.' }, { 'id' : '5725a6803d87f1b77e17b62b', 'name' : 'Odessa', 'avatar': 'assets/images/avatars/Odessa.jpg', 'status': 'away', - 'mood' : 'A day without sunshine is like, night.', + 'mood' : 'A day without sunshine is like, night.' }, { 'id' : '5725a680e87cb319bd9bd673', 'name' : 'Reyna', 'avatar': 'assets/images/avatars/Reyna.jpg', 'status': 'offline', - 'mood' : 'I can\'t wait for summer in Canada...', + 'mood' : 'I can\'t wait for summer in Canada...' }, { 'id' : '5725a6802d10e277a0f35775', @@ -142,42 +142,42 @@ export class ChatFakeDb 'avatar': 'assets/images/avatars/Shauna.jpg', 'status': 'online', 'mood' : 'My take home pay doesn’t ven take me home.', - 'unread': null, + 'unread': null }, { 'id' : '5725a680aef1e5cf26dd3d1f', 'name' : 'Shepard', 'avatar': 'assets/images/avatars/Shepard.jpg', 'status': 'online', - 'mood' : 'I don\'t speak Spanish, but I\'m pretty sure \'Dora\' means \'annoying\'', + 'mood' : 'I don\'t speak Spanish, but I\'m pretty sure \'Dora\' means \'annoying\'' }, { 'id' : '5725a680cd7efa56a45aea5d', 'name' : 'Tillman', 'avatar': 'assets/images/avatars/Tillman.jpg', 'status': 'do-not-disturb', - 'mood' : '', + 'mood' : '' }, { 'id' : '5725a680fb65c91a82cb35e2', 'name' : 'Trevino', 'avatar': 'assets/images/avatars/Trevino.jpg', 'status': 'away', - 'mood' : 'Apparently, a rat and a plastic tube does not count as a DIY abortion kit.', + 'mood' : 'Apparently, a rat and a plastic tube does not count as a DIY abortion kit.' }, { 'id' : '5725a68018c663044be49cbf', 'name' : 'Tyson', 'avatar': 'assets/images/avatars/Tyson.jpg', 'status': 'do-not-disturb', - 'mood' : 'I\'m wondering why life keeps teaching me lessons I have no desire to learn...', + 'mood' : 'I\'m wondering why life keeps teaching me lessons I have no desire to learn...' }, { 'id' : '5725a6809413bf8a0a5272b1', 'name' : 'Velazquez', 'avatar': 'assets/images/avatars/Velazquez.jpg', 'status': 'online', - 'mood' : 'Modulation in all things.', + 'mood' : 'Modulation in all things.' } ]; diff --git a/src/app/main/content/apps/calendar/calendar.service.ts b/src/app/main/content/apps/calendar/calendar.service.ts index c765e74a..6774fb45 100644 --- a/src/app/main/content/apps/calendar/calendar.service.ts +++ b/src/app/main/content/apps/calendar/calendar.service.ts @@ -45,7 +45,10 @@ export class CalendarService implements Resolve updateEvents(events) { return new Promise((resolve, reject) => { - this.http.post('api/calendar/events', {id: 'events', data: [...events]}) + this.http.post('api/calendar/events', { + id : 'events', + data: [...events] + }) .subscribe(response => { this.getEvents(); }, reject); diff --git a/src/app/main/content/apps/calendar/event.model.ts b/src/app/main/content/apps/calendar/event.model.ts index 67008724..30c9d329 100644 --- a/src/app/main/content/apps/calendar/event.model.ts +++ b/src/app/main/content/apps/calendar/event.model.ts @@ -71,5 +71,4 @@ export class CalendarEventModel }; } - } diff --git a/src/app/main/content/apps/chat/chat-start/chat-start.component.scss b/src/app/main/content/apps/chat/chat-start/chat-start.component.scss index 8429e311..2debabf7 100644 --- a/src/app/main/content/apps/chat/chat-start/chat-start.component.scss +++ b/src/app/main/content/apps/chat/chat-start/chat-start.component.scss @@ -13,7 +13,7 @@ line-height: 300px; text-align: center; - md-icon{ + md-icon { color: mat-color($accent); } } diff --git a/src/app/main/content/apps/chat/chat-start/chat-start.component.ts b/src/app/main/content/apps/chat/chat-start/chat-start.component.ts index ab7a6e51..955ee3e7 100644 --- a/src/app/main/content/apps/chat/chat-start/chat-start.component.ts +++ b/src/app/main/content/apps/chat/chat-start/chat-start.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit} from '@angular/core'; +import { Component, OnInit } from '@angular/core'; @Component({ selector : 'fuse-chat-start', diff --git a/src/app/main/content/apps/chat/chat-view/chat-view.component.ts b/src/app/main/content/apps/chat/chat-view/chat-view.component.ts index 24bcf63d..7faf2da3 100644 --- a/src/app/main/content/apps/chat/chat-view/chat-view.component.ts +++ b/src/app/main/content/apps/chat/chat-view/chat-view.component.ts @@ -79,7 +79,6 @@ export class ChatViewComponent implements OnInit, AfterViewInit } - reply(event) { // Message diff --git a/src/app/main/content/apps/chat/chat.module.ts b/src/app/main/content/apps/chat/chat.module.ts index 6d9ead69..35f8814f 100644 --- a/src/app/main/content/apps/chat/chat.module.ts +++ b/src/app/main/content/apps/chat/chat.module.ts @@ -1,11 +1,11 @@ -import {NgModule} from '@angular/core'; -import {SharedModule} from '../../../../core/modules/shared.module'; -import {RouterModule, Routes} from '@angular/router'; -import {ChatComponent} from './chat.component'; -import {ChatService} from './chat.service'; +import { NgModule } from '@angular/core'; +import { SharedModule } from '../../../../core/modules/shared.module'; +import { RouterModule, Routes } from '@angular/router'; +import { ChatComponent } from './chat.component'; +import { ChatService } from './chat.service'; import { ChatViewComponent } from './chat-view/chat-view.component'; import { ChatStartComponent } from './chat-start/chat-start.component'; -import {ChatsSidenavComponent} from './sidenavs/left/chats/chats.component'; +import { ChatsSidenavComponent } from './sidenavs/left/chats/chats.component'; import { UserSidenavComponent } from './sidenavs/left/user/user.component'; import { LeftSidenavComponent } from './sidenavs/left/left.component'; import { RightSidenavComponent } from './sidenavs/right/right.component'; @@ -13,8 +13,10 @@ import { ContactSidenavComponent } from './sidenavs/right/contact/contact.compon const routes: Routes = [ { - path : '**', component: ChatComponent, children: [], - resolve: { + path : '**', + component: ChatComponent, + children : [], + resolve : { chat: ChatService } } diff --git a/src/app/main/content/apps/chat/chat.service.ts b/src/app/main/content/apps/chat/chat.service.ts index f3353e6e..5b17e801 100644 --- a/src/app/main/content/apps/chat/chat.service.ts +++ b/src/app/main/content/apps/chat/chat.service.ts @@ -93,7 +93,7 @@ export class ChatService implements Resolve id : chatId, lastMessageTime: '2017-02-18T10:30:18.931Z', name : contact.name, - unread : null, + unread : null }; /** diff --git a/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.ts b/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.ts index abcb32d3..9d2f4f6a 100644 --- a/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.ts +++ b/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.ts @@ -16,9 +16,11 @@ export class ChatsSidenavComponent implements OnInit chatSearch: any; searchText = ''; - constructor(private chatService: ChatService, - private fuseMdSidenavService: FuseMdSidenavHelperService, - public media: ObservableMedia) + constructor( + private chatService: ChatService, + private fuseMdSidenavService: FuseMdSidenavHelperService, + public media: ObservableMedia + ) { this.chatSearch = { name: '' diff --git a/src/app/main/content/apps/chat/sidenavs/left/left.component.html b/src/app/main/content/apps/chat/sidenavs/left/left.component.html index 43df8660..5595a45f 100644 --- a/src/app/main/content/apps/chat/sidenavs/left/left.component.html +++ b/src/app/main/content/apps/chat/sidenavs/left/left.component.html @@ -1,11 +1,11 @@
+ *ngSwitchCase="'chats'" + [@slideInRight]> + *ngSwitchCase="'user'" + [@slideInLeft]>
diff --git a/src/app/main/content/apps/chat/sidenavs/left/user/user.component.scss b/src/app/main/content/apps/chat/sidenavs/left/user/user.component.scss index 9a844a8f..5b1ce733 100644 --- a/src/app/main/content/apps/chat/sidenavs/left/user/user.component.scss +++ b/src/app/main/content/apps/chat/sidenavs/left/user/user.component.scss @@ -15,7 +15,7 @@ } - .sidenav-content{ + .sidenav-content { background: whitesmoke; } } diff --git a/src/app/main/content/apps/chat/sidenavs/left/user/user.component.ts b/src/app/main/content/apps/chat/sidenavs/left/user/user.component.ts index 9f4ce7bc..fd0d63cb 100644 --- a/src/app/main/content/apps/chat/sidenavs/left/user/user.component.ts +++ b/src/app/main/content/apps/chat/sidenavs/left/user/user.component.ts @@ -26,13 +26,13 @@ export class UserSidenavComponent implements OnInit, OnDestroy ngOnInit() { this.onFormChange = this.userForm.valueChanges - .debounceTime(500) - .distinctUntilChanged() - .subscribe(data => { - this.user.mood = data.mood; - this.user.status = data.status; - this.chatService.updateUserData(this.user); - }); + .debounceTime(500) + .distinctUntilChanged() + .subscribe(data => { + this.user.mood = data.mood; + this.user.status = data.status; + this.chatService.updateUserData(this.user); + }); } changeLeftSidenavView(view) diff --git a/src/app/main/content/apps/chat/sidenavs/right/contact/contact.component.scss b/src/app/main/content/apps/chat/sidenavs/right/contact/contact.component.scss index 9a844a8f..5b1ce733 100644 --- a/src/app/main/content/apps/chat/sidenavs/right/contact/contact.component.scss +++ b/src/app/main/content/apps/chat/sidenavs/right/contact/contact.component.scss @@ -15,7 +15,7 @@ } - .sidenav-content{ + .sidenav-content { background: whitesmoke; } } diff --git a/src/app/main/content/apps/chat/sidenavs/right/right.component.html b/src/app/main/content/apps/chat/sidenavs/right/right.component.html index a193e1f3..35e7b937 100644 --- a/src/app/main/content/apps/chat/sidenavs/right/right.component.html +++ b/src/app/main/content/apps/chat/sidenavs/right/right.component.html @@ -1,8 +1,8 @@
+ *ngSwitchCase="'contact'" + [@slideInRight]>
diff --git a/src/app/main/content/apps/dashboards/project/project.component.html b/src/app/main/content/apps/dashboards/project/project.component.html index c6b14ba5..0b437bcb 100644 --- a/src/app/main/content/apps/dashboards/project/project.component.html +++ b/src/app/main/content/apps/dashboards/project/project.component.html @@ -44,7 +44,7 @@
- +
diff --git a/src/app/main/content/apps/file-manager/file-manager.component.scss b/src/app/main/content/apps/file-manager/file-manager.component.scss index f931f9ab..16c07066 100644 --- a/src/app/main/content/apps/file-manager/file-manager.component.scss +++ b/src/app/main/content/apps/file-manager/file-manager.component.scss @@ -38,7 +38,7 @@ } } - .content{ + .content { display: flex; flex: 1; overflow: auto; diff --git a/src/app/main/content/apps/mail/mail-list/mail-list.component.scss b/src/app/main/content/apps/mail/mail-list/mail-list.component.scss index 8932a03d..6451a90e 100644 --- a/src/app/main/content/apps/mail/mail-list/mail-list.component.scss +++ b/src/app/main/content/apps/mail/mail-list/mail-list.component.scss @@ -1,11 +1,11 @@ -:host{ +:host { position: relative; display: flex; flex-direction: column; flex: 1; overflow-y: auto; padding: 0; - border-right: 1px solid rgba(0,0,0,.12); + border-right: 1px solid rgba(0, 0, 0, .12); .no-messages-text { font-size: 24px; diff --git a/src/app/main/content/apps/todo/todo.component.scss b/src/app/main/content/apps/todo/todo.component.scss index 95588254..219ab321 100644 --- a/src/app/main/content/apps/todo/todo.component.scss +++ b/src/app/main/content/apps/todo/todo.component.scss @@ -35,7 +35,7 @@ } } - .content-card{ + .content-card { @include media-breakpoint-down(lg) { fuse-todo-list, diff --git a/src/app/main/content/apps/todo/todo.service.ts b/src/app/main/content/apps/todo/todo.service.ts index ecf6ffed..dade9d5c 100644 --- a/src/app/main/content/apps/todo/todo.service.ts +++ b/src/app/main/content/apps/todo/todo.service.ts @@ -29,8 +29,10 @@ export class TodoService implements Resolve onSearchTextChanged: BehaviorSubject = new BehaviorSubject(''); onNewTodoClicked: Subject = new Subject(); - constructor(private http: Http, - private location: Location) + constructor( + private http: Http, + private location: Location + ) { this.selectedTodos = []; } @@ -81,7 +83,6 @@ export class TodoService implements Resolve }); } - /** * Get all filters * @returns {Promise} @@ -397,18 +398,18 @@ export class TodoService implements Resolve updateTodos(todos) { - /* return new Promise((resolve, reject) => { + /* return new Promise((resolve, reject) => { - this.http.post('api/todo-todos/', {...todos}) + this.http.post('api/todo-todos/', {...todos}) - .subscribe(response => { + .subscribe(response => { - this.getTodos().then(_todos => { - console.log(response); - resolve(_todos); - }, reject); - }); - });*/ + this.getTodos().then(_todos => { + console.log(response); + resolve(_todos); + }, reject); + }); + });*/ } } diff --git a/src/app/main/content/content.component.ts b/src/app/main/content/content.component.ts index 12d48783..5c1f0514 100644 --- a/src/app/main/content/content.component.ts +++ b/src/app/main/content/content.component.ts @@ -3,14 +3,14 @@ import { Component, OnInit } from '@angular/core'; import { NavigationEnd, Router } from '@angular/router'; @Component({ - selector : 'fuse-content', - templateUrl : './content.component.html', - styleUrls : ['./content.component.scss'] + selector : 'fuse-content', + templateUrl: './content.component.html', + styleUrls : ['./content.component.scss'] }) export class FuseContentComponent implements OnInit { constructor( - private router: Router, + private router: Router // private perfectScrollbarDirective: PerfectScrollbarDirective ) { @@ -19,12 +19,10 @@ export class FuseContentComponent implements OnInit ngOnInit() { - this.router.events.subscribe((event) => - { + this.router.events.subscribe((event) => { if ( event instanceof NavigationEnd ) { - setTimeout(() => - { + setTimeout(() => { // this.perfectScrollbarDirective.scrollToTop(); }, 0); } diff --git a/src/app/main/content/pages/authentication/lock/lock.component.ts b/src/app/main/content/pages/authentication/lock/lock.component.ts index df88ade2..2b83fc7a 100644 --- a/src/app/main/content/pages/authentication/lock/lock.component.ts +++ b/src/app/main/content/pages/authentication/lock/lock.component.ts @@ -4,9 +4,9 @@ import { FuseLayoutService } from '../../../../../core/services/layout.service'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; @Component({ - selector : 'fuse-lock', + selector: 'fuse-lock', templateUrl: './lock.component.html', - styleUrls : ['./lock.component.scss'] + styleUrls: ['./lock.component.scss'] }) export class LockComponent implements OnInit { @@ -33,7 +33,12 @@ export class LockComponent implements OnInit ngOnInit() { this.lockForm = this.formBuilder.group({ - username: [{value: 'Katherine', disabled: true}, Validators.required], + username: [ + { + value : 'Katherine', + disabled: true + }, Validators.required + ], password: ['', Validators.required] }); diff --git a/src/app/main/content/pages/maintenance/maintenance.component.html b/src/app/main/content/pages/maintenance/maintenance.component.html index 1f678977..848319da 100644 --- a/src/app/main/content/pages/maintenance/maintenance.component.html +++ b/src/app/main/content/pages/maintenance/maintenance.component.html @@ -1,21 +1,21 @@
- +
- +
- + - +
Closed for scheduled maintenance!
- +
We're sorry for the inconvenience.
Please check back later.
- +
- +
- -
\ No newline at end of file + +
diff --git a/src/app/main/content/pages/pages.module.ts b/src/app/main/content/pages/pages.module.ts index a78c8593..7aa38974 100644 --- a/src/app/main/content/pages/pages.module.ts +++ b/src/app/main/content/pages/pages.module.ts @@ -17,7 +17,7 @@ import { ProfileModule } from './profile/profile.module'; import { SearchModule } from './search/search.module'; @NgModule({ - imports : [ + imports: [ // Auth LoginModule, Login2Module, diff --git a/src/app/main/content/pages/search/search.component.scss b/src/app/main/content/pages/search/search.component.scss index d6e0818e..4ee064d3 100644 --- a/src/app/main/content/pages/search/search.component.scss +++ b/src/app/main/content/pages/search/search.component.scss @@ -51,7 +51,7 @@ .pager { - @include media-breakpoint('xs'){ + @include media-breakpoint('xs') { margin-top: 16px; } @@ -67,4 +67,4 @@ } } } -} \ No newline at end of file +} diff --git a/src/app/main/content/pages/search/tabs/table/table.component.html b/src/app/main/content/pages/search/tabs/table/table.component.html index e6378a32..8257d83a 100644 --- a/src/app/main/content/pages/search/tabs/table/table.component.html +++ b/src/app/main/content/pages/search/tabs/table/table.component.html @@ -8,29 +8,29 @@ Name - {{row.name}} + {{row.name}} Position - {{row.position}} + {{row.position}} Office - {{row.office}} + {{row.office}} Salary - {{row.salary | currency:'USD':true}} + {{row.salary | currency:'USD':true}} -
\ No newline at end of file + diff --git a/src/app/main/content/pages/search/tabs/table/table.component.scss b/src/app/main/content/pages/search/tabs/table/table.component.scss index 56e6b52a..b3ec99b8 100644 --- a/src/app/main/content/pages/search/tabs/table/table.component.scss +++ b/src/app/main/content/pages/search/tabs/table/table.component.scss @@ -2,5 +2,4 @@ :host { - -} \ No newline at end of file +} diff --git a/src/app/main/content/ui/forms/forms.component.ts b/src/app/main/content/ui/forms/forms.component.ts index c32e110d..e4c9c1b4 100644 --- a/src/app/main/content/ui/forms/forms.component.ts +++ b/src/app/main/content/ui/forms/forms.component.ts @@ -28,7 +28,12 @@ export class FuseFormsComponent implements OnInit ngOnInit() { this.form = this.formBuilder.group({ - company : [{value: 'Google', disabled: true}, Validators.required], + company : [ + { + value : 'Google', + disabled: true + }, Validators.required + ], firstName : ['', Validators.required], lastName : ['', Validators.required], address : ['', Validators.required], diff --git a/src/app/main/content/ui/helper-classes/tabs/padding-margin/padding-margin.component.html b/src/app/main/content/ui/helper-classes/tabs/padding-margin/padding-margin.component.html index 4038d9f3..3fef43a1 100644 --- a/src/app/main/content/ui/helper-classes/tabs/padding-margin/padding-margin.component.html +++ b/src/app/main/content/ui/helper-classes/tabs/padding-margin/padding-margin.component.html @@ -5,7 +5,7 @@
- +
p-0
@@ -222,4 +222,4 @@
-
\ No newline at end of file + diff --git a/src/app/main/content/ui/helper-classes/tabs/width-height/width-height.component.html b/src/app/main/content/ui/helper-classes/tabs/width-height/width-height.component.html index 79fda541..0e95ed91 100644 --- a/src/app/main/content/ui/helper-classes/tabs/width-height/width-height.component.html +++ b/src/app/main/content/ui/helper-classes/tabs/width-height/width-height.component.html @@ -5,7 +5,7 @@
- +
w-0
@@ -138,4 +138,4 @@
-
\ No newline at end of file + diff --git a/src/app/main/content/ui/typography/tabs/helpers/helpers.component.html b/src/app/main/content/ui/typography/tabs/helpers/helpers.component.html index 0269bf1e..af3844f2 100644 --- a/src/app/main/content/ui/typography/tabs/helpers/helpers.component.html +++ b/src/app/main/content/ui/typography/tabs/helpers/helpers.component.html @@ -177,11 +177,11 @@

- +
- +
Italic text
@@ -192,11 +192,11 @@
Italic text
- +
- +
Semi-bold text
@@ -207,11 +207,11 @@
Semi-bold text
- +
- +
Bold text
@@ -222,11 +222,11 @@
Bold text
- +
- +
This is a truncated text. It will be truncated if it's too long. Vivamus convallis dui porta massa. @@ -241,9 +241,9 @@ - +
- \ No newline at end of file + diff --git a/src/app/main/footer/footer.component.html b/src/app/main/footer/footer.component.html index 629da9e4..86de4cdb 100644 --- a/src/app/main/footer/footer.component.html +++ b/src/app/main/footer/footer.component.html @@ -1,5 +1,5 @@ - Footer + Footer diff --git a/src/app/main/footer/footer.component.ts b/src/app/main/footer/footer.component.ts index 88abc14c..d741f76c 100644 --- a/src/app/main/footer/footer.component.ts +++ b/src/app/main/footer/footer.component.ts @@ -1,15 +1,19 @@ import { Component, OnInit } from '@angular/core'; @Component({ - selector: 'fuse-footer', - templateUrl: './footer.component.html', - styleUrls: ['./footer.component.scss'] + selector : 'fuse-footer', + templateUrl: './footer.component.html', + styleUrls : ['./footer.component.scss'] }) -export class FuseFooterComponent implements OnInit { +export class FuseFooterComponent implements OnInit +{ - constructor() { } + constructor() + { + } - ngOnInit() { - } + ngOnInit() + { + } } diff --git a/src/app/main/navbar/navbar.component.html b/src/app/main/navbar/navbar.component.html index 67c7ccee..4567f25f 100644 --- a/src/app/main/navbar/navbar.component.html +++ b/src/app/main/navbar/navbar.component.html @@ -1,7 +1,8 @@