diff --git a/templates/css/theme.css b/templates/css/theme.css index 5e262e3..7ab3384 100644 --- a/templates/css/theme.css +++ b/templates/css/theme.css @@ -146,10 +146,10 @@ body.noscroll } - .createCampus - { - position:relative; - } +.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*/ \ No newline at end of file diff --git a/templates/js/controllers/homeController.js b/templates/js/controllers/homeController.js index 46395cb..98c95ca 100644 --- a/templates/js/controllers/homeController.js +++ b/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" + }, + ]; + }]); \ No newline at end of file diff --git a/templates/views/home.html b/templates/views/home.html index 881bf23..391e23b 100644 --- a/templates/views/home.html +++ b/templates/views/home.html @@ -15,12 +15,52 @@

Welcome To SE-Hub

-

- This Is your Home Page -

+ + +
+
+ Messages + +
+ {{item.who}} + + +
+

+ +

{{ item.who }}

+
{{ item.what }}
+
{{ item.notes }}
+
{{ item.when }}
+
+
+
+
+ + +
+
+ + + + Tasks + + +
+ +
Ex: {{ item.ExNum }}
+
Task Title: {{ item.notes }}
+
Due Date: {{ item.dueDate }}
+
+
+
+
+
+
+
\ No newline at end of file