maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

update api and ajax handling and response

Browse Source
This commit is contained in:
envoyr
2022-02-20 11:38:08 +01:00
parent d5e53cc7db
commit 424a00b39e
65 changed files with 881 additions and 2736 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
templates/Froxlor/assets/js/main.js
View File

@@ -3198,10 +3198,76 @@ function withinMaxClamp(min, value, max) {
/***/ }),
/***/ "./templates/Froxlor/src/main.js":
/*!***************************************!*\
!*** ./templates/Froxlor/src/main.js ***!
\***************************************/
/***/ "./templates/Froxlor/src/js/components/newsfeed.js":
/*!*********************************************************!*\
!*** ./templates/Froxlor/src/js/components/newsfeed.js ***!
\*********************************************************/
/***/ (() => {
$(document).ready(function () {
/*
* newsfeed
*/
if (document.getElementById('newsfeed')) {
var role = "";
if (typeof $("#newsfeed").data("role") !== "undefined") {
role = "&role=" + $("#newsfeed").data("role");
}
$.ajax({
url: "lib/ajax.php?action=newsfeed" + role + "&theme=" + window.$theme + "&s=" + window.$session,
type: "GET",
success: function success(data) {
$("#newsfeeditems").html(data);
},
error: function error(request, status, _error) {
console.log(request, status, _error);
$("#newsfeeditems").html('<div class="alert alert-warning" role="alert">Error loading newsfeed</div>');
}
});
}
});
/***/ }),
/***/ "./templates/Froxlor/src/js/components/updatecheck.js":
/*!************************************************************!*\
!*** ./templates/Froxlor/src/js/components/updatecheck.js ***!
\************************************************************/
/***/ (() => {
$(document).ready(function () {
/*
* updatecheck
*/
if (document.getElementById('updatecheck')) {
var role = "";
if (typeof $("#updatecheck").data("role") !== "undefined") {
role = "&role=" + $("#newsfeed").data("role");
}
$.ajax({
url: "lib/ajax.php?action=updatecheck" + role + "&theme=" + window.$theme + "&s=" + window.$session,
type: "GET",
success: function success(data) {
$("#newsfeeditems").html(data);
},
error: function error(request, status, _error) {
console.log(request, status, _error);
$("#newsfeeditems").html('<div class="alert alert-warning" role="alert">Error loading newsfeed</div>');
}
});
}
});
/***/ }),
/***/ "./templates/Froxlor/src/js/main.js":
/*!******************************************!*\
!*** ./templates/Froxlor/src/js/main.js ***!
\******************************************/
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
"use strict";
@@ -3212,30 +3278,13 @@ __webpack_require__.r(__webpack_exports__);
window.$ = window.jQuery = __webpack_require__(/*! jquery */ "./node_modules/jquery/dist/jquery.js");
$(document).ready(function () {
var mytheme = 'Froxlor';
/*
* newsfeed
*/
window.$theme = 'Froxlor';
window.$session = $('meta[name="froxlor-session"]').attr('content');
}); // Load components
if (document.getElementById('newsfeed')) {
var role = "";
__webpack_require__(/*! ./components/newsfeed */ "./templates/Froxlor/src/js/components/newsfeed.js");
if (typeof $("#newsfeed").data("role") !== "undefined") {
role = "&role=" + $("#newsfeed").data("role");
}
$.ajax({
url: "lib/ajax.php?action=newsfeed" + role + "&theme=" + mytheme,
type: "GET",
success: function success(data) {
$("#newsfeeditems").html(data);
},
error: function error(a, b) {
$("#newsfeeditems").html('<div class="alert alert-warning" role="alert">Error loading newsfeed</div>');
}
});
}
});
__webpack_require__(/*! ./components/updatecheck */ "./templates/Froxlor/src/js/components/updatecheck.js");
/***/ }),
@@ -19334,7 +19383,7 @@ __webpack_require__.r(__webpack_exports__);
/******/ // startup
/******/ // Load entry module and return exports
/******/ // This entry module depends on other loaded chunks and execution need to be delayed
/******/ __webpack_require__.O(undefined, ["templates/Froxlor/assets/css/dark","templates/Froxlor/assets/css/main"], () => (__webpack_require__("./templates/Froxlor/src/main.js")))
/******/ __webpack_require__.O(undefined, ["templates/Froxlor/assets/css/dark","templates/Froxlor/assets/css/main"], () => (__webpack_require__("./templates/Froxlor/src/js/main.js")))
/******/ __webpack_require__.O(undefined, ["templates/Froxlor/assets/css/dark","templates/Froxlor/assets/css/main"], () => (__webpack_require__("./templates/Froxlor/src/scss/main.scss")))
/******/ var __webpack_exports__ = __webpack_require__.O(undefined, ["templates/Froxlor/assets/css/dark","templates/Froxlor/assets/css/main"], () => (__webpack_require__("./templates/Froxlor/src/scss/dark.scss")))
/******/ __webpack_exports__ = __webpack_require__.O(__webpack_exports__);

