From 52016345518430b6fd8316cffe1c873e138b2030 Mon Sep 17 00:00:00 2001 From: Matan Bar Yosef Date: Wed, 1 Jul 2015 02:35:23 +0300 Subject: [PATCH] - project Page - Commits - added (work in progress..) - createMessage API - fixed (still need to check retrieve data from server) - theme.css - removed some unneccesary methods, tabDesign overflow - added (work in progress) --- templates/css/theme.css | 324 ++++++++---------- templates/js/controllers/homeController.js | 4 +- templates/js/controllers/projectController.js | 7 +- templates/js/services/apiService.js | 4 +- templates/views/project.html | 32 +- 5 files changed, 168 insertions(+), 203 deletions(-) diff --git a/templates/css/theme.css b/templates/css/theme.css index d0cb499..c03dfb7 100644 --- a/templates/css/theme.css +++ b/templates/css/theme.css @@ -151,33 +151,6 @@ body.noscroll /*width: 100%;*/ } -/*.hvr-curl-top-left { - display: inline-block; - vertical-align: middle; - -webkit-transform: translateZ(0); - transform: translateZ(0); - box-shadow: 0 0 1px rgba(0, 0, 0, 0); - -webkit-backface-visibility: hidden; - backface-visibility: hidden; - -moz-osx-font-smoothing: grayscale; - position: relative; -}*/ - -/* Grow Rotate */ -/*.campusCard { - display: inline-block; - vertical-align: middle; - -webkit-transform: translateZ(0); - transform: translateZ(0); - box-shadow: 0 0 1px rgba(0, 0, 0, 0); - -webkit-backface-visibility: hidden; - backface-visibility: hidden; - -moz-osx-font-smoothing: grayscale; - -webkit-transition-duration: 0.3s; - transition-duration: 0.3s; - -webkit-transition-property: transform; - transition-property: transform; -}*/ .campusCard:hover, .campusCard:focus, .campusCard:active { -webkit-transform: rotate(4deg); transform: rotate(4deg); @@ -220,186 +193,172 @@ body.noscroll -moz-box-shadow: 0 0 8px rgba(0, 0, 0, .8); } -/*.dropDown /* TODO * +.allCampusesShow { - border-bottom: 2px black solid; - border-top: 2px black solid; - border-left: 2px black solid; - border-right: 2px black solid; - border-radius: 1px black solid; - }*/ - - .allCampusesShow - { - overflow:hidden; - background-size: auto; - - } - .campusCard - { - /*height:80%;*/ - /*width:80%;*/ - } + overflow:hidden; + background-size: auto; + +} .gray-font-no-animation - { - color: #7f7f7f; - font-size: 300%; - text-shadow:#e0e0e0 1px 1px 0; - - } +{ + color: #7f7f7f; + font-size: 300%; + text-shadow:#e0e0e0 1px 1px 0; + +} - .gray-font - { - color: #7f7f7f; - font-size: 300%; - text-shadow:#e0e0e0 1px 1px 0; - opacity: 0; - -webkit-animation-duration: 8s; - animation-duration: 8s; - -webkit-animation-fill-mode: both; - animation-fill-mode: both; - overflow: hidden; - height: 100%; +.gray-font +{ + color: #7f7f7f; + font-size: 300%; + text-shadow:#e0e0e0 1px 1px 0; + opacity: 0; + -webkit-animation-duration: 8s; + animation-duration: 8s; + -webkit-animation-fill-mode: both; + animation-fill-mode: both; + overflow: hidden; + height: 100%; +} + +@-webkit-keyframes fadeOutUp { + 0% { + opacity: 1; + -webkit-transform: translateY(0); } - - @-webkit-keyframes fadeOutUp { - 0% { - opacity: 1; - -webkit-transform: translateY(0); - } - 100% { - opacity: 0; - -webkit-transform: translateY(-200px); - /*-webkit-transform: scale(0,0); */ - height: 0px; - } + 100% { + opacity: 0; + -webkit-transform: translateY(-200px); + /*-webkit-transform: scale(0,0); */ + height: 0px; } - @keyframes fadeOutUp { - 0% { - opacity: 1; - transform: translateY(0); - } - 100% { - opacity: 0; - transform: translateY(-200px); - /*transform: scale(0,0); */ - height: 0px; - } +} +@keyframes fadeOutUp { + 0% { + opacity: 1; + transform: translateY(0); } - .fadeOutUp { - -webkit-animation-name: fadeOutUp; - animation-name: fadeOutUp; - } + 100% { + opacity: 0; + transform: translateY(-200px); + /*transform: scale(0,0); */ + height: 0px; + } +} +.fadeOutUp { + -webkit-animation-name: fadeOutUp; + animation-name: fadeOutUp; +} - .user-pane-menu{ - width: 100%; - height: 15%; - background-color: #3F51B5; - -webkit-box-shadow: 0px 13px 34px -14px rgba(0,0,0,0.75); - -moz-box-shadow: 0px 13px 34px -14px rgba(0,0,0,0.75); - box-shadow: 0px 13px 34px -14px rgba(0,0,0,0.75); - top: 20px; - position: relative; - } +.user-pane-menu{ + width: 100%; + height: 15%; + background-color: #3F51B5; + -webkit-box-shadow: 0px 13px 34px -14px rgba(0,0,0,0.75); + -moz-box-shadow: 0px 13px 34px -14px rgba(0,0,0,0.75); + box-shadow: 0px 13px 34px -14px rgba(0,0,0,0.75); + top: 20px; + position: relative; +} - .user-pane-menu img{ - border: 7px rgb(255, 255, 255) solid; - -webkit-border-radius: 100px; - -moz-border-radius: 100px; - border-radius: 50px; - width: 30%; - position: relative; - z-index: 50; - } +.user-pane-menu img{ + border: 7px rgb(255, 255, 255) solid; + -webkit-border-radius: 100px; + -moz-border-radius: 100px; + border-radius: 50px; + width: 30%; + position: relative; + z-index: 50; +} - .se-menu{ - /*margin-top: 20%; */ - } +.se-menu{ + /*margin-top: 20%; */ +} - .se-menu ul{ - list-style: none; - padding: 0; - padding-left: 0; - } +.se-menu ul{ + list-style: none; + padding: 0; + padding-left: 0; +} - .se-menu li{ - width: 100%; - padding: 15px 0px 15px 15px; - font-size: 150%; - } +.se-menu li{ + width: 100%; + padding: 15px 0px 15px 15px; + font-size: 150%; +} - .se-menu li:hover{ - background-color: #E2E2E2; - font-weight: bold; - cursor: pointer; - } +.se-menu li:hover{ + background-color: #E2E2E2; + font-weight: bold; + cursor: pointer; +} - .se-menu li:active{ - background-color: #B2B2B2; - text-shadow:#e0e0e0 1px 1px 0; - font-weight: bold; - } +.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; - } +.se-menu .selected{ + background-color: #E2E2E2; + text-shadow:#e0e0e0 1px 1px 0; + font-weight: bold; +} - .user-box{ - width: 100% - } +.user-box{ + width: 100% +} - .user-box img{ - width: 100%; - border: 4px #7f7f7f solid; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - } - .user-data{ - margin-top: auto; - } +.user-box img{ + width: 100%; + border: 4px #7f7f7f solid; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; +} +.user-data{ + margin-top: auto; +} - .se-menu ul a{ - text-decoration: none !important; - color: #7f7f7f; - } +.se-menu ul a{ + text-decoration: none !important; + color: #7f7f7f; +} - /*Settings Style*/ +/*Settings Style*/ - .settingList .settingListItem:hover{ - background-color: #E2E2E2; - font-weight: bold; - } +.settingList .settingListItem:hover{ + background-color: #E2E2E2; + font-weight: bold; +} - .settingList .settingListItemRoot{ - list-style: none; - padding: 0; - padding-left: 0; - } +.settingList .settingListItemRoot{ + list-style: none; + padding: 0; + padding-left: 0; +} - .settingList .settingListItem{ - width: 100%; - padding: 15px 0px auto 15px; - } +.settingList .settingListItem{ + width: 100%; + padding: 15px 0px auto 15px; +} - /*End Settings*/ +/*End Settings*/ - /*md Effects*/ +/*md Effects*/ - .md-avatar{ - width: 40px; - height: 40px; - margin-top: 8px; - margin-bottom: 8px; - margin-right: 16px; - border-radius: 50%; - box-sizing: content-box; - } +.md-avatar{ + width: 40px; + height: 40px; + margin-top: 8px; + margin-bottom: 8px; + margin-right: 16px; + border-radius: 50%; + box-sizing: content-box; +} /* Colors*/ @@ -467,6 +426,11 @@ body.noscroll word-break: break-word; } +.tabDesign +{ + overflow: scroll; +} + .tasksContent { padding-left: 4px; diff --git a/templates/js/controllers/homeController.js b/templates/js/controllers/homeController.js index a1c153f..2d6bd34 100644 --- a/templates/js/controllers/homeController.js +++ b/templates/js/controllers/homeController.js @@ -50,12 +50,10 @@ angular.module('SeHub') } $scope.postMessageClicked = function() // Posting the message itself { - - if($scope.msg.msgToAdd != null) { jsonNewMsg = { - 'courseName': 'A', // TODO Should be ===> $scope.course.courseName + 'courseName': 'Math', // TODO Should be ===> $scope.course.courseName 'message': $scope.msg.msgToAdd }; diff --git a/templates/js/controllers/projectController.js b/templates/js/controllers/projectController.js index 70311cf..d3c3ebd 100644 --- a/templates/js/controllers/projectController.js +++ b/templates/js/controllers/projectController.js @@ -26,14 +26,13 @@ angular.module('SeHub') // }); // Pop-up alert }; - $scope.getProfileRoute = function(assigneeName) + $scope.getProfileRoute = function(userName) { for(var i = 0; i < $scope.project.members.length; i++) { - - if(assigneeName === $scope.project.members[i].name) + if(userName === $scope.project.members[i].name) { - console.log(assigneeName); + console.log(userName); console.log($scope.project.members[i].name); return '#/profile/' + $scope.project.members[i].id; } diff --git a/templates/js/services/apiService.js b/templates/js/services/apiService.js index e3352d3..d7697ef 100644 --- a/templates/js/services/apiService.js +++ b/templates/js/services/apiService.js @@ -169,7 +169,7 @@ service.factory('apiService', ['$http', function($http) { return $http(req); }, createMessage: function(token, payLoad){ - var url = (DEBUG ? "http://localhost:8080" : "http://se-hub.appspot.com") + "/api/courses/create/" + token; + var url = (DEBUG ? "http://localhost:8080" : "http://se-hub.appspot.com") + "/api/messages/create/" + token; req = { method : "POST", url : url, @@ -177,7 +177,7 @@ service.factory('apiService', ['$http', function($http) { }; return $http(req); }, - create: function(token, payLoad){ + create: function(token, payLoad){ // createProject var url = (DEBUG ? "http://localhost:8080" : "http://se-hub.appspot.com") + "/api/projects/create/" + token; req = { method : "POST", diff --git a/templates/views/project.html b/templates/views/project.html index 91ecb2a..5d10acb 100644 --- a/templates/views/project.html +++ b/templates/views/project.html @@ -68,32 +68,37 @@ -

Commits

- +
- - - + + + - + + + - -
NameTitleUrlMessageDateCommitter
+ + + {{msg.message}} + + + + + {{date.date}} + + {{member.name}} -
- {{commit.commits_url}} -
-
-

Issues

@@ -127,7 +132,6 @@
Title
-