From 1954b60e13563a47391efcc99d944233452a3fd1 Mon Sep 17 00:00:00 2001
From: Aidaho <aidaho@roxy-wi.org>
Date: Thu, 18 Apr 2024 09:58:32 +0300
Subject: [PATCH] v7.2.4.0: Update requirements and refactor date formatting
 function

The requirements for el9, deb, and main have been updated to specifically use version 2.27.1 of the "requests" package. In addition, the date formatting function get_time_zoned_date in common.py has been refactored. The default format for the date has been moved to the function arguments, and the function now also checks if the provided date is an instance of datetime before processing it.
---
 app/modules/common/common.py                 |  2 ++
 {inc => app/static/js}/add.js                |  0
 {inc => app/static/js}/add_nginx.js          |  0
 {inc => app/static/js}/admin_settings.js     |  0
 {inc => app/static/js}/configshow.js         |  0
 {inc => app/static/js}/hotkeys.js            |  0
 {inc => app/static/js}/metrics.js            |  0
 {inc => app/static/js}/nprogress.js          |  0
 {inc => app/static/js}/overview.js           | 26 ++++++++++----------
 {inc => app/static/js}/runtimeapi.js         |  0
 {inc => app/static/js}/select2.js            |  0
 {inc => app/static/js}/smon.js               |  0
 app/static/js/waf.js                         |  2 +-
 app/templates/add.html                       |  2 +-
 app/templates/add_nginx.html                 |  2 +-
 app/templates/config.html                    |  2 +-
 app/templates/ha_cluster.html                |  2 +-
 app/templates/include/admin_settings.html    |  2 +-
 app/templates/include/main_head.html         |  6 ++---
 app/templates/include/smon/smon_history.html |  2 +-
 app/templates/metrics.html                   |  2 +-
 app/templates/ovw.html                       |  4 +--
 app/templates/portscanner.html               |  2 +-
 app/templates/runtimeapi.html                |  2 +-
 app/templates/sections.html                  |  2 +-
 app/templates/service.html                   |  4 +--
 app/templates/smon/agent.html                |  2 +-
 app/templates/smon/dashboard.html            |  2 +-
 app/templates/smon/manage_status_page.html   |  2 +-
 app/templates/smon/status_page.html          |  2 +-
 app/templates/waf.html                       |  6 ++---
 inc/script.js                                |  8 +++---
 index.html                                   |  6 ++---
 33 files changed, 47 insertions(+), 45 deletions(-)
 rename {inc => app/static/js}/add.js (100%)
 rename {inc => app/static/js}/add_nginx.js (100%)
 rename {inc => app/static/js}/admin_settings.js (100%)
 rename {inc => app/static/js}/configshow.js (100%)
 rename {inc => app/static/js}/hotkeys.js (100%)
 rename {inc => app/static/js}/metrics.js (100%)
 rename {inc => app/static/js}/nprogress.js (100%)
 rename {inc => app/static/js}/overview.js (96%)
 rename {inc => app/static/js}/runtimeapi.js (100%)
 rename {inc => app/static/js}/select2.js (100%)
 rename {inc => app/static/js}/smon.js (100%)

