Skip to content

Commit

Permalink
Refactor build
Browse files Browse the repository at this point in the history
  • Loading branch information
Çağatay Çivici committed Mar 24, 2017
1 parent f2449b4 commit 2f16efa
Show file tree
Hide file tree
Showing 45 changed files with 4,893 additions and 486 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
node_modules
public/resources/*.css
!public/resources/themes/bootstrap/theme.css
public/resources/**/*.css
public/resources/**/*.map
.vscode
.DS_Store
.idea
.sass-cache
22 changes: 9 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,14 @@
"private": true,
"devDependencies": {
"axios": "^0.15.3",
"babel-core": "^6.21.0",
"babel-loader": "^6.2.10",
"babel-preset-es2015": "^6.18.0",
"babel-preset-react": "^6.23.0",
"babel-preset-stage-0": "6.22.0",
"del": "^2.2.0",
"gulp": "^3.9.1",
"gulp-concat": "^2.6.0",
"gulp-flatten": "^0.2.0",
"gulp-rename": "^1.2.2",
"gulp-uglify": "^1.5.3",
"gulp-uglifycss": "^1.0.6",
"webpack": "^1.13.1",
"webpack-dev-server": "^1.16.2",
"webpack-merge": "^0.14.0"
"react-scripts": "0.9.5"
},
"dependencies": {
"chart.js": "^2.4.0",
Expand All @@ -28,12 +21,15 @@
"react": "^15.4.1",
"react-addons-css-transition-group": "^15.4.1",
"react-dom": "^15.4.1",
"react-router": "^3.0.0"
"react-router": "^3.0.0",
"jquery": "^3.1.1",
"fullcalendar": "^3.1.0",
"moment": "^2.17.1"
},
"scripts": {
"webpack": "webpack",
"webpack:w": "webpack -w",
"webpack-dev-server": "webpack-dev-server --inline",
"start": "npm run webpack-dev-server"
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test --env=jsdom",
"eject": "react-scripts eject"
}
}
7 changes: 3 additions & 4 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="shortcut icon" href="public/favicon.ico">
<link rel="stylesheet" href="public/resources/themes/omega/theme.css">
<link rel="stylesheet" href="/resources/themes/omega/theme.css">
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/fullcalendar/3.1.0/fullcalendar.min.css">
<link rel="stylesheet" href="public/resources/primeng.min.css">
<script src="public/showcase/resources/script/prism.js" data-manual></script>
<link rel="stylesheet" href="/resources/primeng.min.css">
<script src="/showcase/resources/script/prism.js" data-manual></script>

<!-- Schedule -->
<script src="https://code.jquery.com/jquery-2.2.4.min.js"></script>
Expand All @@ -28,6 +28,5 @@
To begin the development, run `npm start`.
To create a production bundle, use `npm run build`.
-->
<script src="bundle.js"></script>
</body>
</html>
Loading

0 comments on commit 2f16efa

Please sign in to comment.