diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..9a874b5 Binary files /dev/null and b/.DS_Store differ diff --git a/src/.DS_Store b/src/.DS_Store new file mode 100644 index 0000000..fadd49a Binary files /dev/null and b/src/.DS_Store differ diff --git a/src/app/.DS_Store b/src/app/.DS_Store new file mode 100644 index 0000000..51707bc Binary files /dev/null and b/src/app/.DS_Store differ diff --git a/src/app/pages/.DS_Store b/src/app/pages/.DS_Store new file mode 100644 index 0000000..6c0c687 Binary files /dev/null and b/src/app/pages/.DS_Store differ diff --git a/src/app/pages/components/.DS_Store b/src/app/pages/components/.DS_Store new file mode 100644 index 0000000..f04238f Binary files /dev/null and b/src/app/pages/components/.DS_Store differ diff --git a/src/app/pages/surveys/.DS_Store b/src/app/pages/surveys/.DS_Store new file mode 100644 index 0000000..5008ddf Binary files /dev/null and b/src/app/pages/surveys/.DS_Store differ diff --git a/src/app/pages/teams/.DS_Store b/src/app/pages/teams/.DS_Store new file mode 100644 index 0000000..f04238f Binary files /dev/null and b/src/app/pages/teams/.DS_Store differ diff --git a/src/app/pages/teams/members/MembersTabCtrl.js b/src/app/pages/teams/members/MembersTabCtrl.js index fa7e877..c3cd69a 100644 --- a/src/app/pages/teams/members/MembersTabCtrl.js +++ b/src/app/pages/teams/members/MembersTabCtrl.js @@ -6,23 +6,22 @@ 'use strict'; angular.module('BlurAdmin.pages.teams.members') - .controller('MembersTabCtrl', MembersTabCtrl); + .controller('MembersTabCtrl', MembersTabCtrl); /** @ngInject */ - function MembersTabCtrl($scope, fileReader, $filter, $uibModal) { - $scope.picture = $filter('profilePicture')('Nasta'); - - $scope.removePicture = function () { - $scope.picture = $filter('appImage')('theme/no-photo.png'); - $scope.noPicture = true; - }; - - $scope.uploadPicture = function () { - var fileInput = document.getElementById('uploadFile'); - fileInput.click(); + function MembersTabCtrl(composeModal, mailMessages) { + var vm = this; + vm.navigationCollapsed = true; + vm.showCompose = function(subject, to , text){ + composeModal.open({ + subject : subject, + to: to, + text: text + }) }; + vm.tabs = mailMessages.getTabs(); } -})(); \ No newline at end of file +})(); diff --git a/src/app/pages/teams/members/composeBox/compose.html b/src/app/pages/teams/members/composeBox/compose.html new file mode 100644 index 0000000..4337188 --- /dev/null +++ b/src/app/pages/teams/members/composeBox/compose.html @@ -0,0 +1,26 @@ +
+ + New message + + + + + + +
+
+ + +
+ + +
+
+
+ + +
+ + +
+
\ No newline at end of file diff --git a/src/app/pages/teams/members/composeBox/composeBoxCtrl.js b/src/app/pages/teams/members/composeBox/composeBoxCtrl.js new file mode 100644 index 0000000..9c46092 --- /dev/null +++ b/src/app/pages/teams/members/composeBox/composeBoxCtrl.js @@ -0,0 +1,18 @@ +/** + * @author a.demeshko + * created on 24/12/15 + */ +(function () { + 'use strict'; + + angular.module('BlurAdmin.pages.components.mail') + .controller('composeBoxCtrl', composeBoxCtrl); + + /** @ngInject */ + function composeBoxCtrl(subject, to, text) { + var vm = this; + vm.subject = subject; + vm.to = to; + vm.text = text; + } +})(); \ No newline at end of file diff --git a/src/app/pages/teams/members/composeBox/composeModal.js b/src/app/pages/teams/members/composeBox/composeModal.js new file mode 100644 index 0000000..3921c0f --- /dev/null +++ b/src/app/pages/teams/members/composeBox/composeModal.js @@ -0,0 +1,36 @@ +/** + * @author a.demeshko + * created on 12/24/15 + */ +(function () { + 'use strict'; + + angular.module('BlurAdmin.pages.components.mail') + .service('composeModal', composeModal); + + /** @ngInject */ + function composeModal($uibModal) { + this.open = function(options){ + return $uibModal.open({ + animation: false, + templateUrl: 'app/pages/components/mail/composeBox/compose.html', + controller: 'composeBoxCtrl', + controllerAs: 'boxCtrl', + size: 'compose', + resolve: { + subject: function () { + return options.subject; + }, + to: function () { + return options.to; + }, + text: function () { + return options.text; + } + } + }); + } + + } + +})(); \ No newline at end of file diff --git a/src/app/pages/teams/members/detail/MailDetailCtrl.js b/src/app/pages/teams/members/detail/MailDetailCtrl.js new file mode 100644 index 0000000..6891060 --- /dev/null +++ b/src/app/pages/teams/members/detail/MailDetailCtrl.js @@ -0,0 +1,18 @@ +/** + * @author a.demeshko + * created on 28.12.2015 + */ +(function () { + 'use strict'; + + angular.module('BlurAdmin.pages.teams.members') + .controller('MemberDetailCtrl', MemberDetailCtrl); + + /** @ngInject */ + function MemberDetailCtrl($stateParams, mailMessages) { + var vm = this; + vm.mail = mailMessages.getMessageById($stateParams.id); + vm.label = $stateParams.label; + } + +})(); diff --git a/src/app/pages/teams/members/detail/memberDetail.html b/src/app/pages/teams/members/detail/memberDetail.html new file mode 100644 index 0000000..0e6b7b0 --- /dev/null +++ b/src/app/pages/teams/members/detail/memberDetail.html @@ -0,0 +1,82 @@ +
+
+
+
+ +
+ +
+
+
+ + +
+

