diff --git a/skolehjem/package-lock.json b/skolehjem/package-lock.json
index 9851b09..faf2f7e 100644
--- a/skolehjem/package-lock.json
+++ b/skolehjem/package-lock.json
@@ -1850,12 +1850,6 @@
"integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
"dev": true
},
- "bootstrap": {
- "version": "4.5.0",
- "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.5.0.tgz",
- "integrity": "sha512-Z93QoXvodoVslA+PWNdk23Hze4RBYIkpb5h8I2HY2Tu2h7A0LpAgLcyrhrSUyo2/Oxm2l1fRZPs1e5hnxnliXA==",
- "dev": true
- },
"brace-expansion": {
"version": "1.1.11",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -2938,12 +2932,6 @@
"integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=",
"dev": true
},
- "de-indent": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
- "integrity": "sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0=",
- "dev": true
- },
"debug": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
@@ -5076,12 +5064,6 @@
}
}
},
- "jquery": {
- "version": "3.5.1",
- "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz",
- "integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==",
- "dev": true
- },
"js-tokens": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -6440,12 +6422,6 @@
"find-up": "^2.1.0"
}
},
- "popper.js": {
- "version": "1.16.1",
- "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
- "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==",
- "dev": true
- },
"portfinder": {
"version": "1.0.26",
"resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.26.tgz",
@@ -9124,12 +9100,6 @@
"integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
"dev": true
},
- "vue": {
- "version": "2.6.11",
- "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.11.tgz",
- "integrity": "sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ==",
- "dev": true
- },
"vue-hot-reload-api": {
"version": "2.3.4",
"resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz",
@@ -9159,16 +9129,6 @@
"loader-utils": "^1.0.2"
}
},
- "vue-template-compiler": {
- "version": "2.6.11",
- "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.11.tgz",
- "integrity": "sha512-KIq15bvQDrcCjpGjrAhx4mUlyyHfdmTaoNfeoATHLAiWB+MU3cx4lOzMwrnUh9cCxy0Lt1T11hAFY6TQgroUAA==",
- "dev": true,
- "requires": {
- "de-indent": "^1.0.2",
- "he": "^1.1.0"
- }
- },
"vue-template-es2015-compiler": {
"version": "1.9.1",
"resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz",
diff --git a/skolehjem/package.json b/skolehjem/package.json
index 8ed93d1..153da11 100644
--- a/skolehjem/package.json
+++ b/skolehjem/package.json
@@ -11,16 +11,11 @@
},
"devDependencies": {
"axios": "^0.19",
- "bootstrap": "^4.0.0",
"cross-env": "^7.0",
- "jquery": "^3.2",
"laravel-mix": "^5.0.1",
"lodash": "^4.17.13",
- "popper.js": "^1.12",
"resolve-url-loader": "^2.3.1",
"sass": "^1.20.1",
- "sass-loader": "^8.0.0",
- "vue": "^2.5.17",
- "vue-template-compiler": "^2.6.10"
+ "sass-loader": "^8.0.0"
}
}
diff --git a/skolehjem/resources/js/app.js b/skolehjem/resources/js/app.js
index aa19e31..91c4dcf 100644
--- a/skolehjem/resources/js/app.js
+++ b/skolehjem/resources/js/app.js
@@ -6,7 +6,7 @@
require('./bootstrap');
-window.Vue = require('vue');
+// window.Vue = require('vue');
/**
* The following block of code may be used to automatically register your
@@ -19,7 +19,7 @@ window.Vue = require('vue');
// const files = require.context('./', true, /\.vue$/i)
// files.keys().map(key => Vue.component(key.split('/').pop().split('.')[0], files(key).default))
-Vue.component('example-component', require('./components/ExampleComponent.vue').default);
+// Vue.component('example-component', require('./components/ExampleComponent.vue').default);
/**
* Next, we will create a fresh Vue application instance and attach it to
@@ -27,6 +27,6 @@ Vue.component('example-component', require('./components/ExampleComponent.vue').
* or customize the JavaScript scaffolding to fit your unique needs.
*/
-const app = new Vue({
- el: '#app',
-});
+// const app = new Vue({
+// el: '#app',
+// });
diff --git a/skolehjem/resources/js/bootstrap.js b/skolehjem/resources/js/bootstrap.js
index 63605fa..7335cf6 100644
--- a/skolehjem/resources/js/bootstrap.js
+++ b/skolehjem/resources/js/bootstrap.js
@@ -6,12 +6,12 @@ window._ = require('lodash');
* code may be modified to fit the specific needs of your application.
*/
-try {
- window.Popper = require('popper.js').default;
- window.$ = window.jQuery = require('jquery');
-
- require('bootstrap');
-} catch (e) {}
+// try {
+// window.Popper = require('popper.js').default;
+// window.$ = window.jQuery = require('jquery');
+//
+// require('bootstrap');
+// } catch (e) {}
/**
* We'll load the axios HTTP library which allows us to easily issue requests
diff --git a/skolehjem/resources/sass/app.scss b/skolehjem/resources/sass/app.scss
index 3193ffa..0d9b616 100644
--- a/skolehjem/resources/sass/app.scss
+++ b/skolehjem/resources/sass/app.scss
@@ -5,4 +5,4 @@
@import 'variables';
// Bootstrap
-@import '~bootstrap/scss/bootstrap';
+//@import '~bootstrap/scss/bootstrap';
diff --git a/skolehjem/resources/views/index.blade.php b/skolehjem/resources/views/index.blade.php
index 02c5596..82bd044 100644
--- a/skolehjem/resources/views/index.blade.php
+++ b/skolehjem/resources/views/index.blade.php
@@ -1,5 +1,7 @@
@extends("layout.base")
+
+
@section("content")
Hej
@endsection
diff --git a/skolehjem/resources/views/layout/base.blade.php b/skolehjem/resources/views/layout/base.blade.php
index 8cc7ac7..5d3009b 100644
--- a/skolehjem/resources/views/layout/base.blade.php
+++ b/skolehjem/resources/views/layout/base.blade.php
@@ -1,6 +1,8 @@
+ @yield("title")
+