page-view, projetos, push notifications

mlpassos · Oct 4, 2016 · 502e41d · 502e41d
1 parent 4952eca
commit 502e41d
Show file tree

Hide file tree

Showing 11 changed files with 78 additions and 40 deletions.
diff --git a/app/components/page-view.js b/app/components/page-view.js
@@ -8,11 +8,13 @@ export default Ember.Component.extend({
 		if (ct.length) {
 			// alert('existe page-content');
 			ct.delegate('a', 'click', function(e) {
-			   e.preventDefault();
+			   // e.preventDefault();
 			   let url = $(this).attr('href');
 			   // console.log($(this).attr('href') + ' substituido com sucesso!');
 			   // window.open( $(this).attr('href'), 'popup' );
-			   let ref = window.open(url, '_blank', 'location=yes');
+			   // console.log('trocou');
+			   // alert('tem');
+			   var ref = cordova.InAppBrowser.open(url, '_blank', 'location=yes');
 			});	
 		}
 	}

diff --git a/app/routes/home.js b/app/routes/home.js
@@ -17,45 +17,47 @@ export default Ember.Route.extend({
     	} else {
     		alert('nao existe InAppBrowser');
     	}
-    	var push = PushNotification.init({
-		    android: {
-		        senderID: "605443485040"
-		    },
-		    browser: {
-		        pushServiceURL: 'https://ember-secom-app.firebaseio.com'
-		    },
-		    ios: {
-		        alert: "true",
-		        badge: "true",
-		        sound: "true"
-		    },
-		    windows: {}
-		});
+    	PushNotification.hasPermission(function(data) {
+		    if (data.isEnabled) {
+		       var push = PushNotification.init({
+				    android: {
+				        senderID: "605443485040",
+				        forceShow: "true"
+				    },
+				    browser: {
+				        pushServiceURL: 'https://ember-secom-app.firebaseio.com'
+				    },
+				    ios: {
+				        alert: "true",
+				        badge: "true",
+				        sound: "true"
+				    },
+				    windows: {}
+				});
 
-		push.on('registration', function(data) {
-		    // data.registrationId
-		    alert('registrado ' + data.registrationId);
-		});
+				push.on('registration', function(data) {
+				    // data.registrationId
+				    alert('registrado ' + data.registrationId);
+				});
 
-		push.on('notification', function(data) {
-			// alert('mensagem: ' + data.message);
-			navigator.notification.alert(
-			    data.message,  // message
-			    function(){},         // callback
-			    data.title,            // title
-			    'Ok'                  // buttonName
-			);
-		    // data.message,
-		    // data.title,
-		    // data.count,
-		    // data.sound,
-		    // data.image,
-		    // data.additionalData
-		});
+				push.on('notification', function(data) {
+					// alert('mensagem: ' + data.message);
+					navigator.notification.alert(
+					    data.message,  // message
+					    function(){},         // callback
+					    data.title,            // title
+					    'Ok'                  // buttonName
+					);
+				});
 
-		push.on('error', function(e) {
-		    alert(e.message);
+				push.on('error', function(e) {
+				    alert('Erro de push: ' + e.message);
+				});
+		    } else {
+		    	alert('Push is off');
+		    }
 		});
+
 	},	
 	model() {
 		return props;

diff --git a/app/routes/projetos.js b/app/routes/projetos.js
@@ -5,8 +5,28 @@ export default Ember.Route.extend({
 		title:'Projetos', 
 		content: 'Em breve'
 	},
+	// model() {
+	// 	// return this.store.findRecord('page', 'biizu');
+	// 	return this.get('props');
+	// }
 	model() {
-		// return this.store.findRecord('page', 'biizu');
-		return this.get('props');
+     return Ember.RSVP.hash({
+        biizu: this.store.findRecord('page', 'biizu'),
+	    paraResponde: this.store.findRecord('page', 'para-responde'),
+	    publicom: this.store.findRecord('page', 'publicom'),
+	    radioEscola: this.store.findRecord('page', 'radio-escola'),
+	    asfemBel: this.store.findRecord('page', 'projeto-jornal-das-feiras-asfembel')
+	  });
+	},
+    setupController(controller, models) {
+    	this._super(...arguments);
+	    controller.set('biizu', models.biizu);
+	    controller.set('paraResponde', models.paraResponde);
+	    controller.set('publicom', models.publicom);
+	    controller.set('radioEscola', models.radioEscola);
+	    controller.set('asfemBel', models.asfemBel);
+	    controller.set('props', this.get('props'));
+	    // or, more concisely:
+	    // controller.setProperties(models);
 	}
 });
diff --git a/app/serializers/page.js b/app/serializers/page.js
@@ -15,6 +15,11 @@ export default DS.RESTSerializer.extend(DS.EmbeddedRecordsMixin, {
 			case 'findRecord':
 				console.log('page.findRecord: ', target);
 				payload = payload.page;
+				// payload = payload.map((page) => {
+				payload.oldId = payload.id;
+				payload.id = payload.slug;
+					// return page;
+				// });
 				payload = {page: payload};
 				break;
 			default:

diff --git a/app/templates/projetos.hbs b/app/templates/projetos.hbs
@@ -1,4 +1,13 @@
 <div class="container">
-	{{page-view page=model}}
+	{{page-view page=biizu}}
+	<hr>
+	{{page-view page=paraResponde}}
+	<hr>
+	{{page-view page=publicom}}
+	<hr>
+	{{page-view page=radioEscola}}
+	<hr>
+	{{page-view page=asfemBel}}
+	<hr>
 </div>
 {{outlet}}
diff --git a/cordova/platforms/android/.gradle/2.13/taskArtifacts/cache.properties.lock b/cordova/platforms/android/.gradle/2.13/taskArtifacts/cache.properties.lock
diff --git a/cordova/platforms/android/.gradle/2.13/taskArtifacts/fileHashes.bin b/cordova/platforms/android/.gradle/2.13/taskArtifacts/fileHashes.bin
diff --git a/cordova/platforms/android/.gradle/2.13/taskArtifacts/fileSnapshots.bin b/cordova/platforms/android/.gradle/2.13/taskArtifacts/fileSnapshots.bin
diff --git a/cordova/platforms/android/.gradle/2.13/taskArtifacts/taskArtifacts.bin b/cordova/platforms/android/.gradle/2.13/taskArtifacts/taskArtifacts.bin
diff --git a/...le/2.13/tasks/_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/...le/2.13/tasks/_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
diff --git a/...tasks/_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/...tasks/_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock