diff --git a/web/js/confighandler.js b/web/js/confighandler.js
index 1e46725..481cf4e 100644
--- a/web/js/confighandler.js
+++ b/web/js/confighandler.js
@@ -315,8 +315,8 @@ function submitData() {
}
}
- $("#fmlist-integration").prop("checked", data.extras ? data.extras?.fmlist_integration : "true");
- $('#fmlist-omid').val(data.extras?.fmlist_omid);
+ $("#fmlist-integration").prop("checked", data.extras ? data.extras?.fmlistIntegration : "true");
+ $('#fmlist-omid').val(data.extras?.fmlistOmid);
})
.catch(error => {
console.error('Error fetching data:', error.message);
diff --git a/web/js/init.js b/web/js/init.js
index d73378c..1ca3395 100644
--- a/web/js/init.js
+++ b/web/js/init.js
@@ -1,9 +1,9 @@
-var currentDate = new Date('Sep 15, 2024 00:00:00');
+var currentDate = new Date('Sep 15, 2024 15:00:00');
var day = currentDate.getDate();
var month = currentDate.getMonth() + 1; // Months are zero-indexed, so add 1
var year = currentDate.getFullYear();
var formattedDate = day + '/' + month + '/' + year;
-var currentVersion = 'v1.3.0 [' + formattedDate + ']';
+var currentVersion = 'v1.3.0.1 [' + formattedDate + ']';
getInitialSettings();
removeUrlParameters(); // Call this function to remove URL parameters
diff --git a/web/js/main.js b/web/js/main.js
index 30b1c6e..bcae21e 100644
--- a/web/js/main.js
+++ b/web/js/main.js
@@ -181,6 +181,38 @@ $(document).ready(function () {
textInput.focus();
});
initTooltips();
+
+ //FMLIST logging
+ $('#log-fmlist').on('click', function() {
+ console.log('asdfdasf');
+ $.ajax({
+ url: './log_fmlist',
+ method: 'GET',
+ success: function(response) {
+ // Show a success toast with the response message
+ sendToast('success', 'Log successful', response, false, true);
+ },
+ error: function(xhr) {
+ let errorMessage;
+
+ // Handle different error status codes with custom messages
+ switch (xhr.status) {
+ case 429:
+ errorMessage = xhr.responseText;
+ break;
+ case 500:
+ errorMessage = 'Server error: ' + xhr.responseText || 'Internal Server Error';
+ break;
+ default:
+ errorMessage = xhr.statusText || 'An error occurred';
+ }
+
+ // Show an error toast with the specific error message
+ sendToast('error', 'Log failed', errorMessage, false, true);
+ }
+ });
+ });
+
});
function getServerTime() {
@@ -834,7 +866,7 @@ const updateDataElements = throttle(function(parsedData) {
}
if(parsedData.txInfo.tx.length > 1 && parsedData.txInfo.dist > 150 && parsedData.txInfo.dist < 4000) {
- $('#log-fmlist').attr('disabled', 'false').removeClass('btn-disabled cursor-disabled');
+ $('#log-fmlist').removeAttr('disabled').removeClass('btn-disabled cursor-disabled');
} else {
$('#log-fmlist').attr('disabled', 'true').addClass('btn-disabled cursor-disabled');
}
@@ -1016,18 +1048,4 @@ function fillPresets() {
tuneTo(Number(presetText));
});
}
-}
-
-//FMLIST logging
-$('#log-fmlist').on('click', function() {
- $.ajax({
- url: './log_fmlist',
- method: 'GET',
- success: function(response) {
- sendToast('success', 'Log successful', response, false, true);
- },
- error: function(xhr) {
- sendToast('error', 'Log failed', xhr.statusText, false, true);
- }
- });
-});
+}
\ No newline at end of file
diff --git a/web/js/settings.js b/web/js/settings.js
index df997f6..882c2ee 100644
--- a/web/js/settings.js
+++ b/web/js/settings.js
@@ -155,6 +155,13 @@ $(document).ready(() => {
$('.version-string').text(currentVersion);
setBg();
+
+ updateIconState();
+
+ // Update icons when the checkbox state changes
+ $('input[type="checkbox"]').change(function() {
+ updateIconState();
+ });
});
function getQueryParameter(name) {
@@ -162,6 +169,17 @@ function getQueryParameter(name) {
return urlParams.get(name);
}
+function updateIconState() {
+ $('input[type="checkbox"]').each(function() {
+ var icon = $(this).siblings('label').find('i');
+ if ($(this).is(':checked')) {
+ icon.removeClass('fa-toggle-off').addClass('fa-toggle-on');
+ } else {
+ icon.removeClass('fa-toggle-on').addClass('fa-toggle-off');
+ }
+ });
+}
+
function setTheme(themeName) {
const themeColors = themes[themeName];
if (themeColors) {
@@ -191,4 +209,5 @@ function setBg() {
} else {
$('body').css('background', 'var(--color-main)');
}
-}
\ No newline at end of file
+}
+
diff --git a/web/setup.ejs b/web/setup.ejs
index 3ada2a1..fad5ac0 100644
--- a/web/setup.ejs
+++ b/web/setup.ejs
@@ -118,11 +118,11 @@
@@ -156,7 +156,7 @@