From cfbfe0c2274f36824c5c03c86709f39577829dad Mon Sep 17 00:00:00 2001 From: Skylar Ittner Date: Mon, 4 Jul 2016 15:43:59 -0600 Subject: [PATCH] Refactor home.js into several files --- .../2.2.1/taskArtifacts/cache.properties.lock | Bin 17 -> 17 bytes .../2.2.1/taskArtifacts/fileHashes.bin | Bin 137062 -> 137339 bytes .../2.2.1/taskArtifacts/fileSnapshots.bin | Bin 1337800 -> 1384095 bytes .../2.2.1/taskArtifacts/taskArtifacts.bin | Bin 84256 -> 84256 bytes .../assets/www/js/{home.js => location.js} | 153 +----------------- platforms/android/assets/www/js/main.js | 33 +++- platforms/android/assets/www/js/user.js | 120 ++++++++++++++ .../android/assets/www/screens/home.html | 3 +- .../android/assets/www/screens/inventory.html | 11 +- .../android/assets/www/screens/settings.html | 9 +- .../browser/www/js/{home.js => location.js} | 153 +----------------- platforms/browser/www/js/main.js | 33 +++- platforms/browser/www/js/user.js | 120 ++++++++++++++ platforms/browser/www/screens/home.html | 3 +- platforms/browser/www/screens/inventory.html | 11 +- platforms/browser/www/screens/settings.html | 9 +- www/js/{home.js => location.js} | 153 +----------------- www/js/main.js | 33 +++- www/js/user.js | 120 ++++++++++++++ www/screens/home.html | 3 +- www/screens/inventory.html | 13 +- 21 files changed, 504 insertions(+), 476 deletions(-) rename platforms/android/assets/www/js/{home.js => location.js} (67%) create mode 100644 platforms/android/assets/www/js/user.js rename platforms/browser/www/js/{home.js => location.js} (67%) create mode 100644 platforms/browser/www/js/user.js rename www/js/{home.js => location.js} (67%) create mode 100644 www/js/user.js 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 940b2933df50a02ff3089a5fd45b8c7c3754bda7..7babce59e42007635c5fd90c468cdc9bddd25922 100644 GIT binary patch literal 17 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 LAz!}LX~+Ko6~=Zh diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin b/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin index 4d9ab42d3352143f03729c46729533b3e38624aa..e9c4e09ea23ef19ee1d959a5ff6013c992c0140d 100644 GIT binary patch delta 4358 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 diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin b/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin index 6d414663c1f16dcd3e179974c3013034bf899b9b..04125ff9c7d6246e6691fbcd38f890321af8144a 100644 GIT binary patch delta 1059 zcmZ25iFLsw)(z`>1fFe@-aIR~eRh#{nAdGRefi0Sy^92{IKO3x*7|2<6m#Zsyxf%= zAi>G&dp2<}0Kv}c+C`J)_Iqp=?eFFiP>2wy5Rkrdm2>&R7|G`;&o*zE>CY%|Ch%6q zEax{%G8OqMocu$K!J?ZN%#3FQ8)0><{QYLxv#XdU=P&pt(D(P$%xCHsH#PVMswAGh za(ud=1f$2~`)hJH2jmzs3Y6Sun7Slyt5#5~^6g!{DbA?Un{yX_W1N0Ll#zucNVs(C z( zE?J%qaa-uhp2d?luD&MlKy0VkMGGaN9=%^@-lc5e0NcCy{+fA=0twOGU;b%KJzQ&h zME>D|2k#J4o7>mGob!cU=HTYSO{ZA}K5W)$FF5g(Ek=LC6HVzDE|7Bf&Eb2wnFQt? zme@0KN1(F0)Kv@q@G2pM)MlFMc@XJ z&f+u13=A9}f%qi|GjqN=@!`+3mHy34ocSBuz6VbZEVkLa|8^?VWS!gY0ump-nwKxW z9QNtO)|W2fE{mbEYnV1y-%wzh-2LE=GEeMNW{{ce%?u1Ii$It;JIBa4k;@`)pGNn! zyt5KdH!pZn%_xxduy0cHt$5Cjt5zHqbW`3A7TsL+up1Kkt&tN?OkVgRcyrmasZ4^2 zYz2|wTsoiL2D0*A`0n)j;N*$fQqu!W7}+=5zSL#j%<-duN$}Ud$qV0ltaxK%eUn%C z^4xdW6m8~y8Ol6eUyzY&bJm*zrpXr)SXAQ04#a?*%mZ{T&nzIWXLh>G9`*klYhKO8 z;9ZLyGA?;XZPi%nZlco9J&XJ>3;nq07kg=NEm!ab9{W|VEW=VyGbBG}AcWVA+8H1Nmn zBBd3F{QCDyp4gDt`>1?C)glB2DWy|$j;2~pZ9s@J->Nnd2Cr8 zyP-ZCnO|yx;i_t}B0r-$?}BpU!wv*d!Y6VlOIG&oHf?V%yx>Y0j2db6Lk>&#c=GHO zWYgl0*MFMD#cyAU08phc^LP4oAnxl3N$Q8*2U~GN@#_Gp_dKhtPn{mUDR2)w!Lu7& zovyAZHGDjYt@~;S^sY>c-@G~xApMj4xhPFk{NZ~;x4IV#b7=lX;Ez;wad`hp7XWVt zdazJ>^p>t7CzXM;Cj4pa3aGPpsZkXAnKkyQi3ZTSB7b3O#zB&x=%nMrE{jn^u`d=? zTLAcLGS9nbxop95BGI?#1+B*#S*=xYG-D1m)_#u@8+47__S)hgg$6axu@ha*Y;UZ7 ziB)x_00wL_EeV;iI}$T=C&ghptn@!b_pb*OmEd>fG)`#hVK*s{5>Uzx@7!Tv@P{fY zRP>UmFjjAiaj4RWfaO(^cV=8XM_4(x(wu*swfh(G2x=wVMuG>rJOHk0bu`8q_lHSX z5jfvHez(%)&;)&39eiAlB0~iDL4Pd?@0e~`67{5JFJDhepRyNaJ|XP{I{U+K=8jcC z&AmHVERIH(NqtBh`#?Y-=iprAFf4}g2cq4-nqB;01Dx;dOP6a=aH0op8LlJXJ(0qE zmj?CPbI-jIY46$kgxm)x>*0vGdbZ?@ezD$ z;s>m;a%q|5$B4?`Dy#R5?%G~_c>ev5zF1>M1m<;V0c~jr>=`d(kVe3P{K-t?tx3bR zFIvivIXXRJ2G#)|fP{yHNIh;ve`f;J&|*{JSn!IAGZ4BBhlrPI^v-d>_zQsvK+-xk z`Ekc>w6EwC" + msg.username + " " + msg.message + "
"; - }); - $('#chatmsgs').html(content); - }); - } -} - - -syncStats(); -setInterval(function () { - syncStats(); -}, 10 * 1000); -setInterval(function () { - getChat(); -}, 2000); -// Send chat messages -$("#chatsendform").submit(function (event) { - message = $('#chatbox-input').val(); - if (message !== '') { - $.post(mkApiUrl('chat', 'cs'), { - user: username, - lat: latitude, - long: longitude, - msg: message - }, function (data) { - if (data.status === 'OK') { - $('#chatbox-input').val(""); - $("#chatmsgs").animate({scrollTop: $('#chatmsgs').prop("scrollHeight")}, 1000); - } - }, "json"); - } - event.preventDefault(); - return false; -}); -function toggleChat() { - if ($('#chatmsgs').css('display') === 'none') { - openChat(); - } else { - closeChat(); - } -} - -function closeChat() { - $('#chatmsgs').css('display', 'none'); - $('#chatbox').css('height', 'auto'); -} - -function openChat() { - $('#chatbox').css('height', '50%'); - $('#chatmsgs').css('display', 'block'); - $("#chatmsgs").animate({scrollTop: $('#chatmsgs').prop("scrollHeight")}, 1000); -} - -function openProfile(user) { - user = typeof user !== 'undefined' ? user : username; - $('#main-content').load("screens/profile.html", null, function (x) { - $('#overlay-main').css('display', 'block'); - loadProfile(user); - }); -} - -function openRules() { - openmodal('rules', '#rules-modal'); -} - -function openIntro() { - openmodal('intro', '#intro-modal'); -} - -function openMenu(topage) { - topage = typeof topage !== 'undefined' ? topage : ""; - $('#main-content').load("screens/menu.html", null, function (x) { - $('#overlay-main').css('display', 'block'); - if (topage !== '') { - $('#' + topage + '-tab').tab('show'); - } - }); -} - - - -////////////////////////////////////////////// -// Other things -////////////////////////////////////////////// - -function closeMain() { - $('#overlay-main').slideDown(100, function () { - $('#overlay-main').css('display', 'none'); - $('#main-content').html(""); - }); -} - -// Handle back button to close things -document.addEventListener("backbutton", function (event) { - if ($('#overlay-main').css('display') !== 'none') { - closeMain(); - } else if ($('#chatmsgs').css('display') !== 'none') { - toggleChat(); - } -}, false); -// Show the rules -if (localStorage.getItem("seenintro") !== 'yes') { - openIntro(); - localStorage.setItem("seenintro", 'yes'); -} \ No newline at end of file +}, 15 * 1000); \ No newline at end of file diff --git a/platforms/android/assets/www/js/main.js b/platforms/android/assets/www/js/main.js index 12ef656..1e13190 100644 --- a/platforms/android/assets/www/js/main.js +++ b/platforms/android/assets/www/js/main.js @@ -91,9 +91,36 @@ function scanCode() { } function sortResults(array, prop, asc) { - array = array.sort(function(a, b) { - if (asc) return (a[prop] > b[prop]) ? 1 : ((a[prop] < b[prop]) ? -1 : 0); - else return (b[prop] > a[prop]) ? 1 : ((b[prop] < a[prop]) ? -1 : 0); + array = array.sort(function (a, b) { + if (asc) + return (a[prop] > b[prop]) ? 1 : ((a[prop] < b[prop]) ? -1 : 0); + else + return (b[prop] > a[prop]) ? 1 : ((b[prop] < a[prop]) ? -1 : 0); }); return array; +} + +////////////////////////////////////////////// +// Other things +////////////////////////////////////////////// + +function closeMain() { + $('#overlay-main').slideDown(100, function () { + $('#overlay-main').css('display', 'none'); + $('#main-content').html(""); + }); +} + +// Handle back button to close things +document.addEventListener("backbutton", function (event) { + if ($('#overlay-main').css('display') !== 'none') { + closeMain(); + } else if ($('#chatmsgs').css('display') !== 'none') { + toggleChat(); + } +}, false); +// Show the rules +if (localStorage.getItem("seenintro") !== 'yes') { + openIntro(); + localStorage.setItem("seenintro", 'yes'); } \ No newline at end of file diff --git a/platforms/android/assets/www/js/user.js b/platforms/android/assets/www/js/user.js new file mode 100644 index 0000000..d82001f --- /dev/null +++ b/platforms/android/assets/www/js/user.js @@ -0,0 +1,120 @@ +////////////////////////////////////////////// +// Profile, stats, and chat stuff +////////////////////////////////////////////// + + +/* + * Handles general server communication. + */ + +/** + * Syncs the user's stats with the server and calls refreshStats(). + */ +function syncStats() { + $.getJSON(mkApiUrl('getstats'), { + user: username + }, function (data) { + if (data.status === 'OK') { + maxenergy = data.stats.maxenergy; + energy = data.stats.energy; + level = data.stats.level; + refreshStats(); + } + }); +} + +/** + * Display the current stats on the home screen. + */ +function refreshStats() { + energypercent = (energy * 1.0 / maxenergy * 1.0) * 100.0; + $('#energybar').css('width', String(energypercent) + '%'); +} + +function getChat() { + if (lockGot) { + $.getJSON(mkApiUrl('chat', 'cs'), { + lat: latitude, + long: longitude + }, function (data) { + data = sortResults(data, 'time', true); + var content = ""; + data.forEach(function (msg) { + content += "" + msg.username + " " + msg.message + "
"; + }); + $('#chatmsgs').html(content); + }); + } +} + + +syncStats(); +setInterval(function () { + syncStats(); +}, 10 * 1000); +setInterval(function () { + getChat(); +}, 2000); +// Send chat messages +$("#chatsendform").submit(function (event) { + message = $('#chatbox-input').val(); + if (message !== '') { + $.post(mkApiUrl('chat', 'cs'), { + user: username, + lat: latitude, + long: longitude, + msg: message + }, function (data) { + if (data.status === 'OK') { + $('#chatbox-input').val(""); + $("#chatmsgs").animate({scrollTop: $('#chatmsgs').prop("scrollHeight")}, 1000); + } + }, "json"); + } + event.preventDefault(); + return false; +}); +function toggleChat() { + if ($('#chatmsgs').css('display') === 'none') { + openChat(); + } else { + closeChat(); + } +} + +function closeChat() { + $('#chatmsgs').css('display', 'none'); + $('#chatbox').css('height', 'auto'); +} + +function openChat() { + $('#chatbox').css('height', '50%'); + $('#chatmsgs').css('display', 'block'); + $("#chatmsgs").animate({scrollTop: $('#chatmsgs').prop("scrollHeight")}, 1000); +} + +function openProfile(user) { + user = typeof user !== 'undefined' ? user : username; + $('#main-content').load("screens/profile.html", null, function (x) { + $('#overlay-main').css('display', 'block'); + loadProfile(user); + }); +} + +function openRules() { + openmodal('rules', '#rules-modal'); +} + +function openIntro() { + openmodal('intro', '#intro-modal'); +} + +function openMenu(topage) { + topage = typeof topage !== 'undefined' ? topage : ""; + $('#main-content').load("screens/menu.html", null, function (x) { + $('#overlay-main').css('display', 'block'); + if (topage !== '') { + $('#' + topage + '-tab').tab('show'); + } + }); +} diff --git a/platforms/android/assets/www/screens/home.html b/platforms/android/assets/www/screens/home.html index 397805e..d9f9502 100644 --- a/platforms/android/assets/www/screens/home.html +++ b/platforms/android/assets/www/screens/home.html @@ -54,4 +54,5 @@ $('#namedisp').text(username); navigator.splashscreen.hide(); - \ No newline at end of file + + \ No newline at end of file diff --git a/platforms/android/assets/www/screens/inventory.html b/platforms/android/assets/www/screens/inventory.html index 262b022..753bc71 100644 --- a/platforms/android/assets/www/screens/inventory.html +++ b/platforms/android/assets/www/screens/inventory.html @@ -1,3 +1,10 @@
- -
\ No newline at end of file +
+
+ + + \ No newline at end of file diff --git a/platforms/android/assets/www/screens/settings.html b/platforms/android/assets/www/screens/settings.html index 13281eb..4c16596 100644 --- a/platforms/android/assets/www/screens/settings.html +++ b/platforms/android/assets/www/screens/settings.html @@ -1,5 +1,8 @@
+
+ Show Introduction +
Show Rules
@@ -8,13 +11,13 @@

