Merge pull request #45 from mrholek/v1.0.9

v1.0.9 with Bootstrap 4.0.0

Author: xidedix

CHANGELOG.md

@@ -1,6 +1,6 @@
 {
   "name": "@coreui/react",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "Open Source Bootstrap Admin Template",
   "author": "Łukasz Holeczek",
   "homepage": "http://coreui.io",
@@ -15,10 +15,10 @@
     "babel-preset-react": "6.24.1",
     "copy-webpack-plugin": "4.3.1",
     "css-hot-loader": "1.3.5",
-    "css-loader": "0.28.8",
+    "css-loader": "0.28.9",
     "extract-text-webpack-plugin": "3.0.2",
     "file-loader": "1.1.6",
-    "html-loader": "0.5.4",
+    "html-loader": "0.5.5",
     "html-webpack-plugin": "2.30.1",
     "node-sass": "4.7.2",
     "rimraf": "2.6.2",
@@ -31,7 +31,7 @@
     "webpack-dev-server": "2.9.7"
   },
   "dependencies": {
-    "bootstrap": "4.0.0-beta.3",
+    "bootstrap": "4.0.0",
     "chart.js": "2.7.1",
     "flag-icon-css": "2.9.0",
     "font-awesome": "4.7.0",
@@ -51,7 +51,7 @@
     "clean": "rimraf ./build"
   },
   "engines": {
-    "node": ">= 6.12.3",
+    "node": ">= 8.9.4",
     "npm": ">= 5.6.0"
   }
 }

React_Full_Project/package.json

@@ -1,6 +1,6 @@
 /*!
  * CoreUI - Open Source Bootstrap Admin Template
- * @version v1.0.8
+ * @version v1.0.9
  * @link http://coreui.io
  * Copyright (c) 2018 creativeLabs Łukasz Holeczek
  * @license MIT

React_Full_Project/scss/style.scss

@@ -69,6 +69,22 @@ class Sidebar extends Component {
       return (<li key={key} className={ classes }></li>);
     };
 
+    // nav label with nav link
+    const navLabel = (item, key) => {
+      const classes = {
+        item: classNames( 'hidden-cn', item.class ),
+        link: classNames( 'nav-label', item.class ? item.class : ''),
+        icon: classNames(
+          !item.icon ? 'fa fa-circle' : item.icon ,
+          item.label.variant ? `text-${item.label.variant}` : '',
+          item.label.class ?  item.label.class : ''
+        )
+      };
+      return (
+        navLink(item, key, classes)
+      );
+    };
+
     // nav item with nav link
     const navItem = (item, key) => {
       const classes = {
@@ -114,6 +130,7 @@ class Sidebar extends Component {
     const navType = (item, idx) =>
       item.title ? title(item, idx) :
       item.divider ? divider(item, idx) :
+      item.label ? navLabel(item, idx) :
       item.children ? navDropdown(item, idx)
                     : navItem(item, idx) ;
 

React_Full_Project/src/components/Sidebar/Sidebar.js

@@ -1,6 +1,6 @@
 {
   "name": "@coreui/react",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "Open Source Bootstrap Admin Template",
   "author": "Łukasz Holeczek",
   "homepage": "http://coreui.io",
@@ -15,10 +15,10 @@
     "babel-preset-react": "6.24.1",
     "copy-webpack-plugin": "4.3.1",
     "css-hot-loader": "1.3.5",
-    "css-loader": "0.28.8",
+    "css-loader": "0.28.9",
     "extract-text-webpack-plugin": "3.0.2",
     "file-loader": "1.1.6",
-    "html-loader": "0.5.4",
+    "html-loader": "0.5.5",
     "html-webpack-plugin": "2.30.1",
     "node-sass": "4.7.2",
     "rimraf": "2.6.2",
@@ -31,7 +31,7 @@
     "webpack-dev-server": "2.9.7"
   },
   "dependencies": {
-    "bootstrap": "4.0.0-beta.3",
+    "bootstrap": "4.0.0",
     "chart.js": "2.7.1",
     "flag-icon-css": "2.9.0",
     "font-awesome": "4.7.0",
@@ -51,7 +51,7 @@
     "clean": "rimraf ./build"
   },
   "engines": {
-    "node": ">= 6.12.3",
+    "node": ">= 8.9.4",
     "npm": ">= 5.6.0"
   }
 }

React_Starter/package.json

@@ -1,6 +1,6 @@
 /*!
  * CoreUI - Open Source Bootstrap Admin Template
- * @version v1.0.8
+ * @version v1.0.9
  * @link http://coreui.io
  * Copyright (c) 2018 creativeLabs Łukasz Holeczek
  * @license MIT

React_Starter/public/img/flags/ASEAN.png

@@ -69,6 +69,22 @@ class Sidebar extends Component {
       return (<li key={key} className={ classes }></li>);
     };
 
+    // nav label with nav link
+    const navLabel = (item, key) => {
+      const classes = {
+        item: classNames( 'hidden-cn', item.class ),
+        link: classNames( 'nav-label', item.class ? item.class : ''),
+        icon: classNames(
+          !item.icon ? 'fa fa-circle' : item.icon ,
+          item.label.variant ? `text-${item.label.variant}` : '',
+          item.label.class ?  item.label.class : ''
+        )
+      };
+      return (
+        navLink(item, key, classes)
+      );
+    };
+
     // nav item with nav link
     const navItem = (item, key) => {
       const classes = {
@@ -114,6 +130,7 @@ class Sidebar extends Component {
     const navType = (item, idx) =>
       item.title ? title(item, idx) :
       item.divider ? divider(item, idx) :
+      item.label ? navLabel(item, idx) :
       item.children ? navDropdown(item, idx)
                     : navItem(item, idx) ;