gitadmin/admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4 from xidedix/master-dist

Browse Source 
minor fixes
This commit is contained in:
xidedix 2017-08-24 17:22:20 +02:00 committed by GitHub
commit 1560e0b949
22 changed files with 262 additions and 16766 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.gitignore vendored Normal file
View File

@ -0,0 +1,18 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.
# dependencies
node_modules
# testing
coverage
# production
build
# misc
.DS_Store
Thumbs.db
.env
.idea
npm-debug.log
compilation-stats.json

7
React_Full_Project/CHANGELOG.md → CHANGELOG.md
View File

@ -1,4 +1,9 @@
## Changelog CoreUI react
## Changelog [react](./REACT.md) version
### 2017.08.24
- webpack.config env.prod
- Dashboard .dropdown-menu-right temp.scss hotfix (full)
- callout.scss .chart-wrapper hotfix (full)
### 2017.08.11
- Bootstrap 4 beta

8
React_Full_Project/CORE_REACT.md → REACT.md
View File

@ -1,4 +1,4 @@
# CoreUI React version
# React version
## Intro
@ -28,3 +28,9 @@ public/img (images)
**npm run clean** to clean build dir
**npm run dev** to run a dev build with watching filesystem for changes
## See also
[Changelog](./CHANGELOG.md)
[Readme](./README.md)

2
React_Full_Project/.gitignore vendored
View File

@ -11,6 +11,8 @@ build
# misc
.DS_Store
Thumbs.db
.env
.idea
npm-debug.log
compilation-stats.json

7808
React_Full_Project/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

24
React_Full_Project/package.json
View File

@ -9,14 +9,14 @@
"private": true,
"homepage": ".",
"devDependencies": {
"babel-core": "^6.25.0",
"babel-loader": "^7.1.1",
"babel-plugin-transform-object-rest-spread": "^6.23.0",
"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.0.1",
"css-hot-loader": "^1.3.0",
"css-loader": "^0.28.4",
"css-loader": "^0.28.5",
"extract-text-webpack-plugin": "^3.0.0",
"file-loader": "^0.11.2",
"html-loader": "^0.5.1",
@ -26,29 +26,29 @@
"sass-loader": "^6.0.6",
"source-list-map": "^2.0.0",
"style-loader": "^0.18.2",
"uglify-js": "^3.0.27",
"uglify-js": "^3.0.28",
"url-loader": "^0.5.9",
"webpack": "^3.5.3",
"webpack": "^3.5.5",
"webpack-dev-server": "^2.7.1"
},
"dependencies": {
"bootstrap": "^4.0.0-beta",
"chart.js": "2.6.0",
"font-awesome": "^4.7.0",
"history": "4.6.3",
"history": "4.7.2",
"react": "^15.6.1",
"react-addons-css-transition-group": "^15.6.0",
"react-addons-transition-group": "^15.6.0",
"react-chartjs-2": "2.5.6",
"react-chartjs-2": "2.6.1",
"react-dom": "^15.6.1",
"react-router-dom": "4.1.2",
"react-router-dom": "4.2.0",
"reactstrap": "^4.8.0",
"simple-line-icons": "^2.4.1"
},
"scripts": {
"dev": "webpack -d --progress --watch",
"start": "webpack-dev-server --env.dev --open --hot --progress --colors --inline",
"build": "webpack -p --progress",
"dev": "webpack -d --progress --watch --profile --json > compilation-stats.json --env.dev",
"start": "webpack-dev-server --progress --colors --inline --env.dev",
"build": "webpack -p --progress --env.prod",
"clean": "rimraf ./build"
},
"engines": {

4
React_Full_Project/scss/core/_callout.scss
View File

@ -12,9 +12,9 @@
.chart-wrapper {
position: absolute;
top: 18px;
left: 45%;
left: 50%;
float: right;
width: 100px;
width: 60%;
}
}

7
React_Full_Project/scss/core/_temp.scss
View File

