From 6b8cd41d5e0fd45a1484dc4a00b98a0a3a642084 Mon Sep 17 00:00:00 2001 From: Sercan Yemen Date: Thu, 12 Jul 2018 13:19:34 +0300 Subject: [PATCH 1/3] Added SidePanel to the layouts for controlling the chat bar and possible other bar properties via FuseConfig --- .../theme-options.component.html | 68 +++++++++++++++++++ .../theme-options/theme-options.component.ts | 14 ++-- src/@fuse/types/fuse-config.ts | 4 ++ src/app/app.component.html | 1 + src/app/app.component.scss | 10 ++- src/app/fuse-config/index.ts | 14 ++-- .../chat-panel/chat-panel.component.html | 2 +- .../chat-panel/chat-panel.component.scss | 20 ++++++ .../chat-panel/chat-panel.component.ts | 8 --- .../layout-1/layout-1.component.html | 34 ++++++++-- .../vertical/layout-1/layout-1.component.html | 34 ++++++++-- .../vertical/layout-2/layout-2.component.html | 34 ++++++++-- .../vertical/layout-3/layout-3.component.html | 34 ++++++++-- 13 files changed, 227 insertions(+), 50 deletions(-) diff --git a/src/@fuse/components/theme-options/theme-options.component.html b/src/@fuse/components/theme-options/theme-options.component.html index 00a10741..fa2bd51b 100644 --- a/src/@fuse/components/theme-options/theme-options.component.html +++ b/src/@fuse/components/theme-options/theme-options.component.html @@ -132,6 +132,23 @@ + +
+ +

Side Panel

+ + + Hide + + +

Position:

+ + Left + Right + + +
+ @@ -226,6 +243,23 @@ + +
+ +

Side Panel

+ + + Hide + + +

Position:

+ + Left + Right + + +
+ @@ -318,6 +352,23 @@ + +
+ +

Side Panel

+ + + Hide + + +

Position:

+ + Left + Right + + +
+ @@ -405,6 +456,23 @@ + +
+ +

Side Panel

+ + + Hide + + +

Position:

