Hide a custom field or two, un-hardcode API URL

This commit is contained in:
Skylar Ittner 2016-05-19 01:01:10 -06:00
parent c47be0c77f
commit 2d02f4596d
5 changed files with 32 additions and 4 deletions

View File

@ -0,0 +1,3 @@
.item-hidden {
display: none;
}

View File

@ -16,6 +16,9 @@
<!-- FontAwesome --> <!-- FontAwesome -->
<link href="css/font-awesome.css" rel="stylesheet"> <link href="css/font-awesome.css" rel="stylesheet">
<!-- Other styles -->
<link href="css/main.css" rel="stylesheet">
<!-- jQuery Version 1.11.1 --> <!-- jQuery Version 1.11.1 -->
<script src="js/jquery.js"></script> <script src="js/jquery.js"></script>

View File

@ -7,7 +7,8 @@
/** /**
* API base URL * API base URL
*/ */
APIURL = "http://snipe-mobile-api/snipeapi/app/"; APIURL = "";
//APIURL = "http://snipe-mobile-api/snipeapi/app/";
//APIURL = "http://localhost:8000/"; //APIURL = "http://localhost:8000/";
username = ""; username = "";
@ -35,7 +36,16 @@ function dologin() {
if ($('#usernameBox').val() === "") { if ($('#usernameBox').val() === "") {
$('#errormsg').text("Error: Missing username."); $('#errormsg').text("Error: Missing username.");
$('#errorbase').css('display', 'block'); $('#errorbase').css('display', 'block');
$('#loginBtn').html('<i class="fa fa-sign-in"></i> Login');
return;
} }
if ($('#urlBox').val() === "") {
$('#errormsg').text("Error: Missing API address.");
$('#errorbase').css('display', 'block');
$('#loginBtn').html('<i class="fa fa-sign-in"></i> Login');
return;
}
APIURL = $('#urlBox').val();
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: mkApiUrl("login"), url: mkApiUrl("login"),
@ -50,6 +60,7 @@ function dologin() {
if (data.status === 'OK') { if (data.status === 'OK') {
username = $('#usernameBox').val(); username = $('#usernameBox').val();
localStorage.setItem("username", username); localStorage.setItem("username", username);
localStorage.setItem("apiurl", APIURL);
openscreen("home"); openscreen("home");
} else { } else {
$('#loginBtn').html('<i class="fa fa-sign-in"></i> Login'); $('#loginBtn').html('<i class="fa fa-sign-in"></i> Login');

View File

@ -47,8 +47,8 @@
</select> </select>
</div> </div>
<br class="item-only-asset"/> <br class="item-only-asset item-hidden"/>
<div class="input-group item-only-asset"> <div class="input-group item-only-asset item-hidden">
<span class="input-group-addon"><i class="fa fa-fw fa-hdd-o"></i></span> <span class="input-group-addon"><i class="fa fa-fw fa-hdd-o"></i></span>
<input type="text" class="form-control" id="item-hdd-secure" placeholder="Hard Drive Secure (Y/N)" /> <input type="text" class="form-control" id="item-hdd-secure" placeholder="Hard Drive Secure (Y/N)" />
</div> </div>
@ -105,7 +105,7 @@
<li><a href="#" onclick="additem('asset');" id="addassetbtn"><i class="fa fa-fw fa-desktop"></i> Asset</a></li> <li><a href="#" onclick="additem('asset');" id="addassetbtn"><i class="fa fa-fw fa-desktop"></i> Asset</a></li>
<li><a href="#" onclick="additem('accessory');" id="addaccessorybtn"><i class="fa fa-fw fa-keyboard-o"></i> Accessory</a></li> <li><a href="#" onclick="additem('accessory');" id="addaccessorybtn"><i class="fa fa-fw fa-keyboard-o"></i> Accessory</a></li>
<li><a href="#" onclick="additem('consumable');" id="addconsumablebtn"><i class="fa fa-fw fa-tint"></i> Consumable</a></li> <li><a href="#" onclick="additem('consumable');" id="addconsumablebtn"><i class="fa fa-fw fa-tint"></i> Consumable</a></li>
<li><a href="#" onclick="additem('hdd');" id="addassetbtn"><i class="fa fa-fw fa-hdd-o"></i> Hard Drive</a></li> <li class="item-hidden"><a href="#" onclick="additem('hdd');" id="addassetbtn"><i class="fa fa-fw fa-hdd-o"></i> Hard Drive</a></li>
</ul> </ul>
</div> </div>
</div> </div>

View File

@ -10,6 +10,12 @@
<div id="errorbase" class="alert alert-danger alert-dismissable" style="display: none;"> <div id="errorbase" class="alert alert-danger alert-dismissable" style="display: none;">
<p id="errormsg">An error occurred.</p> <p id="errormsg">An error occurred.</p>
</div> </div>
<br />
<div class="input-group">
<span class="input-group-addon" id="basic-addon-globeicon"><i class="fa fa-globe"></i></span>
<input type="text" placeholder="API Address" id="urlBox" class="form-control" aria-describedby="basic-addon-globeicon" value="" />
</div>
<br />
<div class="input-group"> <div class="input-group">
<span class="input-group-addon" id="basic-addon-usericon"><i class="fa fa-user"></i></span> <span class="input-group-addon" id="basic-addon-usericon"><i class="fa fa-user"></i></span>
<input type="text" placeholder="Username" id="usernameBox" class="form-control" aria-describedby="basic-addon-usericon"/> <input type="text" placeholder="Username" id="usernameBox" class="form-control" aria-describedby="basic-addon-usericon"/>
@ -32,6 +38,11 @@
} else { } else {
$('#usernameBox').val(localStorage.getItem("username")); $('#usernameBox').val(localStorage.getItem("username"));
} }
if (localStorage.getItem("apiurl") === null) {
} else {
$('#urlBox').val(localStorage.getItem("apiurl"));
}
$("#usernameBox").keydown(function (event) { $("#usernameBox").keydown(function (event) {
if (event.keyCode == 13) { if (event.keyCode == 13) {