3
templates/Froxlor/base.html.twig
View File

@@ -7,6 +7,9 @@
<meta name="robots" content="noindex, nofollow, noarchive"/>
<meta name="googlebot" content="nosnippet"/>
<!-- Session -->
<meta name="froxlor-session" content="{{ s }}">
<!-- CSS -->
{% if theme_css is empty %}
<link href="{{ basehref|default('') }}templates/Froxlor/assets/css/main.css" rel="stylesheet" type="text/css" />

24
templates/Froxlor/src/js/components/newsfeed.js Normal file
View File

@@ -0,0 +1,24 @@
$(document).ready(function () {
/*
* newsfeed
*/
if (document.getElementById('newsfeed')) {
let role = "";
if (typeof $("#newsfeed").data("role") !== "undefined") {
role = "&role=" + $("#newsfeed").data("role");
}
$.ajax({
url: "lib/ajax.php?action=newsfeed" + role + "&theme=" + window.$theme + "&s=" + window.$session,
type: "GET",
success: function (data) {
$("#newsfeeditems").html(data);
},
error: function (request, status, error) {
console.log(request, status, error)
$("#newsfeeditems").html('<div class="alert alert-warning" role="alert">Error loading newsfeed</div>');
}
});
}
});

24
templates/Froxlor/src/js/components/updatecheck.js Normal file
View File

@@ -0,0 +1,24 @@
$(document).ready(function () {
/*
* updatecheck
*/
if (document.getElementById('updatecheck')) {
let role = "";
if (typeof $("#updatecheck").data("role") !== "undefined") {
role = "&role=" + $("#newsfeed").data("role");
}
$.ajax({
url: "lib/ajax.php?action=updatecheck" + role + "&theme=" + window.$theme + "&s=" + window.$session,
type: "GET",
success: function (data) {
$("#newsfeeditems").html(data);
},
error: function (request, status, error) {
console.log(request, status, error)
$("#newsfeeditems").html('<div class="alert alert-warning" role="alert">Error loading newsfeed</div>');
}
});
}
});

14
templates/Froxlor/src/js/main.js Normal file
View File

@@ -0,0 +1,14 @@
// load bootstrap
import 'bootstrap';
// load jquery
window.$ = window.jQuery = require('jquery');
$(document).ready(function () {
window.$theme = 'Froxlor';
window.$session = $('meta[name="froxlor-session"]').attr('content');
});
// Load components
require('./components/newsfeed')
require('./components/updatecheck')

43
templates/Froxlor/src/main.js
View File

@@ -1,43 +0,0 @@
// load bootstrap
import 'bootstrap';
// load jquery
window.$ = window.jQuery = require('jquery');
function getUrlVars() {
var vars = [], hash;
var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
for (var i = 0; i < hashes.length; i++) {
hash = hashes[i].split('=');
vars.push(hash[0]);
vars[hash[0]] = hash[1];
}
return vars;
}
$(document).ready(function () {
const mytheme = 'Froxlor';
/*
* newsfeed
*/
if (document.getElementById('newsfeed')) {
var role = "";
if (typeof $("#newsfeed").data("role") !== "undefined") {
role = "&role=" + $("#newsfeed").data("role");
}
var s = getUrlVars()["s"];
$.ajax({
url: "lib/ajax.php?action=newsfeed" + role + "&theme=" + mytheme + "&s=" + s,
type: "GET",
success: function (data) {
$("#newsfeeditems").html(data);
},
error: function (a, b) {
$("#newsfeeditems").html('<div class="alert alert-warning" role="alert">Error loading newsfeed</div>');
}
});
}
});

5
templates/Froxlor/userarea.html.twig
View File

@@ -32,6 +32,11 @@
</div>
<div class="collapse navbar-collapse justify-content-end px-3" id="navbar">
<ul class="navbar-nav align-items-center">
<li class="nav-item text-nowrap d-block">
<a class="btn btn-link" title="{{ lng('login.logout') }}" href="{{ linker({'section': 'index', 'action': 'logout'}) }}">
<i class="fas fa-power-off"></i>
</a>
</li>
<li class="nav-item text-nowrap d-block me-2">
<a class="btn btn-primary btn-sm d-block" href="{{ linker({'section': 'index'}) }}">
<i class="fa fa-dashboard"></i> {{ lng('panel.dashboard') }}