+ + Left + Right + + +
+ diff --git a/src/@fuse/components/theme-options/theme-options.component.ts b/src/@fuse/components/theme-options/theme-options.component.ts index 2243e1ea..7facf8ce 100644 --- a/src/@fuse/components/theme-options/theme-options.component.ts +++ b/src/@fuse/components/theme-options/theme-options.component.ts @@ -62,24 +62,28 @@ export class FuseThemeOptionsComponent implements OnInit, OnDestroy // noinspection TypeScriptValidateTypes this.form = this._formBuilder.group({ layout : this._formBuilder.group({ - style : new FormControl(), - width : new FormControl(), - navbar : this._formBuilder.group({ + style : new FormControl(), + width : new FormControl(), + navbar : this._formBuilder.group({ background: new FormControl(), folded : new FormControl(), hidden : new FormControl(), position : new FormControl(), variant : new FormControl() }), - toolbar: this._formBuilder.group({ + toolbar : this._formBuilder.group({ background: new FormControl(), hidden : new FormControl(), position : new FormControl() }), - footer : this._formBuilder.group({ + footer : this._formBuilder.group({ background: new FormControl(), hidden : new FormControl(), position : new FormControl() + }), + sidepanel: this._formBuilder.group({ + hidden: new FormControl(), + position : new FormControl() }) }), customScrollbars: new FormControl() diff --git a/src/@fuse/types/fuse-config.ts b/src/@fuse/types/fuse-config.ts index 6ad44ba4..1b513489 100644 --- a/src/@fuse/types/fuse-config.ts +++ b/src/@fuse/types/fuse-config.ts @@ -19,6 +19,10 @@ export interface FuseConfig background: string, hidden: boolean, position: 'above' | 'above-static' | 'above-fixed' | 'below' | 'below-static' | 'below-fixed' + }, + sidepanel: { + hidden: boolean, + position: 'left' | 'right' } }; customScrollbars: boolean; diff --git a/src/app/app.component.html b/src/app/app.component.html index b1bd2000..fe46258b 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -20,6 +20,7 @@ diff --git a/src/app/app.component.scss b/src/app/app.component.scss index e04a412f..a3c28b9f 100644 --- a/src/app/app.component.scss +++ b/src/app/app.component.scss @@ -11,7 +11,7 @@ .theme-options-button { position: absolute; top: 160px; - right: 70px; + right: 0; width: 48px; height: 48px; line-height: 48px; @@ -23,8 +23,12 @@ opacity: .90; z-index: 998; - @include media-breakpoint-down('md') { - right: 0; + + &.right-side-panel { + + @include media-breakpoint-up('lg') { + right: 70px; + } } mat-icon { diff --git a/src/app/fuse-config/index.ts b/src/app/fuse-config/index.ts index aac07997..7db7b88c 100644 --- a/src/app/fuse-config/index.ts +++ b/src/app/fuse-config/index.ts @@ -10,24 +10,28 @@ import { FuseConfig } from '@fuse/types'; export const fuseConfig: FuseConfig = { layout : { - style : 'vertical-layout-1', - width : 'fullwidth', - navbar : { + style : 'vertical-layout-1', + width : 'fullwidth', + navbar : { background: 'mat-fuse-dark-700-bg', folded : false, hidden : false, position : 'left', variant : 'vertical-style-1' }, - toolbar: { + toolbar : { background: 'mat-white-500-bg', hidden : false, position : 'below-static' }, - footer : { + footer : { background: 'mat-fuse-dark-900-bg', hidden : false, position : 'below-fixed' + }, + sidepanel: { + hidden : false, + position: 'right' } }, customScrollbars: true diff --git a/src/app/layout/components/chat-panel/chat-panel.component.html b/src/app/layout/components/chat-panel/chat-panel.component.html index 07ebf17a..84b4ee42 100644 --- a/src/app/layout/components/chat-panel/chat-panel.component.html +++ b/src/app/layout/components/chat-panel/chat-panel.component.html @@ -22,7 +22,7 @@ arrow_forward - diff --git a/src/app/layout/components/chat-panel/chat-panel.component.scss b/src/app/layout/components/chat-panel/chat-panel.component.scss index ffb556f7..9676ba32 100644 --- a/src/app/layout/components/chat-panel/chat-panel.component.scss +++ b/src/app/layout/components/chat-panel/chat-panel.component.scss @@ -10,6 +10,11 @@ chat-panel { z-index: 99; overflow: hidden; + @include media-breakpoint-down('xs') { + max-width: none !important; + width: 100% !important; + } + .header { height: 64px; max-height: 64px; @@ -26,6 +31,7 @@ chat-panel { transition: opacity 300ms ease-in-out; } } + } #contacts-list { @@ -350,6 +356,20 @@ fuse-sidebar { width: 100vw !important; } + &.left-chat-panel { + + .header { + + .toggle-sidebar-folded, + .toggle-sidebar-open { + + mat-icon { + transform: rotate(180deg); + } + } + } + } + // Folded &.folded { diff --git a/src/app/layout/components/chat-panel/chat-panel.component.ts b/src/app/layout/components/chat-panel/chat-panel.component.ts index df12d123..e998de21 100644 --- a/src/app/layout/components/chat-panel/chat-panel.component.ts +++ b/src/app/layout/components/chat-panel/chat-panel.component.ts @@ -142,14 +142,6 @@ export class ChatPanelComponent implements OnInit, AfterViewInit, OnDestroy // @ Public methods // ----------------------------------------------------------------------------------------------------- - /** - * Toggle sidebar folded status - */ - toggleSidebarFolded(): void - { - this._fuseSidebarService.getSidebar('chatPanel').toggleFold(); - } - /** * Fold the temporarily unfolded sidebar back */ diff --git a/src/app/layout/horizontal/layout-1/layout-1.component.html b/src/app/layout/horizontal/layout-1/layout-1.component.html index 504a8b19..e06ee6be 100644 --- a/src/app/layout/horizontal/layout-1/layout-1.component.html +++ b/src/app/layout/horizontal/layout-1/layout-1.component.html @@ -1,3 +1,17 @@ + + + + + + + + + + + +
@@ -55,13 +69,19 @@
- - - - - + + + + + + + + + + + diff --git a/src/app/layout/vertical/layout-1/layout-1.component.html b/src/app/layout/vertical/layout-1/layout-1.component.html index 737e6666..942a5b2b 100644 --- a/src/app/layout/vertical/layout-1/layout-1.component.html +++ b/src/app/layout/vertical/layout-1/layout-1.component.html @@ -1,3 +1,17 @@ + + + + + + + + + + + +
@@ -67,13 +81,19 @@
- - - - - + + + + + + + + + + + diff --git a/src/app/layout/vertical/layout-2/layout-2.component.html b/src/app/layout/vertical/layout-2/layout-2.component.html index 3b3714bf..f4fd6dd1 100644 --- a/src/app/layout/vertical/layout-2/layout-2.component.html +++ b/src/app/layout/vertical/layout-2/layout-2.component.html @@ -1,3 +1,17 @@ + + + + + + + + + + + +
@@ -67,13 +81,19 @@
- - - - - + + + + + + + + + + + diff --git a/src/app/layout/vertical/layout-3/layout-3.component.html b/src/app/layout/vertical/layout-3/layout-3.component.html index f133a812..9154e39d 100644 --- a/src/app/layout/vertical/layout-3/layout-3.component.html +++ b/src/app/layout/vertical/layout-3/layout-3.component.html @@ -1,3 +1,17 @@ + + + + + + + + + + + +
@@ -53,13 +67,19 @@
- - - - - + + + + + + + + + + + From b8803a055fcf4671cf57f405b206827d269e7873 Mon Sep 17 00:00:00 2001 From: Sercan Yemen Date: Thu, 12 Jul 2018 13:27:26 +0300 Subject: [PATCH 2/3] Removed side panel from auth pages Updated the changelog Theme options button adjustments --- src/app/app.component.html | 3 +- src/app/app.component.scss | 5 +- .../changelog/changelog.component.html | 46 ++++++++++++++++++- .../forgot-password-2.component.ts | 9 ++-- .../forgot-password.component.ts | 9 ++-- .../authentication/lock/lock.component.ts | 9 ++-- .../login-2/login-2.component.ts | 9 ++-- .../authentication/login/login.component.ts | 9 ++-- .../mail-confirm/mail-confirm.component.ts | 9 ++-- .../register-2/register-2.component.ts | 9 ++-- .../register/register.component.ts | 9 ++-- .../reset-password-2.component.ts | 9 ++-- .../reset-password.component.ts | 9 ++-- .../coming-soon/coming-soon.component.ts | 9 ++-- .../pages/errors/404/error-404.component.ts | 9 ++-- .../pages/errors/500/error-500.component.ts | 9 ++-- .../maintenance/maintenance.component.ts | 9 ++-- src/app/navigation/navigation.ts | 2 +- 18 files changed, 135 insertions(+), 47 deletions(-) diff --git a/src/app/app.component.html b/src/app/app.component.html index fe46258b..8e2890eb 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -20,7 +20,8 @@ diff --git a/src/app/app.component.scss b/src/app/app.component.scss index a3c28b9f..e1b40cd1 100644 --- a/src/app/app.component.scss +++ b/src/app/app.component.scss @@ -23,7 +23,6 @@ opacity: .90; z-index: 998; - &.right-side-panel { @include media-breakpoint-up('lg') { @@ -31,6 +30,10 @@ } } + &.side-panel-hidden { + right: 0 !important; + } + mat-icon { animation: rotating 3s linear infinite; } diff --git a/src/app/main/documentation/changelog/changelog.component.html b/src/app/main/documentation/changelog/changelog.component.html index 7386ede1..cd38391e 100644 --- a/src/app/main/documentation/changelog/changelog.component.html +++ b/src/app/main/documentation/changelog/changelog.component.html @@ -20,12 +20,12 @@
- +
- v6.2.1 + v6.2.2 (2018-07-12)
@@ -58,6 +58,48 @@
+ + + +
+ +
+ v6.2.1 + (2018-07-12) +
+ +
+ +
+ New +
    +
  • + (Layout) Added SidePanel position to the layout for controlling Chat Panel and possible + other panels +
  • +
