diff --git a/platforms/browser/www/assets/logonobg.svg b/platforms/browser/www/assets/logonobg.svg
index 4a51efb..425f7e7 100644
--- a/platforms/browser/www/assets/logonobg.svg
+++ b/platforms/browser/www/assets/logonobg.svg
@@ -15,145 +15,13 @@
viewBox="0 0 1321.5612 429.71863"
id="svg2"
version="1.1"
- inkscape:version="0.91 r13725"
- sodipodi:docname="logonobg.svg">
+ inkscape:version="0.91 r"
+ sodipodi:docname="logonobg.svg"
+ inkscape:export-filename="/home/skylar/Documents/Projects/Assets/TerranQuest/logo-3.0/png/logonobg.png"
+ inkscape:export-xdpi="52.369881"
+ inkscape:export-ydpi="52.369881">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -247,7 +95,7 @@
image/svg+xml
-
+
@@ -261,194 +109,53 @@
transform="matrix(0.57053535,0,0,0.57053535,343.19761,121.49738)"
inkscape:export-xdpi="34.138618"
inkscape:export-ydpi="34.138618">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/platforms/browser/www/css/main.css b/platforms/browser/www/css/main.css
index e32f3e4..12e496f 100644
--- a/platforms/browser/www/css/main.css
+++ b/platforms/browser/www/css/main.css
@@ -1,3 +1,7 @@
+body {
+ color: #eee;
+}
+
.brandlogo {
margin-top: 20px;
margin-left: auto;
@@ -270,4 +274,24 @@ body {
border-right: 1px solid white;
padding-top: 10px;
margin-top: -10px;
+}
+
+#place-name {
+ max-width: 90%;
+ border-bottom: 1px solid white;
+ border-left: 1px solid white;
+ padding-left: 5px;
+ padding-bottom: 2px;
+}
+
+#place-info-div {
+ font-size: 120%;
+ padding: 5px;
+ border-right: 1px solid white;
+ border-top: 1px solid white;
+}
+
+#team-choice-list {
+ color: #000;
+ font-size: 120%;
}
\ No newline at end of file
diff --git a/platforms/browser/www/js/auth.js b/platforms/browser/www/js/auth.js
index 344b93e..ef9ca18 100644
--- a/platforms/browser/www/js/auth.js
+++ b/platforms/browser/www/js/auth.js
@@ -25,6 +25,22 @@ function logout() {
$('#content-zone').load("screens/login.html");
}
+function checkUserHasTeamOpenChooserIfNot(username) {
+ $.getJSON(mkApiUrl('getstats', 'gs'), {
+ user: username
+ }, function (data) {
+ if (data.status === 'OK' && data.stats.teamid !== null && data.stats.teamid > 0) {
+ // We're all good.
+ openscreen("home");
+ } else {
+ // Open the team intro thingy
+ openscreen('chooseteam');
+ }
+ }).fail(function () {
+
+ });
+}
+
function dosignup() {
if (authOpInProgress) {
return;
@@ -60,7 +76,7 @@ function dosignup() {
password = $('#passwordBox').val();
localStorage.setItem("username", username);
localStorage.setItem("password", password);
- openscreen("home");
+ checkUserHasTeamOpenChooserIfNot(username);
} else {
$('#signupBtn').html(' Sign Up');
$('#signupBtn').attr('disabled', false);
@@ -104,7 +120,7 @@ function dologin() {
localStorage.setItem("username", username);
localStorage.setItem("password", password);
navigator.splashscreen.hide();
- openscreen("home");
+ checkUserHasTeamOpenChooserIfNot(username);
} else {
$('#loginBtn').html(' Login');
$('#loginBtn').attr('disabled', false);
diff --git a/platforms/browser/www/js/main.js b/platforms/browser/www/js/main.js
index 9d3857a..421b3e2 100644
--- a/platforms/browser/www/js/main.js
+++ b/platforms/browser/www/js/main.js
@@ -116,6 +116,7 @@ function closeMain() {
}
function getTeamInfoFromId(id) {
+ id = id + "";
var team_string = "None";
var team_color = "FFFFFF";
switch (id) {
diff --git a/platforms/browser/www/screens/chooseteam.html b/platforms/browser/www/screens/chooseteam.html
new file mode 100644
index 0000000..c00fccc
--- /dev/null
+++ b/platforms/browser/www/screens/chooseteam.html
@@ -0,0 +1,56 @@
+Choose Your Magic
+Before you can harness the power of magic, you must make a difficult choice.
+
+ The key to unlocking your inner power is channeling it into one of the elements.
+ Once you have chosen, it is extremely difficult to change.
+
+ Choose wisely.
+
+
+
+
+Continue
+
diff --git a/platforms/browser/www/screens/home.html b/platforms/browser/www/screens/home.html
index d9f9502..2d127d6 100644
--- a/platforms/browser/www/screens/home.html
+++ b/platforms/browser/www/screens/home.html
@@ -28,7 +28,7 @@
- Energy
+ Life
diff --git a/platforms/browser/www/screens/place.html b/platforms/browser/www/screens/place.html
index 7853717..d9b5c44 100644
--- a/platforms/browser/www/screens/place.html
+++ b/platforms/browser/www/screens/place.html
@@ -1,13 +1,18 @@
\ No newline at end of file
diff --git a/plugins/android.json b/plugins/android.json
index e425c3c..83cf89e 100644
--- a/plugins/android.json
+++ b/plugins/android.json
@@ -7,7 +7,7 @@
"files": {}
},
"installed_plugins": {
- "cordova-plugin-whitelist": {
+ "cordova-plugin-camera": {
"PACKAGE_NAME": "com.netsyms.terranquest.TerranQuest"
},
"cordova-plugin-console": {
@@ -16,25 +16,25 @@
"cordova-plugin-device": {
"PACKAGE_NAME": "com.netsyms.terranquest.TerranQuest"
},
- "cordova-plugin-camera": {
- "PACKAGE_NAME": "com.netsyms.terranquest.TerranQuest"
- },
- "cordova-plugin-splashscreen": {
- "PACKAGE_NAME": "com.netsyms.terranquest.TerranQuest"
- },
- "cordova-plugin-network-information": {
- "PACKAGE_NAME": "com.netsyms.terranquest.TerranQuest"
- },
"cordova-plugin-dialogs": {
"PACKAGE_NAME": "com.netsyms.terranquest.TerranQuest"
},
+ "cordova-plugin-geolocation": {
+ "PACKAGE_NAME": "com.netsyms.terranquest.TerranQuest"
+ },
"cordova-plugin-media": {
"PACKAGE_NAME": "com.netsyms.terranquest.TerranQuest"
},
"cordova-plugin-media-capture": {
"PACKAGE_NAME": "com.netsyms.terranquest.TerranQuest"
},
- "cordova-plugin-geolocation": {
+ "cordova-plugin-network-information": {
+ "PACKAGE_NAME": "com.netsyms.terranquest.TerranQuest"
+ },
+ "cordova-plugin-splashscreen": {
+ "PACKAGE_NAME": "com.netsyms.terranquest.TerranQuest"
+ },
+ "cordova-plugin-whitelist": {
"PACKAGE_NAME": "com.netsyms.terranquest.TerranQuest"
},
"phonegap-plugin-barcodescanner": {
diff --git a/www/assets/logonobg.svg b/www/assets/logonobg.svg
index 4a51efb..425f7e7 100644
--- a/www/assets/logonobg.svg
+++ b/www/assets/logonobg.svg
@@ -15,145 +15,13 @@
viewBox="0 0 1321.5612 429.71863"
id="svg2"
version="1.1"
- inkscape:version="0.91 r13725"
- sodipodi:docname="logonobg.svg">
+ inkscape:version="0.91 r"
+ sodipodi:docname="logonobg.svg"
+ inkscape:export-filename="/home/skylar/Documents/Projects/Assets/TerranQuest/logo-3.0/png/logonobg.png"
+ inkscape:export-xdpi="52.369881"
+ inkscape:export-ydpi="52.369881">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -247,7 +95,7 @@
image/svg+xml
-
+
@@ -261,194 +109,53 @@
transform="matrix(0.57053535,0,0,0.57053535,343.19761,121.49738)"
inkscape:export-xdpi="34.138618"
inkscape:export-ydpi="34.138618">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/www/css/main.css b/www/css/main.css
index e32f3e4..12e496f 100644
--- a/www/css/main.css
+++ b/www/css/main.css
@@ -1,3 +1,7 @@
+body {
+ color: #eee;
+}
+
.brandlogo {
margin-top: 20px;
margin-left: auto;
@@ -270,4 +274,24 @@ body {
border-right: 1px solid white;
padding-top: 10px;
margin-top: -10px;
+}
+
+#place-name {
+ max-width: 90%;
+ border-bottom: 1px solid white;
+ border-left: 1px solid white;
+ padding-left: 5px;
+ padding-bottom: 2px;
+}
+
+#place-info-div {
+ font-size: 120%;
+ padding: 5px;
+ border-right: 1px solid white;
+ border-top: 1px solid white;
+}
+
+#team-choice-list {
+ color: #000;
+ font-size: 120%;
}
\ No newline at end of file
diff --git a/www/js/auth.js b/www/js/auth.js
index 344b93e..ef9ca18 100644
--- a/www/js/auth.js
+++ b/www/js/auth.js
@@ -25,6 +25,22 @@ function logout() {
$('#content-zone').load("screens/login.html");
}
+function checkUserHasTeamOpenChooserIfNot(username) {
+ $.getJSON(mkApiUrl('getstats', 'gs'), {
+ user: username
+ }, function (data) {
+ if (data.status === 'OK' && data.stats.teamid !== null && data.stats.teamid > 0) {
+ // We're all good.
+ openscreen("home");
+ } else {
+ // Open the team intro thingy
+ openscreen('chooseteam');
+ }
+ }).fail(function () {
+
+ });
+}
+
function dosignup() {
if (authOpInProgress) {
return;
@@ -60,7 +76,7 @@ function dosignup() {
password = $('#passwordBox').val();
localStorage.setItem("username", username);
localStorage.setItem("password", password);
- openscreen("home");
+ checkUserHasTeamOpenChooserIfNot(username);
} else {
$('#signupBtn').html(' Sign Up');
$('#signupBtn').attr('disabled', false);
@@ -104,7 +120,7 @@ function dologin() {
localStorage.setItem("username", username);
localStorage.setItem("password", password);
navigator.splashscreen.hide();
- openscreen("home");
+ checkUserHasTeamOpenChooserIfNot(username);
} else {
$('#loginBtn').html(' Login');
$('#loginBtn').attr('disabled', false);
diff --git a/www/js/main.js b/www/js/main.js
index 9d3857a..421b3e2 100644
--- a/www/js/main.js
+++ b/www/js/main.js
@@ -116,6 +116,7 @@ function closeMain() {
}
function getTeamInfoFromId(id) {
+ id = id + "";
var team_string = "None";
var team_color = "FFFFFF";
switch (id) {
diff --git a/www/screens/chooseteam.html b/www/screens/chooseteam.html
new file mode 100644
index 0000000..de31813
--- /dev/null
+++ b/www/screens/chooseteam.html
@@ -0,0 +1,56 @@
+Choose Your Magic
+Before you can harness the power of magic, you must make a difficult choice.
+
+ The key to unlocking your inner power is channeling it into one of the elements.
+ Once you have chosen, you cannot change your mind.
+
+ Choose wisely.
+
+
+
+
+Continue
+
diff --git a/www/screens/home.html b/www/screens/home.html
index d9f9502..2d127d6 100644
--- a/www/screens/home.html
+++ b/www/screens/home.html
@@ -28,7 +28,7 @@
- Energy
+ Life
diff --git a/www/screens/place.html b/www/screens/place.html
index 7853717..d9b5c44 100644
--- a/www/screens/place.html
+++ b/www/screens/place.html
@@ -1,13 +1,18 @@
\ No newline at end of file