A new update to the dev branch

This commit is contained in:
Donald Zou
2023-11-28 16:37:16 -05:00
parent e06cc1bd2d
commit f07508073f
35 changed files with 853 additions and 7307 deletions

View File

@@ -184,7 +184,6 @@
</main>
</div>
</div>
{% include "modal.html" %}
<div class="position-fixed top-0 right-0 p-3 toastContainer" style="z-index: 5; right: 0; top: 50px;"></div>
{% include "tools.html" %}
@@ -192,7 +191,7 @@
{% include "footer.html" %}
<script src="{{ url_for('static',filename='js/configuration.js') }}"></script>
<script src="{{ url_for('static',filename='js/configurationTool.js') }}"></script>
<script src="{{ url_for('static',filename='js/wireguard.min.js') }}"></script>
<script src="{{ url_for('static',filename='js/wireguard.js') }}"></script>
<script>
configurations.setConfigurationName("{{ conf_data['name'] }}");
configurations.setActiveConfigurationName();

View File

@@ -1,4 +1,4 @@
<script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-fQybjgWLrvvRgtW6bFlB7jaZrFsaBXjsOMm/tB9LTS58ONXgqbR9W8oWht/amnpF" crossorigin="anonymous"></script>
<script src="{{ url_for('static',filename='js/tools.min.js') }}"></script>
<script src="{{ url_for('static',filename='js/tools.js') }}"></script>
<script src="{{ url_for('static',filename='js/pwa.js') }}"></script>

View File

@@ -156,10 +156,9 @@
</div>
</div>
</div>
{% include "tools.html" %}
{% include "tools.html" %}
</body>
{% include "footer.html" %}
<script src="{{ url_for('static',filename='js/wireguard.min.js') }}"></script>
<script src="{{ url_for('static',filename='js/wireguard.js') }}"></script>
<script src="{{ url_for('static',filename='js/index.js') }}"></script>
</html>

View File

@@ -371,58 +371,32 @@
</div>
<pre id="addCconfigurationAlertMessage" class="index-alert d-none"></pre>
<form id="add_configuration_form">
<div class="row">
<div class="col-sm">
<div class="form-group">
<label for="editConfigurationName">Configuration Name</label>
<p id="editConfigurationName"></p>
</div>
</div>
<div class="col-sm">
<div class="form-group">
<label for="editConfigurationAddress">Address</label>
<p class="codeFont" id="editConfigurationAddress"></p>
</div>
</div>
</div>
<div class="form-group">
<div>
<label for="editConfigurationPrivateKey">Private Key <code>*</code></label>
</div>
<div class="input-group">
<input type="text" class="form-control codeFont" id="editConfigurationPrivateKey"
name="editConfigurationPrivateKey" required>
<div class="input-group-append">
<button type="button" class="btn btn-danger" id="reGeneratePrivateKey"
data-toggle="tooltip" data-placement="top" title="Regenerate Key"><i
class="bi bi-arrow-repeat"></i></button>
</div>
<div id="editConfigurationPrivateKeyFeedback" class="input-feedback"></div>
</div>
</div>
<div class="row">
<div class="col-sm">
<div class="form-group">
<label for="editConfigurationName">Configuration Name <code>*</code></label>
<input type="text" class="form-control" id="editConfigurationName"
name="editConfigurationName" required>
<div id="editConfigurationNameFeedback" class="input-feedback"></div>
</div>
</div>
<div class="col-sm">
<div class="form-group">
<label for="editConfigurationListenPort">Listen Port <code>*</code></label>
<input type="number" class="form-control codeFont" id="editConfigurationListenPort"
name="editConfigurationListenPort" required>
<div id="editConfigurationListenPortFeedback" class="input-feedback"></div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm">
<div class="form-group">
<label for="editConfigurationAddress">Address <code>*</code>
</label>
<input type="text" class="form-control codeFont" id="editConfigurationAddress"
placeholder="Ex: 192.168.0.1/24" name="editConfigurationAddress" required>
<div id="editConfigurationAddressFeedback" class="input-feedback"></div>
</div>
</div>
<div class="col-sm">
<div class="form-group">
<label for=""># of available IPs</label>
<p class="editConfigurationAvailableIPs">N/A</p>
</div>
</div>
<label for="editConfigurationPrivateKey">Private Key</label>
<p class="codeFont" id="editConfigurationPrivateKey"></p>
</div>
<hr>
<div class="form-group">
<label for="editConfigurationListenPort">Listen Port <code>*</code></label>
<input type="number" class="form-control codeFont" id="editConfigurationListenPort"
name="editConfigurationListenPort" required>
<div id="editConfigurationListenPortFeedback" class="input-feedback"></div>
</div>
<div class="form-group">
<label for="editConfigurationPreUp">PreUp</label>
<input type="text" class="form-control codeFont" id="editConfigurationPreUp"
@@ -447,15 +421,7 @@
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-primary" id="editConfigurationBtn">Add</button>
<div class="text-primary editConfigurationStatus editConfigurationAddStatus d-none">
<div class="spinner-border spinner-border-sm" role="status"><span class="sr-only">Loading...</span>
</div>
Editing Configuration
</div>
<div class="text-primary editConfigurationStatus editConfigurationToggleStatus d-none waiting">
<i class="bi bi-circle"></i> Toggle Configuration
</div>
<button type="button" class="btn btn-primary" id="editConfigurationBtn">Save</button>
</div>
</div>
</div>

View File

@@ -181,69 +181,9 @@
</div>
</div>
{% include "tools.html" %}
<div class="position-fixed top-0 right-0 p-3 toastContainer" style="z-index: 5; right: 0; top: 50px;"></div>
</body>
{% include "footer.html" %}
<script>
$(".sb-settings-url").addClass("active")
$(".confirm_modal").click(function () {
$(".app_new_ip").html($("#app_ip")[0].value)
$(".app_new_port").html($("#app_port")[0].value)
})
<script src="{{ url_for('static',filename='js/settings.js') }}"></script>
$(".confirm_restart").click(function () {
$(".cancel_restart").remove()
countdown = 7;
$.post('/update_app_ip_port', $('.update_app_ip_port').serialize())
url = $("#app_ip")[0].value + ":" + $("#app_port")[0].value;
$(".confirm_restart").attr("disabled", "disabled")
setInterval(function () {
if (countdown === 0) {
window.location.replace("http://" + url);
}
$(".confirm_restart").html("Redirecting you in " + countdown + " seconds.")
countdown--;
}, 1000)
});
$(".change_path").click(function () {
$(this).attr("disabled", "disabled");
countdown = 5;
setInterval(function () {
if (countdown === 0) {
location.reload()
}
$(".change_path").html("Redirecting you in " + countdown + " seconds.")
countdown--;
}, 1000)
$.post('/update_wg_conf_path', $('.update_wg_conf_path').serialize())
});
$(".bottomNavSettings").addClass("active");
$(".theme-switch-btn").on("click", function(){
if (!$(this).hasClass("active")){
let theme = $(this).data("theme");
$(".theme-switch-btn").removeClass("active");
$(this).addClass("active");
$.ajax({
method: "POST",
url: "/api/settings/setTheme",
headers: {"Content-Type": "application/json"},
data: JSON.stringify({"theme": theme})
}).done(function(res){
if (res.status == true){
if (theme == "light"){
$("#darkThemeCSS").remove();
}else{
$("head").append('<link rel="stylesheet" type="text/css" href="/static/css/theme/dark.min.css" id="darkThemeCSS">');
}
}
});
}
});
</script>
</html>