Fixing A BAAAD Commit

templates/css/theme.css

@@ -33,9 +33,9 @@ md-list .md-button {
 https://github.com/google/material-design-icons
 */
 
-p {
+/*p {
   margin-left: 2em;
-}
+}*/
 
 .menuBtn {
   background: transparent url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2ZXJzaW9uPSIxLjEiIHg9IjBweCIgeT0iMHB4IiB3aWR0aD0iMjRweCIgaGVpZ2h0PSIyNHB4IiB2aWV3Qm94PSIwIDAgMjQgMjQiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDI0IDI0IiB4bWw6c3BhY2U9InByZXNlcnZlIj4KPGcgaWQ9IkhlYWRlciI+CiAgICA8Zz4KICAgICAgICA8cmVjdCB4PSItNjE4IiB5PSItMjIzMiIgZmlsbD0ibm9uZSIgd2lkdGg9IjE0MDAiIGhlaWdodD0iMzYwMCIvPgogICAgPC9nPgo8L2c+CjxnIGlkPSJMYWJlbCI+CjwvZz4KPGcgaWQ9Ikljb24iPgogICAgPGc+CiAgICAgICAgPHJlY3QgZmlsbD0ibm9uZSIgd2lkdGg9IjI0IiBoZWlnaHQ9IjI0Ii8+CiAgICAgICAgPHBhdGggZD0iTTMsMThoMTh2LTJIM1YxOHogTTMsMTNoMTh2LTJIM1YxM3ogTTMsNnYyaDE4VjZIM3oiIHN0eWxlPSJmaWxsOiNmM2YzZjM7Ii8+CiAgICA8L2c+CjwvZz4KPGcgaWQ9IkdyaWQiIGRpc3BsYXk9Im5vbmUiPgogICAgPGcgZGlzcGxheT0iaW5saW5lIj4KICAgIDwvZz4KPC9nPgo8L3N2Zz4=) no-repeat  center center;
@@ -76,28 +76,21 @@ body.noscroll
   margin-top: 1em;
   margin-right: 1em;
   position: center;
-
   -webkit-border-radius: 30%;
   -moz-border-radius: 30%;
   border-radius: 30%;
-
-
 }
 
-/*.avatar {
-  background: rgba(0, 0, 0, 0.2);
-  }*/
-
-  .avatar img {
-    border-radius: 40px;
-    position:center;
-    width: 80px;
-    height: 80px;
-    margin: 6px;  /*centers the image in the parent element */
-    -webkit-box-shadow: 2px 2px 5px 0px rgba(0,0,0,0.75);
-    -moz-box-shadow: 2px 2px 5px 0px rgba(0,0,0,0.75);
-    box-shadow: 2px 2px 5px 0px rgba(0,0,0,0.75);
-  }
+.avatar img {
+  border-radius: 40px;
+  position:center;
+  width: 80px;
+  height: 80px;
+  margin: 6px;
+  -webkit-box-shadow: 2px 2px 5px 0px rgba(0,0,0,0.75);
+  -moz-box-shadow: 2px 2px 5px 0px rgba(0,0,0,0.75);
+  box-shadow: 2px 2px 5px 0px rgba(0,0,0,0.75);
+}
 
   /* Added BY devMatan */
 
@@ -111,14 +104,8 @@ body.noscroll
  
   }*/
 
-  .campusAvatar img
-  {
-/*
-  margin-top: 1em;
-  margin-right: 1em;
-  position: center;
-  */
-
+.campusAvatar img
+{
   border-radius: 40px;
   position:center;
   width: 80px;
@@ -157,9 +144,24 @@ body.noscroll
   margin-bottom: 10px;
 }
 
-.md-avatar img  
+.feed
 {
-  /*TODO*/
+  overflow-y: scroll;
+  height: 350px;
+  /*width: 100%;*/
+}
+
+/*.feedMessages
+{
+  overflow: scroll;
+  height: 300px;
+  width: 100%;
+}
+.feedTasks
+{
+  overflow: scroll;
+  height: 300px;
+  width: 100%;
 }
 
 .feedContent
@@ -167,7 +169,7 @@ body.noscroll
   padding-left: 6%;
   font-size: 15px;
   display:table;
-}
+}*/
 
 .md-no-sticky
 {
@@ -181,7 +183,6 @@ body.noscroll
   border-radius: 150px;
   -webkit-border-radius: 150px;
   -moz-border-radius: 150px;
-  /*background: url(http://i61.tinypic.com/v86f7.png) no-repeat;*/
   box-shadow: 0 0 8px rgba(0, 0, 0, .8);
   -webkit-box-shadow: 0 0 8px rgba(0, 0, 0, .8);
   -moz-box-shadow: 0 0 8px rgba(0, 0, 0, .8);
@@ -256,7 +257,6 @@ body.noscroll
     -moz-border-radius: 100px;
     border-radius: 50px;
     width: 30%;
-    /*top: -40px;*/
     position: relative;
     z-index: 50;
   }
@@ -282,8 +282,17 @@ body.noscroll
     font-weight: bold;
     cursor: pointer;
   }
