Skip to content

Commit 1a359db

Browse files
okendokenokendoken
committed
update bootstrap, react, react-router, add buttons page, adjust error message
1 parent 1ee0533 commit 1a359db

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+741
-7945
lines changed

‎.babelrc.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
2-
* React Starter Kit (https://www.reactstarterkit.com/)
2+
* Flatlogic Dashboards (https://flatlogic.com/admin-dashboards)
33
*
4-
* Copyright © 2014-present Kriasoft, LLC. All rights reserved.
4+
* Copyright © 2015-present Flatlogic, LLC. All rights reserved.
55
*
66
* This source code is licensed under the MIT license found in the
77
* LICENSE.txt file in the root directory of this source tree.

‎.eslintrc.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
2-
* React Starter Kit (https://www.reactstarterkit.com/)
2+
* Flatlogic Dashboards (https://flatlogic.com/admin-dashboards)
33
*
4-
* Copyright © 2014-present Kriasoft, LLC. All rights reserved.
4+
* Copyright © 2015-present Flatlogic, LLC. All rights reserved.
55
*
66
* This source code is licensed under the MIT license found in the
77
* LICENSE.txt file in the root directory of this source tree.

‎.stylelintrc.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
2-
* React Starter Kit (https://www.reactstarterkit.com/)
2+
* Flatlogic Dashboards (https://flatlogic.com/admin-dashboards)
33
*
4-
* Copyright © 2014-present Kriasoft, LLC. All rights reserved.
4+
* Copyright © 2015-present Flatlogic, LLC. All rights reserved.
55
*
66
* This source code is licensed under the MIT license found in the
77
* LICENSE.txt file in the root directory of this source tree.

‎package.json

+7-8
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,15 @@
33
"version": "0.0.0",
44
"private": true,
55
"engines": {
6-
"node": ">=6.5",
7-
"npm": ">=3.10"
6+
"node": "8.10.0"
87
},
98
"browserslist": [">1%", "last 4 versions", "Firefox ESR", "not ie < 9"],
109
"dependencies": {
1110
"@babel/polyfill": "7.0.0-beta.32",
1211
"awesome-bootstrap-checkbox": "^1.0.1",
1312
"bluebird": "^3.5.1",
1413
"body-parser": "^1.18.2",
15-
"bootstrap": "^4.1.1",
14+
"bootstrap": "4.2.1",
1615
"bundle-loader": "^0.5.5",
1716
"classnames": "^2.2.5",
1817
"cookie-parser": "^1.4.3",
@@ -39,15 +38,15 @@
3938
"pretty-error": "^2.1.1",
4039
"prop-types": "^15.6.1",
4140
"query-string": "^5.0.1",
42-
"react": "^16.1.1",
41+
"react": "16.7.0",
4342
"react-cookie": "^1.0.5",
44-
"react-dom": "^16.1.1",
43+
"react-dom": "16.7.0",
4544
"react-google-maps": "^9.4.5",
4645
"react-redux": "^5.0.4",
47-
"react-router": "^4.0.0",
48-
"react-router-dom": "^4.0.0",
46+
"react-router": "4.3.1",
47+
"react-router-dom": "4.3.1",
4948
"react-sparklines": "^1.7.0",
50-
"reactstrap": "^6.0.1",
49+
"reactstrap": "7.1.0",
5150
"recharts": "^1.0.0-beta.10",
5251
"redux": "^3.6.0",
5352
"redux-logger": "^3.0.1",

‎src/DOMUtils.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
2-
* React Starter Kit (https://www.reactstarterkit.com/)
2+
* Flatlogic Dashboards (https://flatlogic.com/admin-dashboards)
33
*
4-
* Copyright © 2014-present Kriasoft, LLC. All rights reserved.
4+
* Copyright © 2015-present Flatlogic, LLC. All rights reserved.
55
*
66
* This source code is licensed under the MIT license found in the
77
* LICENSE.txt file in the root directory of this source tree.

‎src/client.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
2-
* React Starter Kit (https://www.reactstarterkit.com/)
2+
* Flatlogic Dashboards (https://flatlogic.com/admin-dashboards)
33
*
4-
* Copyright © 2014-present Kriasoft, LLC. All rights reserved.
4+
* Copyright © 2015-present Flatlogic, LLC. All rights reserved.
55
*
66
* This source code is licensed under the MIT license found in the
77
* LICENSE.txt file in the root directory of this source tree.

‎src/components/App.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
2-
* React Starter Kit (https://www.reactstarterkit.com/)
2+
* Flatlogic Dashboards (https://flatlogic.com/admin-dashboards)
33
*
4-
* Copyright © 2014-present Kriasoft, LLC. All rights reserved.
4+
* Copyright © 2015-present Flatlogic, LLC. All rights reserved.
55
*
66
* This source code is licensed under the MIT license found in the
77
* LICENSE.txt file in the root directory of this source tree.

‎src/components/Footer/Footer.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
2-
* React Starter Kit (https://www.reactstarterkit.com/)
2+
* Flatlogic Dashboards (https://flatlogic.com/admin-dashboards)
33
*
4-
* Copyright © 2014-present Kriasoft, LLC. All rights reserved.
4+
* Copyright © 2015-present Flatlogic, LLC. All rights reserved.
55
*
66
* This source code is licensed under the MIT license found in the
77
* LICENSE.txt file in the root directory of this source tree.
@@ -28,7 +28,7 @@ class Footer extends React.Component {
2828
return (
2929
<footer className={cx(s.root, this.props.className)}>
3030
<div className={s.container}>
31-
<span>© 2017 &nbsp;Flatlogic LLC </span>
31+
<span>© 2019 &nbsp;Flatlogic LLC </span>
3232
<span className={s.spacer}>·</span>
3333
<Link to="/app/tos">Terms of Service</Link>
3434
<span className={s.spacer}>·</span>

‎src/components/Footer/Footer.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
2-
* React Starter Kit (https://www.reactstarterkit.com/)
2+
* Flatlogic Dashboards (https://flatlogic.com/admin-dashboards)
33
*
4-
* Copyright © 2014-present Kriasoft, LLC. All rights reserved.
4+
* Copyright © 2015-present Flatlogic, LLC. All rights reserved.
55
*
66
* This source code is licensed under the MIT license found in the
77
* LICENSE.txt file in the root directory of this source tree.

‎src/components/Header/Header.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
2-
* React Starter Kit (https://www.reactstarterkit.com/)
2+
* Flatlogic Dashboards (https://flatlogic.com/admin-dashboards)
33
*
4-
* Copyright © 2014-present Kriasoft, LLC. All rights reserved.
4+
* Copyright © 2015-present Flatlogic, LLC. All rights reserved.
55
*
66
* This source code is licensed under the MIT license found in the
77
* LICENSE.txt file in the root directory of this source tree.

‎src/components/Header/Header.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
2-
* React Starter Kit (https://www.reactstarterkit.com/)
2+
* Flatlogic Dashboards (https://flatlogic.com/admin-dashboards)
33
*
4-
* Copyright © 2014-present Kriasoft, LLC. All rights reserved.
4+
* Copyright © 2015-present Flatlogic, LLC. All rights reserved.
55
*
66
* This source code is licensed under the MIT license found in the
77
* LICENSE.txt file in the root directory of this source tree.

‎src/components/Html.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
2-
* React Starter Kit (https://www.reactstarterkit.com/)
2+
* Flatlogic Dashboards (https://flatlogic.com/admin-dashboards)
33
*
4-
* Copyright © 2014-present Kriasoft, LLC. All rights reserved.
4+
* Copyright © 2015-present Flatlogic, LLC. All rights reserved.
55
*
66
* This source code is licensed under the MIT license found in the
77
* LICENSE.txt file in the root directory of this source tree.

‎src/components/Layout/Layout.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
2-
* React Starter Kit (https://www.reactstarterkit.com/)
2+
* Flatlogic Dashboards (https://flatlogic.com/admin-dashboards)
33
*
4-
* Copyright © 2014-present Kriasoft, LLC. All rights reserved.
4+
* Copyright © 2015-present Flatlogic, LLC. All rights reserved.
55
*
66
* This source code is licensed under the MIT license found in the
77
* LICENSE.txt file in the root directory of this source tree.
@@ -19,6 +19,7 @@ import loadPrivacy from 'bundle-loader?lazy!../../pages/privacy';
1919
import loadProfile from 'bundle-loader?lazy!../../pages/profile';
2020
import loadTypography from 'bundle-loader?lazy!../../pages/typography';
2121
import loadTables from 'bundle-loader?lazy!../../pages/tables';
22+
import loadButtons from 'bundle-loader?lazy!../../pages/buttons';
2223
import loadNotifications from 'bundle-loader?lazy!../../pages/notifications';
2324
import loadCharts from 'bundle-loader?lazy!../../pages/charts';
2425
import loadIcons from 'bundle-loader?lazy!../../pages/icons';
@@ -40,6 +41,7 @@ const PrivacyBundle = Bundle.generateBundle(loadPrivacy);
4041
const ProfileBundle = Bundle.generateBundle(loadProfile);
4142
const TypographyBundle = Bundle.generateBundle(loadTypography);
4243
const TablesBundle = Bundle.generateBundle(loadTables);
44+
const ButtonsBundle = Bundle.generateBundle(loadButtons);
4345
const NotificationsBundle = Bundle.generateBundle(loadNotifications);
4446
const ChartsBundle = Bundle.generateBundle(loadCharts);
4547
const IconsBundle = Bundle.generateBundle(loadIcons);
@@ -78,6 +80,7 @@ class Layout extends React.Component {
7880
<Route path="/app/typography" exact component={TypographyBundle} />
7981
<Route path="/app/tables" exact component={TablesBundle} />
8082
<Route path="/app/notifications" exact component={NotificationsBundle} />
83+
<Route path="/app/components/buttons" exact component={ButtonsBundle} />
8184
<Route path="/app/components/charts" exact component={ChartsBundle} />
8285
<Route path="/app/components/icons" exact component={IconsBundle} />
8386
<Route path="/app/components/maps" exact component={MapsBundle} />

‎src/components/Layout/Layout.test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
2-
* React Starter Kit (https://www.reactstarterkit.com/)
2+
* Flatlogic Dashboards (https://flatlogic.com/admin-dashboards)
33
*
4-
* Copyright © 2014-present Kriasoft, LLC. All rights reserved.
4+
* Copyright © 2015-present Flatlogic, LLC. All rights reserved.
55
*
66
* This source code is licensed under the MIT license found in the
77
* LICENSE.txt file in the root directory of this source tree.

‎src/components/Page/Page.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
2-
* React Starter Kit (https://www.reactstarterkit.com/)
2+
* Flatlogic Dashboards (https://flatlogic.com/admin-dashboards)
33
*
4-
* Copyright © 2014-present Kriasoft, LLC. All rights reserved.
4+
* Copyright © 2015-present Flatlogic, LLC. All rights reserved.
55
*
66
* This source code is licensed under the MIT license found in the
77
* LICENSE.txt file in the root directory of this source tree.

‎src/components/Page/Page.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
2-
* React Starter Kit (https://www.reactstarterkit.com/)
2+
* Flatlogic Dashboards (https://flatlogic.com/admin-dashboards)
33
*
4-
* Copyright © 2014-present Kriasoft, LLC. All rights reserved.
4+
* Copyright © 2015-present Flatlogic, LLC. All rights reserved.
55
*
66
* This source code is licensed under the MIT license found in the
77
* LICENSE.txt file in the root directory of this source tree.

‎src/components/Sidebar/Sidebar.js

+4
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ const Sidebar = () => (
4040
header="Components"
4141
headerLink="/app/components"
4242
childrenLinks={[
43+
{
44+
name: 'Buttons',
45+
link: '/app/components/buttons',
46+
},
4347
{
4448
name: 'Charts',
4549
link: '/app/components/charts',

‎src/components/Widget/Widget.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
2-
* React Starter Kit (https://www.reactstarterkit.com/)
2+
* Flatlogic Dashboards (https://flatlogic.com/admin-dashboards)
33
*
4-
* Copyright © 2014-present Kriasoft, LLC. All rights reserved.
4+
* Copyright © 2015-present Flatlogic, LLC. All rights reserved.
55
*
66
* This source code is licensed under the MIT license found in the
77
* LICENSE.txt file in the root directory of this source tree.

‎src/config.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
2-
* React Starter Kit (https://www.reactstarterkit.com/)
2+
* Flatlogic Dashboards (https://flatlogic.com/admin-dashboards)
33
*
4-
* Copyright © 2014-present Kriasoft, LLC. All rights reserved.
4+
* Copyright © 2015-present Flatlogic, LLC. All rights reserved.
55
*
66
* This source code is licensed under the MIT license found in the
77
* LICENSE.txt file in the root directory of this source tree.

‎src/createFetch.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
2-
* React Starter Kit (https://www.reactstarterkit.com/)
2+
* Flatlogic Dashboards (https://flatlogic.com/admin-dashboards)
33
*
4-
* Copyright © 2014-present Kriasoft, LLC. All rights reserved.
4+
* Copyright © 2015-present Flatlogic, LLC. All rights reserved.
55
*
66
* This source code is licensed under the MIT license found in the
77
* LICENSE.txt file in the root directory of this source tree.

‎src/data/models/User.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
2-
* React Starter Kit (https://www.reactstarterkit.com/)
2+
* Flatlogic Dashboards (https://flatlogic.com/admin-dashboards)
33
*
4-
* Copyright © 2014-present Kriasoft, LLC. All rights reserved.
4+
* Copyright © 2015-present Flatlogic, LLC. All rights reserved.
55
*
66
* This source code is licensed under the MIT license found in the
77
* LICENSE.txt file in the root directory of this source tree.

‎src/data/models/UserClaim.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
2-
* React Starter Kit (https://www.reactstarterkit.com/)
2+
* Flatlogic Dashboards (https://flatlogic.com/admin-dashboards)
33
*
4-
* Copyright © 2014-present Kriasoft, LLC. All rights reserved.
4+
* Copyright © 2015-present Flatlogic, LLC. All rights reserved.
55
*
66
* This source code is licensed under the MIT license found in the
77
* LICENSE.txt file in the root directory of this source tree.

‎src/data/models/UserLogin.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
2-
* React Starter Kit (https://www.reactstarterkit.com/)
2+
* Flatlogic Dashboards (https://flatlogic.com/admin-dashboards)
33
*
4-
* Copyright © 2014-present Kriasoft, LLC. All rights reserved.
4+
* Copyright © 2015-present Flatlogic, LLC. All rights reserved.
55
*
66
* This source code is licensed under the MIT license found in the
77
* LICENSE.txt file in the root directory of this source tree.

‎src/data/models/UserProfile.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
2-
* React Starter Kit (https://www.reactstarterkit.com/)
2+
* Flatlogic Dashboards (https://flatlogic.com/admin-dashboards)
33
*
4-
* Copyright © 2014-present Kriasoft, LLC. All rights reserved.
4+
* Copyright © 2015-present Flatlogic, LLC. All rights reserved.
55
*
66
* This source code is licensed under the MIT license found in the
77
* LICENSE.txt file in the root directory of this source tree.

‎src/data/models/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
2-
* React Starter Kit (https://www.reactstarterkit.com/)
2+
* Flatlogic Dashboards (https://flatlogic.com/admin-dashboards)
33
*
4-
* Copyright © 2014-present Kriasoft, LLC. All rights reserved.
4+
* Copyright © 2015-present Flatlogic, LLC. All rights reserved.
55
*
66
* This source code is licensed under the MIT license found in the
77
* LICENSE.txt file in the root directory of this source tree.

‎src/data/queries/me.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
2-
* React Starter Kit (https://www.reactstarterkit.com/)
2+
* Flatlogic Dashboards (https://flatlogic.com/admin-dashboards)
33
*
4-
* Copyright © 2014-present Kriasoft, LLC. All rights reserved.
4+
* Copyright © 2015-present Flatlogic, LLC. All rights reserved.
55
*
66
* This source code is licensed under the MIT license found in the
77
* LICENSE.txt file in the root directory of this source tree.

‎src/data/queries/news.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
2-
* React Starter Kit (https://www.reactstarterkit.com/)
2+
* Flatlogic Dashboards (https://flatlogic.com/admin-dashboards)
33
*
4-
* Copyright © 2014-present Kriasoft, LLC. All rights reserved.
4+
* Copyright © 2015-present Flatlogic, LLC. All rights reserved.
55
*
66
* This source code is licensed under the MIT license found in the
77
* LICENSE.txt file in the root directory of this source tree.

‎src/data/sequelize.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
2-
* React Starter Kit (https://www.reactstarterkit.com/)
2+
* Flatlogic Dashboards (https://flatlogic.com/admin-dashboards)
33
*
4-
* Copyright © 2014-present Kriasoft, LLC. All rights reserved.
4+
* Copyright © 2015-present Flatlogic, LLC. All rights reserved.
55
*
66
* This source code is licensed under the MIT license found in the
77
* LICENSE.txt file in the root directory of this source tree.

‎src/data/types/NewsItemType.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
2-
* React Starter Kit (https://www.reactstarterkit.com/)
2+
* Flatlogic Dashboards (https://flatlogic.com/admin-dashboards)
33
*
4-
* Copyright © 2014-present Kriasoft, LLC. All rights reserved.
4+
* Copyright © 2015-present Flatlogic, LLC. All rights reserved.
55
*
66
* This source code is licensed under the MIT license found in the
77
* LICENSE.txt file in the root directory of this source tree.

‎src/data/types/UserType.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
2-
* React Starter Kit (https://www.reactstarterkit.com/)
2+
* Flatlogic Dashboards (https://flatlogic.com/admin-dashboards)
33
*
4-
* Copyright © 2014-present Kriasoft, LLC. All rights reserved.
4+
* Copyright © 2015-present Flatlogic, LLC. All rights reserved.
55
*
66
* This source code is licensed under the MIT license found in the
77
* LICENSE.txt file in the root directory of this source tree.

‎src/history.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
2-
* React Starter Kit (https://www.reactstarterkit.com/)
2+
* Flatlogic Dashboards (https://flatlogic.com/admin-dashboards)
33
*
4-
* Copyright © 2014-present Kriasoft, LLC. All rights reserved.
4+
* Copyright © 2015-present Flatlogic, LLC. All rights reserved.
55
*
66
* This source code is licensed under the MIT license found in the
77
* LICENSE.txt file in the root directory of this source tree.

‎src/pages/about/About.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
2-
* React Starter Kit (https://www.reactstarterkit.com/)
2+
* Flatlogic Dashboards (https://flatlogic.com/admin-dashboards)
33
*
4-
* Copyright © 2014-present Kriasoft, LLC. All rights reserved.
4+
* Copyright © 2015-present Flatlogic, LLC. All rights reserved.
55
*
66
* This source code is licensed under the MIT license found in the
77
* LICENSE.txt file in the root directory of this source tree.

0 commit comments

Comments
 (0)