Netsyms/HelpingHelenaApp
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use callAPI method

Browse Source
This commit is contained in:
Skylar Ittner 2019-03-26 14:15:45 -06:00
parent 5434fe841e
commit a92b59f0a4
2 changed files with 27 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/index.html
View File

@ -11,6 +11,7 @@
<link rel="stylesheet" href="fonts/roboto/Roboto.css"> <link rel="stylesheet" href="fonts/roboto/Roboto.css">
<link rel="stylesheet" href="node_modules/framework7/css/framework7.bundle.min.css"> <link rel="stylesheet" href="node_modules/framework7/css/framework7.bundle.min.css">
<link rel="stylesheet" href="node_modules/@fortawesome/fontawesome-free/css/all.min.css"> <link rel="stylesheet" href="node_modules/@fortawesome/fontawesome-free/css/all.min.css">
<link rel="stylesheet" href="css/styles.css">
<title>Helping Helena</title> <title>Helping Helena</title>
@ -28,6 +29,7 @@
<script src="node_modules/framework7/js/framework7.bundle.min.js"></script> <script src="node_modules/framework7/js/framework7.bundle.min.js"></script>
<script src="settings.js"></script> <script src="settings.js"></script>
<script src="js/api.js"></script>
<script src="routes.js"></script> <script src="routes.js"></script>
<script src="js/platform.js"></script> <script src="js/platform.js"></script>
<script src="js/main.js"></script> <script src="js/main.js"></script>

51
www/js/setup1.js
View File

@ -11,37 +11,21 @@ $('#username').on("keyup", function () {
function checkAndSave(username, password, type) { function checkAndSave(username, password, type) {
app.preloader.show(); app.preloader.show();
callAPI("getkey", {
var url = SETTINGS["server"] + "/getkey";
$.ajax({
url: url,
dataType: "json",
cache: false,
method: "POST",
data: {
username: username, username: username,
password: password, password: password
type: type }, function (data) {
},
success: function (data) {
app.preloader.hide(); app.preloader.hide();
if (data.status == "OK") { localStorage.setItem("key", data.key);
localStorage.setItem("username", username); localStorage.setItem("username", username);
localStorage.setItem("password", password); localStorage.setItem("password", password);
localStorage.setItem("accttype", type); localStorage.setItem("accttype", type);
localStorage.setItem("configured", true); localStorage.setItem("configured", true);
// Restart the app to re-read the config // Restart the app to re-read the config
restartApplication(); restartApplication();
} else if (data.status == "ERROR") { }, function (msg) {
app.dialog.alert(data.msg, "Error");
} else {
app.dialog.alert("", "Error");
}
}, error: function () {
app.preloader.hide(); app.preloader.hide();
app.dialog.alert("Could not sign in. Check your credentials and connection.", "Error"); app.dialog.alert(msg, "Error");
}
}); });
} }
@ -60,30 +44,15 @@ function createAccount() {
app.preloader.show(); app.preloader.show();
var url = SETTINGS["server"] + "/signup"; callAPI("signup", {
$.ajax({
url: url,
dataType: "json",
cache: false,
method: "POST",
data: {
username: username, username: username,
password: password, password: password,
accttype: type accttype: type
}, }, function (data) {
success: function (data) {
app.preloader.hide(); app.preloader.hide();
if (data.status == "OK") {
checkAndSave(username, password, type); checkAndSave(username, password, type);
} else if (data.status == "ERROR") { }, function (msg) {
app.dialog.alert(data.msg, "Error");
} else {
app.dialog.alert("", "Error");
}
}, error: function () {
app.preloader.hide(); app.preloader.hide();
app.dialog.alert("Could not create account. Check your connection.", "Error"); app.dialog.alert(msg, "Error");
}
}); });
} }