dev
fengyuexingzi 8 years ago
parent c8c960ebfc
commit 160b1a0b1f

@ -14,14 +14,12 @@
"axios": "^0.18.0", "axios": "^0.18.0",
"babel-core": "^6.26.0", "babel-core": "^6.26.0",
"babel-loader": "^7.1.4", "babel-loader": "^7.1.4",
"babel-plugin-dynamic-import-node": "^1.2.0",
"babel-plugin-dynamic-import-webpack": "^1.0.2", "babel-plugin-dynamic-import-webpack": "^1.0.2",
"babel-plugin-syntax-dynamic-import": "^6.18.0",
"babel-preset-env": "^1.6.1", "babel-preset-env": "^1.6.1",
"bootstrap": "^4.1.0", "bootstrap": "^4.1.0",
"bootstrap-sass": "^3.3.7", "bootstrap-sass": "^3.3.7",
"copy-webpack-plugin": "^4.5.1",
"css-loader": "^0.28.11", "css-loader": "^0.28.11",
"es6-promise": "^4.2.4",
"extract-text-webpack-plugin": "^4.0.0-beta.0", "extract-text-webpack-plugin": "^4.0.0-beta.0",
"html-webpack-plugin": "^3.2.0", "html-webpack-plugin": "^3.2.0",
"jquery": "^3.3.1", "jquery": "^3.3.1",
@ -29,7 +27,6 @@
"node-sass": "^4.8.3", "node-sass": "^4.8.3",
"path": "^0.12.7", "path": "^0.12.7",
"popper.js": "^1.14.0", "popper.js": "^1.14.0",
"promise-polyfill": "^7.1.2",
"sass-loader": "^6.0.7", "sass-loader": "^6.0.7",
"style-loader": "^0.20.3", "style-loader": "^0.20.3",
"vue": "^2.5.16", "vue": "^2.5.16",

@ -1,4 +1,11 @@
@import url(https://fonts.googleapis.com/css?family=Raleway:300,400,600);@charset "UTF-8"; @import url(https://fonts.googleapis.com/css?family=Raleway:300,400,600);
body[data-v-7435e7a7], .tasks-list[data-v-7435e7a7] {
padding-top: 20px;
}
.done label[data-v-7435e7a7] {
text-decoration: line-through;
}
@charset "UTF-8";
/*! /*!
* Bootstrap v3.3.7 (http://getbootstrap.com) * Bootstrap v3.3.7 (http://getbootstrap.com)
* Copyright 2011-2016 Twitter, Inc. * Copyright 2011-2016 Twitter, Inc.

407
public/js/app.js vendored

File diff suppressed because one or more lines are too long

100
public/js/jquery.js vendored

File diff suppressed because one or more lines are too long

@ -1,17 +1,12 @@
//import 'babel-polyfill'; import jQuery from 'jquery';
import vue from 'vue';
// import jQuery from 'jquery'; import Tasks from './components/Tasks.vue';
//
// window.$ = window.jQuery = jQuery;
//import vue from 'vue';
//import Tasks from './components/Tasks.vue';
import main from '../sass/app.scss'; import main from '../sass/app.scss';
window.$ = window.jQuery = jQuery;
const app = new vue({
// const app = new vue({ el: '#app',
// el: '#app', components: {Tasks}
// components: {Tasks} });
// });

@ -65,12 +65,17 @@
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><a href="{{ route('companies.index') }}"><i class="fa fa-building" <li><a href="{{ route('companies.index') }}"><i class="fa fa-building"
aria-hidden="true"></i>All Companies</a></li> aria-hidden="true"></i>All Companies</a>
<li><a href="{{ route('projects.index') }}"><i class="fas fa-briefcase"></i>All Projects</a>
</li> </li>
<li><a href="{{ route('tasks.index') }}"><i class="fas fa-tasks"></i>All Tasks</a></li> <li><a href="{{ route('projects.index') }}"><i class="fas fa-briefcase"></i>All
<li><a href="{{ route('users.index') }}"><i class="fas fa-user"></i>All Users</a></li> Projects</a>
<li><a href="{{ route('roles.index') }}"><i class="fas fa-envelope"></i>All Roles</a></li> </li>
<li><a href="{{ route('tasks.index') }}"><i class="fas fa-tasks"></i>All Tasks</a>
</li>
<li><a href="{{ route('users.index') }}"><i class="fas fa-user"></i>All Users</a>
</li>
<li><a href="{{ route('roles.index') }}"><i class="fas fa-envelope"></i>All
Roles</a></li>
</ul> </ul>
</li> </li>
@ -116,6 +121,9 @@
</div> </div>
<!-- Scripts --> <!-- Scripts -->
<script src="{{ asset('js/polyfill.js') }}"></script>
<script src="{{ asset('js/jquery.js') }}"></script>
<script src="{{ asset('js/vue.js') }}"></script>
<script src="{{ asset('js/app.js') }}"></script> <script src="{{ asset('js/app.js') }}"></script>
<script defer src="https://use.fontawesome.com/releases/v5.0.9/js/all.js" <script defer src="https://use.fontawesome.com/releases/v5.0.9/js/all.js"

@ -13,8 +13,9 @@
<Tasks></Tasks> <Tasks></Tasks>
</div> </div>
<script src="{{ asset('js/app.js') }}"></script>
<script src="{{ asset('js/jquery.js') }}"></script>
<script src="{{ asset('js/polyfill.js') }}"></script> <script src="{{ asset('js/polyfill.js') }}"></script>
<script src="{{ asset('js/jquery.js') }}"></script>
<script src="{{ asset('js/vue.js') }}"></script>
<script src="{{ asset('js/app.js') }}"></script>
</body> </body>
</html> </html>

21
webpack.config.js vendored

@ -1,5 +1,6 @@
const path = require('path'); const path = require('path');
const ExtractTextPlugin = require('extract-text-webpack-plugin'); const ExtractTextPlugin = require('extract-text-webpack-plugin');
const CopyWebpackPlugin = require('copy-webpack-plugin');
const extractSass = new ExtractTextPlugin({ const extractSass = new ExtractTextPlugin({
filename: (getPath) => { filename: (getPath) => {
@ -11,7 +12,6 @@ const extractSass = new ExtractTextPlugin({
const config = { const config = {
entry: { entry: {
app: './resources/assets/js/app.js', app: './resources/assets/js/app.js',
jquery: 'jquery',
polyfill: 'babel-polyfill' polyfill: 'babel-polyfill'
}, },
output: output:
@ -54,11 +54,22 @@ const config = {
] ]
}, },
plugins: [ plugins: [
extractSass extractSass,
new CopyWebpackPlugin([
{
from: path.resolve(__dirname,"resources/assets/js/jquery.js"),
to: path.resolve(__dirname,"public/js/jquery.js")
},
{
from: path.resolve(__dirname,"resources/assets/js/vue.js"),
to: path.resolve(__dirname,"public/js/vue.js")
}
])
], ],
// externals: { externals: {
// "vue": 'vue' jquery: "jQuery",
// }, vue: "Vue"
},
resolve: { resolve: {
alias: { alias: {
'vue$': 'vue/dist/vue.js' 'vue$': 'vue/dist/vue.js'

Loading…
Cancel
Save