Merge pull request #16 from fullstack-devops/bugfix/merge-ui-frame-to-one-module

merged fs-frame to one module

Author: eksrha

projects/lib-workspace/src/app/app.module.ts

@@ -14,9 +14,7 @@ import {
   FsCalendarModule,
   FsCalendarService,
   FsMaterialFullModule,
-  FsUiFrameContentModule,
   FsUiFrameModule,
-  FsUiFrameToolbarModule,
 } from 'projects/ng-mat-components/src/public-api';
 import { CalendarTableComponent } from './content/calendar-table/calendar-table.component';
 import { HomeComponent } from './content/home/home.component';
@@ -41,8 +39,6 @@ import { TestComponent } from './content/test/test.component';
     /* Lib modules */
     FsMaterialFullModule,
     FsUiFrameModule,
-    FsUiFrameContentModule,
-    FsUiFrameToolbarModule,
     FsCalendarModule,
   ],
   providers: [

projects/ng-mat-components/src/lib/fs-ui-frame-content/fs-ui-frame-content.module.ts

@@ -1,79 +1,85 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { Router, ActivatedRoute, NavigationEnd } from '@angular/router';
+import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
 import { filter, map } from 'rxjs';
-import { FrameEvent, NavUser, FrameRoutes, FrameConfig, FrameEvents } from './fs-ui-frame.modules';
-import { FsUiFrameService } from './fs-ui-frame.service';
+import { FsUiFrameService } from './services/fs-ui-frame.service';
+import {
+  FrameConfig,
+  FrameEvent,
+  FrameEvents,
+  FrameRoutes,
+  NavUser,
+} from './ui-frame.modules';
 
 @Component({
   selector: 'fs-ui-frame',
   templateUrl: './fs-ui-frame.component.html',
   styleUrls: ['./fs-ui-frame.component.scss'],
   host: {
-    'class': 'fs-ui-frame',
+    class: 'fs-ui-frame',
   },
 })
 export class FsUiFrameComponent implements OnInit {
-
   @Output() event = new EventEmitter<FrameEvent>();
 
   @Input() navUser: NavUser | undefined;
   @Input() appRoutes: FrameRoutes = [];
   @Input() frameConfig: FrameConfig = {
     appName: 'Dummy App',
     // appNameShort: stringOfLength('DUMMY', 0, 6),
-    logo: 'https://upload.wikimedia.org/wikipedia/commons/thumb/c/cf/Angular_full_color_logo.svg/1024px-Angular_full_color_logo.svg.png'
+    logo: 'https://upload.wikimedia.org/wikipedia/commons/thumb/c/cf/Angular_full_color_logo.svg/1024px-Angular_full_color_logo.svg.png',
   };
 
-  isClosed: boolean = true
-  isActivePath: string = ''
-  navList: FrameRoutes = []
+  isClosed: boolean = true;
+  isActivePath: string = '';
+  navList: FrameRoutes = [];
 
-  constructor(private frameService: FsUiFrameService,
+  constructor(
+    private frameService: FsUiFrameService,
     private router: Router,
-    private activatedRoute: ActivatedRoute) { }
+    private activatedRoute: ActivatedRoute
+  ) {}
 
   ngOnInit(): void {
-    this.navList = this.appRoutes.filter(elm => {
-      return elm.data?.displaySidemenu === true
+    this.navList = this.appRoutes.filter((elm) => {
+      return elm.data?.displaySidemenu === true;
     });
     this.router.events
       .pipe(
         filter((event) => event instanceof NavigationEnd),
         map(() => {
           const child = this.activatedRoute.firstChild;
-          return child
+          return child;
         })
       )
       .subscribe((ttl: ActivatedRoute | null) => {
-        ttl?.url.subscribe(obj => {
-          this.isActivePath = obj[0].path
-        })
+        ttl?.url.subscribe((obj) => {
+          this.isActivePath = obj[0].path;
+        });
       });
   }
 
   toggleSidemenu() {
-    this.frameService.isMenuClosed.emit(!this.isClosed)
-    this.isClosed = !this.isClosed
+    this.frameService.isMenuClosed.emit(!this.isClosed);
+    this.isClosed = !this.isClosed;
   }
 
   isNavActive(name: string): boolean {
-    return name === this.isActivePath
+    return name === this.isActivePath;
   }
 
   onManageAccount(): void {
     const frameEvent: FrameEvent = {
       type: FrameEvents.MANAGE_ACCOUNT,
       data: {},
-    }
+    };
     this.event.emit(frameEvent);
   }
 
   onLogout(): void {
     const frameEvent: FrameEvent = {
       type: FrameEvents.LOGOUT,
       data: {},
-    }
+    };
     this.event.emit(frameEvent);
   }
-
 }

projects/ng-mat-components/src/lib/fs-ui-frame-content/public-api.ts

@@ -1,5 +1,5 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterModule } from '@angular/router';
@@ -11,7 +11,12 @@ import { MatInputModule } from '@angular/material/input';
 import { MatMenuModule } from '@angular/material/menu';
 import { MatTooltipModule } from '@angular/material/tooltip';
 
+import { FsUiFrameToolbarCenterDirective } from './directives/fs-ui-frame-toolbar-center.directive';
+import { FsUiFrameToolbarSideDirective } from './directives/fs-ui-frame-toolbar-side.directive';
+import { FsUiFrameToolbarTitleDirective } from './directives/fs-ui-frame-toolbar-title.directive';
 import { FsUiFrameComponent } from './fs-ui-frame.component';
+import { FsUiFrameContentComponent } from './ui-frame-content/fs-ui-frame-content.component';
+import { FsUiFrameToolbarComponent } from './ui-frame-toolbar/fs-ui-frame-toolbar.component';
 
 @NgModule({
   imports: [
@@ -26,7 +31,21 @@ import { FsUiFrameComponent } from './fs-ui-frame.component';
     MatMenuModule,
     MatTooltipModule,
   ],
-  exports: [FsUiFrameComponent],
-  declarations: [FsUiFrameComponent],
+  exports: [
+    FsUiFrameComponent,
+    FsUiFrameToolbarComponent,
+    FsUiFrameToolbarCenterDirective,
+    FsUiFrameToolbarSideDirective,
+    FsUiFrameToolbarTitleDirective,
+    FsUiFrameContentComponent,
+  ],
+  declarations: [
+    FsUiFrameComponent,
+    FsUiFrameToolbarComponent,
+    FsUiFrameToolbarCenterDirective,
+    FsUiFrameToolbarSideDirective,
+    FsUiFrameToolbarTitleDirective,
+    FsUiFrameContentComponent,
+  ],
 })
-export class FsUiFrameModule { }
+export class FsUiFrameModule {}