diff --git a/app/modules/common/common.py b/app/modules/common/common.py
index c0b74c0f..8049db66 100644
--- a/app/modules/common/common.py
+++ b/app/modules/common/common.py
@@ -40,6 +40,8 @@ def get_time_zoned_date(date: datetime, fmt: str = '%Y-%m-%d %H:%M:%S') -> str:
 	:rtype: str
 	"""
 	date_format = '%Y-%m-%d %H:%M:%S'
+	if not fmt:
+		fmt = date_format
 	if not isinstance(date, datetime):
 		date = datetime.strptime(date, date_format)
 	native = _convert_to_time_zone(date)
diff --git a/inc/add.js b/app/static/js/add.js
similarity index 100%
rename from inc/add.js
rename to app/static/js/add.js
diff --git a/inc/add_nginx.js b/app/static/js/add_nginx.js
similarity index 100%
rename from inc/add_nginx.js
rename to app/static/js/add_nginx.js
diff --git a/inc/admin_settings.js b/app/static/js/admin_settings.js
similarity index 100%
rename from inc/admin_settings.js
rename to app/static/js/admin_settings.js
diff --git a/inc/configshow.js b/app/static/js/configshow.js
similarity index 100%
rename from inc/configshow.js
rename to app/static/js/configshow.js
diff --git a/inc/hotkeys.js b/app/static/js/hotkeys.js
similarity index 100%
rename from inc/hotkeys.js
rename to app/static/js/hotkeys.js
diff --git a/inc/metrics.js b/app/static/js/metrics.js
similarity index 100%
rename from inc/metrics.js
rename to app/static/js/metrics.js
diff --git a/inc/nprogress.js b/app/static/js/nprogress.js
similarity index 100%
rename from inc/nprogress.js
rename to app/static/js/nprogress.js
diff --git a/inc/overview.js b/app/static/js/overview.js
similarity index 96%
rename from inc/overview.js
rename to app/static/js/overview.js
index 646dbef8..75b870a3 100644
--- a/inc/overview.js
+++ b/app/static/js/overview.js
@@ -10,7 +10,7 @@ function showHapserversCallBack(serv, hostnamea, service) {
 	$.ajax( {
 		url: "/app/service/" + service + "/" + serv + "/last-edit",
 		beforeSend: function() {
-			$("#edit_date_"+hostnamea).html('<img class="loading_small_haproxyservers" src="/app/static/images/loading.gif" />');
+			$("#edit_date_"+hostnamea).html('<img class="loading_small_haproxyservers" src="/images/loading.gif" />');
 		},
 		type: "GET",
 		success: function( data ) {
@@ -32,7 +32,7 @@ function overviewHapserverBackends(serv, hostnamea, service) {
 	$.ajax( {
 		url: "/app/service/" + service + "/backends/" + serv[0],
 		beforeSend: function() {
-			$("#top-"+hostnamea).html('<img class="loading_small" style="padding-left: 45%;" src="/app/static/images/loading.gif" />');
+			$("#top-"+hostnamea).html('<img class="loading_small" style="padding-left: 45%;" src="/images/loading.gif" />');
 		},
 		success: function( data ) {
 			if (data.indexOf('error:') != '-1') {
@@ -59,7 +59,7 @@ function showOverviewCallBack(serv, hostnamea) {
 	$.ajax( {
 		url: "/app/overview/server/"+serv,
 		beforeSend: function() {
-			$("#"+hostnamea).html('<img class="loading_small" src="/app/static/images/loading.gif" />');
+			$("#"+hostnamea).html('<img class="loading_small" src="/images/loading.gif" />');
 		},
 		type: "GET",
 		success: function( data ) {
@@ -77,7 +77,7 @@ function showServicesOverview() {
 	$.ajax( {
 		url: "/app/overview/services",
 		beforeSend: function() {
-			$("#services_ovw").html('<img class="loading_small_bin_bout" style="padding-left: 100%;padding-top: 40px;padding-bottom: 40px;" src="/app/static/images/loading.gif" />');
+			$("#services_ovw").html('<img class="loading_small_bin_bout" style="padding-left: 100%;padding-top: 40px;padding-bottom: 40px;" src="/images/loading.gif" />');
 
 		},
 		type: "GET",
@@ -321,8 +321,8 @@ function showBytes(serv) {
 		},
 		type: "POST",
 		beforeSend: function() {
-			$("#show_bin_bout").html('<img class="loading_small_bin_bout" src="/app/static/images/loading.gif" />');
-			$("#sessions").html('<img class="loading_small_bin_bout" src="/app/static/images/loading.gif" />');
+			$("#show_bin_bout").html('<img class="loading_small_bin_bout" src="/images/loading.gif" />');
+			$("#sessions").html('<img class="loading_small_bin_bout" src="/images/loading.gif" />');
 		},
 		success: function( data ) {
 			data = data.replace(/\s+/g,' ');
@@ -343,7 +343,7 @@ function showNginxConnections(serv) {
 		},
 		type: "POST",
 		beforeSend: function() {
-			$("#sessions").html('<img class="loading_small_bin_bout" src="/app/static/images/loading.gif" />');
+			$("#sessions").html('<img class="loading_small_bin_bout" src="/images/loading.gif" />');
 		},
 		success: function( data ) {
 			data = data.replace(/\s+/g,' ');
@@ -364,7 +364,7 @@ function showApachekBytes(serv) {
 		},
 		type: "POST",
 		beforeSend: function() {
-			$("#sessions").html('<img class="loading_small_bin_bout" src="/app/static/images/loading.gif" />');
+			$("#sessions").html('<img class="loading_small_bin_bout" src="/images/loading.gif" />');
 		},
 		success: function( data ) {
 			data = data.replace(/\s+/g,' ');
@@ -385,7 +385,7 @@ function keepalivedBecameMaster(serv) {
 		},
 		type: "POST",
 		beforeSend: function() {
-			$("#bin_bout").html('<img class="loading_small_bin_bout" src="/app/static/images/loading.gif" />');
+			$("#bin_bout").html('<img class="loading_small_bin_bout" src="/images/loading.gif" />');
 		},
 		success: function( data ) {
 			data = data.replace(/\s+/g,' ');
@@ -407,7 +407,7 @@ function showUsersOverview() {
 		// },
 		type: "GET",
 		beforeSend: function() {
-			$("#users-table").html('<img class="loading_small_bin_bout" style="padding-left: 100%;padding-top: 40px;padding-bottom: 40px;" src="/app/static/images/loading.gif" />');
+			$("#users-table").html('<img class="loading_small_bin_bout" style="padding-left: 100%;padding-top: 40px;padding-bottom: 40px;" src="/images/loading.gif" />');
 		},
 		success: function( data ) {
 			data = data.replace(/\s+/g,' ');
@@ -428,7 +428,7 @@ function showSubOverview() {
 		// },
 		type: "GET",
 		beforeSend: function() {
-			$("#sub-table").html('<img class="loading_small_bin_bout" style="padding-left: 40%;padding-top: 40px;padding-bottom: 40px;" src="/app/static/images/loading.gif" />');
+			$("#sub-table").html('<img class="loading_small_bin_bout" style="padding-left: 40%;padding-top: 40px;padding-bottom: 40px;" src="/images/loading.gif" />');
 		},
 		success: function( data ) {
 			data = data.replace(/\s+/g,' ');
@@ -576,13 +576,13 @@ function ShowOverviewLogs() {
 		url: "/app/overview/logs",
 		type: "GET",
 		beforeSend: function() {
-			$("#overview-logs").html('<img class="loading_small_bin_bout" style="padding-left: 40%;padding-top: 40px;padding-bottom: 40px;" src="/app/static/images/loading.gif" />');
+			$("#overview-logs").html('<img class="loading_small_bin_bout" style="padding-left: 40%;padding-top: 40px;padding-bottom: 40px;" src="/images/loading.gif" />');
 		},
 		success: function( data ) {
 			data = data.replace(/\s+/g,' ');
 			$("#overview-logs").html(data);
 			$.getScript("/inc/fontawesome.min.js")
-			$.getScript("/inc/overview.js")
+			$.getScript("/app/static/js/overview.js")
 		}
 	} );
 }
diff --git a/inc/runtimeapi.js b/app/static/js/runtimeapi.js
similarity index 100%
rename from inc/runtimeapi.js
rename to app/static/js/runtimeapi.js
diff --git a/inc/select2.js b/app/static/js/select2.js
similarity index 100%
rename from inc/select2.js
rename to app/static/js/select2.js
diff --git a/inc/smon.js b/app/static/js/smon.js
similarity index 100%
rename from inc/smon.js
rename to app/static/js/smon.js
diff --git a/app/static/js/waf.js b/app/static/js/waf.js
index 34f024d4..6a0efa78 100644
--- a/app/static/js/waf.js
+++ b/app/static/js/waf.js
@@ -1,6 +1,6 @@
 var awesome = "/inc/fontawesome.min.js"
 var waf = "/app/static/js/waf.js"
-var overview = "/inc/overview.js"
+var overview = "/app/static/js/overview.js"
 function showOverviewWaf(serv, hostnamea) {
 	var service = cur_url[1];
 	if (service == 'haproxy') {
diff --git a/app/templates/add.html b/app/templates/add.html
index b72a58dd..d12c7a4b 100644
--- a/app/templates/add.html
+++ b/app/templates/add.html
@@ -20,7 +20,7 @@
 {% set header_params = {'add-header': 'add-header', 'set-header': 'set-header', 'del-header': 'del-header'} %}
 {% set if_values = {'1':'Host name starts with','2':'Host name ends with','3':'Path starts with','4':'Path ends with', '6': 'Src ip'} %}
 
-<script src="/inc/add.js"></script>
+<script src="/app/static/js/add.js"></script>
 <div id="tabs">
 	<ul>
 		<li><a href="#create" title="{{lang.words.add|title()}} {{lang.words.proxy}}: {{lang.words.create|title()}} {{lang.words.proxy}} - Roxy-WI">{{lang.words.create|title()}} {{lang.words.proxy}}</a></li>
diff --git a/app/templates/add_nginx.html b/app/templates/add_nginx.html
index 34c83fc0..b7bf0f2d 100644
--- a/app/templates/add_nginx.html
+++ b/app/templates/add_nginx.html
@@ -5,7 +5,7 @@
 {% from 'include/input_macros.html' import input, checkbox, select %}
 {% set balance_params = dict() %}
 {% set balance_params = {'ip_hash':'ip_hash','least_conn':'least_conn','random':'random', 'round_robin': 'round-robin'} %}
-<script src="/inc/add_nginx.js"></script>
+<script src="/app/static/js/add_nginx.js"></script>
 <div id="tabs">
 	<ul>
 		<li><a href="#create" title="{{lang.words.add|title()}} {{lang.words.proxy}}: {{lang.words.add|title()}} {{lang.words.proxy}} - Roxy-WI">{{lang.words.add|title()}} {{lang.words.proxy}}</a></li>
diff --git a/app/templates/config.html b/app/templates/config.html
index bd542d9e..0410a586 100644
--- a/app/templates/config.html
+++ b/app/templates/config.html
@@ -24,7 +24,7 @@
 <script src="/inc/codemirror/mode/nginx.js"></script>
 <script src="/inc/codemirror/mode/haproxy.js"></script>
 <script src="/inc/codemirror/keymap/sublime.js"></script>
-<script src="/inc/configshow.js"></script>
+<script src="/app/static/js/configshow.js"></script>
 {% if is_serv_protected and g.user_params['role'] > 2 %}
 <meta http-equiv="refresh" content="0; url=/app/service">
 {% else %}
diff --git a/app/templates/ha_cluster.html b/app/templates/ha_cluster.html
index 2ccc26bf..8c06d622 100644
--- a/app/templates/ha_cluster.html
+++ b/app/templates/ha_cluster.html
@@ -5,7 +5,7 @@
 {% from 'include/input_macros.html' import input, checkbox, copy_to_clipboard %}
 <script src="/inc/users.js"></script>
 <script src="/app/static/js/ha.js"></script>
-<script src="/inc/overview.js"></script>
+<script src="/app/static/js/overview.js"></script>
 <link href="{{ url_for('static', filename='css/servers.css') }}" rel="stylesheet"/>
 <link href="{{ url_for('static', filename='css/smon.css') }}" rel="stylesheet">
 <link href="{{ url_for('static', filename='css/ha.css') }}" rel="stylesheet">
diff --git a/app/templates/include/admin_settings.html b/app/templates/include/admin_settings.html
index ac76f31c..2cf76424 100644
--- a/app/templates/include/admin_settings.html
+++ b/app/templates/include/admin_settings.html
@@ -12,7 +12,7 @@
     'smon': 'SMON',
     }
 %}
-<script defer src="/inc/admin_settings.js"></script>
+<script defer src="/app/static/js/admin_settings.js"></script>
 <table id="settings">
     <tbody>
         {% set section = namespace(section='') %}
diff --git a/app/templates/include/main_head.html b/app/templates/include/main_head.html
index a8197349..23bc7f37 100644
--- a/app/templates/include/main_head.html
+++ b/app/templates/include/main_head.html
@@ -39,10 +39,10 @@
 <script src="/inc/jquery-ui.min.js"></script>
 <script src="/inc/js.cookie.min.js"></script>
 <script src="/inc/reconnecting-websocket.js"></script>
-<script src="/inc/hotkeys.js"></script>
+<script src="/app/static/js/hotkeys.js"></script>
 <link href="{{ url_for('static', filename='css/select2.css') }}" rel="stylesheet" />
-<script src="/inc/select2.js"></script>
+<script src="/app/static/js/select2.js"></script>
 <script src="/inc/script.js"></script>
-<script src="/inc/nprogress.js"></script>
+<script src="/app/static/js/nprogress.js"></script>
 <link href="{{ url_for('static', filename='css/toastr-6.3.9.css') }}" rel="stylesheet"/>
 <script src="/inc/toastr.js"></script>
diff --git a/app/templates/include/smon/smon_history.html b/app/templates/include/smon/smon_history.html
index 445f0e73..88024156 100644
--- a/app/templates/include/smon/smon_history.html
+++ b/app/templates/include/smon/smon_history.html
@@ -10,7 +10,7 @@
 <link href="{{ url_for('static', filename='css/chart.min.css') }}" rel="stylesheet">
 <link href="{{ url_for('static', filename='css/smon.css') }}" rel="stylesheet">
 <script src="/inc/chart.min-4.3.0.js"></script>
-<script src="/inc/smon.js"></script>
+<script src="/app/static/js/smon.js"></script>
 <div class="row wrap1">
 {% for s in smon %}
     <div id="smon_name" class="col-md-8">
diff --git a/app/templates/metrics.html b/app/templates/metrics.html
index fc266401..926cae2f 100644
--- a/app/templates/metrics.html
+++ b/app/templates/metrics.html
@@ -16,7 +16,7 @@
 	}
 </style>
 <link href="{{ url_for('static', filename='css/chart.min.css') }}" rel="stylesheet">
-<script src="/inc/metrics.js"></script>
+<script src="/app/static/js/metrics.js"></script>
 <script src="/inc/chart.min-4.3.0.js"></script>
 <input type="hidden" id="service" value="{{service}}">
 {% if user_subscription['user_status'] == 0 %}
diff --git a/app/templates/ovw.html b/app/templates/ovw.html
index 04d98b56..58f63fed 100644
--- a/app/templates/ovw.html
+++ b/app/templates/ovw.html
@@ -3,9 +3,9 @@
 {% block h2 %}{{lang.menu_links.overview.h2}}{% endblock %}
 {% block content %}
 <link href="{{ url_for('static', filename='css/chart.min.css') }}" rel="stylesheet">
-<script src="/inc/metrics.js"></script>
+<script src="/app/static/js/metrics.js"></script>
 <script src="/inc/chart.min-4.3.0.js"></script>
-<script src="/inc/overview.js"></script>
+<script src="/app/static/js/overview.js"></script>
 <script>
 	$("#secIntervals").css("display", "none");
 	var ip = []
diff --git a/app/templates/portscanner.html b/app/templates/portscanner.html
index ac4b84b6..d8bfc81d 100644
--- a/app/templates/portscanner.html
+++ b/app/templates/portscanner.html
@@ -3,7 +3,7 @@
 {% block h2 %}{{ lang.p_s_page.p_s_title }}{% endblock %}
 {% block content %}
 {% from 'include/input_macros.html' import input, checkbox, select %}
-<script src="/inc/overview.js"></script>
+<script src="/app/static/js/overview.js"></script>
 <style>
 .alert-danger {
 	width: 250px;
diff --git a/app/templates/runtimeapi.html b/app/templates/runtimeapi.html
index 32646f92..2ee85fb8 100644
--- a/app/templates/runtimeapi.html
+++ b/app/templates/runtimeapi.html
@@ -5,7 +5,7 @@
 {% from 'include/input_macros.html' import input, checkbox, select %}
 <link href="{{ url_for('static', filename='css/table-6.3.9.css') }}" rel="stylesheet" type="text/css">
 <script type="text/javascript" charset="utf8" src="/inc/dataTables.min.js"></script>
-<script type="text/javascript" charset="utf8" src="/inc/runtimeapi.js"></script>
+<script type="text/javascript" charset="utf8" src="/app/static/js/runtimeapi.js"></script>
 <div id="tabs">
 	<ul>
 		<li><a href="#runtimeapi" title="Runtime API - Roxy-WI">Runtime API</a></li>
diff --git a/app/templates/sections.html b/app/templates/sections.html
index ee1400c7..a535c482 100644
--- a/app/templates/sections.html
+++ b/app/templates/sections.html
@@ -26,7 +26,7 @@
 <script src="/inc/codemirror/addon/scroll/annotatescrollbar.js"></script>
 <script src="/inc/codemirror/mode/haproxy.js"></script>
 <script src="/inc/codemirror/keymap/sublime.js"></script>
-<script src="/inc/configshow.js"></script>
+<script src="/app/static/js/configshow.js"></script>
 <div class="left-space" style="margin-top: var(--indent);">
 	<select autofocus required name="section" id="section">
 		<option disabled>------</option>
diff --git a/app/templates/service.html b/app/templates/service.html
index c6ce7cbb..de3253d1 100644
--- a/app/templates/service.html
+++ b/app/templates/service.html
@@ -3,9 +3,9 @@
 {% block h2 %}{{ lang.menu_links.hapservers.h2 }} {{ service_desc.service }}{% endblock %}
 {% block content %}
 {% from 'include/input_macros.html' import input, checkbox, select, copy_to_clipboard %}
-<script src="/inc/overview.js"></script>
+<script src="/app/static/js/overview.js"></script>
 <link href="{{ url_for('static', filename='css/chart.min.css') }}" rel="stylesheet">
-<script src="/inc/metrics.js"></script>
+<script src="/app/static/js/metrics.js"></script>
 <script src="/inc/chart.min-4.3.0.js"></script>
 {% if servers|length == 0 %} {% include 'include/getstarted.html' %} {% endif %}
 <style>
diff --git a/app/templates/smon/agent.html b/app/templates/smon/agent.html
index cd27a199..dbc63e0e 100644
--- a/app/templates/smon/agent.html
+++ b/app/templates/smon/agent.html
@@ -3,7 +3,7 @@
 {% block h2 %}{{ lang.menu_links.monitoring.smon.agent }}{% endblock %}
 {% block content %}
 {% from 'include/input_macros.html' import input, select %}
-<script src="/inc/smon.js"></script>
+<script src="/app/static/js/smon.js"></script>
 <script src="/inc/jquery.timeago.js" type="text/javascript"></script>
 <link href="{{ url_for('static', filename='css/servers.css') }}" rel="stylesheet"/>
 <link href="{{ url_for('static', filename='css/smon.css') }}" rel="stylesheet"/>
diff --git a/app/templates/smon/dashboard.html b/app/templates/smon/dashboard.html
index fa8ff423..ae194c48 100644
--- a/app/templates/smon/dashboard.html
+++ b/app/templates/smon/dashboard.html
@@ -3,7 +3,7 @@
 {% block h2 %}{{ lang.menu_links.monitoring.smon.dashboard }}{% endblock %}
 {% from 'include/input_macros.html' import input, checkbox, select %}
 {% block content %}
-<script src="/inc/smon.js"></script>
+<script src="/app/static/js/smon.js"></script>
 <script src="/inc/users.js"></script>
 <script src="/inc/fontawesome.min.js"></script>
 <script src="/inc/jquery.timeago.js" type="text/javascript"></script>
diff --git a/app/templates/smon/manage_status_page.html b/app/templates/smon/manage_status_page.html
index 11696324..f434951d 100644
--- a/app/templates/smon/manage_status_page.html
+++ b/app/templates/smon/manage_status_page.html
@@ -3,7 +3,7 @@
 {% block h2 %}{{ lang.menu_links.monitoring.smon.status_page }}{% endblock %}
 {% block content %}
 {% from 'include/input_macros.html' import input, select %}
-<script src="/inc/smon.js"></script>
+<script src="/app/static/js/smon.js"></script>
 <link href="{{ url_for('static', filename='css/servers.css') }}" rel="stylesheet"/>
 <link href="{{ url_for('static', filename='css/smon.css') }}" rel="stylesheet"/>
 
diff --git a/app/templates/smon/status_page.html b/app/templates/smon/status_page.html
index e8c2b7f6..bd8bf9d9 100644
--- a/app/templates/smon/status_page.html
+++ b/app/templates/smon/status_page.html
@@ -31,7 +31,7 @@
         <link href="{{ url_for('static', filename='css/smon.css') }}" rel="stylesheet">
         <script src="/inc/jquery-3.6.0.min.js"></script>
 		<script src="/inc/jquery-ui.min.js"></script>
-        <script src="/inc/smon.js"></script>
+        <script src="/app/static/js/smon.js"></script>
         <link href="{{ url_for('static', filename='css/toastr-6.3.9.css') }}" rel="stylesheet"/>
 		<script src="/inc/toastr.js"></script>
     </head>
diff --git a/app/templates/waf.html b/app/templates/waf.html
index 167539d9..fca67792 100644
--- a/app/templates/waf.html
+++ b/app/templates/waf.html
@@ -71,7 +71,7 @@
 		<script src="/inc/codemirror/mode/nginx.js"></script>
 		<script src="/inc/codemirror/mode/haproxy.js"></script>
 		<script src="/inc/codemirror/keymap/sublime.js"></script>
-		<script src="/inc/configshow.js"></script>
+		<script src="/app/static/js/configshow.js"></script>
 			<h4>{{lang.words.config|title()}} {{waf_rule_file}} {{lang.words.from|title()}} {{ serv }}</h4>
 			<form action="/app/waf/{{service}}/{{serv}}/rule/{{waf_rule_id}}/save" name="saveconfig" id="saveconfig" method="post">
 				<input type="hidden" value="{{ serv }}" name="serv">
@@ -177,8 +177,8 @@
 	</table>
 	{% if service == 'haproxy' %}
 	<link href="{{ url_for('static', filename='css/chart.min.css') }}" rel="stylesheet">
-	<script src="/inc/overview.js"></script>
-	<script src="/inc/metrics.js"></script>
+	<script src="/app/static/js/overview.js"></script>
+	<script src="/app/static/js/metrics.js"></script>
 	<script src="/inc/chart.min-4.3.0.js"></script>
 	<div id="table_metrics"></div>
 	<div class="metrics-time-range">
diff --git a/inc/script.js b/inc/script.js
index 23df09fa..da00035d 100644
--- a/inc/script.js
+++ b/inc/script.js
@@ -182,7 +182,7 @@ if(localStorage.getItem('restart')) {
 				} else {
 					$('#' + apply_div).html("You have made changes to the server: " + ip_for_restart + ". Changes will take effect only after restart. <a href='service' title='Overview'>Go to the HAProxy Overview page and restart</a><a href='#' title='close' id='apply_close' style='float: right'><b>X</b></a>");
 				}
-				$.getScript('/inc/overview.js');
+				$.getScript('/app/static/js/overview.js');
 			}
 		}
 	});
@@ -436,7 +436,7 @@ function showRemoteLogFiles() {
 			} else {
 				toastr.clear();
 				$("#remote_log_files").html(data);
-				$.getScript('/inc/configshow.js');
+				$.getScript('/app/static/js/configshow.js');
 			}
 		}
 	} );
@@ -538,7 +538,7 @@ function showConfig() {
 			} else {
 				toastr.clear();
 				$("#ajax").html(data);
-				$.getScript('/inc/configshow.js');
+				$.getScript('/app/static/js/configshow.js');
 				window.history.pushState("Show config", "Show config", "/app/config/" + service + "/" + $("#serv").val() + "/show/" + config_file_name);
 			}
 		}
@@ -607,7 +607,7 @@ function showUploadConfig() {
 				toastr.clear();
 				$("#ajax").html(data);
 				window.history.pushState("Show config", "Show config", "/app/config/versions/" + service + "/" + serv + "/" + configver);
-				$.getScript('/inc/configshow.js');
+				$.getScript('/app/static/js/configshow.js');
 			}
 		}
 	} );
diff --git a/index.html b/index.html
index 814faf24..572a242c 100644
--- a/index.html
+++ b/index.html
@@ -35,12 +35,12 @@
 		<link href="/app/static/css/jquery-ui.structure.min.css" rel="stylesheet">
 		<script src="/inc/jquery-3.6.0.min.js"></script>
 		<script src="/inc/jquery-ui.min.js"></script>
-		<script src="/inc/nprogress.js"></script>
+		<script src="/app/static/js/nprogress.js"></script>
 		<script defer src="/inc/fa-solid.min.js"></script>
 		<script defer src="/inc/fontawesome.min.js"></script>
 		<link href="/app/static/css/awesome-6.3.9.css" rel="stylesheet">
 		<link href="/app/static/css/chart.min.css" rel="stylesheet">
-		<script src="/inc/metrics.js"></script>
+		<script src="/app/static/js/metrics.js"></script>
 		<script src="/inc/chart.min-4.3.0.js"></script>
 		<link rel="stylesheet" href="/inc/codemirror/lib/codemirror.css">
 		<script src="/inc/codemirror/lib/codemirror.js"></script>
@@ -51,7 +51,7 @@
 		<script src="/inc/toastr.js"></script>
 		<script defer src="/inc/ion.sound.min.js"></script>
 		<link href="/app/static/css/select2.css" rel="stylesheet" />
-		<script src="/inc/select2.js"></script>
+		<script src="/app/static/js/select2.js"></script>
 		<script src="/inc/reconnecting-websocket.js"></script>
 		<link href="/app/static/css/table-6.3.9.css" rel="stylesheet" type="text/css">
 		<script type="text/javascript" charset="utf8" src="/inc/dataTables.min.js"></script>