{{detailCtrl.mail.name.split(' ')[0]}}

+ +

{{detailCtrl.mail.name.split(' ')[1]}}

+ +
+ {{detailCtrl.mail.tag}} +
+
+
+
+
+
+ + 777-777-7777 +
+
+ + +
+
+
+ +
+
+
+ {{detailCtrl.mail.position}} +
+
+ 12 Nezavisimosti st. Vilnius, Lithuania +
+
+
+
+
+
+
+
+ {{detailCtrl.mail.subject}} + • {{detailCtrl.mail.date | date : 'h:mm a MMMM d '}} +
+
+
+ +
+
+
+ 1 Attachment - View | Download +
+ + {{detailCtrl.mail.attachment}} +
+
+
+
+ + + + + +
+ +
+
+
Nothing to show
+
+
\ No newline at end of file diff --git a/src/app/pages/teams/members/list/MembersListCtrl.js b/src/app/pages/teams/members/list/MembersListCtrl.js new file mode 100644 index 0000000..96d83d2 --- /dev/null +++ b/src/app/pages/teams/members/list/MembersListCtrl.js @@ -0,0 +1,19 @@ +/** + * @author a.demeshko + * created on 28.12.2015 + */ +(function () { + 'use strict'; + + angular.module('BlurAdmin.pages.teams.members') + .controller('MembersListCtrl', MembersListCtrl); + + /** @ngInject */ + function MembersListCtrl($stateParams, mailMessages) { + var vm = this; + console.log($stateParams.label); + vm.messages = mailMessages.getMessagesByLabel($stateParams.label); + vm.label = $stateParams.label; + } + +})(); diff --git a/src/app/pages/teams/members/list/membersList.html b/src/app/pages/teams/members/list/membersList.html new file mode 100644 index 0000000..659d4d0 --- /dev/null +++ b/src/app/pages/teams/members/list/membersList.html @@ -0,0 +1,59 @@ +
+
+
+ +
+ + +
+ + +
+
+
+ + + + + + + + + +
+
+ +
+ 		+
+
{{m.name}}
+
{{m.tag}}
+
+ 		+
+ {{m.email}} +
+ 		+ {{m.position}} + + + +
+
+
\ No newline at end of file diff --git a/src/app/pages/teams/members/members.html b/src/app/pages/teams/members/members.html index 067888e..e9b716f 100644 --- a/src/app/pages/teams/members/members.html +++ b/src/app/pages/teams/members/members.html @@ -1,88 +1,42 @@ -
- +
+
+
+
+
+
+ +
+
+ {{t.name}}{{t.newMails}} +
+
+
- -
-
-

Survey Title