-  .se-menu li .selected{
+
+  .se-menu li:active{
+    background-color: #B2B2B2;
+    text-shadow:#e0e0e0 1px 1px 0;
+    font-weight: bold;
+  }
+
+  .se-menu .selected{
     background-color: #E2E2E2;
+    text-shadow:#e0e0e0 1px 1px 0;
+    font-weight: bold;
   }
 
   .user-box{
@@ -293,7 +302,6 @@ body.noscroll
   .user-box img{
     width: 100%;
     border: 4px #7f7f7f solid;
-
     -webkit-border-radius: 5px;
     -moz-border-radius: 5px;
     border-radius: 5px;
@@ -342,26 +350,70 @@ body.noscroll
   }
 
 
-/*  md-list-item .md-no-style.md-button, md-list-item.md-no-proxy.md-button {
-  font-size: inherit;
-  height: inherit;
-  text-align: left;
-  text-transform: none;
-  width: 100%;
-  white-space: normal;
+/* Colors*/
+.gray{
+  background:#f5f5f5;
+}
+.aliceblue {
+  background: aliceblue; 
+}
+  .green {
+  background: #b9f6ca;
+}
+  .yellow {
+  background: #ffff8d;
+}
+  .blue {
+  background: #84ffff;
+}
+  .purple {
+  background: #b388ff;
+}
+  .red {
+  background: #ff8a80;
+}
+/* End Colors */
+
+.whiteframedemoBasicUsage md-whiteframe {
+  background: #fff;
+  margin: 20px;
+  padding: 20px;
 }
 
-md-list-item, md-list-item .md-list-item-inner {
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  -webkit-align-items: center;
-  -ms-flex-align: center;
-  align-items: center;
-  min-height: 48px;
-  }*/
-
-/*End Effects for MD*/
+.tasksContent
+{
+  padding-left: 4px;
+  padding-right: 4px;
+  margin: 5px;
+  background-color: aliceblue;
+  overflow: scroll;
+  height:250;
+  width:500;
+}
+.messagesContent
+{
+  padding-left: 4px;
+  padding-right: 4px;
+  margin: 5px;
+  background-color: #f5f5f5;
+  overflow: scroll;
+  height:250;
+  width:500;
+}
+p.tasksFeed
+{
+  padding-left: 4px;
+  margin: 5px;
+  width:500;
+  height: auto;
+  background-color: aliceblue;
+ 
+}
+p.messagesFeed
+{
+  padding-left: 4px;
+  margin: 5px;
+  width:500;
+  height: auto;
+  background-color: #f5f5f5;
+}

templates/js/app.js

@@ -2,7 +2,7 @@ var DEBUG = true;
 
 var welcome = angular.module('welcome', ['ngMaterial', 'seHub.services', 'ngRoute' , 'ngCookies']);
 
-var app = angular.module('SeHub', ['ngMaterial', 'ngRoute', 'seHub.services', 'ngCookies']);
+var app = angular.module('SeHub', ['ngMaterial', 'ngRoute', 'seHub.services', 'ngCookies', 'chart.js']);
 
 
 welcome.config(function($mdThemingProvider) {
@@ -41,8 +41,15 @@ app.config(['$routeProvider', '$locationProvider',
 			.when('/Settings', {
 				templateUrl: 'templates/views/settings.html',
 				controller: 'settingsController'
+			})
+			.when('/tasks', {
+				templateUrl: 'templates/views/tasks.html',
+				controller: 'tasksController'
+			})
+			.when('/tasks/new', {
+				templateUrl: 'templates/views/newTask.html',
+				controller: 'newTasksController'
 			});
-
 	}
 ]);
 

templates/js/controllers/homeController.js

@@ -1,71 +1,51 @@
 angular.module('SeHub')
 .controller('homeController', ['$scope', '$cookies', '$cookieStore', '$window', '$location', '$mdToast', '$mdDialog', 'apiService', '$rootScope', function ($scope, $cookies, $cookieStore, $window, $location, $mdToast, $mdDialog, apiService ,$rootScope)
 {
- var imagePath = $scope.user.avatar_url;
-    $scope.phones = [
-      { type: 'Home', number: '(972) 865-82861' },
-      { type: 'Cell', number: '(972) 5251-32309' },
-    ];
+  $scope.isStudent = false;
+  $scope.addMsg = false;
+  $scope.msgToPost = "";
+  $scope.oldText = "";
 
-    $scope.messages = [
-      {
-        face : imagePath,
-        what: 'I need to go to luna-park',
-        who: 'Matan Bar Yosef',
-        when: '3:08PM',
-        notes: " Lets do something"
-      },
-      {
-        face : imagePath,
-        what: 'Lets Lets Lets',
-        who: 'Matan Bar Yosef',
-        when: '4:33PM',
-        notes: " Lets go drink something"
-      },
-      {
-        face : imagePath,
-        what: 'Let me tell you a secret',
-        who: 'Sagi Dayan',
-        when: '4:15PM',
-        notes: " I am S'ein"
-      },
-      {
-        face : imagePath,
-        what: 'Listen to this!',
-        who: 'Aran Zaiger',
-        when: '6:15PM',
-        notes: " I am gaylord ultima!!"
-      },
-      {
-        face : imagePath,
-        what: 'Hi?',
-        who: 'Etye Meyer',
-        when: '7:45AM',
-        notes: " I am mega gaylord ultima"
-      }
-    ];
+  var imagePath = $scope.user.avatar_url;
+  $scope.phones = [
+    { type: 'Home', number: '(972) 865-82861' },
+    { type: 'Cell', number: '(972) 5251-32309' },
+  ];
 
-    $scope.tasks = [
-      {
-        ExNum: '1',
-        dueDate: '23/06/15',
-        notes: " Build A Game: Scrabble"
-      },
-      {
-        ExNum: '3',
-        dueDate: '30/06/15',
-        notes: " Static Array"
-      },
-      {
-        ExNum: '4',
-        dueDate: '07/07/15',
-        notes: " Dynamic Array"
-      },
-    ];
+  if($scope.user.isLecturer)
+  {
+    $scope.isStudent = false;
+    console.log("Lecturer Mode!");
+  }
+  else
+  {
+    $scope.isStudent = true;
+    console.log("Student Mode!");
+  }
 
+  $scope.addMessageClicked = function()
+  {
+    $scope.addMsg = true; // Reveal the "POST" Button
+  }
 
+  $scope.postMessageClicked = function(msg) // Posting the message itself
+  {  
+    if(msg != null)
+    {
+      $scope.prevText = "- " + msg;
+      implementText = document.getElementById("msg").value;
+      $scope.prevText +=  "<br></br>";
+      document.getElementById("bindText").innerHTML += $scope.prevText;
+    }
+    document.getElementById("msg").value = '';
+    $scope.prevText = '';  
+  }
 
+  $scope.clearAllClicked = function() // Clear Screen from text
+  {
+    document.getElementById("bindText").innerHTML = "";
+  }
 
-    // animation
-    $scope.isEnterd = top.setIsEnterd;
+  // animation
+  $scope.isEnterd = top.setIsEnterd;
 }]);

templates/js/controllers/mainController.js

@@ -53,7 +53,7 @@ angular.module('SeHub')
 				"title": "Tasks",
 				"icon": "fa fa-clipboard",
 				"style": "",
-				"route": "/campuses"
+				"route": "/tasks"
 			}, {
 				"title": "Settings",
 				"icon": "fa fa-cogs",

templates/js/controllers/registerController.js

@@ -83,7 +83,7 @@ angular.module('SeHub')
 				console.log("DONE - 200");
 			  	$mdDialog.show($mdDialog.alert().title('E-mail Verification').content('A verification e-mail has been sent to your email address.')
 		        .ariaLabel('Email verification alert dialog').ok('Got it!').targetEvent(ev)); // Pop-up alert for e-mail verification
-		        // TODO ADD delete cookies and redirect only after pressed 'Got it'
+		        // TODO ADD- delete cookies and redirect only after pressed 'Got it'
 		        $cookieStore.remove("com.sehub.www"); // Removing the cookies
 		        $window.location.href = 'http://se-hub.appspot.com'; // Reference to 'welcome' page
 			}).error(function()
@@ -117,8 +117,6 @@ angular.module('SeHub')
 	    var result = /^([\w-]+(?:\.[\w-]+)*)@((?:[\w-]+\.)*\w[\w-]{0,66})\.([a-z]{2,6}(?:\.[a-z]{2})?)$/i;
 	    if (!result.test(email)) // TODO Fix when success to show mdDialog until 'Got it' clicked
 	    {
-	    	console.log(email + ", Error in email, should alert");
-   			// alert('Please provide a valid e-mail address');
    			$mdDialog.show($mdDialog.alert().title('Error - E-mail Verification').content('An error has occured in your e-mail address.')
 		        .ariaLabel('Email verification error alert dialog').ok('Got it!').targetEvent(email));
     	}

templates/js/controllers/settingsController.js

@@ -35,7 +35,13 @@ angular.module('SeHub')
 					$scope.profileMode = "Save Profile";
 					$scope.profileModeIcon = "fa fa-floppy-o";
 				} else {
-					dataService.userBrodcast($scope.user);
+					apiService.updateUser(token, $scope.user).success(function(data) {
+						console.info('User Saved');
+						dataService.userBrodcast($scope.user);
+
+					}).error(function(e) {
+						console.error('Fail To Save User');
+					});
 					$scope.profileMode = "Edit Profile";
 					$scope.profileModeIcon = "fa fa-pencil";
 				}
@@ -74,5 +80,14 @@ angular.module('SeHub')
 			}];
 
 
