Commit 33bc7730 authored by K9260's avatar K9260 🎅🏼

Merge, fix säädataan

parent fe0894bb
......@@ -162,10 +162,7 @@ return [
Illuminate\Validation\ValidationServiceProvider::class,
Illuminate\View\ViewServiceProvider::class,
<<<<<<< HEAD
=======
>>>>>>> origin/dev_g2700
/*
* Package Service Providers...
*/
......@@ -230,10 +227,6 @@ return [
'Validator' => Illuminate\Support\Facades\Validator::class,
'View' => Illuminate\Support\Facades\View::class,
<<<<<<< HEAD
=======
>>>>>>> origin/dev_g2700
],
];
......@@ -3133,13 +3133,14 @@ __webpack_require__.r(__webpack_exports__);
this.temperatures = [];
this.temperaturesWithC = [];
this.hourLabels = [];
this.dateLabels = [];
this.summary = this.weatherData[this.hour + this.date].summary;
this.currentTemp = Math.round(this.weatherData[this.hour + this.date].temperature);
this.feelsLike = Math.round(this.weatherData[this.hour + this.date].apparentTemperature);
this.icon += this.weatherData[this.hour + this.date].icon + ".png"; //Timestampit 0 - 21
this.dateLabels = []; //Timestampit 0 - 21
if (this.date > 0) {
this.summary = this.weatherData[this.hour + this.date - this.time].summary;
this.currentTemp = Math.round(this.weatherData[this.hour + this.date - this.time].temperature);
this.feelsLike = Math.round(this.weatherData[this.hour + this.date - this.time].apparentTemperature);
this.icon += this.weatherData[this.hour + this.date].icon + ".png";
for (var i = this.hour + this.date - this.time; i <= this.hour + this.date - this.time + this.ticks; i++) {
this.hourLabels.push((j * this.interval % 24).toString());
j++;
......@@ -3155,6 +3156,11 @@ __webpack_require__.r(__webpack_exports__);
}
} //Timestampit this.time - 21
else {
this.summary = this.weatherData[this.hour + this.date].summary;
this.currentTemp = Math.round(this.weatherData[this.hour + this.date].temperature);
this.feelsLike = Math.round(this.weatherData[this.hour + this.date].apparentTemperature);
this.icon += this.weatherData[this.hour + this.date].icon + ".png";
for (var i = this.hour + this.date; i <= this.hour + this.date + this.ticks; i++) {
this.hourLabels.push(((this.time + j * this.interval) % 24).toString());
j++;
......@@ -7863,7 +7869,7 @@ exports = module.exports = __webpack_require__(/*! ../../../node_modules/css-loa
// module
exports.push([module.i, "\n#icon {\n float: left;\n width: calc(20% - 40px);\n margin-right: 40px;\n margin-top: 10px;\n}\n#chart {\n float: left;\n width: 80%;\n margin-top: 10px;\n}\n.left {\n float: left;\n width: 100%;\n font-size: calc(0.6vw + 30px);\n text-align: left;\n margin-bottom: 10px;\n}\n.temperature {\n margin-right: 20px;\n margin-top: 10px;\n padding: 5px;\n font-size: 1.5vw;\n background-color: #f0fdff;\n border-radius: 5px;\n min-width: 80px;\n}\n#summary {\n width: 100%;\n text-align: left;\n font-size: calc(0.2vw + 16px);\n}\n#location {\n font-size: calc(0.2vw + 16px);\n}\n#feels-like {\n font-size: calc(0.2vw + 24px);\n}\n.label {\n float: left;\n font-size: calc(0.2vw + 8px);\n margin-bottom: -5px;\n}\n#top {\n margin-left: 10px;\n margin-right: 10px;\n}\n \n\n", ""]);
exports.push([module.i, "\n#icon {\n float: left;\n width: calc(20% - 40px);\n margin-right: 40px;\n margin-top: 10px;\n}\n#chart {\n float: left;\n width: 80%;\n margin-top: 10px;\n}\n.left {\n float: left;\n width: 100%;\n font-size: calc(0.6vw + 30px);\n text-align: left;\n margin-bottom: 10px;\n}\n.temperature {\n margin-right: 20px;\n margin-top: 10px;\n padding: 5px;\n font-size: 1.5vw;\n background-color: #f0fdff;\n border-radius: 5px;\n min-width: 80px;\n}\n#summary {\n width: 100%;\n text-align: left;\n font-size: calc(0.2vw + 16px);\n}\n#location {\n font-size: calc(0.2vw + 16px);\n}\n#feels-like {\n font-size: calc(0.2vw + 24px);\n}\n.label {\n float: left;\n font-size: calc(0.2vw + 8px);\n margin-bottom: -5px;\n}\n#top {\n margin-left: 10px;\n margin-right: 10px;\n}\n\n", ""]);
// exports
......@@ -114796,10 +114802,10 @@ var app = new vue__WEBPACK_IMPORTED_MODULE_0___default.a({
/***/ (function(module, exports, __webpack_require__) {
window._ = __webpack_require__(/*! lodash */ "./node_modules/lodash/lodash.js");
/**
* 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.
/**
* 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.
*/
try {
......@@ -114808,19 +114814,19 @@ try {
__webpack_require__(/*! bootstrap */ "./node_modules/bootstrap/dist/js/bootstrap.js");
} catch (e) {}
/**
* 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.
/**
* 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 = __webpack_require__(/*! axios */ "./node_modules/axios/index.js");
window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
/**
* Next we will register the CSRF Token as a common header with Axios so that
* all outgoing HTTP requests automatically have it attached. This is just
* a simple convenience so we don't have to attach every token manually.
/**
* Next we will register the CSRF Token as a common header with Axios so that
* all outgoing HTTP requests automatically have it attached. This is just
* a simple convenience so we don't have to attach every token manually.
*/
var token = document.head.querySelector('meta[name="csrf-token"]');
......@@ -114830,10 +114836,10 @@ if (token) {
} else {
console.error('CSRF token not found: https://laravel.com/docs/csrf#csrf-x-csrf-token');
}
/**
* 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.
/**
* 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.Pusher = require('pusher-js');
......@@ -82,12 +82,16 @@
this.hourLabels = [];
this.dateLabels = [];
this.summary = this.weatherData[this.hour + this.date].summary;
this.currentTemp = Math.round(this.weatherData[this.hour + this.date].temperature);
this.feelsLike = Math.round(this.weatherData[this.hour + this.date].apparentTemperature);
this.icon += this.weatherData[this.hour + this.date].icon + ".png";
//Timestampit 0 - 21
if (this.date > 0) {
this.summary = this.weatherData[this.hour + this.date - this.time].summary;
this.currentTemp = Math.round(this.weatherData[this.hour + this.date - this.time].temperature);
this.feelsLike = Math.round(this.weatherData[this.hour + this.date - this.time].apparentTemperature);
this.icon += this.weatherData[this.hour + this.date].icon + ".png";
for (var i = this.hour + this.date - this.time; i <= this.hour + this.date - this.time + this.ticks; i++) {
this.hourLabels.push(((j * this.interval) % 24).toString());
j++;
......@@ -102,6 +106,12 @@
}
//Timestampit this.time - 21
else {
this.summary = this.weatherData[this.hour + this.date].summary;
this.currentTemp = Math.round(this.weatherData[this.hour + this.date].temperature);
this.feelsLike = Math.round(this.weatherData[this.hour + this.date].apparentTemperature);
this.icon += this.weatherData[this.hour + this.date].icon + ".png";
for (var i = this.hour + this.date; i <= this.hour + this.date + this.ticks; i++) {
this.hourLabels.push(((this.time + j * this.interval) % 24).toString());
j++;
......@@ -198,6 +208,5 @@
margin-left: 10px;
margin-right: 10px;
}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment