School/WasteInformationServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reedited sweetalert version changes

Browse Source
This commit is contained in:
lukas-heiligenbrunner 2020-04-14 16:55:09 +02:00
parent 54e2cd7856
commit 1a481db4dd
8 changed files with 49 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/resources/wwwroot/dashboard.html
View File

@ -416,7 +416,7 @@
<!-- Bootstrap 4 --> <!-- Bootstrap 4 -->
<script src="lib/AdminLTE/plugins/bootstrap/js/bootstrap.bundle.min.js"></script> <script src="lib/AdminLTE/plugins/bootstrap/js/bootstrap.bundle.min.js"></script>
<!-- AdminLTE App --> <!-- AdminLTE App -->
<!--<script src="lib/AdminLTE/dist/js/adminlte.js"></script>--> <script src="lib/AdminLTE/dist/js/adminlte.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.4.1/js/bootstrap-datepicker.min.js"></script> <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.4.1/js/bootstrap-datepicker.min.js"></script>
<!-- DataTables --> <!-- DataTables -->

5
src/resources/wwwroot/index.html
View File

@ -3,19 +3,18 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>Login Page</title> <title>Login Page</title>
<!--Made with love by Mutiullah Samim -->
<!-- Latest compiled and minified CSS --> <!-- Latest compiled and minified CSS -->
<link rel="stylesheet" href="lib/bootstrap.min.css"> <link rel="stylesheet" href="lib/bootstrap.min.css">
<!-- jQuery library --> <!-- jQuery library -->
<script src="lib/jquery.min.js"></script> <script src="lib/AdminLTE/plugins/jquery/jquery.min.js"></script>
<!-- Popper JS --> <!-- Popper JS -->
<script src="lib/popper.min.js"></script> <script src="lib/popper.min.js"></script>
<!-- Latest compiled JavaScript --> <!-- Latest compiled JavaScript -->
<script src="lib/bootstrap.min.js"></script> <script src="lib/AdminLTE/plugins/bootstrap/js/bootstrap.min.js"></script>
<!--Fontawesome CDN--> <!--Fontawesome CDN-->
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.3.1/css/all.css" <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.3.1/css/all.css"

18
src/resources/wwwroot/js/dashboard.js
View File