+
+ +
+ Fixed +
    +
      +
    • (Chat Panel) Mobile width issues
    • +
    +
+
+ +
+ Improved +
    +
  • Removed chat panel from auth pages using layout options
  • +
+
+ +
+ +
+ diff --git a/src/app/main/pages/authentication/forgot-password-2/forgot-password-2.component.ts b/src/app/main/pages/authentication/forgot-password-2/forgot-password-2.component.ts index 17c4950d..4c4fdee9 100644 --- a/src/app/main/pages/authentication/forgot-password-2/forgot-password-2.component.ts +++ b/src/app/main/pages/authentication/forgot-password-2/forgot-password-2.component.ts @@ -28,13 +28,16 @@ export class ForgotPassword2Component implements OnInit // Configure the layout this._fuseConfigService.config = { layout: { - navbar : { + navbar : { hidden: true }, - toolbar: { + toolbar : { hidden: true }, - footer : { + footer : { + hidden: true + }, + sidepanel: { hidden: true } } diff --git a/src/app/main/pages/authentication/forgot-password/forgot-password.component.ts b/src/app/main/pages/authentication/forgot-password/forgot-password.component.ts index 3557ef8f..107b6e79 100644 --- a/src/app/main/pages/authentication/forgot-password/forgot-password.component.ts +++ b/src/app/main/pages/authentication/forgot-password/forgot-password.component.ts @@ -28,13 +28,16 @@ export class ForgotPasswordComponent implements OnInit // Configure the layout this._fuseConfigService.config = { layout: { - navbar : { + navbar : { hidden: true }, - toolbar: { + toolbar : { hidden: true }, - footer : { + footer : { + hidden: true + }, + sidepanel: { hidden: true } } diff --git a/src/app/main/pages/authentication/lock/lock.component.ts b/src/app/main/pages/authentication/lock/lock.component.ts index 086d7078..f1c1c995 100644 --- a/src/app/main/pages/authentication/lock/lock.component.ts +++ b/src/app/main/pages/authentication/lock/lock.component.ts @@ -28,13 +28,16 @@ export class LockComponent implements OnInit // Configure the layout this._fuseConfigService.config = { layout: { - navbar : { + navbar : { hidden: true }, - toolbar: { + toolbar : { hidden: true }, - footer : { + footer : { + hidden: true + }, + sidepanel: { hidden: true } } diff --git a/src/app/main/pages/authentication/login-2/login-2.component.ts b/src/app/main/pages/authentication/login-2/login-2.component.ts index 5fe9ca97..201b8ecc 100644 --- a/src/app/main/pages/authentication/login-2/login-2.component.ts +++ b/src/app/main/pages/authentication/login-2/login-2.component.ts @@ -28,13 +28,16 @@ export class Login2Component implements OnInit // Configure the layout this._fuseConfigService.config = { layout: { - navbar : { + navbar : { hidden: true }, - toolbar: { + toolbar : { hidden: true }, - footer : { + footer : { + hidden: true + }, + sidepanel: { hidden: true } } diff --git a/src/app/main/pages/authentication/login/login.component.ts b/src/app/main/pages/authentication/login/login.component.ts index fc2e2af9..0b4244ab 100644 --- a/src/app/main/pages/authentication/login/login.component.ts +++ b/src/app/main/pages/authentication/login/login.component.ts @@ -28,13 +28,16 @@ export class LoginComponent implements OnInit // Configure the layout this._fuseConfigService.config = { layout: { - navbar : { + navbar : { hidden: true }, - toolbar: { + toolbar : { hidden: true }, - footer : { + footer : { + hidden: true + }, + sidepanel: { hidden: true } } diff --git a/src/app/main/pages/authentication/mail-confirm/mail-confirm.component.ts b/src/app/main/pages/authentication/mail-confirm/mail-confirm.component.ts index e69c2256..6a7bc059 100644 --- a/src/app/main/pages/authentication/mail-confirm/mail-confirm.component.ts +++ b/src/app/main/pages/authentication/mail-confirm/mail-confirm.component.ts @@ -23,13 +23,16 @@ export class MailConfirmComponent // Configure the layout this._fuseConfigService.config = { layout: { - navbar : { + navbar : { hidden: true }, - toolbar: { + toolbar : { hidden: true }, - footer : { + footer : { + hidden: true + }, + sidepanel: { hidden: true } } diff --git a/src/app/main/pages/authentication/register-2/register-2.component.ts b/src/app/main/pages/authentication/register-2/register-2.component.ts index fac699d1..9da7238b 100644 --- a/src/app/main/pages/authentication/register-2/register-2.component.ts +++ b/src/app/main/pages/authentication/register-2/register-2.component.ts @@ -27,13 +27,16 @@ export class Register2Component implements OnInit, OnDestroy // Configure the layout this._fuseConfigService.config = { layout: { - navbar : { + navbar : { hidden: true }, - toolbar: { + toolbar : { hidden: true }, - footer : { + footer : { + hidden: true + }, + sidepanel: { hidden: true } } diff --git a/src/app/main/pages/authentication/register/register.component.ts b/src/app/main/pages/authentication/register/register.component.ts index b201cfcd..c472f1f4 100644 --- a/src/app/main/pages/authentication/register/register.component.ts +++ b/src/app/main/pages/authentication/register/register.component.ts @@ -27,13 +27,16 @@ export class RegisterComponent implements OnInit, OnDestroy // Configure the layout this._fuseConfigService.config = { layout: { - navbar : { + navbar : { hidden: true }, - toolbar: { + toolbar : { hidden: true }, - footer : { + footer : { + hidden: true + }, + sidepanel: { hidden: true } } diff --git a/src/app/main/pages/authentication/reset-password-2/reset-password-2.component.ts b/src/app/main/pages/authentication/reset-password-2/reset-password-2.component.ts index e8d63786..47ae0a52 100644 --- a/src/app/main/pages/authentication/reset-password-2/reset-password-2.component.ts +++ b/src/app/main/pages/authentication/reset-password-2/reset-password-2.component.ts @@ -27,13 +27,16 @@ export class ResetPassword2Component implements OnInit, OnDestroy // Configure the layout this._fuseConfigService.config = { layout: { - navbar : { + navbar : { hidden: true }, - toolbar: { + toolbar : { hidden: true }, - footer : { + footer : { + hidden: true + }, + sidepanel: { hidden: true } } diff --git a/src/app/main/pages/authentication/reset-password/reset-password.component.ts b/src/app/main/pages/authentication/reset-password/reset-password.component.ts index 02726c80..d9b6a474 100644 --- a/src/app/main/pages/authentication/reset-password/reset-password.component.ts +++ b/src/app/main/pages/authentication/reset-password/reset-password.component.ts @@ -27,13 +27,16 @@ export class ResetPasswordComponent implements OnInit, OnDestroy // Configure the layout this._fuseConfigService.config = { layout: { - navbar : { + navbar : { hidden: true }, - toolbar: { + toolbar : { hidden: true }, - footer : { + footer : { + hidden: true + }, + sidepanel: { hidden: true } } diff --git a/src/app/main/pages/coming-soon/coming-soon.component.ts b/src/app/main/pages/coming-soon/coming-soon.component.ts index 39cbe734..0e8ab27a 100644 --- a/src/app/main/pages/coming-soon/coming-soon.component.ts +++ b/src/app/main/pages/coming-soon/coming-soon.component.ts @@ -34,13 +34,16 @@ export class ComingSoonComponent implements OnInit, OnDestroy // Configure the layout this._fuseConfigService.config = { layout: { - navbar : { + navbar : { hidden: true }, - toolbar: { + toolbar : { hidden: true }, - footer : { + footer : { + hidden: true + }, + sidepanel: { hidden: true } } diff --git a/src/app/main/pages/errors/404/error-404.component.ts b/src/app/main/pages/errors/404/error-404.component.ts index 2f8a6986..6e28679b 100644 --- a/src/app/main/pages/errors/404/error-404.component.ts +++ b/src/app/main/pages/errors/404/error-404.component.ts @@ -21,13 +21,16 @@ export class Error404Component // Configure the layout this._fuseConfigService.config = { layout: { - navbar : { + navbar : { hidden: true }, - toolbar: { + toolbar : { hidden: true }, - footer : { + footer : { + hidden: true + }, + sidepanel: { hidden: true } } diff --git a/src/app/main/pages/errors/500/error-500.component.ts b/src/app/main/pages/errors/500/error-500.component.ts index f68e94e3..a0985865 100644 --- a/src/app/main/pages/errors/500/error-500.component.ts +++ b/src/app/main/pages/errors/500/error-500.component.ts @@ -21,13 +21,16 @@ export class Error500Component // Configure the layout this._fuseConfigService.config = { layout: { - navbar : { + navbar : { hidden: true }, - toolbar: { + toolbar : { hidden: true }, - footer : { + footer : { + hidden: true + }, + sidepanel: { hidden: true } } diff --git a/src/app/main/pages/maintenance/maintenance.component.ts b/src/app/main/pages/maintenance/maintenance.component.ts index 4e86c78e..50b7e9a0 100644 --- a/src/app/main/pages/maintenance/maintenance.component.ts +++ b/src/app/main/pages/maintenance/maintenance.component.ts @@ -23,13 +23,16 @@ export class MaintenanceComponent // Configure the layout this._fuseConfigService.config = { layout: { - navbar : { + navbar : { hidden: true }, - toolbar: { + toolbar : { hidden: true }, - footer : { + footer : { + hidden: true + }, + sidepanel: { hidden: true } } diff --git a/src/app/navigation/navigation.ts b/src/app/navigation/navigation.ts index ee1fea20..62f9df0e 100644 --- a/src/app/navigation/navigation.ts +++ b/src/app/navigation/navigation.ts @@ -849,7 +849,7 @@ export const navigation: FuseNavigation[] = [ icon : 'update', url : '/documentation/changelog', badge: { - title: '6.2.0', + title: '6.2.2', bg : '#EC0C8E', fg : '#FFFFFF' } From 1c34a65034314efb7e5b183850cd3084940e2b31 Mon Sep 17 00:00:00 2001 From: Sercan Yemen Date: Thu, 12 Jul 2018 13:30:17 +0300 Subject: [PATCH 3/3] Increased Fuse version --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5cd4abfe..2684398b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "fuse", - "version": "6.2.1", + "version": "6.2.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index f007e30f..aad07bb5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fuse", - "version": "6.2.1", + "version": "6.2.2", "license": "https://themeforest.net/licenses/terms/regular", "scripts": { "ng": "ng",