conflicts

Author: mledour

angular.json

@@ -23,9 +23,18 @@
               "src/assets"
             ],
             "styles": [
+              "node_modules/bootstrap-css-only/css/bootstrap.min.css",
+              "node_modules/font-awesome/css/font-awesome.css",
+              "node_modules/ionicons/css/ionicons.css",
+              "node_modules/prismjs/themes/prism-tomorrow.css",
+              "node_modules/admin-lte-css/dist/css/AdminLTE.css",
+              "node_modules/admin-lte-css/dist/css/skins/_all-skins.css",
               "src/styles.css"
             ],
-            "scripts": []
+            "scripts": [
+              "node_modules/prismjs/prism.js",
+              "node_modules/prismjs/components/prism-typescript.js"
+            ]
           },
           "configurations": {
             "production": {

library/angular-admin-lte/ng-package.json

@@ -3,6 +3,6 @@
   "dest": "../../dist/angular-admin-lte",
   "deleteDestPath": false,
   "lib": {
-    "entryFile": "src/public_api.ts"
+    "entryFile": "src/index.ts"
   }
-}
+}

library/angular-admin-lte/ng-package.prod.json

@@ -2,6 +2,6 @@
   "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
   "dest": "../../dist/angular-admin-lte",
   "lib": {
-    "entryFile": "src/public_api.ts"
+    "entryFile": "src/index.ts"
   }
-}
+}

library/angular-admin-lte/package.json

