diff --git a/templates/css/theme.css b/templates/css/theme.css index 815890f..45b271e 100644 --- a/templates/css/theme.css +++ b/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; @@ -147,7 +147,7 @@ body.noscroll .feed { overflow-y: scroll; - height: 300px; + height: 350px; /*width: 100%;*/ } @@ -349,17 +349,11 @@ body.noscroll box-sizing: content-box; } -/*gridList Effects*/ -md-grid-list -{ - margin: 8px; -} -.gray -{ +/* Colors*/ +.gray{ background:#f5f5f5; } - .aliceblue { background: aliceblue; } @@ -378,6 +372,7 @@ md-grid-list .red { background: #ff8a80; } +/* End Colors */ .whiteframedemoBasicUsage md-whiteframe { background: #fff; @@ -385,40 +380,40 @@ md-grid-list padding: 20px; } - -/* md-grid-tile { - transition: all 400ms ease-out 50ms; -}*/ - -/*END gridList Effects*/ - - .tasksContent { - /*float:left;*/ + padding-left: 4px; + padding-right: 4px; + margin: 5px; + background-color: aliceblue; + overflow: scroll; + height:250; + width:500; } - - - 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: 300px; - white-space: normal; +.messagesContent +{ + padding-left: 4px; + padding-right: 4px; + margin: 5px; + background-color: #f5f5f5; + overflow: scroll; + height:250; + width:500; } - -/*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*/ \ No newline at end of file +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; +} \ No newline at end of file diff --git a/templates/js/controllers/homeController.js b/templates/js/controllers/homeController.js index 573dab3..2e1b19d 100644 --- a/templates/js/controllers/homeController.js +++ b/templates/js/controllers/homeController.js @@ -1,57 +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: '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 += "

"; + 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; }]); \ No newline at end of file diff --git a/templates/js/controllers/registerController.js b/templates/js/controllers/registerController.js index 071096c..6ce4d08 100644 --- a/templates/js/controllers/registerController.js +++ b/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)); } diff --git a/templates/views/home.html b/templates/views/home.html index b312bf7..cd2fc49 100644 --- a/templates/views/home.html +++ b/templates/views/home.html @@ -22,52 +22,93 @@ - - - -
- - - -

Messages

- - In The Future Will Enter Wanted MESSAGES Text Here - - - -

Tasks

- - -
- For Task 3 Press: Task #3 -
=====================
- For Task 4 Press: Task #4 -
- - - +
+ +
+
+ +

Messages

+ +
+
+ +

Tasks

+ +
- - - - - - - - - - +
+
+ +

+ +
+
+ +

+ For Task 3 Press: Task #3 +

+ For Task 4 Press: Task #4 +

+ For Task 5 Press: Task #5 +

+ For Task 6 Press: Task #6 +

+ For Task 7 Press: Task #7 +

+ For Task 8 Press: Task #8 +

+ +
+
+
+ Add Message +
+
+
+ Post + Clear All +
+
+ + + + +
+ +
+
+ +
+
+ +

Messages

+ +
+
+ +

Tasks

+ +
+
+
+
+ +

+ +
+
+ +

+ For Task 3 Press: Task #3 +

+ For Task 4 Press: Task #4 +

+ For Task 5 Press: Task #5 +

+ +
+
+ +
\ No newline at end of file