-
- -
-
- - -
-
-
- -
- - Change Profile Picture - -
-
-
-
- -
-
- - -
- -
-
-
- - -
- -
-
-
- -
-
- - -
- -
-
- -
- - -
- -
-
-
- -
-
+
+
+
+ Work +
+
+ Family +
+
+ Friend +
+
+ Study +
+
+
+
+ Add new label +
+
+ +
- - +
\ No newline at end of file diff --git a/src/app/pages/teams/members/members.module.js b/src/app/pages/teams/members/members.module.js index 6954cd0..d889690 100644 --- a/src/app/pages/teams/members/members.module.js +++ b/src/app/pages/teams/members/members.module.js @@ -6,17 +6,35 @@ 'use strict'; angular.module('BlurAdmin.pages.teams.members', []) - .directive('tagInput', tagInput); + .config(routeConfig); - function tagInput() { - return { - restrict: 'A', - link: function( $scope, elem, attr) { - $(elem).tagsinput({ - tagClass: 'label label-' + attr.tagInput + /** @ngInject */ + function routeConfig($stateProvider,$urlRouterProvider) { + $stateProvider + .state('teams.members', { + url: '/members', + abstract: true, + templateUrl: 'app/pages/teams/members/members.html', + controller: "MembersTabCtrl", + controllerAs: "tabCtrl", + title: 'Members', + sidebarMeta: { + order: 0, + }, + }).state('teams.members.label', { + url: '/:label', + templateUrl: 'app/pages/teams/members/list/membersList.html', + title: 'Mail', + controller: "MailListCtrl", + controllerAs: "listCtrl" + }).state('teams.members.detail', { + url: '/:label/:id', + templateUrl: 'app/pages/teams/members/detail/memberDetail.html', + title: 'Detail', + controller: "MemberDetailCtrl", + controllerAs: "detailCtrl" }); - } - }; + $urlRouterProvider.when('/teams/members','/teams/members/inbox'); } })(); diff --git a/src/app/pages/teams/members/membersMessages.js b/src/app/pages/teams/members/membersMessages.js new file mode 100644 index 0000000..1078a04 --- /dev/null +++ b/src/app/pages/teams/members/membersMessages.js @@ -0,0 +1,250 @@ +/** + * @author a.demeshko + * created on 12/29/15 + */ +(function () { + 'use strict'; + + angular.module('BlurAdmin.pages.teams.members') + .service('membersMessages', membersMessages); + + /** @ngInject */ + function membersMessages($sce) { + var messages = [ + { + "id": "4563faass", + "name": "Nasta Linnie", + "subject": "Great text", + "date": "2015-08-28T07:57:09", + "body": $sce.trustAsHtml("

Hey John,

Check out this cool text.

"), + "pic": "img/Nasta.png", + "email": "petraramsey@mail.com", + "attachment": "poem.txt", + "position": "Great Employee", + "tag": "friend", + "labels": ['inbox'] + }, + { + "id": "4563fdfvd", + "name": "Nasta Linnie", + "subject": "Lores ipsum", + "date": "2015-11-19T03:30:45", + "important": false, + "body": $sce.trustAsHtml("

Hey John,


Lorem ipsum dolor sit amet, consectetur adipiscing elit. Mauris ex mauris, ultrices vel lectus quis, scelerisque hendrerit ipsum. Suspendisse ullamcorper turpis neque, eget dapibus magna placerat ac. Suspendisse rhoncus ligula ac mi tempus varius ut sed lacus. Sed et commodo nulla, et placerat leo. Nam rhoncus vulputate sem non pharetra. Praesent fringilla massa in laoreet convallis. Aliquam lobortis dui a congue facilisis. Aenean dapibus semper semper. Quisque aliquam, nibh dapibus interdum condimentum, ex velit tempor tortor, at vestibulum magna leo quis leo. Morbi pulvinar varius erat ac rutrum. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; In hac habitasse platea dictumst.

" + + "

Cras rhoncus quam ipsum, vel dignissim nisl egestas sed. Aliquam erat volutpat. Integer eu nisl elit. Donec malesuada diam vitae tellus luctus tincidunt. Donec tempus blandit neque, rutrum egestas ipsum sagittis tempor. Curabitur volutpat ligula enim, nec vehicula purus molestie at. Sed a facilisis enim, nec molestie magna. Donec in augue non est viverra dapibus vel tempus risus. Nam porttitor purus sit amet hendrerit ullamcorper. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.

"), + "pic": "img/Nasta.png", + "email": "petraramsey@mail.com", + "position": "Great Employee", + "tag": "study", + "labels": ['inbox'] + }, + { + "id": "4563zxcss", + "name": "Nasta Linnie", + "subject": "Lores ipsum", + "date": "2015-10-19T03:30:45", + "important": false, + "body": $sce.trustAsHtml("

Hey Nasta,

Lorem ipsum dolor sit amet, consectetur adipiscing elit

"), + "pic": "img/Nasta.png", + "email": "petraramsey@mail.com", + "position": "Great Employee", + "tag": "work", + "labels": ['sent', 'important'] + }, + { + "id": "8955sddf", + "name": "Nick Cat", + "subject": "New Design", + "date": "2015-05-05T12:59:45", + "body": $sce.trustAsHtml("

Hey John, Consectetur adipiscing elit


" + + "

Cras rhoncus quam ipsum, vel dignissim nisl egestas sed. Aliquam erat volutpat. Integer eu nisl elit. Donec malesuada diam vitae tellus luctus tincidunt. Donec tempus blandit neque, rutrum egestas ipsum sagittis tempor. Curabitur volutpat ligula enim, nec vehicula purus molestie at. Sed a facilisis enim, nec molestie magna. Donec in augue non est viverra dapibus vel tempus risus. Nam porttitor purus sit amet hendrerit ullamcorper. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.

"), + "pic": "img/Nick.png", + "email": "barlowshort@mail.com", + "position": "Graphical designer", + "attachment": "design.psd", + "tag": "work", + "labels": ['inbox'] + }, + { + "id": "8955sdfcc", + "name": "Nick Cat", + "subject": "Gift card", + "date": "2015-07-18T10:19:01", + "body": $sce.trustAsHtml("

Hey John,


Consectetur adipiscing elit, Lorem ipsum dolor sit amet

"), + "pic": "img/Nick.png", + "email": "barlowshort@mail.com", + "position": "Graphical designer", + "tag": "study", + "labels": ['inbox'] + }, + { + "id": "8955asewf", + "name": "Nick Cat", + "subject": "Some news", + "date": "2015-09-23T03:04:10", + "body": $sce.trustAsHtml("

Hey John,


Integer eu nisl elit. Donec malesuada diam vitae tellus luctus tincidunt. Donec tempus blandit neque, rutrum egestas ipsum sagittis tempor. Curabitur volutpat ligula enim, nec vehicula purus molestie at. Sed a facilisis enim, nec molestie magna. Donec in augue non est viverra dapibus vel tempus risus. Nam porttitor purus sit amet hendrerit ullamcorper. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.

"), + "pic": "img/Nick.png", + "email": "barlowshort@mail.com", + "position": "Graphical designer", + "tag": "work", + "labels": ['inbox', 'important'] + }, + { + "id": "2334uudsa", + "name": "Kostya Danovsky", + "subject": "Street Art", + "date": "2015-11-22T10:05:09", + "body": $sce.trustAsHtml("

Hey John,

Aliquam eu facilisis eros, quis varius est.

" + + "

Consectetur adipiscing elit. Aliquam sodales sem in nibh pellentesque, ac dignissim mi dapibus.

" + + "

Lorem ipsum dolor sit amet! Nullam imperdiet justo a ipsum laoreet euismod.

" + + "

Cras tincidunt fermentum lectus, quis scelerisque lorem volutpat sed." + + "Sed quis orci sed nisl sagittis viverra id at mauris. Nam venenatis mi nibh. Sed fringilla mattis vehic

"), + "pic": "img/Kostya.png", + "email": "schwart@mail.com", + "position": "Technical Chef", + "attachment": "file.doc", + "tag": "family", + "labels": ['inbox', 'important'] + }, + { + "id": "2334aefvv", + "name": "Kostya Danovsky", + "subject": "New product", + "date": "2015-06-22T06:26:10", + "body": $sce.trustAsHtml("

Hello John,

Lorem ipsum dolor sit amet!

" + + "

Consectetur adipiscing elit. Aliquam sodales sem in nibh pellentesque, ac dignissim mi dapibus.

" + + "

Aliquam eu facilisis eros, quis varius est. Nullam imperdiet justo a ipsum laoreet euismod.

" + + "

Nulla facilisi. Nulla congue, arcu eget blandit lacinia, leo ante ullamcorper lectus, vel pulvinar justo ipsum vitae justo." + + "Cras tincidunt fermentum lectus, quis scelerisque lorem volutpat sed. Sed quis orci sed nisl sagittis viverra id at mauris. Nam venenatis mi nibh. Sed fringilla mattis vehic

"), + "pic": "img/Kostya.png", + "email": "schwart@mail.com", + "position": "Technical Chef", + "tag": "family", + "labels": ['inbox', 'important'] + }, + { + "id": "2334cvdss", + "name": "Kostya Danovsky", + "subject": "Old product", + "date": "2015-06-22T06:26:10", + "body": $sce.trustAsHtml("

Hello John,

" + + "

Consectetur adipiscing elit. Aliquam sodales sem in nibh pellentesque, ac dignissim mi dapibus.

" + + "
"+ + "

Cras tincidunt fermentum lectus, quis scelerisque lorem volutpat sed. Sed quis orci sed nisl sagittis viverra id at mauris. Nam venenatis mi nibh. Sed fringilla mattis vehic

"), + "pic": "img/Kostya.png", + "email": "schwart@mail.com", + "position": "Technical Chef", + "tag": "study", + "labels": ['trash'] + }, + { + "id": "8223xzxfn", + "name": "Andrey Hrabouski", + "subject": "Skype moji", + "date": "2015-07-16T06:47:53", + "body": $sce.trustAsHtml("

Hello John,

Aliquam sodales sem in nibh pellentesque

" + + "

Lorem ipsum dolor I find moji in skype sit amet!.

"), + "pic": "img/Andrey.png", + "email": "lakeishaphillips@mail.com", + "position": "Mobile Developer", + "tag": 'family', + "labels": ['trash'] + }, + { + "id": "8223sdffn", + "name": "Andrey Hrabouski", + "subject": "My App", + "date": "2015-06-20T07:05:02", + "body": $sce.trustAsHtml("

Hey Vlad.

Lorem ipsum dolor sit amet!

" + + "

Consectetur My Falasson App elit. Aliquam sodales sem in nibh pellentesque, ac dignissim mi dapibus.

"), + "pic": "img/Andrey.png", + "email": "lakeishaphillips@mail.com", + "position": "Mobile Developer", + "tag": 'family', + "labels": ['spam'] + }, + { + "id": "9391xdsff", + "name": "Vlad Lugovsky", + "subject": "Cool", + "date": "2015-03-31T11:52:58", + "body": $sce.trustAsHtml("

Hey Vlad.

Aliquam sodales sem in nibh pellentesque

" + + "

Cras tincidunt fermentum lectus, quis scelerisque lorem volutpat sed.

"), + "pic": "img/Vlad.png", + "email": "carlsongoodman@mail.com", + "position": "Fullstack man", + "tag": "study", + "labels": ['draft'] + }, + { + "id": "8223xsdaa", + "name": "Andrey Hrabouski", + "subject": "Car rent", + "date": "2015-02-25T10:58:58", + "body": $sce.trustAsHtml("

Hey Andrey.

" + + "

Cras tincidunt fermentum lectus, quis scelerisque lorem volutpat sed. Sed quis orci sed nisl sagittis viverra id at mauris. Nam venenatis mi nibh. Sed fringilla mattis vehic

"), + "pic": "img/Andrey.png", + "email": "lakeishaphillips@mail.com", + "position": "Mobile Developer", + "tag": "family", + "labels": ['draft'] + }, + { + "id": "9391xdsff", + "name": "Vlad Lugovsky", + "subject": "What next", + "date": "2015-03-31T11:52:58", + "body": $sce.trustAsHtml("

Hey Vlad.

Lorem ipsum dolor sit amet!

" + + "

Esse esse labore tempor ullamco ullamco. Id veniam laborum c.

"), + "pic": "img/Vlad.png", + "email": "carlsongoodman@mail.com", + "position": "Fullstack man", + "tag": "study", + "labels": ['sent'] + } + ].sort(function (a, b) { + if (a.date > b.date) return 1; + if (a.date < b.date) return -1; + }).reverse(); + var tabs = [{ + label: 'inbox', + name: 'Inbox', + newMails: 7 + }, { + label: 'sent', + name: 'Sent Mail' + }, { + label: 'important', + name: 'Important' + }, { + label: 'draft', + name: 'Draft', + newMails: 2 + }, { + label: 'spam', + name: 'Spam' + }, { + label: 'trash', + name: 'Trash' + }]; + + return{ + getTabs : function(){ + return tabs + }, + getMessagesByLabel : function(label){ + console.log('label',$stateParams.label); + return messages.filter(function(m){ + return m.labels.indexOf(label) != -1; + }); + }, + getMessageById : function(id){ + return messages.filter(function(m){ + return m.id == id; + })[0]; + } + } + + } + +})(); \ No newline at end of file diff --git a/src/app/pages/teams/teams.module.js b/src/app/pages/teams/teams.module.js index 97f05c9..8b42866 100644 --- a/src/app/pages/teams/teams.module.js +++ b/src/app/pages/teams/teams.module.js @@ -1,6 +1,6 @@ /** - * @author v.lugovsky - * created on 16.12.2015 + * @author k.danovsky + * created on 15.01.2016 */ (function () { 'use strict'; @@ -16,18 +16,11 @@ .state('teams', { url: '/teams', template : '', - title: 'Teams', + abstract: true, + title: 'teams', sidebarMeta: { - icon: 'ion-gear-a', - order: 1500, - }, - }).state('teams.members', { - url: '/create', - templateUrl: 'app/pages/teams/members/members.html', - controller: "MembersTabCtrl", - title: 'Manage Members', - sidebarMeta: { - order: 0, + icon: 'ion-gear-a', + order: 100, }, }); }