- Third-Party Licenses + Cool Stuff We Stole
Map tiles by Stamen Design (stamen.com), under CC BY 3.0 (creativecommons.org/licenses/by/3.0).
Map tile data by OpenStreetMap (openstreetmap.org), under CC BY-SA (creativecommons.org/licenses/by-sa/3.0).
- Places from OpenStreetMap and contributers, licensed under the ODbL (opendatacommons.org/licenses/odbl). Email apis@netsyms.com for free access to our API. + Places from OpenStreetMap and contributers, licensed under the ODbL (opendatacommons.org/licenses/odbl).
Map display is powered by Leaflet (leafletjs.com), copyright (c) 2010-2016, Vladimir Agafonkin and copyright (c) 2010-2011, CloudMade. BSD 2-clause license.
@@ -23,6 +26,8 @@ Weather data Powered by Forecast (forecast.io).
Geocache data from the OpenCaching.US OKAPI. Data licensed under the CC BY-NC-SA 2.5 (creativecommons.org/licenses/by-nc-sa/2.5). +
+ If you're a developer, you might be interested in this: earth.apis.netsyms.net

diff --git a/platforms/browser/www/js/home.js b/platforms/browser/www/js/location.js similarity index 67% rename from platforms/browser/www/js/home.js rename to platforms/browser/www/js/location.js index 507117e..f05c7f9 100644 --- a/platforms/browser/www/js/home.js +++ b/platforms/browser/www/js/location.js @@ -174,7 +174,7 @@ function pingServer() { $.get(mkApiUrl('ping') + "?user=" + username + "&lat=" + latitude + "&long=" + longitude); } } -; + function onError(error) { $('#loading-error').text("Check your device's network and location settings, and ensure a clear view of the sky."); } @@ -207,153 +207,4 @@ setInterval(pingServer, 5000); // Show error if it's taking too long setTimeout(function () { onError(); -}, 15 * 1000); - - -////////////////////////////////////////////// -// Profile, stats, and chat stuff -////////////////////////////////////////////// - - -/* - * Handles general server communication. - */ - -/** - * Syncs the user's stats with the server and calls refreshStats(). - */ -function syncStats() { - $.getJSON(mkApiUrl('getstats'), { - user: username - }, function (data) { - if (data.status === 'OK') { - maxenergy = data.stats.maxenergy; - energy = data.stats.energy; - level = data.stats.level; - refreshStats(); - } - }); -} - -/** - * Display the current stats on the home screen. - */ -function refreshStats() { - energypercent = (energy * 1.0 / maxenergy * 1.0) * 100.0; - $('#energybar').css('width', String(energypercent) + '%'); -} - -function getChat() { - if (lockGot) { - $.getJSON(mkApiUrl('chat', 'cs'), { - lat: latitude, - long: longitude - }, function (data) { - data = sortResults(data, 'time', true); - var content = ""; - data.forEach(function (msg) { - content += "" + msg.username + " " + msg.message + "
"; - }); - $('#chatmsgs').html(content); - }); - } -} - - -syncStats(); -setInterval(function () { - syncStats(); -}, 10 * 1000); -setInterval(function () { - getChat(); -}, 2000); -// Send chat messages -$("#chatsendform").submit(function (event) { - message = $('#chatbox-input').val(); - if (message !== '') { - $.post(mkApiUrl('chat', 'cs'), { - user: username, - lat: latitude, - long: longitude, - msg: message - }, function (data) { - if (data.status === 'OK') { - $('#chatbox-input').val(""); - $("#chatmsgs").animate({scrollTop: $('#chatmsgs').prop("scrollHeight")}, 1000); - } - }, "json"); - } - event.preventDefault(); - return false; -}); -function toggleChat() { - if ($('#chatmsgs').css('display') === 'none') { - openChat(); - } else { - closeChat(); - } -} - -function closeChat() { - $('#chatmsgs').css('display', 'none'); - $('#chatbox').css('height', 'auto'); -} - -function openChat() { - $('#chatbox').css('height', '50%'); - $('#chatmsgs').css('display', 'block'); - $("#chatmsgs").animate({scrollTop: $('#chatmsgs').prop("scrollHeight")}, 1000); -} - -function openProfile(user) { - user = typeof user !== 'undefined' ? user : username; - $('#main-content').load("screens/profile.html", null, function (x) { - $('#overlay-main').css('display', 'block'); - loadProfile(user); - }); -} - -function openRules() { - openmodal('rules', '#rules-modal'); -} - -function openIntro() { - openmodal('intro', '#intro-modal'); -} - -function openMenu(topage) { - topage = typeof topage !== 'undefined' ? topage : ""; - $('#main-content').load("screens/menu.html", null, function (x) { - $('#overlay-main').css('display', 'block'); - if (topage !== '') { - $('#' + topage + '-tab').tab('show'); - } - }); -} - - - -////////////////////////////////////////////// -// Other things -////////////////////////////////////////////// - -function closeMain() { - $('#overlay-main').slideDown(100, function () { - $('#overlay-main').css('display', 'none'); - $('#main-content').html(""); - }); -} - -// Handle back button to close things -document.addEventListener("backbutton", function (event) { - if ($('#overlay-main').css('display') !== 'none') { - closeMain(); - } else if ($('#chatmsgs').css('display') !== 'none') { - toggleChat(); - } -}, false); -// Show the rules -if (localStorage.getItem("seenintro") !== 'yes') { - openIntro(); - localStorage.setItem("seenintro", 'yes'); -} \ No newline at end of file +}, 15 * 1000); \ No newline at end of file diff --git a/platforms/browser/www/js/main.js b/platforms/browser/www/js/main.js index 12ef656..1e13190 100644 --- a/platforms/browser/www/js/main.js +++ b/platforms/browser/www/js/main.js @@ -91,9 +91,36 @@ function scanCode() { } function sortResults(array, prop, asc) { - array = array.sort(function(a, b) { - if (asc) return (a[prop] > b[prop]) ? 1 : ((a[prop] < b[prop]) ? -1 : 0); - else return (b[prop] > a[prop]) ? 1 : ((b[prop] < a[prop]) ? -1 : 0); + array = array.sort(function (a, b) { + if (asc) + return (a[prop] > b[prop]) ? 1 : ((a[prop] < b[prop]) ? -1 : 0); + else + return (b[prop] > a[prop]) ? 1 : ((b[prop] < a[prop]) ? -1 : 0); }); return array; +} + +////////////////////////////////////////////// +// Other things +////////////////////////////////////////////// + +function closeMain() { + $('#overlay-main').slideDown(100, function () { + $('#overlay-main').css('display', 'none'); + $('#main-content').html(""); + }); +} + +// Handle back button to close things +document.addEventListener("backbutton", function (event) { + if ($('#overlay-main').css('display') !== 'none') { + closeMain(); + } else if ($('#chatmsgs').css('display') !== 'none') { + toggleChat(); + } +}, false); +// Show the rules +if (localStorage.getItem("seenintro") !== 'yes') { + openIntro(); + localStorage.setItem("seenintro", 'yes'); } \ No newline at end of file diff --git a/platforms/browser/www/js/user.js b/platforms/browser/www/js/user.js new file mode 100644 index 0000000..d82001f --- /dev/null +++ b/platforms/browser/www/js/user.js @@ -0,0 +1,120 @@ +////////////////////////////////////////////// +// Profile, stats, and chat stuff +////////////////////////////////////////////// + + +/* + * Handles general server communication. + */ + +/** + * Syncs the user's stats with the server and calls refreshStats(). + */ +function syncStats() { + $.getJSON(mkApiUrl('getstats'), { + user: username + }, function (data) { + if (data.status === 'OK') { + maxenergy = data.stats.maxenergy; + energy = data.stats.energy; + level = data.stats.level; + refreshStats(); + } + }); +} + +/** + * Display the current stats on the home screen. + */ +function refreshStats() { + energypercent = (energy * 1.0 / maxenergy * 1.0) * 100.0; + $('#energybar').css('width', String(energypercent) + '%'); +} + +function getChat() { + if (lockGot) { + $.getJSON(mkApiUrl('chat', 'cs'), { + lat: latitude, + long: longitude + }, function (data) { + data = sortResults(data, 'time', true); + var content = ""; + data.forEach(function (msg) { + content += "" + msg.username + " " + msg.message + "
"; + }); + $('#chatmsgs').html(content); + }); + } +} + + +syncStats(); +setInterval(function () { + syncStats(); +}, 10 * 1000); +setInterval(function () { + getChat(); +}, 2000); +// Send chat messages +$("#chatsendform").submit(function (event) { + message = $('#chatbox-input').val(); + if (message !== '') { + $.post(mkApiUrl('chat', 'cs'), { + user: username, + lat: latitude, + long: longitude, + msg: message + }, function (data) { + if (data.status === 'OK') { + $('#chatbox-input').val(""); + $("#chatmsgs").animate({scrollTop: $('#chatmsgs').prop("scrollHeight")}, 1000); + } + }, "json"); + } + event.preventDefault(); + return false; +}); +function toggleChat() { + if ($('#chatmsgs').css('display') === 'none') { + openChat(); + } else { + closeChat(); + } +} + +function closeChat() { + $('#chatmsgs').css('display', 'none'); + $('#chatbox').css('height', 'auto'); +} + +function openChat() { + $('#chatbox').css('height', '50%'); + $('#chatmsgs').css('display', 'block'); + $("#chatmsgs").animate({scrollTop: $('#chatmsgs').prop("scrollHeight")}, 1000); +} + +function openProfile(user) { + user = typeof user !== 'undefined' ? user : username; + $('#main-content').load("screens/profile.html", null, function (x) { + $('#overlay-main').css('display', 'block'); + loadProfile(user); + }); +} + +function openRules() { + openmodal('rules', '#rules-modal'); +} + +function openIntro() { + openmodal('intro', '#intro-modal'); +} + +function openMenu(topage) { + topage = typeof topage !== 'undefined' ? topage : ""; + $('#main-content').load("screens/menu.html", null, function (x) { + $('#overlay-main').css('display', 'block'); + if (topage !== '') { + $('#' + topage + '-tab').tab('show'); + } + }); +} diff --git a/platforms/browser/www/screens/home.html b/platforms/browser/www/screens/home.html index 397805e..d9f9502 100644 --- a/platforms/browser/www/screens/home.html +++ b/platforms/browser/www/screens/home.html @@ -54,4 +54,5 @@ $('#namedisp').text(username); navigator.splashscreen.hide(); - \ No newline at end of file + + \ No newline at end of file diff --git a/platforms/browser/www/screens/inventory.html b/platforms/browser/www/screens/inventory.html index 262b022..753bc71 100644 --- a/platforms/browser/www/screens/inventory.html +++ b/platforms/browser/www/screens/inventory.html @@ -1,3 +1,10 @@
- -
\ No newline at end of file +
+
+ + + \ No newline at end of file diff --git a/platforms/browser/www/screens/settings.html b/platforms/browser/www/screens/settings.html index 13281eb..4c16596 100644 --- a/platforms/browser/www/screens/settings.html +++ b/platforms/browser/www/screens/settings.html @@ -1,5 +1,8 @@
+
+ Show Introduction +
Show Rules
@@ -8,13 +11,13 @@