+			$scope.labels = ['Commits', 'Issues Assigned', 'Messages', 'Open Tasks'];
+			$scope.series = ['Project A', 'Project B'];
+
+			$scope.data = [
+				[54, 3, 15, 3],
+				[28, 48, 40, 3]
+			];
+
+
 		}
 	]);

templates/views/home.html

@@ -22,47 +22,93 @@
 			</div>
 		</md-card>
 	</md-content>
-	<md-content layout-padding>
-		<md-card>
-		<div class = "feed" ><!--  layout-align="center center"> -->
-			<div>
-				<md-subheader class="md-no-sticky" style = "background-color:aliceblue; margin-right:0;">Messages</md-subheader>
-				<md-list-item class="md-3-line" ng-repeat="item in messages">
-					<div class="md-list-item-text" style="border: 1px solid black;">
-						<img ng-src="{{user.avatar_url}}" class="roundUserAvatar" alt="{{item.who}}" style="margin:8px"/> 
-						<!-- Instead of "user.avatar.url" suppose to be "postedUserAvatarUrl" -->
-						
-						<div class="spacer"></div>
-						<br></br>
-						<md-divider class = "feedContent">
-							<h4>{{ item.who }}</h4>
-							<h5>{{ item.what }}</h5>
-							<h5><b>{{ item.notes }}</b></h5>
-							<h6>{{ item.when }}</h6>
-						</md-divider>	
-					</div>
-				</md-list-item>
+	<div ng-if="user.isLecturer"> <!-- Lecturer Mode -->
+		<md-content layout-padding>
+			<div layout="row" layout-margin layout-padding>
+				<div>
+					<md-card>
+						<p class = "messagesFeed">Messages</p>
+					</md-card>
+				</div>
+				<div>
+					<md-card>
+						<p class = "tasksFeed">Tasks</p>
+					</md-card>
+				</div>
 			</div>
