diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock b/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock index 7970169..ad762a1 100644 Binary files a/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock and b/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock differ diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin b/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin index cd3b956..6965ccd 100644 Binary files a/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin and b/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin differ diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin b/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin index 083db50..da83e9f 100644 Binary files a/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin and b/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin differ diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin b/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin index 50f676d..1e58313 100644 Binary files a/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin and b/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin differ diff --git a/platforms/android/assets/www/config/api.json b/platforms/android/assets/www/config/api.json deleted file mode 100644 index a956baf..0000000 --- a/platforms/android/assets/www/config/api.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "baseurl": "https://apis.noidpay.net/", - "urlappend": "?format=json" -} diff --git a/platforms/android/assets/www/config/merchant.json b/platforms/android/assets/www/config/merchant.json deleted file mode 100644 index 5625ffb..0000000 --- a/platforms/android/assets/www/config/merchant.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "merchantname": "Test Merchant", - "merchantid": "1", - "balancetype": "1" -} diff --git a/platforms/android/assets/www/css/main.css b/platforms/android/assets/www/css/main.css index e69de29..9783685 100644 --- a/platforms/android/assets/www/css/main.css +++ b/platforms/android/assets/www/css/main.css @@ -0,0 +1,3 @@ +.item-hidden { + display: none; +} \ No newline at end of file diff --git a/platforms/android/assets/www/img/launcher.png b/platforms/android/assets/www/img/launcher.png index 4b01497..5130e8d 100644 Binary files a/platforms/android/assets/www/img/launcher.png and b/platforms/android/assets/www/img/launcher.png differ diff --git a/platforms/android/assets/www/img/logo.png b/platforms/android/assets/www/img/logo.png index ac5b6fa..7398182 100644 Binary files a/platforms/android/assets/www/img/logo.png and b/platforms/android/assets/www/img/logo.png differ diff --git a/platforms/android/assets/www/img/logo.svg b/platforms/android/assets/www/img/logo.svg index 6f93004..778a6c3 100644 --- a/platforms/android/assets/www/img/logo.svg +++ b/platforms/android/assets/www/img/logo.svg @@ -58,10 +58,10 @@ id="layer1" transform="translate(0,-540.36216)"> - - - - - - - - - - + id="g4190" + transform="translate(1.9308968,-0.34088195)"> + + diff --git a/platforms/android/assets/www/index.html b/platforms/android/assets/www/index.html index 4b34362..5403a6a 100644 --- a/platforms/android/assets/www/index.html +++ b/platforms/android/assets/www/index.html @@ -16,6 +16,9 @@ + + + diff --git a/platforms/android/assets/www/js/main.js b/platforms/android/assets/www/js/main.js index a54652b..1389dd9 100644 --- a/platforms/android/assets/www/js/main.js +++ b/platforms/android/assets/www/js/main.js @@ -7,7 +7,8 @@ /** * API base URL */ -APIURL = "http://snipe-mobile-api/snipeapi/app/"; +APIURL = ""; +//APIURL = "http://snipe-mobile-api/snipeapi/app/"; //APIURL = "http://localhost:8000/"; username = ""; @@ -35,7 +36,16 @@ function dologin() { if ($('#usernameBox').val() === "") { $('#errormsg').text("Error: Missing username."); $('#errorbase').css('display', 'block'); + $('#loginBtn').html(' Login'); + return; } + if ($('#urlBox').val() === "") { + $('#errormsg').text("Error: Missing API address."); + $('#errorbase').css('display', 'block'); + $('#loginBtn').html(' Login'); + return; + } + APIURL = $('#urlBox').val(); $.ajax({ type: "POST", url: mkApiUrl("login"), @@ -50,6 +60,7 @@ function dologin() { if (data.status === 'OK') { username = $('#usernameBox').val(); localStorage.setItem("username", username); + localStorage.setItem("apiurl", APIURL); openscreen("home"); } else { $('#loginBtn').html(' Login'); diff --git a/platforms/android/assets/www/screens/home.html b/platforms/android/assets/www/screens/home.html index bf0f92a..234adc4 100644 --- a/platforms/android/assets/www/screens/home.html +++ b/platforms/android/assets/www/screens/home.html @@ -47,8 +47,8 @@ -
-
+
+
@@ -105,7 +105,7 @@
  • Asset
  • Accessory
  • Consumable
  • -
  • Hard Drive
  • +
  • Hard Drive
  • diff --git a/platforms/android/assets/www/screens/login.html b/platforms/android/assets/www/screens/login.html index f61fdb6..5ac6874 100644 --- a/platforms/android/assets/www/screens/login.html +++ b/platforms/android/assets/www/screens/login.html @@ -10,6 +10,12 @@ +
    +
    + + +
    +
    @@ -32,6 +38,11 @@ } else { $('#usernameBox').val(localStorage.getItem("username")); } + + if (localStorage.getItem("apiurl") === null) { + } else { + $('#urlBox').val(localStorage.getItem("apiurl")); + } $("#usernameBox").keydown(function (event) { if (event.keyCode == 13) { diff --git a/platforms/android/res/drawable-mdpi/icon.png b/platforms/android/res/drawable-mdpi/icon.png index 4b01497..5130e8d 100644 Binary files a/platforms/android/res/drawable-mdpi/icon.png and b/platforms/android/res/drawable-mdpi/icon.png differ diff --git a/platforms/android/res/values/strings.xml b/platforms/android/res/values/strings.xml index 6181d89..272afef 100644 --- a/platforms/android/res/values/strings.xml +++ b/platforms/android/res/values/strings.xml @@ -1,6 +1,6 @@ - E-Recycle Tracker + SnipeIT @string/app_name @string/launcher_name diff --git a/platforms/android/res/xml/config.xml b/platforms/android/res/xml/config.xml index ea4f0f9..b7b042b 100644 --- a/platforms/android/res/xml/config.xml +++ b/platforms/android/res/xml/config.xml @@ -35,9 +35,9 @@ - E-Recycle Tracker + SnipeIT - Helena Industries Big Sky E-Recycling asset/inventory tracking app, integrated with custom SnipeIT database API + Asset/inventory tracking app, integrated with custom SnipeIT database API diff --git a/www/img/googleplay-banner.png b/www/img/googleplay-banner.png new file mode 100644 index 0000000..dbad660 Binary files /dev/null and b/www/img/googleplay-banner.png differ diff --git a/www/img/googleplay-banner.svg b/www/img/googleplay-banner.svg new file mode 100644 index 0000000..140b55c --- /dev/null +++ b/www/img/googleplay-banner.svg @@ -0,0 +1,125 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + Snipe-ITMobile App + +