@ -63,7 +63,7 @@ class Dashboard {
console.log(data); console.log(data);
if (data.status == "inserted") { if (data.status == "inserted") {
Swal.fire({ Swal.fire({
type: "success", icon: "success",
title: 'Successfully created city!', title: 'Successfully created city!',
html: 'This alert closes automatically.', html: 'This alert closes automatically.',
timer: 1000, timer: 1000,
@ -74,7 +74,7 @@ class Dashboard {
_this.reloadtable(); _this.reloadtable();
} else if (data.status == "exists") { } else if (data.status == "exists") {
Swal.fire({ Swal.fire({
type: "warning", icon: "warning",
title: 'Name already exists in db', title: 'Name already exists in db',
html: 'Close popup.', html: 'Close popup.',
}).then((result) => { }).then((result) => {
@ -179,7 +179,7 @@ class Dashboard {
$.post('/senddata/newdate', 'action=newdate&cityname=' + cityname.html() + "&zone=" + zone.html() + "&wastetype=" + wastetype.html() + "&date=" + date.val(), function (data) { $.post('/senddata/newdate', 'action=newdate&cityname=' + cityname.html() + "&zone=" + zone.html() + "&wastetype=" + wastetype.html() + "&date=" + date.val(), function (data) {
if (data.status == "success") { if (data.status == "success") {
Swal.fire({ Swal.fire({
type: "success", icon: "success",
title: 'Successfully created Date!', title: 'Successfully created Date!',
html: 'This alert closes automatically.', html: 'This alert closes automatically.',
timer: 1000, timer: 1000,
@ -195,7 +195,7 @@ class Dashboard {
_this.reloadDateTable(); _this.reloadDateTable();
} else if (data.status == "citydoesntexist") { } else if (data.status == "citydoesntexist") {
Swal.fire({ Swal.fire({
type: "warning", icon: "warning",
title: 'city name doesnt exist', title: 'city name doesnt exist',
html: 'Close popup.', html: 'Close popup.',
}).then((result) => { }).then((result) => {
@ -275,7 +275,7 @@ class Dashboard {
console.log(data); console.log(data);
if (data.status === "success") { if (data.status === "success") {
Swal.fire({ Swal.fire({
type: "success", icon: "success",
title: 'Successfully deleted city!', title: 'Successfully deleted city!',
html: 'This alert closes automatically.', html: 'This alert closes automatically.',
timer: 1000, timer: 1000,
@ -286,7 +286,7 @@ class Dashboard {
reloadtable(); reloadtable();
} else if (data.status === "dependenciesnotdeleted") { } else if (data.status === "dependenciesnotdeleted") {
Swal.fire({ Swal.fire({
type: "warning", icon: "warning",
title: 'This city is a dependency of a date', title: 'This city is a dependency of a date',
html: 'Do you want do delete it anyway with all dependencies?', html: 'Do you want do delete it anyway with all dependencies?',
}).then((result) => { }).then((result) => {
@ -302,7 +302,7 @@ class Dashboard {
_this.citytable = $("#example2").DataTable(); _this.citytable = $("#example2").DataTable();
} else if (data.query == "nodbconn") { } else if (data.query == "nodbconn") {
Swal.fire({ Swal.fire({
type: "error", icon: "error",
title: 'No connection to Database', title: 'No connection to Database',
html: 'Setup DB here --> <a href="index.html">click<a/>.', html: 'Setup DB here --> <a href="index.html">click<a/>.',
}).then((result) => { }).then((result) => {
@ -345,7 +345,7 @@ class Dashboard {
console.log(data); console.log(data);
if (data.status == "success") { if (data.status == "success") {
Swal.fire({ Swal.fire({
type: "success", icon: "success",
title: 'Successfully deleted city!', title: 'Successfully deleted city!',
html: 'This alert closes automatically.', html: 'This alert closes automatically.',
timer: 1000, timer: 1000,
@ -356,7 +356,7 @@ class Dashboard {
reloadDateTable(); reloadDateTable();
} else if (data.status == "dependenciesnotdeleted") { } else if (data.status == "dependenciesnotdeleted") {
Swal.fire({ Swal.fire({
type: "warning", icon: "warning",
title: 'This city is a dependency of a date', title: 'This city is a dependency of a date',
html: 'Do you want do delete it anyway with all dependencies?', html: 'Do you want do delete it anyway with all dependencies?',
}).then((result) => { }).then((result) => {

8
src/resources/wwwroot/js/device.js
View File

@ -124,7 +124,7 @@ class Device {
$.post('/senddata/Devicedata', 'action=addtodb&deviceid=' + id + '&cityname=' + cityname + '&zonename=' + zone + '&wastetype=' + wastetype, function (data) { $.post('/senddata/Devicedata', 'action=addtodb&deviceid=' + id + '&cityname=' + cityname + '&zonename=' + zone + '&wastetype=' + wastetype, function (data) {
if (data.success) { if (data.success) {
Swal.fire({ Swal.fire({
type: "success", icon: "success",
title: 'Successfully configured!', title: 'Successfully configured!',
html: 'This alert closes added.', html: 'This alert closes added.',
timer: 1000, timer: 1000,
@ -157,7 +157,7 @@ class Device {
console.log(data); console.log(data);
if (data.status === "success") { if (data.status === "success") {
Swal.fire({ Swal.fire({
type: "success", icon: "success",
title: 'Successfully deleted city!', title: 'Successfully deleted city!',
html: 'This alert closes automatically.', html: 'This alert closes automatically.',
timer: 1000, timer: 1000,
@ -168,7 +168,7 @@ class Device {
_this.reloadDevices(); _this.reloadDevices();
} else if (data.status === "dependenciesnotdeleted") { } else if (data.status === "dependenciesnotdeleted") {
Swal.fire({ Swal.fire({
type: "warning", icon: "warning",
title: 'This city is a dependency of a date', title: 'This city is a dependency of a date',
html: 'Do you want do delete it anyway with all dependencies?', html: 'Do you want do delete it anyway with all dependencies?',
}).then((result) => { }).then((result) => {
@ -261,7 +261,7 @@ class Device {
$.post('/senddata/Devicedata', 'action=savetodb&deviceid=' + id + '&cityname=' + cityname + '&zonename=' + zone + '&wastetype=' + wastetype + '&devicename=' + devicename + '&devicelocation=' + devicelocation, function (data) { $.post('/senddata/Devicedata', 'action=savetodb&deviceid=' + id + '&cityname=' + cityname + '&zonename=' + zone + '&wastetype=' + wastetype + '&devicename=' + devicename + '&devicelocation=' + devicelocation, function (data) {
if (data.success) { if (data.success) {
Swal.fire({ Swal.fire({
type: "success", icon: "success",
title: 'Successfully configured!', title: 'Successfully configured!',
html: 'This alert closes automatically.', html: 'This alert closes automatically.',
timer: 1000, timer: 1000,

2
src/resources/wwwroot/js/index.js
View File

@ -10,7 +10,7 @@ $(document).ready(function () {
console.log(data); console.log(data);
if (data.status == "nodbconn"){ if (data.status == "nodbconn"){
Swal.fire({ Swal.fire({
type: "error", icon: "error",
title: 'No connection to Database', title: 'No connection to Database',
html: 'Setup DB here --> <a href="index.html">click<a/>.', html: 'Setup DB here --> <a href="index.html">click<a/>.',
}).then((result) => { }).then((result) => {

25
src/resources/wwwroot/js/register.js
View File

@ -1,5 +1,5 @@
$(document).ready(function() { $(document).ready(function () {
$('#loginbtn').click(function(e) { $('#loginbtn').click(function (e) {
e.preventDefault(); e.preventDefault();
console.log("clicked login button"); console.log("clicked login button");
var username = $("#usernamefield")[0].value; var username = $("#usernamefield")[0].value;
@ -11,12 +11,13 @@ $(document).ready(function() {
if (password != replypassword) { if (password != replypassword) {
console.log("passwords doesnt match"); console.log("passwords doesnt match");
}else { } else {
$.post('/senddata/registerpost','username='+username+ $.post('/senddata/registerpost',
'&firstname='+firstname+ 'username=' + username +
'&lastname='+lastname+ '&firstname=' + firstname +
'&email='+email+ '&lastname=' + lastname +
'&password='+password,function(data){ '&email=' + email +
'&password=' + password, function (data) {
console.log(data); console.log(data);
@ -24,14 +25,14 @@ $(document).ready(function() {
console.log("successfully registered!"); console.log("successfully registered!");
$("#successbar").show(); $("#successbar").show();
setTimeout(function() { setTimeout(function () {
window.location = 'index.html'; window.location = 'index.html';
},3000); }, 3000);
}else { } else {
console.log("error!"); console.log("error!");
$("#errorbar").show(); $("#errorbar").show();
} }
},'json'); }, 'json');
} }
}); });
}); });

7
src/resources/wwwroot/lib/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
src/resources/wwwroot/lib/jquery.min.js vendored
View File

File diff suppressed because one or more lines are too long