-		</md-card>
-	</md-content>
-	<div class="port_spacer"></div>
-	<div>
-		<md-content>
-			<md-card style="margin:0">
-				<!-- <md-list> -->
-				<md-subheader class="md-no-sticky" style = "background-color:aliceblue; margin-right:0;">Tasks</md-subheader>
-				<md-list-item class="md-3-line" ng-repeat="item in tasks">
-				<!-- <img ng-src="{{item.face}}?{{$index}}" class="md-avatar" alt="{{item.who}}" /> -->
-					<div class="md-list-item-text" style="border: 1px solid black;">
-						<md-divider class = "feedContent">
-							<h6><u><em>Ex: {{ item.ExNum }}</em></u></h6>
-							<h5>Task Title: {{ item.notes }}</h5>
-							<h6>Due Date: {{ item.dueDate }}</h6>
-						</md-divider>	
-					</div>
-				</md-list-item>
-			</md-card>
-		</md-content>	
-</div>
-		<!-- </md-card> -->
+			<div layout="row" layout-margin layout-padding>
+				<div>
+					<md-card>
+						<p id = "bindText" class = "messagesContent"></p>
+					</md-card>
+				</div>
+				<div>
+					<md-card>
+						<p class = "tasksContent"> 
+							For Task 3 Press: <a href="http://localhost:8080/home#/tasks">Task #3</a>
+							<br></br>
+							For Task 4 Press: <a href="http://localhost:8080/home#/home">Task #4</a>
+							<br></br>
+							For Task 5 Press: <a href="http://localhost:8080/home#/home">Task #5</a>
+							<br></br>
+							For Task 6 Press: <a href="http://localhost:8080/home#/home">Task #6</a>
+							<br></br>
+							For Task 7 Press: <a href="http://localhost:8080/home#/home">Task #7</a>
+							<br></br>
+							For Task 8 Press: <a href="http://localhost:8080/home#/home">Task #8</a>
+						</p>
+					</md-card>
+				</div>
+			</div>
+			<div layout-margin layout padding>
+				<md-button ng-click="addMessageClicked()" ng class="md-raised md-primary">Add Message</md-button>
+			</div>
+			<div ng-if="addMsg">
+				<div layout = "row" layout-margin layout padding layout-align = "left center">	
+					<md-button ng-click="postMessageClicked(msgToAdd)" ng class="md-raised md-primary">Post</md-button>
+					<md-button ng-click="clearAllClicked()" ng class="md-raised md-primary">Clear All</md-button>
+				</div>
+				<div class="port_spacer"></div>
+				<md-input-container>
+				<label> Write Your Desired Message Here And Press Post</label>
+					<input type="text" id="msg" md-maxlength="150" minlength="1" ng-model="msgToAdd" required>
+				</md-input-container>
+			</div>
+		</md-content>
+	</div>
+	<div ng-if="isStudent"> <!-- Student Mode -->
+		<md-content layout-padding>
+			<div layout="row" layout-margin layout-padding>
+				<div>
+					<md-card>
+						<p class = "messagesFeed">Messages</p>
+					</md-card>
+				</div>
+				<div>
+					<md-card>
+						<p class = "tasksFeed">Tasks</p>
+					</md-card>
+				</div>
+			</div>
+			<div layout="row" layout-margin layout-padding>
+				<div>
+					<md-card>
+						<p id = "bindText" class = "messagesContent"></p>
+					</md-card>
+				</div>
+				<div>
+					<md-card>
+						<p class = "tasksContent"> 
+							For Task 3 Press: <a href="http://localhost:8080/home#/tasks">Task #3</a>
+							<br></br>
+							For Task 4 Press: <a href="http://localhost:8080/home#/home">Task #4</a>
+							<br></br>
+							For Task 5 Press: <a href="http://localhost:8080/home#/home">Task #5</a>
+						</p>
+
+					</md-card>
+				</div>
+			</div>
+		</md-content>
+	</div>
 </div>

