Fix #7 and #1 - aguda notifications and new icon from Guy

This commit is contained in:
Sagi Dayan 2015-02-02 15:23:52 +02:00
parent a71267f7f9
commit 4d832eb788
8 changed files with 36 additions and 28 deletions

View file

@ -9,6 +9,17 @@
<link href="lib/ionic/css/ionic.css" rel="stylesheet"> <link href="lib/ionic/css/ionic.css" rel="stylesheet">
<link href="css/style.css" rel="stylesheet"> <link href="css/style.css" rel="stylesheet">
<!-- Google Analitycs -->
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','http://www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-55431807-3', 'auto');
ga('send', 'pageview');
</script>
<!-- End Google Analitycs -->
<!-- IF using Sass (run gulp sass first), then uncomment below and remove the CSS includes above <!-- IF using Sass (run gulp sass first), then uncomment below and remove the CSS includes above
<link href="css/ionic.app.css" rel="stylesheet"> <link href="css/ionic.app.css" rel="stylesheet">
--> -->

View file

@ -87,14 +87,14 @@ starter.factory('ApiService', ['$http', '$ionicPopup', '$ionicModal', function (
$http.get("https://ajax.googleapis.com/ajax/services/feed/load?v=2.0&num=10&q=https://www.facebook.com/feeds/page.php?id=597726260353610%26format=rss20").then(function(resp) { $http.get("https://ajax.googleapis.com/ajax/services/feed/load?v=2.0&num=10&q=https://www.facebook.com/feeds/page.php?id=597726260353610%26format=rss20").then(function(resp) {
console.log('Success', resp); console.log('Success', resp);
console.log("[JCE] [INFO] : in update - Got Aguda from Facebook!"); console.log("[JCE] [INFO] : in update - Got Aguda from Facebook!");
if(grades === null){ if(agudaPosts === null){
window.localStorage['newAguda'] = "true"; window.localStorage['newAguda'] = "true";
window.localStorage['agudaPosts'] = JSON.stringify(resp.data); window.localStorage['agudaPosts'] = JSON.stringify(resp.data.responseData.feed.entries);
}else if(grades === JSON.stringify(resp.data)){ }else if(agudaPosts === JSON.stringify(resp.data.responseData.feed.entries)){
console.log("[JCE] [INFO] : in update - no new newAguda"); console.log("[JCE] [INFO] : in update - no new newAguda");
}else{ }else{
window.localStorage['newAguda'] = "true"; window.localStorage['newAguda'] = "true";
window.localStorage['agudaPosts'] = JSON.stringify(resp.data); window.localStorage['agudaPosts'] = JSON.stringify(resp.data.responseData.feed.entries);
} }
}, function(err) { }, function(err) {

View file

@ -358,6 +358,11 @@ angular.module('starter.controllers', [])
$scope.update = function(){ $scope.update = function(){
console.log("[JCE] [info]: Refreshing..."); console.log("[JCE] [info]: Refreshing...");
ApiService.update(); ApiService.update();
$timeout(function() {
$scope.$broadcast('scroll.refreshComplete'); //close the popup after 3 seconds for some reason
}, 3000);
if(window.localStorage['newNotes'] === "true") if(window.localStorage['newNotes'] === "true")
$scope.newNotes = true; $scope.newNotes = true;
else else
@ -368,10 +373,10 @@ angular.module('starter.controllers', [])
else else
$scope.newGrades = false; $scope.newGrades = false;
$timeout(function() { if(window.localStorage['newAguda'] === "true")
$scope.$broadcast('scroll.refreshComplete'); //close the popup after 3 seconds for some reason $scope.newAguda = true;
}, 3000); else
$scope.newAguda = false;
}; };

View file

@ -7,6 +7,9 @@
</ion-header-bar> </ion-header-bar>
<ion-content> <ion-content>
<div class="page-content"> <div class="page-content">
<center>
<h1><i class="icon ion-locked"></i></h1><br>
</center>
<form ng-submit="Aouth()"> <form ng-submit="Aouth()">
<div class="list"> <div class="list">
<label class="item item-input"> <label class="item item-input">

View file

@ -1,10 +1,10 @@
<ion-view view-title="אגודת הסטודנטים" > <ion-view view-title="אגודת הסטודנטים" >
<ion-content> <ion-content overflow-scroll="true">
<div class="page-content"> <div class="page-content">
<h1><i class="icon ion-speakerphone"></i> אגודת הסטודנטים</h1> <h1><i class="icon ion-speakerphone"></i> אגודת הסטודנטים</h1>
<div class="list card" ng-repeat="post in agudaAll.responseData.feed.entries"> <div class="list card" ng-repeat="post in agudaAll">
<div class="item item-avatar"> <div class="item item-avatar">
<img src="https://fbcdn-profile-a.akamaihd.net/hprofile-ak-xpa1/v/t1.0-1/p200x200/10660171_597727170353519_3762039883805959255_n.jpg?oh=f4f4498e2f3e8fc29eaf046695ce6246&oe=55319C44&__gda__=1429862649_ff1a6a29c78ac73534f8caa69bb921a6"> <img src="https://fbcdn-profile-a.akamaihd.net/hprofile-ak-xpa1/v/t1.0-1/p200x200/10660171_597727170353519_3762039883805959255_n.jpg?oh=f4f4498e2f3e8fc29eaf046695ce6246&oe=55319C44&__gda__=1429862649_ff1a6a29c78ac73534f8caa69bb921a6">
@ -15,24 +15,13 @@
<div class="item item-body"> <div class="item item-body">
<div ng-bind-html="post.content"></div> <div ng-bind-html="post.content"></div>
<a href="#" class="subdued">1 Like</a>
<a href="#" class="subdued">5 Comments</a>
</p> </p>
</div> </div>
<div class="item tabs tabs-secondary tabs-icon-left"> <div class="item tabs tabs-secondary tabs-icon-left">
<a class="tab-item" href="#"> <p>
<i class="icon ion-thumbsup"></i> מתוך עמוד ה - <i class="icon ion-social-facebook"></i> של האגודה
Like </p>
</a>
<a class="tab-item" href="#">
<i class="icon ion-chatbox"></i>
Comment
</a>
<a class="tab-item" href="#">
<i class="icon ion-share"></i>
Share
</a>
</div> </div>
</div> </div>

View file

@ -1,5 +1,5 @@
<ion-view view-title="הודעות" > <ion-view view-title="הודעות" >
<ion-content> <ion-content overflow-scroll="true">
<div class="page-content"> <div class="page-content">
<h1><i class="icon ion-paper-airplane"></i> הודעות</h1> <h1><i class="icon ion-paper-airplane"></i> הודעות</h1>

View file

@ -9,7 +9,7 @@
<ion-content> <ion-content>
<center> <center>
<div style="width: 30%; height: 30%"> <div style="width: 30%; height: 30%">
<img src="https://camo.githubusercontent.com/796c0e156ff48c9985296e03d55017f8adefd154/687474703a2f2f6c6972616e62672e6769746875622e696f2f4a63654d616e616765722f6173736574732f696d616765732f6c6f676f2e706e67" alt="" style="width: 100%"> <img src="https://cloud.githubusercontent.com/assets/2984053/5891657/4cc6526e-a4ab-11e4-9968-1289ebd33d69.png" alt="" style="width: 100%">
</div> </div>
</center> </center>
<form ng-submit="doLogin()"> <form ng-submit="doLogin()">

View file

@ -1,6 +1,6 @@
<ion-side-menus enable-menu-with-back-views="false"> <ion-side-menus enable-menu-with-back-views="false">
<ion-side-menu-content> <ion-side-menu-content>
<ion-nav-bar class="bar-stable bar-assertive" style="direction: rtl;"> <ion-nav-bar class="bar-stable bar-assertive">
<ion-nav-back-button> <ion-nav-back-button>
</ion-nav-back-button> </ion-nav-back-button>
@ -14,7 +14,7 @@
<ion-side-menu side="right"> <ion-side-menu side="right">
<ion-header-bar class="bar-stable bar-dark"> <ion-header-bar class="bar-stable bar-dark">
<h1 class="title">תפריט</h1> <h1 class="title" style="">תפריט</h1>
</ion-header-bar> </ion-header-bar>
<ion-content> <ion-content>