diff --git a/src/app/wizard/kitbuild3.html b/src/app/wizard/kitbuild3.html
index 015a236..3f511c3 100644
--- a/src/app/wizard/kitbuild3.html
+++ b/src/app/wizard/kitbuild3.html
@@ -1,5 +1,5 @@
diff --git a/src/app/wizard/scripts/accesspointController.js b/src/app/wizard/scripts/accesspointController.js
index 5993a67..40bb601 100644
--- a/src/app/wizard/scripts/accesspointController.js
+++ b/src/app/wizard/scripts/accesspointController.js
@@ -28,9 +28,9 @@ angular.module('app').controller('accesspointController', function ($scope, scop
$scope.$parent.segueControl = 'ready';
$scope.$parent.smartCitizenToggle = '';
if ($scope.$parent.payload.url == "accesspoint_1") {
- $scope.bindable = $sce.trustAsHtml($scope.$parent.payload.h3_1 + "
" + $scope.$parent.payload.em_1 + "" + $scope.$parent.payload.h3_2 + "
" + $scope.$parent.payload.em_2 + "" + $scope.$parent.payload.h3_3);
+ $scope.bindable = $sce.trustAsHtml($scope.$parent.payload.h3_1 + "
" + $scope.$parent.payload.em_1 + "" + $scope.$parent.payload.h3_2 + "
" + $scope.$parent.payload.em_2 + "" + $scope.$parent.payload.h3_3);
} else if ($scope.$parent.payload.url == "accesspoint_2") {
- $scope.bindable = $sce.trustAsHtml($scope.$parent.payload.h3_1 + "
" + $scope.$parent.payload.em_1 + "");
- console.log($scope.$parent.payload.h3_1 + "
" + $scope.$parent.payload.em_1 + "");
+ $scope.bindable = $sce.trustAsHtml($scope.$parent.payload.h3_1 + "
" + $scope.$parent.payload.em_1 + "");
+ console.log($scope.$parent.payload.h3_1 + "
" + $scope.$parent.payload.em_1 + "");
}
});
\ No newline at end of file
diff --git a/src/app/wizard/scripts/accountController.js b/src/app/wizard/scripts/accountController.js
index af4a2df..7a673a0 100644
--- a/src/app/wizard/scripts/accountController.js
+++ b/src/app/wizard/scripts/accountController.js
@@ -2,7 +2,7 @@
/**
* Created by Lucian on 10/12/16.
*/
-angular.module('app').controller('accountController', function ($scope, scopePayload, AnimationService, platform, $timeout, $rootScope, $stateParams) {
+angular.module('app').controller('accountController', function ($scope, scopePayload, AnimationService, platform, $timeout, $rootScope, $stateParams, session) {
$scope.$parent.payload = scopePayload;
AnimationService.animate(scopePayload.index);
@@ -13,6 +13,12 @@ angular.module('app').controller('accountController', function ($scope, scopePay
$scope.given_email = ( $scope.$parent.submittedData.user.email == ' ' ? '' : $scope.$parent.submittedData.user.email);
$scope.given_username = ( $scope.$parent.submittedData.user.username == ' ' ? '' : $scope.$parent.submittedData.user.username);
+ $scope.$parent.submittedData.deviceData = {
+ device_token: session.device_token
+ };
+
+ console.log($scope.$parent.submittedData.deviceData);
+
/********** Watchers **********/
$scope.accountListener = function () {
@@ -34,8 +40,8 @@ angular.module('app').controller('accountController', function ($scope, scopePay
console.log('returned', data);
loginAndBakeDevice();
}, function (res) {
- if (res.data.errors.password) {
- console.error("Password " + res.data.errors.password[0])
+ if (res.status == -1) { //TODO: The '-1' is temporary due to Restangular / CORS weird issue
+ //console.error("Password " + res.data.errors.password[0])
}
//blockSegue();
});
@@ -64,9 +70,9 @@ angular.module('app').controller('accountController', function ($scope, scopePay
platform.createUser($scope.$parent.submittedData.user).then(function (data) {
//Do nothing
}, function (res) {
- if (res.data.errors.username) {
+ if (res.status == -1) { //TODO: The '-1' is temporary due to Restangular / CORS weird issue
// Username has already been taken
- console.error("Username " + res.data.errors.username[0]);
+ // console.error("Username " + res.data.errors.username[0]);
blockSegue();
} else {
prepSegue();
@@ -111,12 +117,17 @@ angular.module('app').controller('accountController', function ($scope, scopePay
};
$scope.forgotPassword = function () {
- window.open("", '_blank');
+ platform.resetPassword($scope.$parent.submittedData.user.email).then(function(data) {
+ $scope.$parent.resetEmailSent();
+ }, function(data){
+ console.error('There was a problem sending the reset password email');
+ });
};
/********** Functions **********/
function loginAndBakeDevice() {
+ print($scope.$parent.submittedData.user);
platform.login($scope.$parent.submittedData.user).then(function (data) {
platform.setAuth(data);
console.log("logged in successful");
@@ -125,7 +136,7 @@ angular.module('app').controller('accountController', function ($scope, scopePay
console.log("baked successful", data);
$timeout(function () {
$scope.$parent.submittedData.deviceData.id = data.id;
- //prepSegue();
+ prepSegue();
$rootScope.$broadcast('forceSegue', {
target: 'wizard.final',
params: {lang: $stateParams.lang}
@@ -155,17 +166,14 @@ angular.module('app').controller('accountController', function ($scope, scopePay
}
function prepSegue() {
- // debugger;
$scope.$parent.segueControl = 'ready';
}
function blockSegue() {
- // debugger;
$scope.$parent.segueControl = 'blocked';
}
function checkSegue() {
- // debugger;
if (
($scope.$parent.payload.url == 'email') && (validateEmail($scope.given_email)) ||
($scope.$parent.payload.url == 'username') && ($scope.given_username)
diff --git a/src/app/wizard/scripts/landingController.js b/src/app/wizard/scripts/landingController.js
index c4bdae7..21b0fcb 100644
--- a/src/app/wizard/scripts/landingController.js
+++ b/src/app/wizard/scripts/landingController.js
@@ -10,7 +10,6 @@ angular.module('app').controller('landingController', function($scope, scopePayl
var buttonTargets = [];
targets(scopePayload);
- console.log(buttonTargets);
function targets(payload){
if (payload.contextButton1 == "ENGLISH") {
diff --git a/src/app/wizard/scripts/location.js b/src/app/wizard/scripts/location.js
index d68a767..33d492c 100644
--- a/src/app/wizard/scripts/location.js
+++ b/src/app/wizard/scripts/location.js
@@ -6,7 +6,7 @@ angular.module('app').config(function (uiGmapGoogleMapApiProvider) {
v: '3.20',
libraries: 'weather,geometry,visualization'
});
-}).controller('locationController', function ($scope, uiGmapIsReady, $geolocation, scopePayload, AnimationService) {
+}).controller('locationController', function ($scope, uiGmapIsReady, $geolocation, scopePayload, AnimationService, tags) {
// Tags must be on this list https://api.smartcitizen.me/v0/tags
@@ -14,29 +14,21 @@ angular.module('app').config(function (uiGmapGoogleMapApiProvider) {
$scope.$parent.payload = scopePayload;
- $scope.locationTags = [
- 'park',
- 'beach',
- 'school',
- 'street',
- 'woods',
- 'residential',
- 'commercial',
- 'plaza',
- 'rural',
- 'busy',
- 'calm',
- 'terrace',
- 'balcony',
- 'window',
- 'garden',
- 'bicycle'
- ];
+
+ var tagList = [];
+ for(var i = 0; i < tags.length; i++) {
+ var obj = tags[i];
+
+ var name = obj.name;
+ tagList.push(name);
+ }
+
+ $scope.locationTags=tagList.slice(0);
+ console.log($scope.locationTags);
$scope.tagStates = Array.apply(null, Array($scope.locationTags.length)).map(String.prototype.valueOf, '');
if ($scope.$parent.payload.url = "location_tags") {
- $scope.locationTags = scopePayload.tags;
$scope.$parent.segueControl = 'ready';
} else {
$scope.$parent.segueControl = 'blocked';
@@ -54,9 +46,9 @@ angular.module('app').config(function (uiGmapGoogleMapApiProvider) {
AnimationService.animate(scopePayload.index);
- uiGmapIsReady.promise(1).then(function () { // Double check issue when browser back
+ // uiGmapIsReady.promise(1).then(function () { // Double check issue when browser back
//setInitialPosition();
- });
+ // });
$geolocation.watchPosition({
diff --git a/src/app/wizard/scripts/platform.js b/src/app/wizard/scripts/platform.js
index c4fbc5e..65abd5b 100644
--- a/src/app/wizard/scripts/platform.js
+++ b/src/app/wizard/scripts/platform.js
@@ -1,8 +1,14 @@
'use strict';
-angular.module('app').factory('platform', function($rootScope, SegueService, Restangular) {
+angular.module('app').factory('platformNotify', function (socketFactory) {
+ return socketFactory({
+ ioSocket: io.connect('wss://ws.smartcitizen.me')
+ });
+});
- var sessionHeaders = {}, socket;
+angular.module('app').factory('platform', function($rootScope, SegueService, Restangular, platformNotify) {
+
+ var sessionHeaders = {};
function setSession(session) {
sessionHeaders.OnboardingSession = session.onboarding_session;
@@ -24,13 +30,12 @@ angular.module('app').factory('platform', function($rootScope, SegueService, Res
}
function bakeDevice(data) {
- console.log('calling bake');
- return Restangular.all('onboarding/register').post({});
+ return Restangular.all('onboarding/register').post(data);
}
- function checkEmail(emailString) {
+ function checkEmail(identity) {
var data = {
- email: emailString
+ email: identity
};
return Restangular.all('onboarding/user').post(data);
}
@@ -43,13 +48,9 @@ angular.module('app').factory('platform', function($rootScope, SegueService, Res
return Restangular.all('users').post(signupData);
}
- function connect(){
- socket = io.connect('wss://smartcitizen.xyz');
- }
function listenDevices(then){
- if (!socket) connect();
- socket.on('data-received', then);
+ platformNotify.on('data-received', then);
}
function listenDevice(id, scope){
@@ -59,8 +60,7 @@ angular.module('app').factory('platform', function($rootScope, SegueService, Res
}
function listenTokens(then){
- if (!socket) connect();
- socket.on('token-received', then);
+ platformNotify.on('token-received', then);
}
function listenToken(token, scope){
@@ -69,6 +69,21 @@ angular.module('app').factory('platform', function($rootScope, SegueService, Res
})
}
+ function resetPassword(emailString){
+ var data = {
+ email_or_username: emailString
+ };
+ return Restangular.all('password_resets').post(data);
+ }
+
+ function getTags() {
+ return Restangular.all('tags')
+ .getList({'per_page': 100})
+ // We add .plain() because we don't need full CRUD on Tags.
+ .then(function(fetchedTags){
+ return fetchedTags.plain();
+ });
+ }
return {
setSession: setSession,
@@ -80,7 +95,9 @@ angular.module('app').factory('platform', function($rootScope, SegueService, Res
login: login,
createUser: createUser,
listenDevice: listenDevice,
- listenToken: listenToken
+ listenToken: listenToken,
+ resetPassword: resetPassword,
+ getTags: getTags
};
});
\ No newline at end of file
diff --git a/src/app/wizard/scripts/router.js b/src/app/wizard/scripts/router.js
index d7c1507..23ae30d 100644
--- a/src/app/wizard/scripts/router.js
+++ b/src/app/wizard/scripts/router.js
@@ -33,23 +33,23 @@ angular.module('app').config(function ($stateProvider, $urlRouterProvider, $loca
}
}
})
- .state('wizard.making_sense', {
- url: '/making_sense?lang',
- templateUrl: 'app/wizard/collaborators.html',
- controller: 'baseController',
- resolve: {
- scopePayload: function (SegueService, $stateParams) {
- return SegueService.prep(1, $stateParams.lang);
- }
- }
- })
+ // .state('wizard.making_sense', {
+ // url: '/making_sense?lang',
+ // templateUrl: 'app/wizard/collaborators.html',
+ // controller: 'baseController',
+ // resolve: {
+ // scopePayload: function (SegueService, $stateParams) {
+ // return SegueService.prep(1, $stateParams.lang);
+ // }
+ // }
+ // })
.state('wizard.smart_citizen', {
url: '/smart_citizen?lang',
templateUrl: 'app/wizard/collaborators.html',
controller: 'smartCitizenController',
resolve: {
scopePayload: function (SegueService, $stateParams) {
- return SegueService.prep(2, $stateParams.lang);
+ return SegueService.prep(1, $stateParams.lang);
}
}
})
@@ -59,7 +59,7 @@ angular.module('app').config(function ($stateProvider, $urlRouterProvider, $loca
controller: 'smartCitizenController',
resolve: {
scopePayload: function (SegueService, $stateParams) {
- return SegueService.prep(3, $stateParams.lang);
+ return SegueService.prep(2, $stateParams.lang);
}
}
})
@@ -69,7 +69,7 @@ angular.module('app').config(function ($stateProvider, $urlRouterProvider, $loca
controller: 'smartCitizenController',
resolve: {
scopePayload: function (SegueService, $stateParams) {
- return SegueService.prep(4, $stateParams.lang);
+ return SegueService.prep(3, $stateParams.lang);
}
}
})
@@ -166,16 +166,16 @@ angular.module('app').config(function ($stateProvider, $urlRouterProvider, $loca
}
}
})
- // .state('wizard.case2', {
- // url: '/case_2?lang',
- // templateUrl: 'app/wizard/casing.html',
- // controller: 'baseController',
- // resolve: {
- // scopePayload: function (SegueService, $stateParams) {
- // return SegueService.prep(19, $stateParams.lang);
- // }
- // }
- // })
+ .state('wizard.case2', {
+ url: '/case_2?lang',
+ templateUrl: 'app/wizard/casing.html',
+ controller: 'baseController',
+ resolve: {
+ scopePayload: function (SegueService, $stateParams) {
+ return SegueService.prep(19, $stateParams.lang);
+ }
+ }
+ })
.state('wizard.confirm_build', {
url: '/confirm_build?lang',
@@ -183,7 +183,7 @@ angular.module('app').config(function ($stateProvider, $urlRouterProvider, $loca
controller: 'baseController',
resolve: {
scopePayload: function (SegueService, $stateParams) {
- return SegueService.prep(19, $stateParams.lang);
+ return SegueService.prep(20, $stateParams.lang);
}
}
})
@@ -263,6 +263,14 @@ angular.module('app').config(function ($stateProvider, $urlRouterProvider, $loca
resolve: {
scopePayload: function (SegueService, $stateParams) {
return SegueService.prep(50, $stateParams.lang);
+ },
+ tags: function (platform, $state) {
+ return platform.getTags().then(function (tags) {
+ return tags;
+ }, function () {
+ $state.go('unavailable');
+ //return true;
+ });
}
}
})
@@ -273,6 +281,14 @@ angular.module('app').config(function ($stateProvider, $urlRouterProvider, $loca
resolve: {
scopePayload: function (SegueService, $stateParams) {
return SegueService.prep(51, $stateParams.lang);
+ },
+ tags: function (platform, $state) {
+ return platform.getTags().then(function (tags) {
+ return tags;
+ }, function () {
+ $state.go('unavailable');
+ //return true;
+ });
}
}
})
@@ -283,6 +299,14 @@ angular.module('app').config(function ($stateProvider, $urlRouterProvider, $loca
resolve: {
scopePayload: function (SegueService, $stateParams) {
return SegueService.prep(52, $stateParams.lang);
+ },
+ tags: function (platform, $state) {
+ return platform.getTags().then(function (tags) {
+ return tags;
+ }, function () {
+ $state.go('unavailable');
+ //return true;
+ });
}
}
})
diff --git a/src/app/wizard/scripts/services.js b/src/app/wizard/scripts/services.js
index 3f0464d..575cc78 100644
--- a/src/app/wizard/scripts/services.js
+++ b/src/app/wizard/scripts/services.js
@@ -11,7 +11,7 @@ angular.module('app').service('SegueService', function () {
"part": 1,
"template": "landing",
"url": "landing",
- "h1": "Welcome to the Making Sense pilot!",
+ "h1": "Welcome to the Smart Citizen Kit Onboarding!",
"h4": "Let’s get you set up with a Smart Citizen kit, and sensing in no time",
"segueButton": "Continue in English",
"contextButton1": "CASTELLANO",
@@ -21,38 +21,28 @@ angular.module('app').service('SegueService', function () {
"index": 1,
"part": 2,
"template": "collaborators",
- "url": "making_sense",
- "companyLogo": "app/images/MS LOGO.png",
- "h2": "Making Sense is a project to help people make sense of their environment.",
- "h4": "We want to help you deploy sensors to help understand sound pollution. By making sense of the issue, we might be able to address it.",
- "segueButton": "SOUNDS GOOD!"
- },
- {
- "index": 2,
- "part": 3,
- "template": "collaborators",
"url": "smart_citizen",
- "companyLogo": "app/images/SCK LOGO.png",
+ "companyLogo": "app/images/scklogo.png",
"h2": "Smart Citizen is a movement for civic participation in a modern world",
"h4": "Smart Citizen creates open tools for citizens to be better informed about the world around them.",
"segueButton": "CONTINUE"
},
{
- "index": 3,
- "part": 4,
+ "index": 2,
+ "part": 3,
"template": "basic2",
"url": "smart_citizen_brief",
- "image": "app/images/sck_glow.png",
+ "image": "app/images/sck.png",
"h2": "The Smart Citizen Kit",
"h4": "This sensor is a Smart Citizen Kit for environmental sensing. It measures sound, air quality, humidity, and lots of other things",
"segueButton": "CONTINUE"
},
{
- "index": 4,
- "part": 5,
+ "index": 3,
+ "part": 4,
"template": "basic2",
"url": "smart_citizen_brief2",
- "image": "app/images/SCK_macbook.png",
+ "image": "app/images/web.png",
"h2": "smartcitizen.me",
"h4": "The kit sends all the measurements to the Smart Citizen website. It's open and free for all to see, question and play with...",
"segueButton": "LET'S DO THIS"
@@ -171,21 +161,21 @@ angular.module('app').service('SegueService', function () {
"url": "case_1",
"h2": "Next, we'll place it all in the casing",
"text": "Make sure you place it with the battery cable towards the bottom of the casing",
- "image": "app/images/BOARDS-CUTOUT_0007_FRONT-eclosureBattSensor.png",
+ "image": "app/images/sck_placeall.png",
"segueButton": "CONTINUE"
},
- // {
- // "index": 19,
- // "part": 10,
- // "template": "casing",
- // "url": "case_2",
- // "h2": "... and to finish, seal the cover",
- // "text": "Place the transparent plastic on the front of the case and fix it in place with the two white plugs.",
- // "image": "app/images/BOARDS-CUTOUT_0007_FRONT-eclosure-wShineclasps.png",
- // "segueButton": "CONTINUE"
- // },
{
"index": 19,
+ "part": 10,
+ "template": "casing",
+ "url": "case_2",
+ "h2": "... and to finish, seal the cover",
+ "text": "Place the transparent plastic on the front of the case and fix it in place with the two white plugs.",
+ "image": "app/images/sck_sealthecover.png",
+ "segueButton": "CONTINUE"
+ },
+ {
+ "index": 20,
"part": 11,
"template": "comfirm",
"url": "confirm_build",
@@ -232,6 +222,10 @@ angular.module('app').service('SegueService', function () {
"url": "wifi_check",
"h2": "Oops, something went wrong...",
"h4": "It seems there is a problem. Notice that the Kit light is red, please retry the Wi-Fi name and password",
+ "input1": "Name of Wi-Fi",
+ "input1_error": "A name is required to connect to a network",
+ "input2": "Password",
+ "input2_error": "",
"segueButtonError": "CHECK THE FIELDS",
"contextButton": "Try another way",
"contextButton2": "Ask for Help",
@@ -356,26 +350,7 @@ angular.module('app').service('SegueService', function () {
"h2": "Is there anything we should know about location?",
"h4": "Selecting from the tags below can help us make sense of the data, and compare it more accurately",
"segueButton": "All SET",
- "continueButton": "All SET",
- "tags": ["Inside",
- "Outside",
- "Ground Floor",
- "First Floor",
- "Second Floor",
- "Third Floor",
- "Fourth Floor",
- "Fifth Floor",
- "Terrace",
- "Garden",
- "Balcony",
- "Window",
- "Residential",
- "Commercial",
- "Kitchen",
- "Bedroom",
- "Living Room",
- "Bathroom"
- ]
+ "continueButton": "All SET"
},
{
"index": 53,
@@ -474,25 +449,15 @@ angular.module('app').service('SegueService', function () {
"index": 1,
"part": 2,
"template": "collaborators",
- "url": "making_sense",
- "companyLogo": "app/images/MS LOGO.png",
- "h2": "Making Sense es un proyecto que ayuda a las personas a entender su entorno.",
- "h4": "Queremos ayudarte a instalar sensores para entender la contaminación acústica. Tomando conciencia del problema, seremos capaces de abordarlo.",
- "segueButton": "SUENA BIEN!"
- },
- {
- "index": 2,
- "part": 3,
- "template": "collaborators",
"url": "smart_citizen",
- "companyLogo": "app/images/SCK LOGO.png",
+ "companyLogo": "app/images/scklogo.png",
"h2": "Smart Citizen es un movimiento para la participación ciudadana utilizando las últimas tecnologías.",
"h4": "Smart Citizen crea herramientas abiertas para que los ciudadanos están mejor informado acerca del mundo a su alrededor.",
"segueButton": "CONTINÚA"
},
{
- "index": 3,
- "part": 4,
+ "index": 2,
+ "part": 3,
"template": "basic2",
"url": "smart_citizen_brief",
"image": "app/images/sck_glow.png",
@@ -501,11 +466,11 @@ angular.module('app').service('SegueService', function () {
"segueButton": "CONTINÚA"
},
{
- "index": 4,
- "part": 5,
+ "index": 3,
+ "part": 4,
"template": "basic2",
"url": "smart_citizen_brief2",
- "image": "app/images/SCK_macbook.png",
+ "image": "app/images/web.png",
"h2": "smartcitizen.me",
"h4": "El Kit envía todos los datos a la web de Smart Citizen. Es abierta y gratuita para todos, para ver, preguntar y jugar con ella...",
"segueButton": "VAMOS"
@@ -624,21 +589,21 @@ angular.module('app').service('SegueService', function () {
"url": "case_1",
"h2": "Después, colocalo todo dentro de la carcasa",
"text": "Asegurate de colocar el Kit con el cable de la batería hacia la parte inferior de la carcasa",
- "image": "app/images/BOARDS-CUTOUT_0007_FRONT-eclosureBattSensor.png",
+ "image": "app/images/sck_placeall.png",
"segueButton": "CONTINÚA"
},
- // {
- // "index": 19,
- // "part": 10,
- // "template": "casing",
- // "url": "case_2",
- // "h2": "... y para terminar, cierra la tapa",
- // "text": "Coloca el plástico transparente en la parte delantera de la caja y fijalo en su lugar con las dos fijaciones blancas",
- // "image": "app/images/BOARDS-CUTOUT_0007_FRONT-eclosure-wShineclasps.png",
- // "segueButton": "CONTINÚA"
- // },
{
"index": 19,
+ "part": 10,
+ "template": "casing",
+ "url": "case_2",
+ "h2": "... y para terminar, cierra la tapa",
+ "text": "Coloca el plástico transparente en la parte delantera de la caja y fijalo en su lugar con las dos fijaciones blancas",
+ "image": "app/images/sck_sealthecover.png",
+ "segueButton": "CONTINÚA"
+ },
+ {
+ "index": 20,
"part": 11,
"template": "comfirm",
"url": "confirm_build",
@@ -809,26 +774,7 @@ angular.module('app').service('SegueService', function () {
"h2": "Selecciona las palabras que mejor describen la ubicación de tu sensor.",
"h4": "Esto ayudarà a otros usuarios entender mejor los datos que estás midiendo",
"segueButton": "TODO CONFIGURADO",
- "continueButton": "TODO CONFIGURADO",
- "tags": ["Inside",
- "Outside",
- "Ground Floor",
- "First Floor",
- "Second Floor",
- "Third Floor",
- "Fourth Floor",
- "Fifth Floor",
- "Terrace",
- "Garden",
- "Balcony",
- "Window",
- "Residential",
- "Commercial",
- "Kitchen",
- "Bedroom",
- "Living Room",
- "Bathroom"
- ]
+ "continueButton": "TODO CONFIGURADO"
},
{
"index": 53,
@@ -927,38 +873,28 @@ angular.module('app').service('SegueService', function () {
"index": 1,
"part": 2,
"template": "collaborators",
- "url": "making_sense",
- "companyLogo": "app/images/MS LOGO.png",
- "h2": "Making Sense és un projecte per ajudar a la gent a entendre millor el seu entorn.",
- "h4": "Volem ajudar-te a instal·lar sensors per entendre millor la contaminació acústica. Prenent conciència del problema serem capaços de resoldre'l.",
- "segueButton": "SONA BÉ!"
- },
- {
- "index": 2,
- "part": 3,
- "template": "collaborators",
"url": "smart_citizen",
- "companyLogo": "app/images/SCK LOGO.png",
+ "companyLogo": "app/images/scklogo.png",
"h2": "Smart Citizen és un moviment per la participació ciutadana utilitzant les últimes tecnologies.",
"h4": "Smart Citizen crea eines obertes per ajudar els ciutadans a entendre millor el seu entorn.",
"segueButton": "CONTINUA"
},
{
- "index": 3,
- "part": 4,
+ "index": 2,
+ "part": 3,
"template": "basic2",
"url": "smart_citizen_brief",
- "image": "app/images/sck_glow.png",
+ "image": "app/images/sck.png",
"h2": "Smart Citizen Kit",
"h4": "Aquest sensors és un Smart Citizen Kit. Mesura soroll, qualitat de l'aire, humitat, i moltes coses més.",
"segueButton": "CONTINUA"
},
{
- "index": 4,
- "part": 5,
+ "index": 3,
+ "part": 4,
"template": "basic2",
"url": "smart_citizen_brief2",
- "image": "app/images/SCK_macbook.png",
+ "image": "app/images/web.png",
"h2": "smartcitizen.me",
"h4": "El sensor envia totes les mesures a la web d'Smart Citizen. És lliure i oberta perquè tothom pugui veure i qüestionar les dades...",
"segueButton": "FEM-HO"
@@ -1077,21 +1013,21 @@ angular.module('app').service('SegueService', function () {
"url": "case_1",
"h2": "A continuació posa-ho tot dins la carcassa",
"text": "Assegura't de col·locar el Kit amb el cable de la bateria cap a la part inferior de la carcassa",
- "image": "app/images/BOARDS-CUTOUT_0007_FRONT-eclosureBattSensor.png",
+ "image": "app/images/sck_placeall.png",
"segueButton": "CONTINUA"
},
- // {
- // "index": 19,
- // "part": 10,
- // "template": "casing",
- // "url": "case_2",
- // "h2": "... i per acabar, posa la tapa.",
- // "text": "Col·loca el plàstic transparent damunt la caixa i fixa'l al seu lloc amb les dues fixacions blanques",
- // "image": "app/images/BOARDS-CUTOUT_0007_FRONT-eclosure-wShineclasps.png",
- // "segueButton": "CONTINUA"
- // },
{
"index": 19,
+ "part": 10,
+ "template": "casing",
+ "url": "case_2",
+ "h2": "... i per acabar, posa la tapa.",
+ "text": "Col·loca el plàstic transparent damunt la caixa i fixa'l al seu lloc amb les dues fixacions blanques",
+ "image": "app/images/sck_sealthecover.png",
+ "segueButton": "CONTINUA"
+ },
+ {
+ "index": 20,
"part": 11,
"template": "comfirm",
"url": "confirm_build",
@@ -1262,26 +1198,7 @@ angular.module('app').service('SegueService', function () {
"h2": "Selecciona les paraules que millor descriuen el lloc on has instal·lat el Kit",
"h4": "Això ens ajudarà a saber el que estàs medint",
"segueButton": "TOT APUNT",
- "continueButton": "TOT APUNT",
- "tags": ["Inside",
- "Outside",
- "Ground Floor",
- "First Floor",
- "Second Floor",
- "Third Floor",
- "Fourth Floor",
- "Fifth Floor",
- "Terrace",
- "Garden",
- "Balcony",
- "Window",
- "Residential",
- "Commercial",
- "Kitchen",
- "Bedroom",
- "Living Room",
- "Bathroom"
- ]
+ "continueButton": "TOT APUNT"
},
{
"index": 53,
@@ -1417,18 +1334,15 @@ angular.module('app').service('SegueService', function () {
var langValue = 0; //default eng
if (lang == "esp") {
langValue = 1;
- console.log("loading Spanish");
} else if (lang == "cat") {
langValue = 2;
- console.log("loading Catalan");
} else {
- console.log("loading English");
}
return payloadGenerate(getPageContent(val, langValue), langValue)
};
this.nextPage = function (val, accountPresent) {
- if (val == 4) {
+ if (val == 3) {
return ('whats_in_the_box');
} else if (val == 19) {
return getPageContent(val + 2).url;
@@ -1483,6 +1397,14 @@ angular.module('app').service('SegueService', function () {
};
function payloadGenerate(content, value) {
+
+ // Ensure all the buttons copy is in lowercase to later postprocess in css at your taste
+ for (var key in content) {
+ if (key.indexOf('Button') !== -1) {
+ content[key] = content[key].toLowerCase();
+ }
+ }
+
if (value == undefined) {
value = 0;
}
@@ -1493,7 +1415,6 @@ angular.module('app').service('SegueService', function () {
var index = pC.findIndex(function (item, i) {
return item.index === payload.index;
});
- // console.log(index);
payload.progressLeftLabel = setupProgressLeft(payload.index).toString() + " / 6";
payload.progressRightLabel = setupProgressRight(payload.index).toString() + " step #" + payload.part;
@@ -1541,9 +1462,9 @@ angular.module('app').service('SegueService', function () {
};
function setupProgressLeft(index) {
- if (index <= 4) {
+ if (index <= 3) {
return 1;
- } else if (index <= 19) {
+ } else if (index <= 20) {
return 2;
} else if (index <= 34) {
return 3;
@@ -1557,9 +1478,9 @@ angular.module('app').service('SegueService', function () {
}
function setupProgressRight(index) {
- if (index <= 4) {
+ if (index <= 3) {
return "Introduction";
- } else if (index <= 19) {
+ } else if (index <= 20) {
return "What's in the Box";
} else if (index <= 33) {
return "Handshake";
diff --git a/src/app/wizard/scripts/statesController.js b/src/app/wizard/scripts/statesController.js
index d14f908..e0c5c41 100644
--- a/src/app/wizard/scripts/statesController.js
+++ b/src/app/wizard/scripts/statesController.js
@@ -119,11 +119,11 @@ angular.module('app').controller('stateCtlr', function($scope, $rootScope, scope
var data = [{
"title": $scope.payload.part1,
"body": $scope.payload.part1_desc,
- "image": "app/images/BOARDS-CUTOUT_0003_SENSOR-BOARD-BLUE.png"
+ "image": "app/images/sensor_board.png"
}, {
"title": $scope.payload.part2,
"body": $scope.payload.part2_desc,
- "image": "app/images/BOARDS-CUTOUT_0002_HARDWARE-BOARD-WHITE.png"
+ "image": "app/images/main_board.png"
}, {
"title": $scope.payload.part3,
"body": $scope.payload.part3_desc,
@@ -131,11 +131,11 @@ angular.module('app').controller('stateCtlr', function($scope, $rootScope, scope
}, {
"title": $scope.payload.part4,
"body": $scope.payload.part4_desc,
- "image": "app/images/BOARDS-CUTOUT_0005_USBgreen.png"
+ "image": "app/images/BOARDS-CUTOUT_0005_USB.png"
}, {
"title": $scope.payload.part5,
"body": $scope.payload.part5_desc,
- "image": "app/images/BOARDS-CUTOUT_0008_ANGLED.png"
+ "image": "app/images/sck_case2.png"
}, {
"title": $scope.payload.part6,
"body": $scope.payload.part6_desc,
diff --git a/src/app/wizard/scripts/wizard.js b/src/app/wizard/scripts/wizard.js
index 80c324d..1904793 100644
--- a/src/app/wizard/scripts/wizard.js
+++ b/src/app/wizard/scripts/wizard.js
@@ -11,15 +11,16 @@ angular.module('app').controller('wizardCtrl', function($scope, $location, $sce,
$scope.submittedData.user = {};
+ console.log('Your session:' , session);
+
$scope.submittedData.deviceData = {
device_token: session.device_token,
- description: 'Making Sense Pilot #1',
+ description: 'iSCAPE Citizen Kit',
exposure: 'outdoor',
- kit_id: 11
+ kit_id: 18
};
- console.log( $scope.submittedData.deviceData.user_tags_array);
- $scope.submittedData.deviceData.user_tags_array = ["MakingSense", "Barcelona", "Plaça del sol", "MS1"];
+ $scope.submittedData.deviceData.user_tags_array = ["iSCAPE"];
$scope.onboarding_session = session.onboarding_session;
@@ -29,11 +30,10 @@ angular.module('app').controller('wizardCtrl', function($scope, $location, $sce,
$scope.handShakeState = false;
$scope.handShakeRepeats = 0;
- $scope.handShakeRetries = 4;
+ $scope.handShakeRetries = 2;
/** Base Navigation **/
$scope.seque = function() {
- console.log($scope.payload.template);
if ($scope.segueControl == 'ready') {
switch ($scope.payload.template) {
case 'handshake':
@@ -79,7 +79,7 @@ angular.module('app').controller('wizardCtrl', function($scope, $location, $sce,
AnimationService.leaving(true);
$scope.payload.progressShow = 'blue';
$timeout(function() {
- console.log($scope.payload.index);
+ console.log('Next slide:', $scope.payload.index);
$location.path('/wizard/' + SegueService.nextPage($scope.payload.index, $scope.pre_made));
$window.scrollTo(0, 0);
$scope.payload.progressShow = ' ';
@@ -103,7 +103,7 @@ angular.module('app').controller('wizardCtrl', function($scope, $location, $sce,
$timeout(function() {
$scope.segueControl = 'ready';
//debugger;
- console.log($scope.payload.index);
+ console.log('Prev slide:', $scope.payload.index);
$location.path('/wizard/' + SegueService.previousPage($scope.payload.index, $scope.pre_made));
$window.scrollTo(0, 0);
$scope.payload.progressShow = ' ';
@@ -111,7 +111,7 @@ angular.module('app').controller('wizardCtrl', function($scope, $location, $sce,
}
function handleError() {
- console.log($scope.payload.template);
+ console.log('User error:', $scope.payload.template);
if (
($scope.payload.template == 'wifi_enter') ||
($scope.payload.template == 'sensorName') ||
@@ -201,6 +201,18 @@ angular.module('app').controller('wizardCtrl', function($scope, $location, $sce,
$rootScope.$broadcast('modal');
};
+ $scope.resetEmailSent = function() {
+ $scope.modalBox = 'green';
+ var data = {
+ title: "Email sent!",
+ body: "We have sent the email out! Check out your email in a new tab then return to put in your new password!",
+ button: "Ok",
+ action: "retry"
+ };
+ $scope.modalContent = data;
+ $rootScope.$broadcast('modal');
+ };
+
/** -- MODAL-- **/
$scope.modalClick = function() {
@@ -219,7 +231,7 @@ angular.module('app').controller('wizardCtrl', function($scope, $location, $sce,
$scope.seque;
break;
case 'restart':
- $state.go('wizard.landing');
+ $state.go('wizard.landing');
break;
default:
$scope.seque;
@@ -232,7 +244,7 @@ angular.module('app').controller('wizardCtrl', function($scope, $location, $sce,
});
Restangular.setErrorInterceptor(function(response, deferred, responseHandler) {
- if ([204, 422, 403, 404].indexOf(response.status) > -1) {
+ if ([-1, 204, 422, 403, 404].indexOf(response.status) > -1) { // TODO: '-1' is temporary fix for restangular / CORS issue
console.warn(response);
return true; // We don't catch errors 422 and 403 since we use them on user login
} else {
diff --git a/src/app/wizard/selectparts.html b/src/app/wizard/selectparts.html
index b826453..1f5a5e0 100644
--- a/src/app/wizard/selectparts.html
+++ b/src/app/wizard/selectparts.html
@@ -13,17 +13,17 @@
{{payload.h4}}
-
![]()
+
![]()
-
{{payload.part1}}
+
{{payload.part1}}
@@ -32,14 +32,14 @@
{{payload.part1}}
-
![]()
+
![]()
{{payload.part2}}
@@ -50,14 +50,14 @@
{{payload.part2}}
-
![]()
+
![]()
{{payload.part3}}
@@ -68,14 +68,14 @@
{{payload.part3}}
-
![]()
+
![]()
{{payload.part4}}
diff --git a/src/app/wizard/selectparts2.html b/src/app/wizard/selectparts2.html
index 337e7ef..dd53bf2 100644
--- a/src/app/wizard/selectparts2.html
+++ b/src/app/wizard/selectparts2.html
@@ -13,15 +13,15 @@
{{payload.h4}}
-
![]()
+
![]()
{{payload.part5}}
@@ -31,15 +31,15 @@
{{payload.part5}}
-
![]()
+
![]()
{{payload.part6}}
@@ -49,15 +49,15 @@
{{payload.part6}}
-
![]()
+
![]()
{{payload.part7}}
@@ -67,15 +67,15 @@
{{payload.part7}}
-
![]()
+
![]()
{{payload.part8}}
diff --git a/src/app/wizard/wifi_check.html b/src/app/wizard/wifi_check.html
index 93ab18e..53302b3 100644
--- a/src/app/wizard/wifi_check.html
+++ b/src/app/wizard/wifi_check.html
@@ -21,10 +21,10 @@
{{payload.h4}}