templates/views/index.html

@@ -6,6 +6,10 @@
 
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
     <link rel="stylesheet" href="templates/css/theme.css">
+
+    <!--charts css-->
+    <link rel="stylesheet" href="templates/js/libs/angular-chart.js-0.7.2/dist/angular-chart.css"/>
+
     <meta name="viewport" content="initial-scale=1, maximum-scale=1" />
 </head>
 
@@ -79,6 +83,14 @@
 <!-- Angular App -->
 <script src="templates/js/app.js"></script>
 
+<!--Angular Libs (Third Party)-->
+<!--charts-->
+<!--docs: http://jtblin.github.io/angular-chart.js/-->
+<script src="templates/js/libs/angular-chart.js-0.7.2/dist/chart.js"></script>
+<script src="templates/js/libs/angular-chart.js-0.7.2/dist/angular-chart.js"></script>
+
+
+
 <!-- Services -->
 <script src="templates/js/services/apiService.js"></script>
 <script src="templates/js/services/dataService.js"></script>
@@ -88,6 +100,7 @@
 <script src="templates/js/controllers/homeController.js"></script>
 <script src="templates/js/controllers/settingsController.js"></script>
 <script src="templates/js/controllers/registerController.js"></script>
+<script src="templates/js/controllers/newTasksController.js"></script>
 
 </body>
 </html>

templates/views/settings.html

@@ -55,6 +55,12 @@
 						</div>
 					</div>
 					<!-- End Edit Div -->
+					<!-- Chart -->
+					<h4>
+						<i class="fa fa-bar-chart"></i> Statistics: 
+					</h4>
+					<canvas id="bar" class="chart chart-bar" data="data"
+  						labels="labels" series="series"></canvas> 
 				</md-card>
 			</div>
 			<!-- Campuses & Classes Div -->