diff --git a/CHANGELOG.md b/CHANGELOG.md
index 64c495c..f18bb1b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,25 @@
## [react](./REACT.md) version `changelog`
+###### `v1.0.6`
+
+- update: react to `^16.1.1`
+- update: reactstrap to `^5.0.0-alpha.4`
+- refactor: deprecated reactstrap `NavDropdown` change to `Dropdown` with `nav` prop
+- refactor: use prop `bsSize` instead of the `size` to bootstrap's input sizing
+- update: dependencies
+
+###### `v1.0.5`
+- feature: Sidebar add divider.class
+- refactor: Sidebar
+- moved to react: `^16.1.0`
+- chore: dependencies update
+
+###### `v1.0.4`
+- refactor: scss
+
+###### `v1.0.3`
+- update: bootstrap to `4.0.0-beta.2`
+
###### `v1.0.2`
- `HeaderDropdown` component example extracted out of `Header`
diff --git a/React_Full_Project/package.json b/React_Full_Project/package.json
index d5380da..dd11fd0 100644
--- a/React_Full_Project/package.json
+++ b/React_Full_Project/package.json
@@ -1,6 +1,6 @@
{
"name": "@coreui/react",
- "version": "1.0.5",
+ "version": "1.0.6",
"description": "Open Source Bootstrap Admin Template",
"author": "Łukasz Holeczek",
"homepage": "http://coreui.io",
@@ -8,40 +8,40 @@
"license": "MIT",
"private": true,
"devDependencies": {
- "babel-core": "^6.26.0",
- "babel-loader": "^7.1.2",
- "babel-plugin-transform-object-rest-spread": "^6.26.0",
- "babel-preset-env": "^1.6.0",
- "babel-preset-react": "^6.24.1",
- "copy-webpack-plugin": "^4.1.1",
- "css-hot-loader": "^1.3.2",
- "css-loader": "^0.28.7",
- "extract-text-webpack-plugin": "^3.0.1",
- "file-loader": "^1.1.5",
- "html-loader": "^0.5.1",
- "html-webpack-plugin": "^2.30.1",
- "node-sass": "^4.5.3",
- "rimraf": "^2.6.2",
- "sass-loader": "^6.0.6",
- "source-list-map": "^2.0.0",
- "style-loader": "^0.19.0",
- "uglify-js": "^3.1.4",
- "url-loader": "^0.6.2",
- "webpack": "^3.7.1",
- "webpack-dev-server": "^2.9.2"
+ "babel-core": "6.26.0",
+ "babel-loader": "7.1.2",
+ "babel-plugin-transform-object-rest-spread": "6.26.0",
+ "babel-preset-env": "1.6.1",
+ "babel-preset-react": "6.24.1",
+ "copy-webpack-plugin": "4.2.1",
+ "css-hot-loader": "1.3.3",
+ "css-loader": "0.28.7",
+ "extract-text-webpack-plugin": "3.0.2",
+ "file-loader": "1.1.5",
+ "html-loader": "0.5.1",
+ "html-webpack-plugin": "2.30.1",
+ "node-sass": "4.7.1",
+ "rimraf": "2.6.2",
+ "sass-loader": "6.0.6",
+ "source-list-map": "2.0.0",
+ "style-loader": "0.19.0",
+ "uglify-js": "3.1.10",
+ "url-loader": "0.6.2",
+ "webpack": "3.8.1",
+ "webpack-dev-server": "2.9.4"
},
"dependencies": {
"bootstrap": "4.0.0-beta.2",
- "chart.js": "2.7.0",
- "font-awesome": "^4.7.0",
+ "chart.js": "2.7.1",
+ "font-awesome": "4.7.0",
"history": "4.7.2",
- "react": "^16.0.0",
+ "react": "16.1.1",
"react-chartjs-2": "2.6.4",
- "react-dom": "^16.0.0",
- "react-router-dom": "^4.2.2",
- "react-transition-group": "^2.2.1",
- "reactstrap": "^5.0.0-alpha.3",
- "simple-line-icons": "^2.4.1"
+ "react-dom": "16.1.1",
+ "react-router-dom": "4.2.2",
+ "react-transition-group": "2.2.1",
+ "reactstrap": "5.0.0-alpha.4",
+ "simple-line-icons": "2.4.1"
},
"scripts": {
"dev": "webpack -d --progress --watch --profile --json > compilation-stats.json --env.dev",
@@ -50,7 +50,7 @@
"clean": "rimraf ./build"
},
"engines": {
- "node": ">= 6.0.0",
+ "node": ">= 6.4.0",
"npm": ">= 5.0.0"
}
}
diff --git a/React_Full_Project/scss/style.scss b/React_Full_Project/scss/style.scss
index 3e56e7c..571b6ea 100644
--- a/React_Full_Project/scss/style.scss
+++ b/React_Full_Project/scss/style.scss
@@ -1,6 +1,6 @@
/*!
* CoreUI - Open Source Bootstrap Admin Template
- * @version v1.0.5
+ * @version v1.0.6
* @link http://coreui.io
* Copyright (c) 2017 creativeLabs Łukasz Holeczek
* @license MIT
diff --git a/React_Full_Project/src/components/Header/HeaderDropdown.js b/React_Full_Project/src/components/Header/HeaderDropdown.js
index 407506a..94d2456 100644
--- a/React_Full_Project/src/components/Header/HeaderDropdown.js
+++ b/React_Full_Project/src/components/Header/HeaderDropdown.js
@@ -4,7 +4,7 @@ import {
DropdownItem,
DropdownMenu,
DropdownToggle,
- NavDropdown
+ Dropdown
} from 'reactstrap';
class HeaderDropdown extends Component {
@@ -26,7 +26,7 @@ class HeaderDropdown extends Component {
dropAccnt() {
return (
-
+
@@ -45,7 +45,7 @@ class HeaderDropdown extends Component {
Lock Account
Logout
-
+
);
}
diff --git a/React_Full_Project/src/components/Sidebar/Sidebar.js b/React_Full_Project/src/components/Sidebar/Sidebar.js
index 1588853..9de4184 100644
--- a/React_Full_Project/src/components/Sidebar/Sidebar.js
+++ b/React_Full_Project/src/components/Sidebar/Sidebar.js
@@ -46,30 +46,41 @@ class Sidebar extends Component {
// nav list section title
const title = (title, key) => {
- const classes = classNames( "nav-title", title.class);
+ const classes = classNames( 'nav-title', title.class);
return (
{wrapper(title)} );
};
// nav list divider
- const divider = (divider, key) => ();
+ const divider = (divider, key) => {
+ const classes = classNames( 'divider', divider.class);
+ return ();
+ };
// nav item with nav link
const navItem = (item, key) => {
- const classes = classNames( item.class )
- const isExternal = (url) => {
- return url.substring(0, 4) === 'http' ? true : false
- }
- const variant = classNames( "nav-link", item.variant ? `nav-link-${item.variant}` : "");
+ const classes = {
+ item: classNames( item.class) ,
+ link: classNames( 'nav-link', item.variant ? `nav-link-${item.variant}` : ''),
+ icon: classNames( item.icon )
+ };
return (
-
- { isExternal(item.url) ?
-
- {item.name}{badge(item.badge)}
-
+ navLink(item, key, classes)
+ )
+ };
+
+ // nav link
+ const navLink = (item, key, classes) => {
+ const url = item.url ? item.url : '';
+ return (
+
+ { isExternal(url) ?
+
+ {item.name}{badge(item.badge)}
+
:
-
- {item.name}{badge(item.badge)}
-
+
+ {item.name}{badge(item.badge)}
+
}
)
@@ -86,8 +97,8 @@ class Sidebar extends Component {
)
};
- // nav link
- const navLink = (item, idx) =>
+ // nav type
+ const navType = (item, idx) =>
item.title ? title(item, idx) :
item.divider ? divider(item, idx) :
item.children ? navDropdown(item, idx)
@@ -95,7 +106,12 @@ class Sidebar extends Component {
// nav list
const navList = (items) => {
- return items.map( (item, index) => navLink(item, index) );
+ return items.map( (item, index) => navType(item, index) );
+ };
+
+ const isExternal = (url) => {
+ const link = url ? url.substring(0, 4) : '';
+ return link === 'http';
};
// sidebar-nav root
diff --git a/React_Full_Project/src/views/Components/Forms/Forms.js b/React_Full_Project/src/views/Components/Forms/Forms.js
index a6c9c51..d482c2a 100644
--- a/React_Full_Project/src/views/Components/Forms/Forms.js
+++ b/React_Full_Project/src/views/Components/Forms/Forms.js
@@ -221,7 +221,7 @@ class Forms extends Component {
-
+
@@ -234,7 +234,7 @@ class Forms extends Component {
-
+
@@ -307,9 +307,11 @@ class Forms extends Component {
+ {' '}
+ {' '}
@@ -346,9 +348,11 @@ class Forms extends Component {
+ {' '}
+ {' '}
@@ -540,8 +544,7 @@ class Forms extends Component {
-
+
@@ -557,8 +560,7 @@ class Forms extends Component {
-
+
diff --git a/React_Full_Project/src/views/Components/Switches/Switches.js b/React_Full_Project/src/views/Components/Switches/Switches.js
index 9122079..d1a90d1 100644
--- a/React_Full_Project/src/views/Components/Switches/Switches.js
+++ b/React_Full_Project/src/views/Components/Switches/Switches.js
@@ -1,5 +1,5 @@
import React, {Component} from "react";
-import {Row, Col, Card, CardHeader, CardBody, Label, Input, Table} from "reactstrap";
+import {Row, Col, Card, CardHeader, CardBody, Label, Input, Table} from 'reactstrap';
class Switches extends Component {
render() {
diff --git a/React_Starter/package.json b/React_Starter/package.json
index d5380da..dd11fd0 100644
--- a/React_Starter/package.json
+++ b/React_Starter/package.json
@@ -1,6 +1,6 @@
{
"name": "@coreui/react",
- "version": "1.0.5",
+ "version": "1.0.6",
"description": "Open Source Bootstrap Admin Template",
"author": "Łukasz Holeczek",
"homepage": "http://coreui.io",
@@ -8,40 +8,40 @@
"license": "MIT",
"private": true,
"devDependencies": {
- "babel-core": "^6.26.0",
- "babel-loader": "^7.1.2",
- "babel-plugin-transform-object-rest-spread": "^6.26.0",
- "babel-preset-env": "^1.6.0",
- "babel-preset-react": "^6.24.1",
- "copy-webpack-plugin": "^4.1.1",
- "css-hot-loader": "^1.3.2",
- "css-loader": "^0.28.7",
- "extract-text-webpack-plugin": "^3.0.1",
- "file-loader": "^1.1.5",
- "html-loader": "^0.5.1",
- "html-webpack-plugin": "^2.30.1",
- "node-sass": "^4.5.3",
- "rimraf": "^2.6.2",
- "sass-loader": "^6.0.6",
- "source-list-map": "^2.0.0",
- "style-loader": "^0.19.0",
- "uglify-js": "^3.1.4",
- "url-loader": "^0.6.2",
- "webpack": "^3.7.1",
- "webpack-dev-server": "^2.9.2"
+ "babel-core": "6.26.0",
+ "babel-loader": "7.1.2",
+ "babel-plugin-transform-object-rest-spread": "6.26.0",
+ "babel-preset-env": "1.6.1",
+ "babel-preset-react": "6.24.1",
+ "copy-webpack-plugin": "4.2.1",
+ "css-hot-loader": "1.3.3",
+ "css-loader": "0.28.7",
+ "extract-text-webpack-plugin": "3.0.2",
+ "file-loader": "1.1.5",
+ "html-loader": "0.5.1",
+ "html-webpack-plugin": "2.30.1",
+ "node-sass": "4.7.1",
+ "rimraf": "2.6.2",
+ "sass-loader": "6.0.6",
+ "source-list-map": "2.0.0",
+ "style-loader": "0.19.0",
+ "uglify-js": "3.1.10",
+ "url-loader": "0.6.2",
+ "webpack": "3.8.1",
+ "webpack-dev-server": "2.9.4"
},
"dependencies": {
"bootstrap": "4.0.0-beta.2",
- "chart.js": "2.7.0",
- "font-awesome": "^4.7.0",
+ "chart.js": "2.7.1",
+ "font-awesome": "4.7.0",
"history": "4.7.2",
- "react": "^16.0.0",
+ "react": "16.1.1",
"react-chartjs-2": "2.6.4",
- "react-dom": "^16.0.0",
- "react-router-dom": "^4.2.2",
- "react-transition-group": "^2.2.1",
- "reactstrap": "^5.0.0-alpha.3",
- "simple-line-icons": "^2.4.1"
+ "react-dom": "16.1.1",
+ "react-router-dom": "4.2.2",
+ "react-transition-group": "2.2.1",
+ "reactstrap": "5.0.0-alpha.4",
+ "simple-line-icons": "2.4.1"
},
"scripts": {
"dev": "webpack -d --progress --watch --profile --json > compilation-stats.json --env.dev",
@@ -50,7 +50,7 @@
"clean": "rimraf ./build"
},
"engines": {
- "node": ">= 6.0.0",
+ "node": ">= 6.4.0",
"npm": ">= 5.0.0"
}
}
diff --git a/React_Starter/scss/style.scss b/React_Starter/scss/style.scss
index 3e56e7c..571b6ea 100644
--- a/React_Starter/scss/style.scss
+++ b/React_Starter/scss/style.scss
@@ -1,6 +1,6 @@
/*!
* CoreUI - Open Source Bootstrap Admin Template
- * @version v1.0.5
+ * @version v1.0.6
* @link http://coreui.io
* Copyright (c) 2017 creativeLabs Łukasz Holeczek
* @license MIT
diff --git a/React_Starter/src/components/Footer/Footer.js b/React_Starter/src/components/Footer/Footer.js
index be08cb7..6dfaf74 100644
--- a/React_Starter/src/components/Footer/Footer.js
+++ b/React_Starter/src/components/Footer/Footer.js
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import React, {Component} from 'react';
class Footer extends Component {
render() {
diff --git a/React_Starter/src/components/Header/Header.js b/React_Starter/src/components/Header/Header.js
index f77f001..cf93eb2 100644
--- a/React_Starter/src/components/Header/Header.js
+++ b/React_Starter/src/components/Header/Header.js
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import React, {Component} from 'react';
import {
Nav,
NavItem,
@@ -42,7 +42,7 @@ class Header extends Component {
- )
+ );
}
}
diff --git a/React_Starter/src/components/Sidebar/Sidebar.js b/React_Starter/src/components/Sidebar/Sidebar.js
index 5286de1..9de4184 100644
--- a/React_Starter/src/components/Sidebar/Sidebar.js
+++ b/React_Starter/src/components/Sidebar/Sidebar.js
@@ -46,30 +46,41 @@ class Sidebar extends Component {
// nav list section title
const title = (title, key) => {
- const classes = classNames( "nav-title", title.class);
+ const classes = classNames( 'nav-title', title.class);
return ({wrapper(title)} );
};
// nav list divider
- const divider = (divider, key) => ();
+ const divider = (divider, key) => {
+ const classes = classNames( 'divider', divider.class);
+ return ();
+ };
// nav item with nav link
const navItem = (item, key) => {
- const classes = classNames( item.class );
- const isExternal = (url) => {
- return url.substring(0, 4) === 'http' ? true : false
- }
- const variant = classNames( "nav-link", item.variant ? `nav-link-${item.variant}` : "");
+ const classes = {
+ item: classNames( item.class) ,
+ link: classNames( 'nav-link', item.variant ? `nav-link-${item.variant}` : ''),
+ icon: classNames( item.icon )
+ };
return (
-
- { isExternal(item.url) ?
-
- {item.name}{badge(item.badge)}
-
+ navLink(item, key, classes)
+ )
+ };
+
+ // nav link
+ const navLink = (item, key, classes) => {
+ const url = item.url ? item.url : '';
+ return (
+
+ { isExternal(url) ?
+
+ {item.name}{badge(item.badge)}
+
:
-
- {item.name}{badge(item.badge)}
-
+
+ {item.name}{badge(item.badge)}
+
}
)
@@ -86,8 +97,8 @@ class Sidebar extends Component {
)
};
- // nav link
- const navLink = (item, idx) =>
+ // nav type
+ const navType = (item, idx) =>
item.title ? title(item, idx) :
item.divider ? divider(item, idx) :
item.children ? navDropdown(item, idx)
@@ -95,7 +106,12 @@ class Sidebar extends Component {
// nav list
const navList = (items) => {
- return items.map( (item, index) => navLink(item, index) );
+ return items.map( (item, index) => navType(item, index) );
+ };
+
+ const isExternal = (url) => {
+ const link = url ? url.substring(0, 4) : '';
+ return link === 'http';
};
// sidebar-nav root
diff --git a/package.json b/package.json
index eac6150..50a297d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "@coreui/react",
- "version": "1.0.5",
+ "version": "1.0.6",
"description": "Open Source React Admin Template",
"main": "",
"homepage": "http://coreui.io/react/",