diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index e5e65be..ce3b544 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -16,7 +16,6 @@ public function boot() { // Schema::defaultStringLength(191); - \URL::forceScheme('https'); } /** diff --git a/bower.json b/bower.json index 4b78089..a004134 100644 --- a/bower.json +++ b/bower.json @@ -16,7 +16,6 @@ "tests" ], "dependencies": { - "bootstrap": "v4.0.0-beta", "font-awesome": "^4.7.0", "jquery": "^3.1.1", "jquery-ujs": "^1.2.2", diff --git a/config/session.php b/config/session.php index 822d476..fe2f7bf 100644 --- a/config/session.php +++ b/config/session.php @@ -44,7 +44,7 @@ | */ - 'encrypt' => true, + 'encrypt' => false, /* |-------------------------------------------------------------------------- diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss index b3c2423..fa23bd8 100644 --- a/resources/assets/sass/app.scss +++ b/resources/assets/sass/app.scss @@ -8,7 +8,7 @@ $link-hover-decoration: none !default; $font-family-base: -apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif; $font-size-base: 0.8125rem !default; $body-color: rgba(0, 0, 0, 0.7); -@import '../../../bower_components/bootstrap/scss/bootstrap'; +@import "~bootstrap/scss/bootstrap"; // Font Awesome $fa-font-path: '/static/fonts/font-awesome' !default; diff --git a/webpack.mix.js b/webpack.mix.js index b154ab6..aed1b3f 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -15,6 +15,7 @@ mix.autoload({}) // Base Directories var bower = 'bower_components/'; +var npm = 'node_modules/'; // Copiando Fontes mix.copy('bower_components/font-awesome/fonts', 'public/static/fonts/font-awesome/'); @@ -26,7 +27,7 @@ mix.sass('resources/assets/sass/app.scss', 'public/static/css/app.css').version( mix.scripts([ bower + 'jquery/dist/jquery.min.js', bower + 'popper.js/dist/umd/popper.js', - bower + 'bootstrap/dist/js/bootstrap.min.js', + npm + 'bootstrap/dist/js/bootstrap.bundle.js', bower + 'jquery-ujs/src/rails.js', bower + 'jquery-mask-plugin/src/jquery.mask.js', bower + 'alertifyjs/src/js/alertify.js',