Merge pull request #48 from sagidayan/UI

Home Page - feed pattern added

templates/css/theme.css

@@ -146,10 +146,10 @@ body.noscroll
 }
 
 
-  .createCampus
-  {
+.createCampus
+{
   position:relative;
-  }
+}
 
 .listdemoBasicUsage md-divider
 {
@@ -187,15 +187,6 @@ body.noscroll
   -moz-box-shadow: 0 0 8px rgba(0, 0, 0, .8);
 }
 
-
-
-/*div.img campusAvatar
-{
-  border: 1px solid #0000ff;
-  padding-right: 10px;
-  float:right;
-  }*/
-
 /*.dropDown /* TODO *
 {
   border-bottom: 2px black solid;
@@ -205,7 +196,8 @@ body.noscroll
   border-radius: 1px black solid;
   }*/
 
-  .gray-font{
+  .gray-font
+  {
     color: #7f7f7f;
     font-size: 300%;
     text-shadow:#e0e0e0 1px 1px 0;
@@ -323,7 +315,7 @@ body.noscroll
   }
 
 
-  md-list-item .md-no-style.md-button, md-list-item.md-no-proxy.md-button {
+/*  md-list-item .md-no-style.md-button, md-list-item.md-no-proxy.md-button {
   font-size: inherit;
   height: inherit;
   text-align: left;
@@ -343,6 +335,6 @@ md-list-item, md-list-item .md-list-item-inner {
   -ms-flex-align: center;
   align-items: center;
   min-height: 48px;
-}
+}*/
 
 /*End Effects for MD*/

templates/js/controllers/homeController.js

@@ -1,9 +1,68 @@
-/**
- * Created by sagi on 6/16/15.
- */
 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.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"
+      }
+    ];
+
+    $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"
+      },
+    ];
+
 
 
 }]);

templates/views/home.html

@@ -15,12 +15,52 @@
 				<div class="spacer"></div>
 				<div>
 					<h1>Welcome To SE-Hub</h1>
-					<p>
-						This Is your Home Page
-					</p>
 				</div>
 				<div class="spacer"></div>
 			</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>
+		</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>