@@ -1,25 +1,27 @@
 {
   "name": "angular-admin-lte",
   "version": "1.1.1",
+  "author": {
+    "name": "Mik@",
+    "email": "michael.ledour@gmail.com"
+  },
+  "license": "MIT",
   "repository": {
     "type": "git",
     "url": "https://github.com/mika-el/angular-admin-lte"
   },
-  "author": {
-    "name": "Mik@",
-    "email": "michael.ledour@gmail.com"
+  "bugs": {
+    "url": "https://github.com/mika-el/angular-admin-lte/issues"
   },
   "keywords": [
     "angular",
+    "angular 2",
     "angular 4",
     "angular 5",
+    "angular 6",
     "typescript",
     "admin-lte"
   ],
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/mika-el/angular-admin-lte/issues"
-  },
   "peerDependencies": {
     "@angular/common": "^6.0.0",
     "@angular/core": "^6.0.0",

library/angular-admin-lte/src/LICENSE

@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2014-2017 Abdullah Almsaeed
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

…rary/angular-admin-lte/src/public_api.ts library/angular-admin-lte/src/index.tslibrary/angular-admin-lte/src/public_api.ts renamed to library/angular-admin-lte/src/index.ts library/angular-admin-lte/src/public_api.ts renamed to library/angular-admin-lte/src/index.ts

@@ -64,7 +64,7 @@ export class AccordionComponent implements OnInit {
     this.headerStyleColor = this.headerColor;
 
     if(!this.header && !this.accordionHeaderComponent) {
-      throw new Error('Attribute "header" OR Component "mk-accordion-header" is required for component "mk-accordion"');
+      throw new Error('Attribute "header" OR Component "mk-+accordion-header" is required for component "mk-+accordion"');
     }
 
     if(this.accordionContentComponent) {

library/angular-admin-lte/src/lib/accordion/accordion.component.ts

@@ -1,4 +1,4 @@
-import { Component, Input, OnInit, ChangeDetectionStrategy, ChangeDetectorRef, ViewChild, ElementRef, OnDestroy } from '@angular/core';
+import { Component, OnInit, ChangeDetectionStrategy, ChangeDetectorRef, ViewChild, ElementRef, OnDestroy } from '@angular/core';
 import { Router, NavigationStart, NavigationEnd, Event as RouterEvent } from '@angular/router';
 import { Title } from '@angular/platform-browser';
 
@@ -9,20 +9,19 @@ import { SidebarRightService } from '../sidebar-right/sidebar-right.service';
 import { HeaderService } from '../header/header.service';
 import { FooterService } from '../footer/footer.service';
 
-import { throttle, removeSubscriptions, removeListeners } from '../../helpers';
+import { removeSubscriptions } from '../../helpers';
 
 @Component({
   selector: 'mk-layout-content',
   templateUrl: './content.component.html',
   styleUrls: ['./content.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush
 })
-export class ContentComponent implements OnInit {
+export class ContentComponent implements OnInit, OnDestroy {
   public description: string;
   public header: string;
   public heightStyle: number;
   public sidebarLeftHeight: number;
-  public sidebarRightHeight: number;
   public windowInnerHeight: number;
 
   private layout: string;
@@ -34,10 +33,15 @@ export class ContentComponent implements OnInit {
 
   /**
    * @method constructor
-   * @param private layoutStore    [description]
-   * @param private layoutService  [description]
-   * @param private routingService [description]
-   * @param private titleService   [description]
+   * @param layoutStore
+   * @param routingService
+   * @param titleService
+   * @param elementRef
+   * @param changeDetectorRef
+   * @param sidebarRightService
+   * @param headerService
+   * @param footerService
+   * @param router
    */
   constructor(
     private layoutStore: LayoutStore,
@@ -58,7 +62,7 @@ export class ContentComponent implements OnInit {
     this.titleTag = this.titleService.getTitle();
 
     this.subscriptions.push(this.routingService.onChange.subscribe((value: any) => {
-      if(value && value[value.length - 1]) {
+      if (value && value[value.length - 1]) {
         this.titleService.setTitle(this.getTitle(value[value.length - 1].data['title']));
         this.header = value[value.length - 1].data['title'];
         this.description = value[value.length - 1].data['description'];
@@ -67,10 +71,10 @@ export class ContentComponent implements OnInit {
     }));
 
     this.subscriptions.push(this.router.events.subscribe((routeEvent: RouterEvent) => {
-      if(routeEvent instanceof NavigationStart) {
+      if (routeEvent instanceof NavigationStart) {
         this.navigationEnd = false;
       }
-      if(routeEvent instanceof NavigationEnd) {
+      if (routeEvent instanceof NavigationEnd) {
         this.navigationEnd = true;
         this.setContentMinHeight();
       }
@@ -124,19 +128,27 @@ export class ContentComponent implements OnInit {
    * @method setMinHeight
    */
   private setContentMinHeight(): void {
-    if(this.navigationEnd) {
-      let heightStyle,
-          headerFooterOffsetHeight = this.headerService.offsetHeight + this.footerService.offsetHeight;
+    if (this.navigationEnd) {
+      let heightStyle;
 
-      if(this.layout === 'fixed') {
+      const headerFooterOffsetHeight = this.headerService.offsetHeight + this.footerService.offsetHeight;
+
+      if (this.layout === 'fixed') {
         heightStyle = this.windowInnerHeight - this.footerService.offsetHeight;
       } else {
-        let sidebarRight = this.sidebarRightService.scrollHeight ? this.sidebarRightService.scrollHeight - this.headerService.offsetHeight: 0;
-        heightStyle = Math.max(this.windowInnerHeight - headerFooterOffsetHeight, this.sidebarLeftHeight - this.headerService.offsetHeight, sidebarRight);
+        const sidebarRight =
+          this.sidebarRightService.scrollHeight ?
+            this.sidebarRightService.scrollHeight - this.headerService.offsetHeight : 0;
+
+        heightStyle = Math.max(
+          this.windowInnerHeight - headerFooterOffsetHeight,
+          this.sidebarLeftHeight - this.headerService.offsetHeight,
+          sidebarRight
+        );
       }
 
-      if(heightStyle && heightStyle !== this.heightStyle) {
-        if(this.scrollHeight > heightStyle) {
+      if (heightStyle && heightStyle !== this.heightStyle) {
+        if (this.scrollHeight > heightStyle) {
           heightStyle = null;
         }
         this.heightStyle = heightStyle;

library/angular-admin-lte/src/lib/layout/content/content.component.ts

@@ -4,13 +4,13 @@
         "directive-selector": [
             true,
             "attribute",
-            "lib",
+            "mk",
             "camelCase"
         ],
         "component-selector": [
             true,
             "element",
-            "lib",
+            "mk",
             "kebab-case"
         ]
     }