@ -12,7 +12,7 @@
border-radius: 1rem !important;
}
// temp fix for Vue-Strap
// temp fix for Vue & React
// Open state for the dropdown
.open, .show {
@ -20,7 +20,10 @@
> .dropdown-menu {
display: block;
}
> .dropdown-menu-right {
right: 0;
left: auto; // Reset the default from `.dropdown-menu`
}
// Remove the outline when :focus is triggered
> a {
outline: 0;

2
React_Full_Project/src/components/Breadcrumb/Breadcrumb.js
View File

@ -15,7 +15,6 @@ const getPaths = (pathname) => {
paths.push(currPath);
return currPath;
});
console.log(paths);
return paths;
};
@ -41,7 +40,6 @@ const BreadcrumbsItem = ({...rest, match}) => {
const Breadcrumbs = ({...rest, location : {pathname}, match}) => {
const paths = getPaths(pathname);
// const i = 0;
const items = paths.map((path, i) => <Route key={i++} path={path} component={BreadcrumbsItem}/>);
return (
<Breadcrumb>

2
React_Full_Project/src/components/Sidebar/Sidebar.js
View File

@ -38,7 +38,7 @@ class Sidebar extends Component {
};
// simple wrapper for nav-title item
const wrapper = item => { return (!item.wrapper ? item.name : (React.createElement(item.wrapper.element, item.wrapper.attributes, item.name))) };
const wrapper = item => { return (item.wrapper && item.wrapper.element ? (React.createElement(item.wrapper.element, item.wrapper.attributes, item.name)): item.name ) };
// nav list section title
const title = (title, key) => {

4
React_Full_Project/src/components/Sidebar/_nav.js
View File

@ -13,10 +13,10 @@ export default {
title: true,
name: 'UI elements',
wrapper: { // optional wrapper object
element: "span", // required valid HTML5 element tag
element: '', // required valid HTML5 element tag
attributes: {} // optional valid JS object with JS API naming ex: { className: "my-class", style: { fontFamily: "Verdana" }, id: "my-id"}
},
class: "" // optional class names space delimited list for title item ex: "text-center"
class: '' // optional class names space delimited list for title item ex: "text-center"
},
{
name: 'Components',

4
React_Full_Project/src/containers/Full/Full.js
View File

@ -9,6 +9,8 @@ import Footer from '../../components/Footer/';
import Dashboard from '../../views/Dashboard/';
import Charts from '../../views/Charts/';
import Widgets from '../../views/Widgets/';
// Components
import Buttons from '../../views/Components/Buttons/';
import Cards from '../../views/Components/Cards/';
import Forms from '../../views/Components/Forms/';
@ -17,6 +19,8 @@ import SocialButtons from '../../views/Components/SocialButtons/';
import Switches from '../../views/Components/Switches/';
import Tables from '../../views/Components/Tables/';
import Tabs from '../../views/Components/Tabs/';
// Icons
import FontAwesome from '../../views/Icons/FontAwesome/';
import SimpleLineIcons from '../../views/Icons/SimpleLineIcons/';

10
React_Full_Project/webpack.config.js
View File

@ -13,7 +13,8 @@ const SRC_DIR = path.resolve(__dirname, 'src');
console.log('BUILD_DIR', BUILD_DIR);
console.log('SRC_DIR', SRC_DIR);
module.exports = {
module.exports = (env = {}) => {
return {
entry: {
index: [SRC_DIR + '/index.js']
},
@ -21,7 +22,8 @@ module.exports = {
path: BUILD_DIR,
filename: '[name].bundle.js'
},
watch: true,
// watch: true,
devtool: env.prod ? 'source-map' : 'cheap-module-eval-source-map',
devServer: {
contentBase: BUILD_DIR,
// port: 9001,
@ -90,7 +92,7 @@ module.exports = {
},
plugins: [
new webpack.HotModuleReplacementPlugin(),
new webpack.optimize.UglifyJsPlugin(),
new webpack.optimize.UglifyJsPlugin({sourceMap: true}),
new webpack.NamedModulesPlugin(),
extractCSS,
extractSCSS,
@ -107,4 +109,4 @@ module.exports = {
)
]
}
;
};

2
React_Starter/.gitignore vendored
View File

@ -11,6 +11,8 @@ build
# misc
.DS_Store
Thumbs.db
.env
.idea
npm-debug.log
compilation-stats.json

13
React_Starter/CHANGELOG.md
View File

@ -1,13 +0,0 @@
## Changelog CoreUI react
### 2017.08.01
- Sidebar component:
- title item with optional wrapper and class (_nav.js)
- nav link item with optional badge
- code refactoring
### 2017.07.31
- moved to [reactstrap](https://reactstrap.github.io/)
- moved to [webpack](https://webpack.js.org/) (dropping gulp)
- data driven Sidebar component (_nav.js)

30
React_Starter/CORE_REACT.md
View File

@ -1,30 +0,0 @@
# CoreUI React version
## Intro
It uses Sass (with .scss). The style is loaded at the component level.
Dependencies can be handled by **npm**.
## Directories
```
src (js|jsx source)
scss (scss source)
public (html template)
public/img (images)
```
## Usage
**npm i** - to install dependencies
## Sctipts
**npm start** for developing (it runs webpack-dev-server)
**npm run build** to run a dev build
**npm run clean** to clean build dir
**npm run dev** to run a dev build with watching filesystem for changes

8698
React_Starter/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

24
React_Starter/package.json
View File

@ -9,14 +9,14 @@
"private": true,
"homepage": ".",
"devDependencies": {
"babel-core": "^6.25.0",
"babel-loader": "^7.1.1",
"babel-plugin-transform-object-rest-spread": "^6.23.0",
"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.0.1",
"css-hot-loader": "^1.3.0",
"css-loader": "^0.28.4",
"css-loader": "^0.28.5",
"extract-text-webpack-plugin": "^3.0.0",
"file-loader": "^0.11.2",
"html-loader": "^0.5.1",
@ -26,29 +26,29 @@
"sass-loader": "^6.0.6",
"source-list-map": "^2.0.0",
"style-loader": "^0.18.2",
"uglify-js": "^3.0.27",
"uglify-js": "^3.0.28",
"url-loader": "^0.5.9",
"webpack": "^3.5.3",
"webpack": "^3.5.5",
"webpack-dev-server": "^2.7.1"
},
"dependencies": {
"bootstrap": "^4.0.0-beta",
"chart.js": "2.6.0",
"font-awesome": "^4.7.0",
"history": "4.6.3",
"history": "4.7.2",
"react": "^15.6.1",
"react-addons-css-transition-group": "^15.6.0",
"react-addons-transition-group": "^15.6.0",
"react-chartjs-2": "2.5.6",
"react-chartjs-2": "2.6.1",
"react-dom": "^15.6.1",
"react-router-dom": "4.1.2",
"react-router-dom": "4.2.0",
"reactstrap": "^4.8.0",
"simple-line-icons": "^2.4.1"
},
"scripts": {
"dev": "webpack -d --progress --watch",
"start": "webpack-dev-server --env.dev --open --hot --progress --colors --inline",
"build": "webpack -p --progress",
"dev": "webpack -d --progress --watch --profile --json > compilation-stats.json --env.dev",
"start": "webpack-dev-server --progress --colors --inline --env.dev",
"build": "webpack -p --progress --env.prod",
"clean": "rimraf ./build"
},
"engines": {

4
React_Starter/scss/core/_callout.scss
View File

@ -12,9 +12,9 @@
.chart-wrapper {
position: absolute;
top: 18px;
left: 45%;
left: 50%;
float: right;
width: 100px;
width: 60%;
}
}

7
React_Starter/scss/core/_temp.scss
View File

@ -12,7 +12,7 @@
border-radius: 1rem !important;
}
// temp fix for Vue-Strap
// temp fix for Vue & React
// Open state for the dropdown
.open, .show {
@ -20,7 +20,10 @@
> .dropdown-menu {
display: block;
}
> .dropdown-menu-right {
right: 0;
left: auto; // Reset the default from `.dropdown-menu`
}
// Remove the outline when :focus is triggered
> a {
outline: 0;

10
React_Starter/webpack.config.js
View File

@ -13,7 +13,8 @@ const SRC_DIR = path.resolve(__dirname, 'src');
console.log('BUILD_DIR', BUILD_DIR);
console.log('SRC_DIR', SRC_DIR);
module.exports = {
module.exports = (env = {}) => {
return {
entry: {
index: [SRC_DIR + '/index.js']
},
@ -21,7 +22,8 @@ module.exports = {
path: BUILD_DIR,
filename: '[name].bundle.js'
},
watch: true,
// watch: true,
devtool: env.prod ? 'source-map' : 'cheap-module-eval-source-map',
devServer: {
contentBase: BUILD_DIR,
// port: 9001,
@ -90,7 +92,7 @@ module.exports = {
},
plugins: [
new webpack.HotModuleReplacementPlugin(),
new webpack.optimize.UglifyJsPlugin(),
new webpack.optimize.UglifyJsPlugin({sourceMap: true}),
new webpack.NamedModulesPlugin(),
extractCSS,
extractSCSS,
@ -107,4 +109,4 @@ module.exports = {
)
]
}
;
};