summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xStoneIsland/config.xml6
-rw-r--r--StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstatebin37168 -> 37128 bytes
-rw-r--r--StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist4
-rwxr-xr-xStoneIsland/platforms/ios/Stone Island/config.xml12
-rwxr-xr-xStoneIsland/platforms/ios/www/js/lib/blogs/BlogView.js13
-rwxr-xr-xStoneIsland/www/js/index.js2
-rwxr-xr-xStoneIsland/www/js/lib/blogs/BlogView.js4
-rwxr-xr-xStoneIsland/www/js/lib/etc/push.js4
8 files changed, 25 insertions, 20 deletions
diff --git a/StoneIsland/config.xml b/StoneIsland/config.xml
index 31108cfa..eb1960f4 100755
--- a/StoneIsland/config.xml
+++ b/StoneIsland/config.xml
@@ -1,11 +1,11 @@
<?xml version='1.0' encoding='utf-8'?>
-<widget id="us.okfoc.stoneisland" version="0.8.8" android-versionCode="6088" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="us.okfoc.stoneisland" version="0.9.0" android-versionCode="6090" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>Stone Island</name>
<description>
Stone Island
</description>
- <author email="frontdesk@okfoc.us" href="http://okfoc.us/">
- OKFocus
+ <author email="julescarbon@gmail.com" href="http://asdf.us/">
+ Jules Laplace
</author>
<content src="index.html" />
<plugin name="cordova-plugin-whitelist" version="1" />
diff --git a/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate b/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate
index 272e3516..0a9d7d7c 100644
--- a/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate
Binary files differ
diff --git a/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist
index 2714e400..22781695 100644
--- a/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist
+++ b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist
@@ -21,7 +21,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>0.8.8</string>
+ <string>0.9.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
@@ -34,7 +34,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
- <string>0.8.8</string>
+ <string>0.9.0</string>
<key>GCM_SENDER_ID</key>
<string>XXXXXXX</string>
<key>IS_GCM_ENABLED</key>
diff --git a/StoneIsland/platforms/ios/Stone Island/config.xml b/StoneIsland/platforms/ios/Stone Island/config.xml
index 89ade77f..a224bc56 100755
--- a/StoneIsland/platforms/ios/Stone Island/config.xml
+++ b/StoneIsland/platforms/ios/Stone Island/config.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
-<widget android-versionCode="6088" id="us.okfoc.stoneisland" version="0.8.8" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget android-versionCode="6090" id="us.okfoc.stoneisland" version="0.9.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<feature name="LocalStorage">
<param name="ios-package" value="CDVLocalStorage" />
</feature>
@@ -47,12 +47,15 @@
<feature name="PushNotification">
<param name="ios-package" value="PushPlugin" />
</feature>
+ <feature name="UniversalAnalytics">
+ <param name="ios-package" value="UniversalAnalyticsPlugin" />
+ </feature>
<name>Stone Island</name>
<description>
Stone Island
</description>
- <author email="frontdesk@okfoc.us" href="http://okfoc.us/">
- OKFocus
+ <author email="julescarbon@gmail.com" href="http://asdf.us/">
+ Jules Laplace
</author>
<content src="index.html" />
<access origin="*" />
@@ -86,7 +89,4 @@
<preference name="SplashMaintainAspectRatio" value="true" />
<preference name="ShowSplashScreenSpinner" value="false" />
<preference name="AutoHideSplashScreen" value="false" />
- <feature name="UniversalAnalytics">
- <param name="ios-package" value="UniversalAnalyticsPlugin" />
- </feature>
</widget>
diff --git a/StoneIsland/platforms/ios/www/js/lib/blogs/BlogView.js b/StoneIsland/platforms/ios/www/js/lib/blogs/BlogView.js
index a6ec75f2..598a0241 100755
--- a/StoneIsland/platforms/ios/www/js/lib/blogs/BlogView.js
+++ b/StoneIsland/platforms/ios/www/js/lib/blogs/BlogView.js
@@ -31,7 +31,14 @@ var BlogView = View.extend({
this.loaded = true
this.data = data = typeof data == "string" ? JSON.parse(data) : data
- app.store = data.store[0]
+ // sdk.env = 'test'
+
+ if (sdk.env === 'test') {
+ app.store = data.store[1]
+ }
+ else {
+ app.store = data.store[0]
+ }
switch (app.store.DepartmentStoreStatus) {
case "open":
@@ -44,8 +51,6 @@ var BlogView = View.extend({
break
}
- // sdk.env = 'test'
-
if (app.closed.storeIsClosed && sdk.env !== 'test') {
app.closed.populate(app.store.ClosedStoreImages)
}
@@ -59,7 +64,7 @@ var BlogView = View.extend({
if (sdk.env === 'test') {
app.department_id = window.location.search.substr(1) || app.department_id
console.log('using test department id', app.department_id)
- app.department_id = 'TSTSZS'
+ // app.department_id = 'TSTSZS'
}
app.collection.loaded = false
app.collection.fetch()
diff --git a/StoneIsland/www/js/index.js b/StoneIsland/www/js/index.js
index 43b55b04..a28faabf 100755
--- a/StoneIsland/www/js/index.js
+++ b/StoneIsland/www/js/index.js
@@ -4,7 +4,7 @@ var app = (function(){
app.init = function(){
console.log("init")
- if (window.location.hostname === 'lvh.me' || window.location.hostname === 'stone.giraffe.life') {
+ if (window.location.hostname === 'lvh.me' || window.location.hostname === 'stone.giraffe.life' || window.location.hostname === 'dev.stone.giraffe.life') {
console.log('launching in test mode')
sdk.init({ env: "test" })
}
diff --git a/StoneIsland/www/js/lib/blogs/BlogView.js b/StoneIsland/www/js/lib/blogs/BlogView.js
index 598a0241..9fe28132 100755
--- a/StoneIsland/www/js/lib/blogs/BlogView.js
+++ b/StoneIsland/www/js/lib/blogs/BlogView.js
@@ -9,8 +9,8 @@ var BlogView = View.extend({
fetch: function(fn){
$.ajax({
method: "GET",
- url: sdk.env === 'test' ? '/db.json' : "https://stone.sup.land/db.json",
- // url: "https://stone.sup.land/db.json",
+ url: sdk.env === 'test' ? '/db.json' : "https://stone.giraffe.life/db.json",
+ // url: "https://stone.giraffe.life/db.json",
success: function(data){
this.success(data)
fn && fn()
diff --git a/StoneIsland/www/js/lib/etc/push.js b/StoneIsland/www/js/lib/etc/push.js
index 6a1dfa5b..3b919ffd 100755
--- a/StoneIsland/www/js/lib/etc/push.js
+++ b/StoneIsland/www/js/lib/etc/push.js
@@ -70,7 +70,7 @@ var push = (function(){
})
$.ajax({
method: "POST",
- url: "https://stone.sup.land/_services/push/add",
+ url: "https://stone.giraffe.life/_services/push/add",
data: data,
contentType: 'application/x-www-form-urlencoded; charset=UTF-8',
success: function(){
@@ -91,7 +91,7 @@ var push = (function(){
}
$.ajax({
method: "POST",
- url: "https://stone.sup.land/_services/push/remove",
+ url: "https://stone.giraffe.life/_services/push/remove",
data: data,
contentType: 'application/x-www-form-urlencoded; charset=UTF-8',
success: function(){