- Third-Party Licenses + Cool Stuff We Stole
Map tiles by Stamen Design (stamen.com), under CC BY 3.0 (creativecommons.org/licenses/by/3.0).
Map tile data by OpenStreetMap (openstreetmap.org), under CC BY-SA (creativecommons.org/licenses/by-sa/3.0).
- Places from OpenStreetMap and contributers, licensed under the ODbL (opendatacommons.org/licenses/odbl). Email apis@netsyms.com for free access to our API. + Places from OpenStreetMap and contributers, licensed under the ODbL (opendatacommons.org/licenses/odbl).
Map display is powered by Leaflet (leafletjs.com), copyright (c) 2010-2016, Vladimir Agafonkin and copyright (c) 2010-2011, CloudMade. BSD 2-clause license.
@@ -23,6 +26,8 @@ Weather data Powered by Forecast (forecast.io).
Geocache data from the OpenCaching.US OKAPI. Data licensed under the CC BY-NC-SA 2.5 (creativecommons.org/licenses/by-nc-sa/2.5). +
+ If you're a developer, you might be interested in this: earth.apis.netsyms.net

diff --git a/www/js/home.js b/www/js/location.js similarity index 67% rename from www/js/home.js rename to www/js/location.js index 507117e..f05c7f9 100644 --- a/www/js/home.js +++ b/www/js/location.js @@ -174,7 +174,7 @@ function pingServer() { $.get(mkApiUrl('ping') + "?user=" + username + "&lat=" + latitude + "&long=" + longitude); } } -; + function onError(error) { $('#loading-error').text("Check your device's network and location settings, and ensure a clear view of the sky."); } @@ -207,153 +207,4 @@ setInterval(pingServer, 5000); // Show error if it's taking too long setTimeout(function () { onError(); -}, 15 * 1000); - - -////////////////////////////////////////////// -// Profile, stats, and chat stuff -////////////////////////////////////////////// - - -/* - * Handles general server communication. - */ - -/** - * Syncs the user's stats with the server and calls refreshStats(). - */ -function syncStats() { - $.getJSON(mkApiUrl('getstats'), { - user: username - }, function (data) { - if (data.status === 'OK') { - maxenergy = data.stats.maxenergy; - energy = data.stats.energy; - level = data.stats.level; - refreshStats(); - } - }); -} - -/** - * Display the current stats on the home screen. - */ -function refreshStats() { - energypercent = (energy * 1.0 / maxenergy * 1.0) * 100.0; - $('#energybar').css('width', String(energypercent) + '%'); -} - -function getChat() { - if (lockGot) { - $.getJSON(mkApiUrl('chat', 'cs'), { - lat: latitude, - long: longitude - }, function (data) { - data = sortResults(data, 'time', true); - var content = ""; - data.forEach(function (msg) { - content += "" + msg.username + " " + msg.message + "
"; - }); - $('#chatmsgs').html(content); - }); - } -} - - -syncStats(); -setInterval(function () { - syncStats(); -}, 10 * 1000); -setInterval(function () { - getChat(); -}, 2000); -// Send chat messages -$("#chatsendform").submit(function (event) { - message = $('#chatbox-input').val(); - if (message !== '') { - $.post(mkApiUrl('chat', 'cs'), { - user: username, - lat: latitude, - long: longitude, - msg: message - }, function (data) { - if (data.status === 'OK') { - $('#chatbox-input').val(""); - $("#chatmsgs").animate({scrollTop: $('#chatmsgs').prop("scrollHeight")}, 1000); - } - }, "json"); - } - event.preventDefault(); - return false; -}); -function toggleChat() { - if ($('#chatmsgs').css('display') === 'none') { - openChat(); - } else { - closeChat(); - } -} - -function closeChat() { - $('#chatmsgs').css('display', 'none'); - $('#chatbox').css('height', 'auto'); -} - -function openChat() { - $('#chatbox').css('height', '50%'); - $('#chatmsgs').css('display', 'block'); - $("#chatmsgs").animate({scrollTop: $('#chatmsgs').prop("scrollHeight")}, 1000); -} - -function openProfile(user) { - user = typeof user !== 'undefined' ? user : username; - $('#main-content').load("screens/profile.html", null, function (x) { - $('#overlay-main').css('display', 'block'); - loadProfile(user); - }); -} - -function openRules() { - openmodal('rules', '#rules-modal'); -} - -function openIntro() { - openmodal('intro', '#intro-modal'); -} - -function openMenu(topage) { - topage = typeof topage !== 'undefined' ? topage : ""; - $('#main-content').load("screens/menu.html", null, function (x) { - $('#overlay-main').css('display', 'block'); - if (topage !== '') { - $('#' + topage + '-tab').tab('show'); - } - }); -} - - - -////////////////////////////////////////////// -// Other things -////////////////////////////////////////////// - -function closeMain() { - $('#overlay-main').slideDown(100, function () { - $('#overlay-main').css('display', 'none'); - $('#main-content').html(""); - }); -} - -// Handle back button to close things -document.addEventListener("backbutton", function (event) { - if ($('#overlay-main').css('display') !== 'none') { - closeMain(); - } else if ($('#chatmsgs').css('display') !== 'none') { - toggleChat(); - } -}, false); -// Show the rules -if (localStorage.getItem("seenintro") !== 'yes') { - openIntro(); - localStorage.setItem("seenintro", 'yes'); -} \ No newline at end of file +}, 15 * 1000); \ No newline at end of file diff --git a/www/js/main.js b/www/js/main.js index 12ef656..1e13190 100644 --- a/www/js/main.js +++ b/www/js/main.js @@ -91,9 +91,36 @@ function scanCode() { } function sortResults(array, prop, asc) { - array = array.sort(function(a, b) { - if (asc) return (a[prop] > b[prop]) ? 1 : ((a[prop] < b[prop]) ? -1 : 0); - else return (b[prop] > a[prop]) ? 1 : ((b[prop] < a[prop]) ? -1 : 0); + array = array.sort(function (a, b) { + if (asc) + return (a[prop] > b[prop]) ? 1 : ((a[prop] < b[prop]) ? -1 : 0); + else + return (b[prop] > a[prop]) ? 1 : ((b[prop] < a[prop]) ? -1 : 0); }); return array; +} + +////////////////////////////////////////////// +// Other things +////////////////////////////////////////////// + +function closeMain() { + $('#overlay-main').slideDown(100, function () { + $('#overlay-main').css('display', 'none'); + $('#main-content').html(""); + }); +} + +// Handle back button to close things +document.addEventListener("backbutton", function (event) { + if ($('#overlay-main').css('display') !== 'none') { + closeMain(); + } else if ($('#chatmsgs').css('display') !== 'none') { + toggleChat(); + } +}, false); +// Show the rules +if (localStorage.getItem("seenintro") !== 'yes') { + openIntro(); + localStorage.setItem("seenintro", 'yes'); } \ No newline at end of file diff --git a/www/js/user.js b/www/js/user.js new file mode 100644 index 0000000..d82001f --- /dev/null +++ b/www/js/user.js @@ -0,0 +1,120 @@ +////////////////////////////////////////////// +// Profile, stats, and chat stuff +////////////////////////////////////////////// + + +/* + * Handles general server communication. + */ + +/** + * Syncs the user's stats with the server and calls refreshStats(). + */ +function syncStats() { + $.getJSON(mkApiUrl('getstats'), { + user: username + }, function (data) { + if (data.status === 'OK') { + maxenergy = data.stats.maxenergy; + energy = data.stats.energy; + level = data.stats.level; + refreshStats(); + } + }); +} + +/** + * Display the current stats on the home screen. + */ +function refreshStats() { + energypercent = (energy * 1.0 / maxenergy * 1.0) * 100.0; + $('#energybar').css('width', String(energypercent) + '%'); +} + +function getChat() { + if (lockGot) { + $.getJSON(mkApiUrl('chat', 'cs'), { + lat: latitude, + long: longitude + }, function (data) { + data = sortResults(data, 'time', true); + var content = ""; + data.forEach(function (msg) { + content += "" + msg.username + " " + msg.message + "
"; + }); + $('#chatmsgs').html(content); + }); + } +} + + +syncStats(); +setInterval(function () { + syncStats(); +}, 10 * 1000); +setInterval(function () { + getChat(); +}, 2000); +// Send chat messages +$("#chatsendform").submit(function (event) { + message = $('#chatbox-input').val(); + if (message !== '') { + $.post(mkApiUrl('chat', 'cs'), { + user: username, + lat: latitude, + long: longitude, + msg: message + }, function (data) { + if (data.status === 'OK') { + $('#chatbox-input').val(""); + $("#chatmsgs").animate({scrollTop: $('#chatmsgs').prop("scrollHeight")}, 1000); + } + }, "json"); + } + event.preventDefault(); + return false; +}); +function toggleChat() { + if ($('#chatmsgs').css('display') === 'none') { + openChat(); + } else { + closeChat(); + } +} + +function closeChat() { + $('#chatmsgs').css('display', 'none'); + $('#chatbox').css('height', 'auto'); +} + +function openChat() { + $('#chatbox').css('height', '50%'); + $('#chatmsgs').css('display', 'block'); + $("#chatmsgs").animate({scrollTop: $('#chatmsgs').prop("scrollHeight")}, 1000); +} + +function openProfile(user) { + user = typeof user !== 'undefined' ? user : username; + $('#main-content').load("screens/profile.html", null, function (x) { + $('#overlay-main').css('display', 'block'); + loadProfile(user); + }); +} + +function openRules() { + openmodal('rules', '#rules-modal'); +} + +function openIntro() { + openmodal('intro', '#intro-modal'); +} + +function openMenu(topage) { + topage = typeof topage !== 'undefined' ? topage : ""; + $('#main-content').load("screens/menu.html", null, function (x) { + $('#overlay-main').css('display', 'block'); + if (topage !== '') { + $('#' + topage + '-tab').tab('show'); + } + }); +} diff --git a/www/screens/home.html b/www/screens/home.html index 397805e..d9f9502 100644 --- a/www/screens/home.html +++ b/www/screens/home.html @@ -54,4 +54,5 @@ $('#namedisp').text(username); navigator.splashscreen.hide(); - \ No newline at end of file + + \ No newline at end of file diff --git a/www/screens/inventory.html b/www/screens/inventory.html index d6694d0..753bc71 100644 --- a/www/screens/inventory.html +++ b/www/screens/inventory.html @@ -1,3 +1,10 @@ -
- -
\ No newline at end of file +
+
+
+
+ + \ No newline at end of file