Skip to content
Snippets Groups Projects
Commit be352337 authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Wir hatten eine merkwürdige Bootstrap Version eingebunden, welche Google

Fonts verwendete.
Die Verbindung zum Google Server wurde zwar vom Browser wegen unseres
CSP Headers unterbunden, aber ich habe dies nun auch entfernt.
parent 15cae146
No related branches found
No related tags found
No related merge requests found
{ {
"name": "laravel/laravel", "name" : "laravel/laravel",
"description": "The Laravel Framework.", "description" : "The Laravel Framework.",
"keywords": ["framework", "laravel"], "keywords" : [
"license": "MIT", "framework",
"type": "project", "laravel"
"require": { ],
"php": ">=5.6.4", "license" : "MIT",
"laravel/framework": "5.4.*", "type" : "project",
"laravel/tinker": "~1.0", "require" : {
"predis/predis": "^1.1" "php" : ">=5.6.4",
}, "laravel/framework" : "5.4.*",
"require-dev": { "laravel/tinker" : "~1.0",
"fzaninotto/faker": "~1.4", "predis/predis" : "^1.1"
"mockery/mockery": "0.9.*", },
"phpunit/phpunit": "~5.0" "require-dev" : {
}, "fzaninotto/faker" : "~1.4",
"autoload": { "mockery/mockery" : "0.9.*",
"classmap": [ "phpunit/phpunit" : "~5.0"
"database" },
], "autoload" : {
"psr-4": { "classmap" : [
"App\\": "app/" "database"
} ],
}, "psr-4" : {
"autoload-dev": { "App\\" : "app/"
"psr-4": { }
"Tests\\": "tests/" },
} "autoload-dev" : {
}, "psr-4" : {
"scripts": { "Tests\\" : "tests/"
"post-root-package-install": [ }
"php -r \"file_exists('.env') || copy('.env.example', '.env');\"" },
], "scripts" : {
"post-create-project-cmd": [ "post-root-package-install" : "php -r \"file_exists('.env') || copy('.env.example', '.env');\"",
"php artisan key:generate" "post-create-project-cmd" : "php artisan key:generate",
], "post-install-cmd" : [
"post-install-cmd": [ "Illuminate\\Foundation\\ComposerScripts::postInstall",
"Illuminate\\Foundation\\ComposerScripts::postInstall", "php artisan optimize"
"php artisan optimize" ],
], "post-update-cmd" : [
"post-update-cmd": [ "Illuminate\\Foundation\\ComposerScripts::postUpdate",
"Illuminate\\Foundation\\ComposerScripts::postUpdate", "php artisan optimize"
"php artisan optimize" ]
] },
}, "config" : {
"config": { "preferred-install" : "dist",
"preferred-install": "dist", "sort-packages" : true
"sort-packages": true }
} }
} \ No newline at end of file
{ {
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", "dev": "npm run development",
"watch": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
"hot": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", "watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
"production": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" "watch-poll": "npm run watch -- --watch-poll",
}, "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
"devDependencies": { "prod": "npm run production",
"axios": "^0.15.2", "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
"bootstrap-sass": "^3.3.7", },
"cross-env": "^5.0.5", "devDependencies": {
"jquery": "^3.1.0", "axios": "^0.16.2",
"laravel-mix": "^0.10.0", "cross-env": "^5.0.1",
"lodash": "^4.16.2", "jquery": "^3.1.1",
"vue": "^2.0.1" "laravel-mix": "^1.0",
} "lodash": "^4.17.4",
} "vue": "^2.1.10"
}
}
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
...@@ -34,6 +34,10 @@ nav>.main>#proxy-text { ...@@ -34,6 +34,10 @@ nav>.main>#proxy-text {
margin: 0 5px; margin: 0 5px;
} }
nav>.main>#proxy-text>a.btn{
padding: 1px 12px;
}
#site-proxy-iframe { #site-proxy-iframe {
border: 0; border: 0;
width: 100%; width: 100%;
......
window._ = require('lodash');
/**
* We'll load jQuery and the Bootstrap jQuery plugin which provides support
* for JavaScript based Bootstrap features such as modals and tabs. This
* code may be modified to fit the specific needs of your application.
*/
window.$ = window.jQuery = require('jquery');
require('bootstrap-sass');
/**
* Vue is a modern JavaScript library for building interactive web interfaces
* using reactive data binding and reusable components. Vue's API is clean
* and simple, leaving you to focus on building your next great project.
*/
window.Vue = require('vue');
/**
* We'll load the axios HTTP library which allows us to easily issue requests
* to our Laravel back-end. This library automatically handles sending the
* CSRF token as a header based on the value of the "XSRF" token cookie.
*/
window.axios = require('axios');
window.axios.defaults.headers.common = {
'X-CSRF-TOKEN': window.Laravel.csrfToken,
'X-Requested-With': 'XMLHttpRequest'
};
/**
* Echo exposes an expressive API for subscribing to channels and listening
* for events that are broadcast by Laravel. Echo and event broadcasting
* allows your team to easily build robust real-time web applications.
*/
// import Echo from "laravel-echo"
// window.Echo = new Echo({
// broadcaster: 'pusher',
// key: 'your-pusher-key'
// });
This diff is collapsed.
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
@yield('content') @yield('content')
<script src="/js/jquery.min.js"></script> <script src="/js/jquery.min.js"></script>
<script src="/js/bootstrap.min.js"></script>
<script src="/js/script.js"></script> <script src="/js/script.js"></script>
</body> </body>
</html> </html>
...@@ -12,7 +12,7 @@ const { mix } = require('laravel-mix'); ...@@ -12,7 +12,7 @@ const { mix } = require('laravel-mix');
*/ */
mix.combine([ mix.combine([
'resources/assets/css/app.css', 'resources/assets/css/bootstrap.min.css',
'resources/assets/bootstrap.min.css',
'resources/assets/css/style.css' 'resources/assets/css/style.css'
], 'public/css/all.css').version(); ], 'public/css/all.css').version();
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment