mirror of
https://github.com/snipe/snipe-it.git
synced 2025-03-05 20:52:15 -08:00
Fixed vue issue with api
This commit is contained in:
parent
11d86d83b6
commit
33ffc58ffe
21
gulpfile.js
21
gulpfile.js
|
@ -1,6 +1,8 @@
|
||||||
var elixir = require('laravel-elixir');
|
var elixir = require('laravel-elixir');
|
||||||
require('laravel-elixir-codeception-standalone');
|
require('laravel-elixir-codeception-standalone');
|
||||||
require('laravel-elixir-phpcs');
|
require('laravel-elixir-phpcs');
|
||||||
|
require('laravel-elixir-vue-2');
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
| Elixir Asset Management
|
| Elixir Asset Management
|
||||||
|
@ -13,16 +15,21 @@ require('laravel-elixir-phpcs');
|
||||||
*/
|
*/
|
||||||
|
|
||||||
elixir(function(mix) {
|
elixir(function(mix) {
|
||||||
mix.less(['AdminLTE.less','skins/skin-blue.less','ekko-lightbox.less','overrides.less','fontawesome-animated.css'],'public/assets/css');
|
|
||||||
|
|
||||||
|
|
||||||
|
mix.less(['AdminLTE.less',
|
||||||
|
'skins/skin-blue.less',
|
||||||
|
'ekko-lightbox.less',
|
||||||
|
'overrides.less',
|
||||||
|
'fontawesome-animated.css'],
|
||||||
|
'public/assets/css')
|
||||||
|
.webpack('app.js');
|
||||||
mix.scripts([
|
mix.scripts([
|
||||||
'plugins/jQuery/jQuery-2.1.4.min.js',
|
'plugins/jQuery/jQuery-2.1.4.min.js',
|
||||||
'plugins/jQueryUI/jquery-ui.js',
|
'plugins/jQueryUI/jquery-ui.js',
|
||||||
'plugins/jQueryUI/jquery.ui.widget.js',
|
'plugins/jQueryUI/jquery.ui.widget.js',
|
||||||
'plugins/iframe-transport/jquery.iframe-transport.js',
|
'plugins/iframe-transport/jquery.iframe-transport.js',
|
||||||
'plugins/fileupload/jquery.fileupload.js',
|
'plugins/fileupload/jquery.fileupload.js',
|
||||||
'bootstrap.js',
|
'bootstrap-js.js',
|
||||||
'plugins/fastclick/fastclick.js',
|
'plugins/fastclick/fastclick.js',
|
||||||
'plugins/slimScroll/jquery.slimscroll.js',
|
'plugins/slimScroll/jquery.slimscroll.js',
|
||||||
'plugins/select2/select2.full.min.js',
|
'plugins/select2/select2.full.min.js',
|
||||||
|
@ -32,14 +39,14 @@ elixir(function(mix) {
|
||||||
'plugins/select2/select2.js',
|
'plugins/select2/select2.js',
|
||||||
'plugins/iCheck/icheck.js',
|
'plugins/iCheck/icheck.js',
|
||||||
'ekko-lightbox.js',
|
'ekko-lightbox.js',
|
||||||
'snipeit.js',
|
'snipeit.js'
|
||||||
'app.js'
|
|
||||||
|
|
||||||
],'public/assets/js');
|
],'public/assets/js')
|
||||||
|
;
|
||||||
mix.version(['assets/css/app.css','assets/js/all.js']);
|
mix.version(['assets/css/app.css','assets/js/all.js']);
|
||||||
|
|
||||||
|
|
||||||
mix.codeception(null, { flags: '--report' });
|
// mix.codeception(null, { flags: '--report' });
|
||||||
|
|
||||||
|
|
||||||
// mix.phpcs([
|
// mix.phpcs([
|
||||||
|
|
BIN
public/js/app.js
BIN
public/js/app.js
Binary file not shown.
|
@ -746,7 +746,39 @@ function _init() {
|
||||||
};
|
};
|
||||||
}(jQuery));
|
}(jQuery));
|
||||||
|
|
||||||
//-------------
|
|
||||||
//- PIE CHART -
|
/**
|
||||||
//-------------
|
* First we will load all of this project's JavaScript dependencies which
|
||||||
// Get context with jQuery - using jQuery's .get() method.
|
* include Vue and Vue Resource. This gives a great starting point for
|
||||||
|
* building robust, powerful web applications using Vue and Laravel.
|
||||||
|
*/
|
||||||
|
|
||||||
|
require('./bootstrap');
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Next, we will create a fresh Vue application instance and attach it to
|
||||||
|
* the page. Then, you may begin adding components to this application
|
||||||
|
* or customize the JavaScript scaffolding to fit your unique needs.
|
||||||
|
*/
|
||||||
|
|
||||||
|
Vue.component(
|
||||||
|
'passport-clients',
|
||||||
|
require('./components/passport/Clients.vue')
|
||||||
|
);
|
||||||
|
|
||||||
|
Vue.component(
|
||||||
|
'passport-authorized-clients',
|
||||||
|
require('./components/passport/AuthorizedClients.vue')
|
||||||
|
);
|
||||||
|
|
||||||
|
Vue.component(
|
||||||
|
'passport-personal-access-tokens',
|
||||||
|
require('./components/passport/PersonalAccessTokens.vue')
|
||||||
|
);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
const app = new Vue({
|
||||||
|
el: '#app'
|
||||||
|
});
|
||||||
|
|
||||||
|
|
2386
resources/assets/js/bootstrap.js
vendored
2386
resources/assets/js/bootstrap.js
vendored
File diff suppressed because it is too large
Load diff
|
@ -621,6 +621,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
<script src="/js/app.js"></script>
|
||||||
<script src="{{ asset(elixir('assets/js/all.js')) }}"></script>
|
<script src="{{ asset(elixir('assets/js/all.js')) }}"></script>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
|
|
@ -104,6 +104,16 @@ Route::group([ 'prefix' => 'admin','middleware' => ['web','auth']], function ()
|
||||||
# Settings
|
# Settings
|
||||||
Route::group([ 'prefix' => 'app' ], function () {
|
Route::group([ 'prefix' => 'app' ], function () {
|
||||||
|
|
||||||
|
Route::get(
|
||||||
|
'api',
|
||||||
|
array('as' => 'api',
|
||||||
|
function () {
|
||||||
|
return view('settings/api');
|
||||||
|
}
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
|
||||||
Route::post('purge', ['as' => 'purge', 'uses' => 'SettingsController@postPurge']);
|
Route::post('purge', ['as' => 'purge', 'uses' => 'SettingsController@postPurge']);
|
||||||
Route::get('edit', [ 'as' => 'edit/settings', 'uses' => 'SettingsController@getEdit' ]);
|
Route::get('edit', [ 'as' => 'edit/settings', 'uses' => 'SettingsController@getEdit' ]);
|
||||||
Route::post('edit', 'SettingsController@postEdit');
|
Route::post('edit', 'SettingsController@postEdit');
|
||||||
|
|
Loading…
Reference in a new issue