\ No newline at end of file
diff --git a/static/resources/js/components/details/switch-pane-projects.directive.js b/static/resources/js/components/details/switch-pane-projects.directive.js
new file mode 100644
index 000000000..d0a8c994e
--- /dev/null
+++ b/static/resources/js/components/details/switch-pane-projects.directive.js
@@ -0,0 +1,64 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.details')
+ .directive('switchPaneProjects', switchPaneProjects);
+
+ SwitchPaneProjectsController.$inject = ['$scope'];
+
+ function SwitchPaneProjectsController($scope) {
+ var vm = this;
+
+ $scope.$watch('vm.selectedProject', function(current, origin) {
+ if(current){
+ vm.projectName = current.name;
+ vm.selectedProject = current;
+ }
+ });
+
+ vm.switchPane = switchPane;
+
+ function switchPane() {
+ if(vm.isOpen) {
+ vm.isOpen = false;
+ }else{
+ vm.isOpen = true;
+ }
+ }
+
+ }
+
+ function switchPaneProjects() {
+ var directive = {
+ restrict: 'E',
+ templateUrl: '/static/resources/js/components/details/switch-pane-projects.directive.html',
+ scope: {
+ 'isOpen': '=',
+ 'selectedProject': '='
+ },
+ controller: SwitchPaneProjectsController,
+ controllerAs: 'vm',
+ bindToController: true
+ };
+
+ return directive;
+
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/dismissable-alerts/dismissable-alerts.directive.html b/static/resources/js/components/dismissable-alerts/dismissable-alerts.directive.html
new file mode 100644
index 000000000..9c8c5dbbd
--- /dev/null
+++ b/static/resources/js/components/dismissable-alerts/dismissable-alerts.directive.html
@@ -0,0 +1,18 @@
+
+
+
+ // 'caution' | tr // //message//
+
\ No newline at end of file
diff --git a/static/resources/js/components/dismissable-alerts/dismissable-alerts.directive.js b/static/resources/js/components/dismissable-alerts/dismissable-alerts.directive.js
new file mode 100644
index 000000000..9b94a1641
--- /dev/null
+++ b/static/resources/js/components/dismissable-alerts/dismissable-alerts.directive.js
@@ -0,0 +1,48 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.dismissable.alerts')
+ .directive('dismissableAlerts', dismissableAlerts);
+
+ function dismissableAlerts() {
+ var directive = {
+ 'restrict': 'E',
+ 'templateUrl': '/static/resources/js/components/dismissable-alerts/dismissable-alerts.directive.html',
+ 'link': link
+ };
+ return directive;
+ function link(scope, element, attrs, ctrl) {
+
+ scope.close = function() {
+ scope.toggleAlert = false;
+ }
+ scope.$on('raiseAlert', function(e, val) {
+ console.log('received raiseAlert:' + angular.toJson(val));
+ if(val.show) {
+ scope.message = val.message;
+ scope.toggleAlert = true;
+ }else{
+ scope.message = ''
+ scope.toggleAlert = false;
+ }
+ });
+ }
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/dismissable-alerts/dismissable-alerts.module.js b/static/resources/js/components/dismissable-alerts/dismissable-alerts.module.js
new file mode 100644
index 000000000..cc1f2e2a7
--- /dev/null
+++ b/static/resources/js/components/dismissable-alerts/dismissable-alerts.module.js
@@ -0,0 +1,21 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular.module('harbor.dismissable.alerts', []);
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/element-height/element-height.inspector.js b/static/resources/js/components/element-height/element-height.inspector.js
new file mode 100644
index 000000000..769f2f068
--- /dev/null
+++ b/static/resources/js/components/element-height/element-height.inspector.js
@@ -0,0 +1,62 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.layout.element.height')
+ .directive('elementHeight', elementHeight);
+
+ function elementHeight($window) {
+ var directive = {
+ 'restrict': 'A',
+ 'link': link
+ };
+
+ return directive;
+
+ function link(scope, element, attrs) {
+
+ var w = angular.element($window);
+
+ scope.getDimension = function() {
+ return {'h' : w.height()};
+ };
+
+ if(!angular.isDefined(scope.subsHeight)) scope.subsHeight = 110;
+ if(!angular.isDefined(scope.subsSection)) scope.subsSection = 32;
+ if(!angular.isDefined(scope.subsSubPane)) scope.subsSubPane = 226;
+ if(!angular.isDefined(scope.subsTblBody)) scope.subsTblBody = 40;
+
+ scope.$watch(scope.getDimension, function(current) {
+ if(current) {
+ var h = current.h;
+ element.css({'height': (h - scope.subsHeight) + 'px'});
+ element.find('.section').css({'height': (h - scope.subsHeight - scope.subsSection) + 'px'});
+ element.find('.sub-pane').css({'height': (h - scope.subsHeight - scope.subsSubPane) + 'px'});
+ element.find('.tab-pane').css({'height': (h - scope.subsHeight - scope.subsSubPane - scope.subsSection -100) + 'px'});
+// var subPaneHeight = element.find('.sub-pane').height();
+// element.find('.table-body-container').css({'height': (subPaneHeight - scope.subsTblBody) + 'px'});
+ }
+ }, true);
+
+ w.on('pageshow, resize', function() {
+ scope.$apply();
+ });
+ }
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/element-height/element-height.module.js b/static/resources/js/components/element-height/element-height.module.js
new file mode 100644
index 000000000..14be71f1e
--- /dev/null
+++ b/static/resources/js/components/element-height/element-height.module.js
@@ -0,0 +1,22 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.layout.element.height', []);
+
+})();
\ No newline at end of file
diff --git a/views/segment/base-layout.tpl b/static/resources/js/components/inline-help/inline-help.directive.html
similarity index 76%
rename from views/segment/base-layout.tpl
rename to static/resources/js/components/inline-help/inline-help.directive.html
index e332907ba..e7b935299 100644
--- a/views/segment/base-layout.tpl
+++ b/static/resources/js/components/inline-help/inline-help.directive.html
@@ -12,17 +12,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-
-
- {{.HeaderInc}}
- {{.PageTitle}}
-
-
- {{.HeaderContent}}
- {{.BodyContent}}
- {{.FooterInc}}
- {{.ModalDialog}}
- {{.FootContent}}
-
-
\ No newline at end of file
+
+
+
\ No newline at end of file
diff --git a/static/resources/js/components/inline-help/inline-help.directive.js b/static/resources/js/components/inline-help/inline-help.directive.js
new file mode 100644
index 000000000..cf2f30fe7
--- /dev/null
+++ b/static/resources/js/components/inline-help/inline-help.directive.js
@@ -0,0 +1,47 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+ 'use strict';
+
+ angular
+ .module('harbor.inline.help')
+ .directive('inlineHelp', inlineHelp);
+ function InlineHelpController() {
+ var vm = this;
+ }
+ function inlineHelp() {
+ var directive = {
+ 'restrict': 'E',
+ 'templateUrl': '/static/resources/js/components/inline-help/inline-help.directive.html',
+ 'scope': {
+ 'helpTitle': '@',
+ 'content': '@'
+ },
+ 'link': link,
+ 'controller': InlineHelpController,
+ 'controllerAs': 'vm',
+ 'bindToController': true
+ };
+ return directive;
+ function link(scope, element, attr, ctrl) {
+ element.popover({
+ 'title': ctrl.helpTitle,
+ 'content': ctrl.content,
+ 'html': true
+ });
+ }
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/inline-help/inline-help.module.js b/static/resources/js/components/inline-help/inline-help.module.js
new file mode 100644
index 000000000..26311190e
--- /dev/null
+++ b/static/resources/js/components/inline-help/inline-help.module.js
@@ -0,0 +1,22 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.inline.help', []);
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/loading-progress/loading-progress.directive.js b/static/resources/js/components/loading-progress/loading-progress.directive.js
new file mode 100644
index 000000000..030f19edf
--- /dev/null
+++ b/static/resources/js/components/loading-progress/loading-progress.directive.js
@@ -0,0 +1,70 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.loading.progress')
+ .directive('loadingProgress', loadingProgress);
+
+ function loadingProgress() {
+ var directive = {
+ 'restrict': 'EA',
+ 'scope': {
+ 'toggleInProgress': '=',
+ 'hideTarget': '@'
+ },
+ 'link': link
+ };
+
+ return directive;
+
+ function link(scope, element, attrs) {
+ var spinner = $('');
+
+ function convertToBoolean(val) {
+ return val === 'true' ? true : false;
+ }
+
+ var hideTarget = convertToBoolean(scope.hideTarget);
+
+ console.log('loading-progress, toggleInProgress:' + scope.toggleInProgress + ', hideTarget:' + hideTarget);
+
+ var pristine = element.html();
+
+ scope.$watch('toggleInProgress', function(current) {
+ if(scope.toggleInProgress) {
+ element.attr('disabled', 'disabled');
+ if(hideTarget) {
+ element.html(spinner);
+ }else{
+ spinner = spinner.css({'margin-left': '5px'});
+ element.append(spinner);
+ }
+ }else{
+ if(hideTarget) {
+ element.html(pristine);
+ }else{
+ element.find('.loading-progress').remove();
+ }
+ element.removeAttr('disabled');
+ }
+ });
+
+ }
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/loading-progress/loading-progress.module.js b/static/resources/js/components/loading-progress/loading-progress.module.js
new file mode 100644
index 000000000..076da55c5
--- /dev/null
+++ b/static/resources/js/components/loading-progress/loading-progress.module.js
@@ -0,0 +1,22 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.loading.progress', []);
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/log/advanced-search.directive.html b/static/resources/js/components/log/advanced-search.directive.html
new file mode 100644
index 000000000..022dc9614
--- /dev/null
+++ b/static/resources/js/components/log/advanced-search.directive.html
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/static/resources/js/components/log/advanced-search.directive.js b/static/resources/js/components/log/advanced-search.directive.js
new file mode 100644
index 000000000..31a858deb
--- /dev/null
+++ b/static/resources/js/components/log/advanced-search.directive.js
@@ -0,0 +1,165 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.log')
+ .directive('advancedSearch', advancedSearch);
+
+ AdvancedSearchController.$inject = ['$scope', 'ListLogService'];
+
+ function AdvancedSearchController($scope, ListLogService) {
+ var vm = this;
+
+ vm.checkOperation = checkOperation;
+ vm.close = close;
+
+ vm.opAll = true;
+
+ vm.doSearch = doSearch;
+
+ $scope.$watch('vm.op', function(current) {
+ if(current && vm.op[0] === 'all') {
+ vm.opCreate = true;
+ vm.opPull = true;
+ vm.opPush = true;
+ vm.opDelete = true;
+ vm.opOthers = true;
+ }
+ }, true);
+
+ $scope.$watch('vm.fromDate', function(current) {
+ if(current) {
+ vm.fromDate = current;
+ }
+ });
+
+ $scope.$watch('vm.toDate', function(current) {
+ if(current) {
+ vm.toDate = current;
+ }
+ });
+
+
+ vm.opCreate = true;
+ vm.opPull = true;
+ vm.opPush = true;
+ vm.opDelete = true;
+ vm.opOthers = true;
+ vm.others = '';
+
+ vm.op = [];
+ vm.op.push('all');
+ function checkOperation(e) {
+ if(e.checked === 'all') {
+ vm.opCreate = vm.opAll;
+ vm.opPull = vm.opAll;
+ vm.opPush = vm.opAll;
+ vm.opDelete = vm.opAll;
+ vm.opOthers = vm.opAll;
+ }else {
+ vm.opAll = false;
+ }
+
+ vm.op = [];
+
+ if(vm.opCreate) {
+ vm.op.push('create');
+ }
+ if(vm.opPull) {
+ vm.op.push('pull');
+ }
+ if(vm.opPush) {
+ vm.op.push('push');
+ }
+ if(vm.opDelete) {
+ vm.op.push('delete');
+ }
+ if(vm.opOthers && $.trim(vm.others) !== '') {
+ vm.op.push($.trim(vm.others));
+ }
+ }
+
+ vm.pickUp = pickUp;
+
+ function pickUp(e) {
+ switch(e.key){
+ case 'fromDate':
+ vm.fromDate = e.value;
+ break;
+ case 'toDate':
+ vm.toDate = e.value;
+ break;
+ }
+ $scope.$apply();
+ }
+
+ function close() {
+ vm.op = [];
+ vm.op.push('all');
+ vm.fromDate = '';
+ vm.toDate = '';
+ vm.others = '';
+ vm.isOpen = false;
+ }
+
+ function doSearch (e){
+ if(vm.opOthers && $.trim(vm.others) !== '') {
+ e.op.push(vm.others);
+ }
+ vm.search(e);
+ }
+ }
+
+ function advancedSearch(I18nService) {
+ var directive = {
+ 'restrict': 'E',
+ 'templateUrl': '/static/resources/js/components/log/advanced-search.directive.html',
+ 'scope': {
+ 'isOpen': '=',
+ 'op': '=',
+ 'opOthers': '=',
+ 'others': '=',
+ 'fromDate': '=',
+ 'toDate': '=',
+ 'search': '&'
+ },
+ 'link': link,
+ 'controller': AdvancedSearchController,
+ 'controllerAs': 'vm',
+ 'bindToController': true
+ };
+ return directive;
+
+ function link(scope, element, attrs, ctrl) {
+ element.find('.datetimepicker').datetimepicker({
+ locale: I18nService().getCurrentLanguage(),
+ ignoreReadonly: true,
+ format: 'L',
+ showClear: true
+ });
+ element.find('#fromDatePicker').on('blur', function(){
+ ctrl.pickUp({'key': 'fromDate', 'value': $(this).val()});
+ });
+ element.find('#toDatePicker').on('blur', function(){
+ ctrl.pickUp({'key': 'toDate', 'value': $(this).val()});
+ });
+
+ }
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/log/list-log.directive.html b/static/resources/js/components/log/list-log.directive.html
new file mode 100644
index 000000000..912498dd4
--- /dev/null
+++ b/static/resources/js/components/log/list-log.directive.html
@@ -0,0 +1,53 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
// 'username' | tr //
+
// 'repository_name' | tr //
+
// 'operation' | tr //
+
// 'timestamp' | tr //
+
+
+
+
+
+
+
+
//log.username//
//log.repo_name//
//log.operation//
//log.op_time | dateL : 'YYYY-MM-DD HH:mm:ss'//
+
+
+
+
+
+
+
+
diff --git a/static/resources/js/components/log/list-log.directive.js b/static/resources/js/components/log/list-log.directive.js
new file mode 100644
index 000000000..5c4868125
--- /dev/null
+++ b/static/resources/js/components/log/list-log.directive.js
@@ -0,0 +1,163 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.log')
+ .directive('listLog', listLog);
+
+ ListLogController.$inject = ['$scope','ListLogService', 'getParameterByName', '$location', '$filter', 'trFilter'];
+
+ function ListLogController($scope, ListLogService, getParameterByName, $location, $filter, trFilter) {
+
+ $scope.subsTabPane = 30;
+
+ var vm = this;
+
+ vm.sectionHeight = {'min-height': '579px'};
+
+ vm.isOpen = false;
+
+ vm.beginTimestamp = 0;
+ vm.endTimestamp = 0;
+ vm.keywords = '';
+ vm.username = '';
+
+ vm.op = [];
+ vm.opOthers = true;
+
+ vm.search = search;
+ vm.showAdvancedSearch = showAdvancedSearch;
+
+ vm.projectId = getParameterByName('project_id', $location.absUrl());
+ vm.queryParams = {
+ 'beginTimestamp' : vm.beginTimestamp,
+ 'endTimestamp' : vm.endTimestamp,
+ 'keywords' : vm.keywords,
+ 'projectId': vm.projectId,
+ 'username' : vm.username
+ };
+
+ retrieve(vm.queryParams);
+
+ $scope.$on('$locationChangeSuccess', function() {
+
+ if(vm.publicity) {
+ vm.target = 'repositories';
+ }
+
+ vm.projectId = getParameterByName('project_id', $location.absUrl());
+ vm.queryParams = {
+ 'beginTimestamp' : vm.beginTimestamp,
+ 'endTimestamp' : vm.endTimestamp,
+ 'keywords' : vm.keywords,
+ 'projectId': vm.projectId,
+ 'username' : vm.username
+ };
+ vm.username = '';
+ retrieve(vm.queryParams);
+ });
+
+ function search(e) {
+
+ if(e.op[0] === 'all') {
+ e.op = ['create', 'pull', 'push', 'delete'];
+ }
+ if(vm.opOthers && $.trim(vm.others) !== '') {
+ e.op.push(vm.others);
+ }
+
+ vm.queryParams.keywords = e.op.join('/');
+ vm.queryParams.username = e.username;
+
+ vm.queryParams.beginTimestamp = toUTCSeconds(vm.fromDate, 0, 0, 0);
+ vm.queryParams.endTimestamp = toUTCSeconds(vm.toDate, 23, 59, 59);
+
+ retrieve(vm.queryParams);
+ }
+
+ function showAdvancedSearch() {
+ if(vm.isOpen){
+ vm.isOpen = false;
+ }else{
+ vm.isOpen = true;
+ }
+ }
+
+ function retrieve(queryParams) {
+ ListLogService(queryParams)
+ .then(listLogComplete)
+ .catch(listLogFailed);
+ }
+
+ function listLogComplete(response) {
+ vm.logs = response.data;
+
+ vm.queryParams = {
+ 'beginTimestamp' : 0,
+ 'endTimestamp' : 0,
+ 'keywords' : '',
+ 'projectId': vm.projectId,
+ 'username' : ''
+ };
+ vm.op = ['all'];
+ vm.fromDate = '';
+ vm.toDate = '';
+ vm.others = '';
+ vm.opOthers = true;
+ vm.isOpen = false;
+ }
+ function listLogFailed(response){
+ $scope.$emit('modalTitle', $filter('tr')('error'));
+ $scope.$emit('modalMessage', $filter('tr')('failed_to_get_log') + response);
+ $scope.$emit('raiseError', true);
+ console.log('Failed to get log:' + response);
+ }
+
+ function toUTCSeconds(date, hour, min, sec) {
+ if(!angular.isDefined(date) || date === '') {
+ return 0;
+ }
+
+ var t = new Date(date);
+ t.setHours(hour);
+ t.setMinutes(min);
+ t.setSeconds(sec);
+
+ return t.getTime() / 1000;
+ }
+
+ }
+
+ function listLog() {
+ var directive = {
+ restrict: 'E',
+ templateUrl: '/static/resources/js/components/log/list-log.directive.html',
+ scope: {
+ 'sectionHeight': '=',
+ 'target': '=',
+ 'publicity': '='
+ },
+ controller: ListLogController,
+ controllerAs: 'vm',
+ bindToController: true
+ };
+
+ return directive;
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/log/log.config.js b/static/resources/js/components/log/log.config.js
new file mode 100644
index 000000000..1f5e1c73d
--- /dev/null
+++ b/static/resources/js/components/log/log.config.js
@@ -0,0 +1,23 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.log');
+
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/log/log.module.js b/static/resources/js/components/log/log.module.js
new file mode 100644
index 000000000..94bf397ae
--- /dev/null
+++ b/static/resources/js/components/log/log.module.js
@@ -0,0 +1,24 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.log', [
+ 'harbor.services.log'
+ ]);
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/modal-dialog/modal-dialog.directive.html b/static/resources/js/components/modal-dialog/modal-dialog.directive.html
new file mode 100644
index 000000000..257d6b09e
--- /dev/null
+++ b/static/resources/js/components/modal-dialog/modal-dialog.directive.html
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
//vm.modalTitle//
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/static/resources/js/components/modal-dialog/modal-dialog.directive.js b/static/resources/js/components/modal-dialog/modal-dialog.directive.js
new file mode 100644
index 000000000..dc1722049
--- /dev/null
+++ b/static/resources/js/components/modal-dialog/modal-dialog.directive.js
@@ -0,0 +1,90 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.modal.dialog')
+ .directive('modalDialog', modalDialog);
+
+ ModalDialogController.$inject = ['$scope'];
+
+ function ModalDialogController($scope) {
+ var vm = this;
+
+ }
+
+ function modalDialog() {
+ var directive = {
+ 'restrict': 'E',
+ 'templateUrl': '/static/resources/js/components/modal-dialog/modal-dialog.directive.html',
+ 'link': link,
+ 'scope': {
+ 'contentType': '@',
+ 'modalTitle': '@',
+ 'modalMessage': '@',
+ 'action': '&',
+ 'confirmOnly': '='
+ },
+ 'controller': ModalDialogController,
+ 'controllerAs': 'vm',
+ 'bindToController': true
+ };
+ return directive;
+
+ function link(scope, element, attrs, ctrl) {
+
+ scope.$watch('contentType', function(current) {
+ if(current) {
+ ctrl.contentType = current;
+ }
+ })
+ scope.$watch('confirmOnly', function(current) {
+ if(current) {
+ ctrl.confirmOnly = current;
+ }
+ })
+
+ scope.$watch('vm.modalMessage', function(current) {
+ if(current) {
+ switch(ctrl.contentType) {
+ case 'text/html':
+ element.find('.modal-body').html(current); break;
+ case 'text/plain':
+ element.find('.modal-body').text(current); break;
+ default:
+ element.find('.modal-body').text(current); break;
+ }
+ }
+ });
+
+ scope.$on('showDialog', function(e, val) {
+ if(val) {
+ element.find('#myModal').modal('show');
+ }else{
+ element.find('#myModal').modal('hide');
+ }
+ });
+
+ element.find('#btnOk').on('click', clickHandler);
+
+ function clickHandler(e) {
+ ctrl.action();
+ }
+ }
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/modal-dialog/modal-dialog.module.js b/static/resources/js/components/modal-dialog/modal-dialog.module.js
new file mode 100644
index 000000000..2ac2ba083
--- /dev/null
+++ b/static/resources/js/components/modal-dialog/modal-dialog.module.js
@@ -0,0 +1,22 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.modal.dialog', []);
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/optional-menu/optional-menu.directive.js b/static/resources/js/components/optional-menu/optional-menu.directive.js
new file mode 100644
index 000000000..4852b7eeb
--- /dev/null
+++ b/static/resources/js/components/optional-menu/optional-menu.directive.js
@@ -0,0 +1,71 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.optional.menu')
+ .directive('optionalMenu', optionalMenu);
+
+ OptionalMenuController.$inject = ['$window', 'I18nService', 'LogOutService', 'currentUser', '$timeout'];
+
+ function OptionalMenuController($window, I18nService, LogOutService, currentUser, $timeout) {
+ var vm = this;
+
+ vm.currentLanguage = I18nService().getCurrentLanguage();
+ vm.languageName = I18nService().getLanguageName(vm.currentLanguage);
+
+ I18nService().setCurrentLanguage(vm.currentLanguage);
+
+ console.log('current language:' + vm.languageName);
+
+ vm.supportLanguages = I18nService().getSupportLanguages();
+ vm.user = currentUser.get();
+ vm.setLanguage = setLanguage;
+ vm.logOut = logOut;
+
+ function setLanguage(language) {
+ I18nService().setCurrentLanguage(language);
+ var hash = $window.location.hash;
+ $window.location.href = '/language?lang=' + language + '&hash=' + encodeURIComponent(hash);
+ }
+ function logOut() {
+ LogOutService()
+ .success(logOutSuccess)
+ .error(logOutFailed);
+ }
+ function logOutSuccess(data, status) {
+ currentUser.unset();
+ $window.location.href= '/';
+ }
+ function logOutFailed(data, status) {
+ console.log('Failed to log out:' + data);
+ }
+ }
+
+ function optionalMenu() {
+ var directive = {
+ 'restrict': 'E',
+ 'templateUrl': '/optional_menu?timestamp=' + new Date().getTime(),
+ 'scope': true,
+ 'controller': OptionalMenuController,
+ 'controllerAs': 'vm',
+ 'bindToController': true
+ };
+ return directive;
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/optional-menu/optional-menu.module.js b/static/resources/js/components/optional-menu/optional-menu.module.js
new file mode 100644
index 000000000..71cde6b35
--- /dev/null
+++ b/static/resources/js/components/optional-menu/optional-menu.module.js
@@ -0,0 +1,25 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.optional.menu', [
+ 'harbor.services.user',
+ 'harbor.services.i18n'
+ ]);
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/project-member/add-project-member.directive.html b/static/resources/js/components/project-member/add-project-member.directive.html
new file mode 100644
index 000000000..2519fac55
--- /dev/null
+++ b/static/resources/js/components/project-member/add-project-member.directive.html
@@ -0,0 +1,44 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/static/resources/js/components/project-member/add-project-member.directive.js b/static/resources/js/components/project-member/add-project-member.directive.js
new file mode 100644
index 000000000..1f6251492
--- /dev/null
+++ b/static/resources/js/components/project-member/add-project-member.directive.js
@@ -0,0 +1,115 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.project.member')
+ .directive('addProjectMember', addProjectMember);
+
+ AddProjectMemberController.$inject = ['$scope', 'roles', 'AddProjectMemberService'];
+
+ function AddProjectMemberController($scope, roles, AddProjectMemberService) {
+ var vm = this;
+
+ $scope.pm = {};
+
+ var pm = $scope.pm;
+
+ vm.roles = roles();
+ vm.optRole = 1;
+
+ vm.save = save;
+ vm.cancel = cancel;
+ vm.reset = reset;
+
+ vm.hasError = false;
+ vm.errorMessage = '';
+
+ function save(pm) {
+ if(pm && angular.isDefined(pm.username)) {
+ AddProjectMemberService(vm.projectId, vm.optRole, pm.username)
+ .success(addProjectMemberComplete)
+ .error(addProjectMemberFailed);
+ }
+ }
+
+ function cancel(form) {
+
+ form.$setPristine();
+ form.$setUntouched();
+
+ vm.isOpen = false;
+ pm.username = '';
+ vm.optRole = 1;
+
+ vm.hasError = false;
+ vm.errorMessage = '';
+ }
+
+ function addProjectMemberComplete(data, status, header) {
+ console.log('addProjectMemberComplete: status:' + status + ', data:' + data);
+ vm.reload();
+ vm.isOpen = false;
+ }
+
+ function addProjectMemberFailed(data, status, headers) {
+ if(status === 403) {
+ vm.hasError = true;
+ vm.errorMessage = 'failed_to_add_member';
+ }
+ if(status === 409 && pm.username != '') {
+ vm.hasError = true;
+ vm.errorMessage = 'username_already_exist';
+ }
+ if(status === 404) {
+ vm.hasError = true;
+ vm.errorMessage = 'username_does_not_exist';
+ }
+ console.log('addProjectMemberFailed: status:' + status + ', data:' + data);
+ }
+
+ function reset() {
+ vm.hasError = false;
+ vm.errorMessage = '';
+ }
+
+ }
+
+ function addProjectMember() {
+ var directive = {
+ 'restrict': 'E',
+ 'templateUrl': '/static/resources/js/components/project-member/add-project-member.directive.html',
+ 'scope': {
+ 'projectId': '@',
+ 'isOpen': '=',
+ 'reload': '&'
+ },
+ 'link': link,
+ 'controller': AddProjectMemberController,
+ 'controllerAs': 'vm',
+ 'bindToController': true
+ };
+
+ return directive;
+
+ function link(scope, element, attrs, ctrl) {
+ scope.form.$setPristine();
+ scope.form.$setUntouched();
+ }
+ }
+
+})();
diff --git a/static/resources/js/components/project-member/edit-project-member.directive.html b/static/resources/js/components/project-member/edit-project-member.directive.html
new file mode 100644
index 000000000..4f83d1a13
--- /dev/null
+++ b/static/resources/js/components/project-member/edit-project-member.directive.html
@@ -0,0 +1,25 @@
+
+
\ No newline at end of file
diff --git a/static/resources/js/components/project-member/edit-project-member.directive.js b/static/resources/js/components/project-member/edit-project-member.directive.js
new file mode 100644
index 000000000..f1e73b48e
--- /dev/null
+++ b/static/resources/js/components/project-member/edit-project-member.directive.js
@@ -0,0 +1,99 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.project.member')
+ .directive('editProjectMember', editProjectMember);
+
+ EditProjectMemberController.$inject = ['$scope', 'roles', 'getRole','EditProjectMemberService', '$filter', 'trFilter'];
+
+ function EditProjectMemberController($scope, roles, getRole, EditProjectMemberService, $filter, trFilter) {
+ var vm = this;
+
+ vm.roles = roles();
+ vm.editMode = false;
+ vm.lastRoleName = vm.roleName;
+
+ $scope.$watch('vm.roleName', function(current, origin) {
+ if(current) {
+ vm.currentRole = getRole({'key': 'roleName', 'value': current});
+ vm.roleId = vm.currentRole.id;
+ }
+ });
+
+ vm.updateProjectMember = updateProjectMember;
+ vm.deleteProjectMember = deleteProjectMember;
+ vm.cancelUpdate = cancelUpdate;
+
+ function updateProjectMember(e) {
+ if(vm.editMode) {
+ console.log('update project member, roleId:' + e.roleId);
+ EditProjectMemberService(e.projectId, e.userId, e.roleId)
+ .success(editProjectMemberComplete)
+ .error(editProjectMemberFailed);
+ }else {
+ vm.editMode = true;
+ }
+ }
+
+ function deleteProjectMember() {
+ vm.delete();
+ }
+
+ function editProjectMemberComplete(data, status, headers) {
+ console.log('edit project member complete: ' + status);
+ vm.lastRoleName = vm.roleName;
+ vm.editMode = false;
+ vm.reload();
+ }
+
+ function editProjectMemberFailed(e) {
+ $scope.$emit('modalTitle', $filter('tr')('error'));
+ $scope.$emit('modalMessage', $filter('tr')('failed_to_change_member'));
+ $scope.$emit('raiseError', true);
+ console.log('Failed to edit project member:' + e);
+ }
+
+ function cancelUpdate() {
+ vm.editMode = false;
+ vm.roleName = vm.lastRoleName;
+ }
+
+ }
+
+ function editProjectMember() {
+ var directive = {
+ 'restrict': 'A',
+ 'templateUrl': '/static/resources/js/components/project-member/edit-project-member.directive.html',
+ 'scope': {
+ 'username': '=',
+ 'userId': '=',
+ 'currentUserId': '=',
+ 'roleName': '=',
+ 'projectId': '=',
+ 'delete': '&',
+ 'reload': '&'
+ },
+ 'controller': EditProjectMemberController,
+ 'controllerAs': 'vm',
+ 'bindToController': true
+ };
+ return directive;
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/project-member/list-project-member.directive.html b/static/resources/js/components/project-member/list-project-member.directive.html
new file mode 100644
index 000000000..7e2654168
--- /dev/null
+++ b/static/resources/js/components/project-member/list-project-member.directive.html
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
// 'username' | tr //
// 'role' | tr //
// 'operation' | tr //
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/static/resources/js/components/project-member/list-project-member.directive.js b/static/resources/js/components/project-member/list-project-member.directive.js
new file mode 100644
index 000000000..cdcc28607
--- /dev/null
+++ b/static/resources/js/components/project-member/list-project-member.directive.js
@@ -0,0 +1,117 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.project.member')
+ .directive('listProjectMember', listProjectMember);
+
+ ListProjectMemberController.$inject = ['$scope', 'ListProjectMemberService', 'DeleteProjectMemberService', 'getParameterByName', '$location', 'currentUser', '$filter', 'trFilter', '$window'];
+
+ function ListProjectMemberController($scope, ListProjectMemberService, DeleteProjectMemberService, getParameterByName, $location, currentUser, $filter, trFilter, $window) {
+
+ $scope.subsTabPane = 30;
+
+ var vm = this;
+
+ vm.sectionHeight = {'min-height': '579px'};
+
+ vm.isOpen = false;
+ vm.search = search;
+ vm.addProjectMember = addProjectMember;
+ vm.deleteProjectMember = deleteProjectMember;
+ vm.retrieve = retrieve;
+ vm.username = '';
+
+ vm.projectId = getParameterByName('project_id', $location.absUrl());
+ vm.retrieve();
+
+ $scope.$on('$locationChangeSuccess', function() {
+ vm.projectId = getParameterByName('project_id', $location.absUrl());
+ vm.username = '';
+ vm.retrieve();
+ });
+
+ function search(e) {
+ vm.projectId = e.projectId;
+ vm.username = e.username;
+ retrieve();
+ }
+
+ function addProjectMember() {
+ if(vm.isOpen) {
+ vm.isOpen = false;
+ }else{
+ vm.isOpen = true;
+ }
+ }
+
+ function deleteProjectMember(e) {
+ DeleteProjectMemberService(e.projectId, e.userId)
+ .success(deleteProjectMemberSuccess)
+ .error(deleteProjectMemberFailed);
+ }
+
+ function deleteProjectMemberSuccess(data, status) {
+ console.log('Successful delete project member.');
+ vm.retrieve();
+ }
+
+ function deleteProjectMemberFailed(e) {
+ $scope.$emit('modalTitle', $filter('tr')('error'));
+ $scope.$emit('modalMessage', $filter('tr')('failed_to_delete_member'));
+ $scope.$emit('raiseError', true);
+ console.log('Failed to edit project member:' + e);
+ }
+
+ function retrieve() {
+ ListProjectMemberService(vm.projectId, {'username': vm.username})
+ .then(getProjectMemberComplete)
+ .catch(getProjectMemberFailed);
+ }
+
+ function getProjectMemberComplete(response) {
+ vm.user = currentUser.get();
+ vm.projectMembers = response.data || [];
+ }
+
+ function getProjectMemberFailed(response) {
+ console.log('Failed to get project members:' + response);
+ vm.projectMembers = [];
+ vm.target = 'repositories';
+ $location.url('repositories').search('project_id', vm.projectId);
+ }
+
+ }
+
+ function listProjectMember() {
+ var directive = {
+ 'restrict': 'E',
+ 'templateUrl': '/static/resources/js/components/project-member/list-project-member.directive.html',
+ 'scope': {
+ 'sectionHeight': '=',
+ 'target': '='
+ },
+ 'controller': ListProjectMemberController,
+ 'controllerAs': 'vm',
+ 'bindToController': true
+ };
+
+ return directive;
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/project-member/project-member.config.js b/static/resources/js/components/project-member/project-member.config.js
new file mode 100644
index 000000000..a63acc2ad
--- /dev/null
+++ b/static/resources/js/components/project-member/project-member.config.js
@@ -0,0 +1,48 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.project.member')
+ .constant('roles', roles)
+ .factory('getRole', getRole);
+
+ function roles() {
+ return [
+ {'id': '1', 'name': 'project_admin', 'roleName': 'projectAdmin'},
+ {'id': '2', 'name': 'developer', 'roleName': 'developer'},
+ {'id': '3', 'name': 'guest', 'roleName': 'guest'}
+ ];
+ }
+
+ getRole.$inject = ['roles', '$filter', 'trFilter'];
+
+ function getRole(roles, $filter, trFilter) {
+ var r = roles();
+ return get;
+ function get(query) {
+
+ for(var i = 0; i < r.length; i++) {
+ var role = r[i];
+ if(query.key === 'roleName' && role.roleName === query.value
+ || query.key === 'roleId' && role.id === String(query.value)) {
+ return role;
+ }
+ }
+ }
+ }
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/project-member/project-member.module.js b/static/resources/js/components/project-member/project-member.module.js
new file mode 100644
index 000000000..45c26aab3
--- /dev/null
+++ b/static/resources/js/components/project-member/project-member.module.js
@@ -0,0 +1,25 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.project.member', [
+ 'harbor.services.project.member',
+ 'harbor.services.user'
+ ]);
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/project-member/switch-role.directive.html b/static/resources/js/components/project-member/switch-role.directive.html
new file mode 100644
index 000000000..dc3c8cef5
--- /dev/null
+++ b/static/resources/js/components/project-member/switch-role.directive.html
@@ -0,0 +1,19 @@
+
+
+ //vm.currentRole.name | tr//
+
+
\ No newline at end of file
diff --git a/static/resources/js/components/project-member/switch-role.directive.js b/static/resources/js/components/project-member/switch-role.directive.js
new file mode 100644
index 000000000..6f9d0a352
--- /dev/null
+++ b/static/resources/js/components/project-member/switch-role.directive.js
@@ -0,0 +1,60 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.project.member')
+ .directive('switchRole', switchRole);
+
+ SwitchRoleController.$inject = ['getRole', '$scope'];
+
+ function SwitchRoleController(getRole, $scope) {
+ var vm = this;
+
+ $scope.$watch('vm.roleName', function(current,origin) {
+ if(current) {
+ vm.currentRole = getRole({'key': 'roleName', 'value': current});
+ }
+ });
+
+ vm.selectRole = selectRole;
+
+ function selectRole(role) {
+ vm.currentRole = getRole({'key': 'roleName', 'value': role.roleName});
+ vm.roleName = role.roleName;
+ }
+
+ }
+
+ function switchRole() {
+ var directive = {
+ 'restrict': 'E',
+ 'templateUrl': '/static/resources/js/components/project-member/switch-role.directive.html',
+ 'scope': {
+ 'roles': '=',
+ 'editMode': '=',
+ 'userId': '=',
+ 'roleName': '='
+ },
+ 'controller' : SwitchRoleController,
+ 'controllerAs': 'vm',
+ 'bindToController': true
+ };
+ return directive;
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/project/add-project.directive.html b/static/resources/js/components/project/add-project.directive.html
new file mode 100644
index 000000000..588da0a1c
--- /dev/null
+++ b/static/resources/js/components/project/add-project.directive.html
@@ -0,0 +1,42 @@
+
+
+
+
\ No newline at end of file
diff --git a/static/resources/js/components/project/add-project.directive.js b/static/resources/js/components/project/add-project.directive.js
new file mode 100644
index 000000000..226eff3ad
--- /dev/null
+++ b/static/resources/js/components/project/add-project.directive.js
@@ -0,0 +1,109 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.project')
+ .directive('addProject', addProject);
+
+ AddProjectController.$inject = ['AddProjectService', '$scope'];
+
+ function AddProjectController(AddProjectService, $scope) {
+ var vm = this;
+
+ $scope.p = {};
+ var vm0 = $scope.p;
+ vm0.projectName = '';
+ vm.isPublic = false;
+
+ vm.addProject = addProject;
+ vm.cancel = cancel;
+
+ vm.reset = reset;
+
+ vm.hasError = false;
+ vm.errorMessage = '';
+
+ function addProject(p) {
+ if(p && angular.isDefined(p.projectName)) {
+ AddProjectService(p.projectName, vm.isPublic)
+ .success(addProjectSuccess)
+ .error(addProjectFailed);
+ }
+ }
+
+ function addProjectSuccess(data, status) {
+ $scope.$emit('addedSuccess', true);
+ vm.hasError = false;
+ vm.errorMessage = '';
+ vm.isOpen = false;
+ }
+
+ function addProjectFailed(data, status) {
+ vm.hasError = true;
+ if(status === 400 && vm0.projectName!= '' && vm0.projectName.length < 4) {
+ vm.errorMessage = 'project_name_is_too_short';
+ }
+ if(status === 400 && vm0.projectName.length > 30) {
+ vm.errorMessage = 'project_name_is_too_long';
+ }
+ if(status === 409 && vm0.projectName != '') {
+ vm.errorMessage = 'project_already_exist';
+ }
+ console.log('Failed to add project:' + status);
+ }
+
+ function cancel(form){
+ if(form) {
+ form.$setPristine();
+ form.$setUntouched();
+ }
+ vm.isOpen = false;
+ vm0.projectName = '';
+ vm.isPublic = false;
+
+ vm.hasError = false; vm.close = close;
+ vm.errorMessage = '';
+ }
+
+ function reset() {
+ vm.hasError = false;
+ vm.errorMessage = '';
+ }
+ }
+
+ function addProject() {
+ var directive = {
+ 'restrict': 'E',
+ 'templateUrl': '/static/resources/js/components/project/add-project.directive.html',
+ 'controller': AddProjectController,
+ 'scope' : {
+ 'isOpen': '='
+ },
+ 'link': link,
+ 'controllerAs': 'vm',
+ 'bindToController': true
+ };
+ return directive;
+
+ function link(scope, element, attrs, ctrl) {
+ scope.form.$setPristine();
+ scope.form.$setUntouched();
+ }
+ }
+
+})();
diff --git a/static/resources/js/components/project/project.module.js b/static/resources/js/components/project/project.module.js
new file mode 100644
index 000000000..dd87d77b4
--- /dev/null
+++ b/static/resources/js/components/project/project.module.js
@@ -0,0 +1,23 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+ 'use strict';
+
+ angular
+ .module('harbor.project', [
+ 'harbor.services.project',
+ 'harbor.services.user'
+ ]);
+})();
\ No newline at end of file
diff --git a/views/segment/foot-content.tpl b/static/resources/js/components/project/publicity-button.directive.html
similarity index 70%
rename from views/segment/foot-content.tpl
rename to static/resources/js/components/project/publicity-button.directive.html
index 0bfa230a3..62460d3db 100644
--- a/views/segment/foot-content.tpl
+++ b/static/resources/js/components/project/publicity-button.directive.html
@@ -12,12 +12,5 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/static/resources/js/components/project/publicity-button.directive.js b/static/resources/js/components/project/publicity-button.directive.js
new file mode 100644
index 000000000..2bb5d3b5d
--- /dev/null
+++ b/static/resources/js/components/project/publicity-button.directive.js
@@ -0,0 +1,91 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.project')
+ .directive('publicityButton', publicityButton);
+
+ PublicityButtonController.$inject = ['$scope', 'ToggleProjectPublicityService', '$filter', 'trFilter'];
+
+ function PublicityButtonController($scope, ToggleProjectPublicityService, $filter, trFilter) {
+ var vm = this;
+ vm.toggle = toggle;
+
+ function toggle() {
+ if(vm.isPublic) {
+ vm.isPublic = false;
+ }else{
+ vm.isPublic = true;
+ }
+ ToggleProjectPublicityService(vm.projectId, vm.isPublic)
+ .success(toggleProjectPublicitySuccess)
+ .error(toggleProjectPublicityFailed);
+ }
+
+ function toggleProjectPublicitySuccess(data, status) {
+
+ console.log('Successful toggle project publicity.');
+ }
+
+ function toggleProjectPublicityFailed(e, status) {
+ $scope.$emit('modalTitle', $filter('tr')('error'));
+ var message;
+ if(status === 403) {
+ message = $filter('tr')('failed_to_toggle_publicity_insuffient_permissions');
+ }else{
+ message = $filter('tr')('failed_to_toggle_publicity');
+ }
+ $scope.$emit('modalMessage', message);
+ $scope.$emit('raiseError', true);
+
+ if(vm.isPublic) {
+ vm.isPublic = false;
+ }else{
+ vm.isPublic = true;
+ }
+
+ console.log('Failed to toggle project publicity:' + e);
+ }
+ }
+
+ function publicityButton() {
+ var directive = {
+ 'restrict': 'E',
+ 'templateUrl': '/static/resources/js/components/project/publicity-button.directive.html',
+ 'scope': {
+ 'isPublic': '=',
+ 'owned': '=',
+ 'projectId': '='
+ },
+ 'link': link,
+ 'controller': PublicityButtonController,
+ 'controllerAs': 'vm',
+ 'bindToController': true
+ };
+ return directive;
+
+ function link(scope, element, attr, ctrl) {
+ scope.$watch('vm.isPublic', function(current, origin) {
+ if(current) {
+ ctrl.isPublic = current;
+ }
+ });
+ }
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/replication/create-policy.directive.html b/static/resources/js/components/replication/create-policy.directive.html
new file mode 100644
index 000000000..73ba59753
--- /dev/null
+++ b/static/resources/js/components/replication/create-policy.directive.html
@@ -0,0 +1,120 @@
+
+
\ No newline at end of file
diff --git a/static/resources/js/components/repository/list-repository.directive.js b/static/resources/js/components/repository/list-repository.directive.js
new file mode 100644
index 000000000..0c509777d
--- /dev/null
+++ b/static/resources/js/components/repository/list-repository.directive.js
@@ -0,0 +1,183 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+ 'use strict';
+
+ angular
+ .module('harbor.repository')
+ .directive('listRepository', listRepository);
+
+ ListRepositoryController.$inject = ['$scope', 'ListRepositoryService', 'DeleteRepositoryService', '$filter', 'trFilter', '$location', 'getParameterByName'];
+
+ function ListRepositoryController($scope, ListRepositoryService, DeleteRepositoryService, $filter, trFilter, $location, getParameterByName) {
+
+ $scope.subsTabPane = 30;
+
+ var vm = this;
+
+ vm.sectionHeight = {'min-height': '579px'};
+
+ vm.filterInput = '';
+ vm.toggleInProgress = [];
+
+ var hashValue = $location.hash();
+ if(hashValue) {
+ var slashIndex = hashValue.indexOf('/');
+ if(slashIndex >=0) {
+ vm.filterInput = hashValue.substring(slashIndex + 1);
+ }else{
+ vm.filterInput = hashValue;
+ }
+ }
+
+ vm.retrieve = retrieve;
+ vm.tagCount = {};
+
+ vm.projectId = getParameterByName('project_id', $location.absUrl());
+ vm.retrieve();
+
+ $scope.$on('$locationChangeSuccess', function() {
+ vm.projectId = getParameterByName('project_id', $location.absUrl());
+ vm.filterInput = '';
+ vm.retrieve();
+ });
+
+
+ $scope.$watch('vm.repositories', function(current) {
+ if(current) {
+ vm.repositories = current || [];
+ }
+ });
+
+ $scope.$on('repoName', function(e, val) {
+ vm.repoName = val;
+ });
+
+ $scope.$on('tag', function(e, val){
+ vm.tag = val;
+ });
+
+ $scope.$on('tagCount', function(e, val) {
+ vm.tagCount = val;
+ });
+
+ $scope.$on('tags', function(e, val) {
+ vm.tags = val;
+ });
+
+ vm.deleteByRepo = deleteByRepo;
+ vm.deleteByTag = deleteByTag;
+ vm.deleteImage = deleteImage;
+
+ function retrieve(){
+ ListRepositoryService(vm.projectId, vm.filterInput)
+ .success(getRepositoryComplete)
+ .error(getRepositoryFailed);
+ }
+
+ function getRepositoryComplete(data, status) {
+ vm.repositories = data || [];
+ $scope.$broadcast('refreshTags', true);
+ }
+
+ function getRepositoryFailed(response) {
+ console.log('Failed to list repositories:' + response);
+ }
+
+ function deleteByRepo(repoName) {
+ vm.repoName = repoName;
+ vm.tag = '';
+
+ $scope.$emit('modalTitle', $filter('tr')('alert_delete_repo_title', [repoName]));
+ $scope.$emit('modalMessage', $filter('tr')('alert_delete_repo', [repoName]));
+
+ var emitInfo = {
+ 'confirmOnly': false,
+ 'contentType': 'text/html',
+ 'action' : vm.deleteImage
+ };
+
+ $scope.$emit('raiseInfo', emitInfo);
+ }
+
+ function deleteByTag() {
+ $scope.$emit('modalTitle', $filter('tr')('alert_delete_tag_title', [vm.tag]));
+ var message;
+ console.log('vm.tagCount:' + angular.toJson(vm.tagCount[vm.repoName]));
+ $scope.$emit('modalMessage', $filter('tr')('alert_delete_tag', [vm.tag]));
+
+ var emitInfo = {
+ 'confirmOnly': false,
+ 'contentType': 'text/html',
+ 'action' : vm.deleteImage
+ };
+
+ $scope.$emit('raiseInfo', emitInfo);
+ }
+
+ function deleteImage() {
+
+ console.log('Delete image, repoName:' + vm.repoName + ', tag:' + vm.tag);
+ vm.toggleInProgress[vm.repoName + '|' + vm.tag] = true;
+ DeleteRepositoryService(vm.repoName, vm.tag)
+ .success(deleteRepositorySuccess)
+ .error(deleteRepositoryFailed);
+ }
+
+ function deleteRepositorySuccess(data, status) {
+ vm.toggleInProgress[vm.repoName + '|' + vm.tag] = false;
+ vm.retrieve();
+ }
+
+ function deleteRepositoryFailed(data, status) {
+ vm.toggleInProgress[vm.repoName + '|' + vm.tag] = false;
+
+ $scope.$emit('modalTitle', $filter('tr')('error'));
+ var message;
+ if(status === 401) {
+ message = $filter('tr')('failed_to_delete_repo_insuffient_permissions');
+ }else{
+ message = $filter('tr')('failed_to_delete_repo');
+ }
+ $scope.$emit('modalMessage', message);
+ $scope.$emit('raiseError', true);
+
+ console.log('Failed to delete repository:' + angular.toJson(data));
+ }
+
+ }
+
+ function listRepository() {
+ var directive = {
+ 'restrict': 'E',
+ 'templateUrl': '/static/resources/js/components/repository/list-repository.directive.html',
+ 'scope': {
+ 'sectionHeight': '='
+ },
+ 'link': link,
+ 'controller': ListRepositoryController,
+ 'controllerAs': 'vm',
+ 'bindToController': true
+ };
+
+ return directive;
+
+ function link(scope, element, attr, ctrl) {
+
+ }
+
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/repository/list-tag.directive.html b/static/resources/js/components/repository/list-tag.directive.html
new file mode 100644
index 000000000..94fc5dab0
--- /dev/null
+++ b/static/resources/js/components/repository/list-tag.directive.html
@@ -0,0 +1,22 @@
+
+
+
+
+
// 'tag' | tr //
+
// 'image_details' | tr //
+
// 'pull_command' | tr //
+
// 'operation' | tr //
+
+
+
+
//tag//
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/static/resources/js/components/repository/list-tag.directive.js b/static/resources/js/components/repository/list-tag.directive.js
new file mode 100644
index 000000000..c856512f5
--- /dev/null
+++ b/static/resources/js/components/repository/list-tag.directive.js
@@ -0,0 +1,100 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.repository')
+ .directive('listTag', listTag);
+
+ ListTagController.$inject = ['$scope', 'ListTagService', '$filter', 'trFilter'];
+
+ function ListTagController($scope, ListTagService, $filter, trFilter) {
+ var vm = this;
+
+ vm.tags = [];
+ vm.retrieve = retrieve;
+
+ $scope.$watch('vm.repoName', function(current, origin) {
+ if(current) {
+ console.log('vm.repoName in tags:' + current);
+ vm.retrieve();
+ }
+ });
+
+ $scope.$on('refreshTags', function(e, val) {
+ if(val) {
+ vm.retrieve();
+ }
+ });
+
+ vm.deleteTag = deleteTag;
+
+ function retrieve() {
+ ListTagService(vm.repoName)
+ .success(getTagSuccess)
+ .error(getTagFailed);
+ }
+
+ function getTagSuccess(data) {
+
+ vm.tags = data || [];
+ vm.tagCount[vm.repoName] = vm.tags.length;
+
+ $scope.$emit('tags', vm.tags);
+ $scope.$emit('tagCount', vm.tagCount);
+
+ angular.forEach(vm.tags, function(item) {
+ vm.toggleInProgress[vm.repoName + '|' + item] = false;
+ });
+ }
+
+ function getTagFailed(data) {
+ $scope.$emit('modalTitle', $filter('tr')('error'));
+ $scope.$emit('modalMessage', $filter('tr')('failed_to_get_tag') + response);
+ $scope.$emit('raiseError', true);
+ console.log('Failed to get tag:' + data);
+ }
+
+ function deleteTag(e) {
+ $scope.$emit('repoName', e.repoName);
+ $scope.$emit('tag', e.tag);
+ vm.deleteByTag();
+ }
+
+ }
+
+ function listTag() {
+ var directive = {
+ 'restrict': 'E',
+ 'templateUrl': '/static/resources/js/components/repository/list-tag.directive.html',
+ 'scope': {
+ 'tagCount': '=',
+ 'associateId': '=',
+ 'repoName': '=',
+ 'toggleInProgress': '=',
+ 'deleteByTag': '&'
+ },
+ 'replace': true,
+ 'controller': ListTagController,
+ 'controllerAs': 'vm',
+ 'bindToController': true
+ };
+ return directive;
+
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/repository/popup-details.directive.html b/static/resources/js/components/repository/popup-details.directive.html
new file mode 100644
index 000000000..83d77b26f
--- /dev/null
+++ b/static/resources/js/components/repository/popup-details.directive.html
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/static/resources/js/components/repository/popup-details.directive.js b/static/resources/js/components/repository/popup-details.directive.js
new file mode 100644
index 000000000..59311917a
--- /dev/null
+++ b/static/resources/js/components/repository/popup-details.directive.js
@@ -0,0 +1,113 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.repository')
+ .directive('popupDetails', popupDetails);
+
+ PopupDetailsController.$inject = ['ListManifestService', '$filter', 'dateLFilter'];
+
+ function PopupDetailsController(ListManifestService, $filter, dateLFilter) {
+ var vm = this;
+
+ vm.retrieve = retrieve;
+
+ function retrieve() {
+ ListManifestService(vm.repoName, vm.tag)
+ .success(getManifestSuccess)
+ .error(getManifestFailed);
+ }
+
+ function getManifestSuccess(data, status) {
+ console.log('Successful get manifest:' + data);
+ vm.manifest = data;
+ vm.manifest['Created'] = $filter('dateL')(vm.manifest['Created'], 'YYYY-MM-DD HH:mm:ss');
+ }
+
+ function getManifestFailed(data, status) {
+ console.log('Failed to get manifest:' + data);
+ }
+ }
+
+ function popupDetails() {
+ var directive = {
+ 'restrict': 'E',
+ 'templateUrl': '/static/resources/js/components/repository/popup-details.directive.html',
+ 'scope': {
+ 'repoName': '@',
+ 'tag': '@',
+ 'index': '@'
+ },
+ 'replace': true,
+ 'link': link,
+ 'controller': PopupDetailsController,
+ 'controllerAs': 'vm',
+ 'bindToController': true
+ };
+ return directive;
+
+ function link(scope, element, attrs, ctrl) {
+ ctrl.retrieve();
+ scope.$watch('vm.manifest', function(current) {
+ if(current) {
+
+ element
+ .popover({
+ 'template': '
',
+ 'title': '
',
+ 'content': generateContent,
+ 'html': true
+ })
+ .on('shown.bs.popover', function(e){
+ var self = jQuery(this);
+ $('[type="text"]:input', self.parent())
+ .on('click', function() {
+ $(this).select();
+ });
+ self.parent().find('.glyphicon.glyphicon-remove-circle').on('click', function() {
+ element.trigger('click');
+ });
+ });
+ }
+ });
+ function generateContent() {
+ var content = '';
+ return content;
+ }
+ }
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/repository/pull-command.directive.html b/static/resources/js/components/repository/pull-command.directive.html
new file mode 100644
index 000000000..0a2b07f3a
--- /dev/null
+++ b/static/resources/js/components/repository/pull-command.directive.html
@@ -0,0 +1,10 @@
+
\ No newline at end of file
diff --git a/static/resources/js/components/repository/pull-command.directive.js b/static/resources/js/components/repository/pull-command.directive.js
new file mode 100644
index 000000000..a002f011c
--- /dev/null
+++ b/static/resources/js/components/repository/pull-command.directive.js
@@ -0,0 +1,55 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.repository')
+ .directive('pullCommand', pullCommand);
+
+ function PullCommandController() {
+
+ }
+
+ function pullCommand() {
+ var directive = {
+ 'restrict': 'E',
+ 'templateUrl': '/static/resources/js/components/repository/pull-command.directive.html',
+ 'scope': {
+ 'repoName': '@',
+ 'tag': '@'
+ },
+ 'link': link,
+ 'controller': PullCommandController,
+ 'controllerAs': 'vm',
+ 'bindToController': true
+ };
+ return directive;
+
+ function link(scope, element, attrs, ctrl) {
+
+ ctrl.harborRegUrl = $('#HarborRegUrl').val() + '/';
+
+ element.find('a').on('click', clickHandler);
+ function clickHandler(e) {
+ element.find('input[type="text"]').select();
+ }
+
+ }
+
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/repository/repository.module.js b/static/resources/js/components/repository/repository.module.js
new file mode 100644
index 000000000..10b3ee18a
--- /dev/null
+++ b/static/resources/js/components/repository/repository.module.js
@@ -0,0 +1,21 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+ 'use strict';
+
+ angular
+ .module('harbor.repository', [
+ 'harbor.services.repository']);
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/search/search-input.directive.html b/static/resources/js/components/search/search-input.directive.html
new file mode 100644
index 000000000..dadde61ef
--- /dev/null
+++ b/static/resources/js/components/search/search-input.directive.html
@@ -0,0 +1,19 @@
+
+
\ No newline at end of file
diff --git a/static/resources/js/components/search/search-input.directive.js b/static/resources/js/components/search/search-input.directive.js
new file mode 100644
index 000000000..5fd9173d5
--- /dev/null
+++ b/static/resources/js/components/search/search-input.directive.js
@@ -0,0 +1,68 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.search')
+ .directive('searchInput', searchInput);
+
+ SearchInputController.$inject = ['$scope', '$location', '$window'];
+
+ function SearchInputController($scope, $location, $window) {
+ var vm = this;
+
+ vm.searchFor = searchFor;
+
+ function searchFor(searchContent) {
+ $location
+ .path('/search')
+ .search({'q': searchContent});
+ $window.location.href = $location.url();
+ }
+
+ }
+
+ function searchInput() {
+
+ var directive = {
+ 'restrict': 'E',
+ 'templateUrl': '/static/resources/js/components/search/search-input.directive.html',
+ 'scope': {
+ 'searchInput': '=',
+ },
+ 'link': link,
+ 'controller': SearchInputController,
+ 'controllerAs': 'vm',
+ 'bindToController': true
+ };
+ return directive;
+
+ function link(scope, element, attrs, ctrl) {
+ element
+ .find('input[type="text"]')
+ .on('keydown', keydownHandler);
+
+ function keydownHandler(e) {
+ if(e.keyCode === 13) {
+ ctrl.searchFor($(this).val());
+ }
+ }
+
+ }
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/search/search.directive.html b/static/resources/js/components/search/search.directive.html
new file mode 100644
index 000000000..9086c0bba
--- /dev/null
+++ b/static/resources/js/components/search/search.directive.html
@@ -0,0 +1,26 @@
+
+
+
+
+
// 'project_repo_name' | tr //
// 'creation_time' | tr //
// 'author' | tr //
+
+
+
+
//s.repository_name//
N/A
N/A
+
+
+
+
\ No newline at end of file
diff --git a/static/resources/js/components/search/search.directive.js b/static/resources/js/components/search/search.directive.js
new file mode 100644
index 000000000..66182aa43
--- /dev/null
+++ b/static/resources/js/components/search/search.directive.js
@@ -0,0 +1,66 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.search')
+ .directive('search', search);
+
+ SearchController.$inject = ['SearchService', '$scope'];
+
+ function SearchController(SearchService, $scope) {
+ var vm = this;
+ vm.keywords = "";
+ vm.search = searchByFilter;
+ vm.filterBy = 'repository';
+
+ searchByFilter();
+
+
+ function searchByFilter() {
+ SearchService(vm.keywords)
+ .success(searchSuccess)
+ .error(searchFailed);
+ }
+
+ function searchSuccess(data, status) {
+ console.log('filterBy:' + vm.filterBy + ", data:" + data);
+ vm.searchResult = data[vm.filterBy];
+ }
+
+ function searchFailed(data, status) {
+ console.log('Failed to search:' + data);
+ }
+
+ }
+
+ function search() {
+ var directive = {
+ 'restrict': 'E',
+ 'templateUrl': '/static/resources/js/components/search/search.directive.html',
+ 'scope': {
+ 'filterBy': '='
+ },
+ 'controller': SearchController,
+ 'controllerAs': 'vm',
+ 'bindToController': true
+ };
+
+ return directive;
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/search/search.module.js b/static/resources/js/components/search/search.module.js
new file mode 100644
index 000000000..5be6cf0a3
--- /dev/null
+++ b/static/resources/js/components/search/search.module.js
@@ -0,0 +1,21 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+ 'use strict';
+
+ angular
+ .module('harbor.search', [
+ 'harbor.services.search']);
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/sign-in/sign-in.directive.js b/static/resources/js/components/sign-in/sign-in.directive.js
new file mode 100644
index 000000000..885239cfd
--- /dev/null
+++ b/static/resources/js/components/sign-in/sign-in.directive.js
@@ -0,0 +1,115 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.sign.in')
+ .directive('signIn', signIn);
+
+ SignInController.$inject = ['SignInService', 'LogOutService', 'currentUser', 'I18nService', '$window', '$scope', 'getParameterByName', '$location'];
+ function SignInController(SignInService, LogOutService, currentUser, I18nService, $window, $scope, getParameterByName, $location) {
+ var vm = this;
+
+ vm.hasError = false;
+ vm.errorMessage = '';
+
+ vm.reset = reset;
+ vm.doSignIn = doSignIn;
+ vm.doSignUp = doSignUp;
+ vm.doForgotPassword = doForgotPassword;
+
+ vm.doContinue = doContinue;
+ vm.doLogOut = doLogOut;
+
+ vm.signInTIP = false;
+
+ function reset() {
+ vm.hasError = false;
+ vm.errorMessage = '';
+ }
+
+ function doSignIn(user) {
+ if(user && angular.isDefined(user.principal) && angular.isDefined(user.password)) {
+ vm.lastUrl = getParameterByName('last_url', $location.absUrl());
+ vm.signInTIP = true;
+ SignInService(user.principal, user.password)
+ .success(signedInSuccess)
+ .error(signedInFailed);
+ }
+ }
+
+ function signedInSuccess(data, status) {
+ if(vm.lastUrl) {
+ $window.location.href = vm.lastUrl;
+ return;
+ }
+ $window.location.href = "/dashboard";
+ }
+
+ function signedInFailed(data, status) {
+ vm.signInTIP = false;
+ if(status === 401) {
+ vm.hasError = true;
+ vm.errorMessage = 'username_or_password_is_incorrect';
+ }
+ console.log('Failed to sign in:' + data + ', status:' + status);
+ }
+
+ function doSignUp() {
+ $window.location.href = '/sign_up';
+ }
+
+ function doForgotPassword() {
+ $window.location.href = '/forgot_password';
+ }
+
+ function doContinue() {
+ $window.location.href = '/dashboard';
+ }
+
+ function doLogOut() {
+ LogOutService()
+ .success(logOutSuccess)
+ .error(logOutFailed);
+ }
+
+ function logOutSuccess(data, status) {
+ currentUser.unset();
+ I18nService().unset();
+ $window.location.href= '/';
+ }
+
+ function logOutFailed(data, status) {
+ console.log('Failed to to log out:' + data);
+ }
+ }
+
+ function signIn() {
+ var directive = {
+ 'restrict': 'E',
+ 'templateUrl': '/sign_in',
+ 'scope': true,
+ 'controller': SignInController,
+ 'controllerAs': 'vm',
+ 'bindToController': true
+ };
+
+ return directive;
+
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/sign-in/sign-in.module.js b/static/resources/js/components/sign-in/sign-in.module.js
new file mode 100644
index 000000000..5c257f635
--- /dev/null
+++ b/static/resources/js/components/sign-in/sign-in.module.js
@@ -0,0 +1,24 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.sign.in', [
+ 'harbor.services.user'
+ ]);
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/summary/summary.directive.html b/static/resources/js/components/summary/summary.directive.html
new file mode 100644
index 000000000..a24ff5221
--- /dev/null
+++ b/static/resources/js/components/summary/summary.directive.html
@@ -0,0 +1,19 @@
+
+
diff --git a/static/resources/js/components/summary/summary.directive.js b/static/resources/js/components/summary/summary.directive.js
new file mode 100644
index 000000000..2273650c7
--- /dev/null
+++ b/static/resources/js/components/summary/summary.directive.js
@@ -0,0 +1,56 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.summary')
+ .directive('projectSummary', projectSummary);
+
+ ProjectSummaryController.$inject = ['$scope', 'StatProjectService', '$filter', 'trFilter'];
+
+ function ProjectSummaryController($scope, StatProjectService, $filter, trFilter) {
+ var vm = this;
+
+ StatProjectService()
+ .success(statProjectSuccess)
+ .error(statProjectFailed);
+
+ function statProjectSuccess(data) {
+ vm.statProjects = data;
+ }
+
+ function statProjectFailed(data) {
+ $scope.$emit('modalTitle', $filter('tr')('error'));
+ $scope.$emit('modalMessage', $filter('tr')('failed_to_get_stat') + data);
+ $scope.$emit('raiseError', true);
+ console.log('Failed to get stat:' + data);
+ }
+ }
+
+ function projectSummary() {
+ var directive = {
+ 'restrict': 'E',
+ 'templateUrl': '/static/resources/js/components/summary/summary.directive.html',
+ 'controller': ProjectSummaryController,
+ 'scope' : true,
+ 'controllerAs': 'vm',
+ 'bindToController': true
+ };
+ return directive;
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/summary/summary.module.js b/static/resources/js/components/summary/summary.module.js
new file mode 100644
index 000000000..3828e956d
--- /dev/null
+++ b/static/resources/js/components/summary/summary.module.js
@@ -0,0 +1,24 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.summary', [
+ 'harbor.services.project'
+ ]);
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/system-management/configuration.directive.html b/static/resources/js/components/system-management/configuration.directive.html
new file mode 100644
index 000000000..74d2a5b9b
--- /dev/null
+++ b/static/resources/js/components/system-management/configuration.directive.html
@@ -0,0 +1,76 @@
+
+
\ No newline at end of file
diff --git a/static/resources/js/components/system-management/configuration.directive.js b/static/resources/js/components/system-management/configuration.directive.js
new file mode 100644
index 000000000..bc21345ad
--- /dev/null
+++ b/static/resources/js/components/system-management/configuration.directive.js
@@ -0,0 +1,68 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.system.management')
+ .directive('configuration', configuration);
+
+ ConfigurationController.$inject = [];
+
+ function ConfigurationController() {
+ var vm = this;
+
+ vm.registrationOptions = [
+ {
+ 'name': 'on',
+ 'value': true
+ },
+ {
+ 'name': 'off',
+ 'value': false
+ }
+ ];
+ vm.currentRegistration = {
+ 'name': 'on',
+ 'value': true
+ };
+
+ vm.changeSettings = changeSettings;
+
+ vm.selectRegistration = selectRegistration;
+
+ function selectRegistration() {
+
+ }
+
+ function changeSettings(system) {
+ console.log(system);
+ }
+ }
+
+ function configuration() {
+ var directive = {
+ 'restrict': 'E',
+ 'templateUrl': '/static/resources/js/components/system-management/configuration.directive.html',
+ 'scope': true,
+ 'controller': ConfigurationController,
+ 'controllerAs': 'vm',
+ 'bindToController': true
+ };
+ return directive;
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/system-management/create-destination.directive.html b/static/resources/js/components/system-management/create-destination.directive.html
new file mode 100644
index 000000000..1f0d8bd5a
--- /dev/null
+++ b/static/resources/js/components/system-management/create-destination.directive.html
@@ -0,0 +1,84 @@
+
+
+
+
+
+
diff --git a/static/resources/js/components/system-management/create-destination.directive.js b/static/resources/js/components/system-management/create-destination.directive.js
new file mode 100644
index 000000000..2d857bc27
--- /dev/null
+++ b/static/resources/js/components/system-management/create-destination.directive.js
@@ -0,0 +1,249 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.system.management')
+ .directive('createDestination', createDestination);
+
+ CreateDestinationController.$inject = ['$scope', 'ListDestinationService', 'CreateDestinationService', 'UpdateDestinationService', 'PingDestinationService', 'ListDestinationPolicyService', '$filter', 'trFilter', '$timeout'];
+
+ function CreateDestinationController($scope, ListDestinationService, CreateDestinationService, UpdateDestinationService, PingDestinationService, ListDestinationPolicyService, $filter, trFilter, $timeout) {
+ var vm = this;
+
+ $scope.destination = {};
+
+ var vm0 = $scope.destination;
+ vm.addNew = addNew;
+ vm.edit = edit;
+ vm.create = create;
+ vm.update = update;
+ vm.pingDestination = pingDestination;
+
+ vm.editable = true;
+ vm.notAvailable = false;
+ vm.pingAvailable = true;
+ vm.pingMessage = '';
+
+ vm.closeError = closeError;
+ vm.toggleErrorMessage = false;
+ vm.errorMessages = [];
+
+ vm.pingTIP = false;
+
+ $scope.$watch('destination.endpoint', function(current) {
+ if(current) {
+ vm.notAvailable = false;
+ }else{
+ vm.notAvailable = true;
+ }
+ });
+
+ function addNew() {
+ vm.modalTitle = $filter('tr')('add_new_destination', []);
+ vm0.name = '';
+ vm0.endpoint = '';
+ vm0.username = '';
+ vm0.password = '';
+ }
+
+ function edit(targetId) {
+ vm.editable = true;
+ vm.modalTitle = $filter('tr')('edit_destination', []);
+ ListDestinationService(targetId)
+ .success(getDestinationSuccess)
+ .error(getDestinationFailed);
+ }
+
+ function create(destination) {
+ CreateDestinationService(destination.name, destination.endpoint,
+ destination.username, destination.password)
+ .success(createDestinationSuccess)
+ .error(createDestinationFailed);
+ }
+
+ function createDestinationSuccess(data, status) {
+ console.log('Successful created destination.');
+ vm.reload();
+ }
+
+ function createDestinationFailed(data, status) {
+ if(status === 409) {
+ vm.errorMessages.push($filter('tr')('destination_already_exists'));
+ }else{
+ vm.errorMessages.push($filter('tr')('failed_to_create_destination') + data);
+ }
+ console.log('Failed to create destination:' + data);
+ }
+
+ function update(destination) {
+ UpdateDestinationService(vm.targetId, destination)
+ .success(updateDestinationSuccess)
+ .error(updateDestinationFailed);
+ }
+
+ function updateDestinationSuccess(data, status) {
+ console.log('Successful update destination.');
+ vm.reload();
+ }
+
+ function updateDestinationFailed(data, status) {
+ vm.errorMessages.push($filter('tr')('failed_to_update_destination') + data);
+ console.log('Failed to update destination.');
+ }
+
+
+ function getDestinationSuccess(data, status) {
+ var destination = data;
+ vm0.name = destination.name;
+ vm0.endpoint = destination.endpoint;
+ vm0.username = destination.username;
+ vm0.password = destination.password;
+
+ ListDestinationPolicyService(destination.id)
+ .success(listDestinationPolicySuccess)
+ .error(listDestinationPolicyFailed);
+ }
+
+ function getDestinationFailed(data, status) {
+ vm.errorMessages.push($filter('tr')('failed_get_destination'));
+ console.log('Failed to get destination.');
+ }
+
+ function listDestinationPolicySuccess(data, status) {
+ for(var i in data) {
+ if(data[i].enabled === 1) {
+ vm.editable = false;
+ break;
+ }
+ }
+ }
+
+ function listDestinationPolicyFailed(data, status) {
+ vm.errorMessages.push($filter('tr')('failed_get_destination_policies'));
+ console.log('Failed to list destination policy:' + data);
+ }
+
+ function pingDestination() {
+
+ vm.pingTIP = true;
+ vm.pingAvailable = false;
+
+ var target = {
+ 'name': vm0.name,
+ 'endpoint': vm0.endpoint,
+ 'username': vm0.username,
+ 'password': vm0.password
+ };
+ PingDestinationService(target)
+ .success(pingDestinationSuccess)
+ .error(pingDestinationFailed);
+ }
+
+ function closeError() {
+ vm.errorMessages = [];
+ vm.toggleErrorMessage = false;
+ }
+
+ function pingDestinationSuccess(data, status) {
+ vm.pingAvailable = true;
+ vm.pingTIP = false;
+ vm.pingMessage = $filter('tr')('successful_ping_target', []);
+ }
+ function pingDestinationFailed(data, status) {
+
+ vm.pingTIP = false;
+ vm.pingMessage = $filter('tr')('failed_to_ping_target', []) + (data && data.length > 0 ? ':' + data : '');
+ }
+ }
+
+ function createDestination($timeout) {
+ var directive = {
+ 'restrict': 'E',
+ 'templateUrl': '/static/resources/js/components/system-management/create-destination.directive.html',
+ 'scope': {
+ 'action': '@',
+ 'targetId': '@',
+ 'reload': '&'
+ },
+ 'link': link,
+ 'controller': CreateDestinationController,
+ 'controllerAs': 'vm',
+ 'bindToController': true
+ };
+ return directive;
+
+ function link(scope, element, attrs, ctrl) {
+
+ element.find('#createDestinationModal').on('show.bs.modal', function() {
+ scope.$apply(function(){
+ scope.form.$setPristine();
+ scope.form.$setUntouched();
+
+ ctrl.notAvailble = false;
+ ctrl.pingAvailable = true;
+ ctrl.pingMessage = '';
+
+ ctrl.pingTIP = false;
+ ctrl.toggleErrorMessage = false;
+ ctrl.errorMessages = [];
+
+ switch(ctrl.action) {
+ case 'ADD_NEW':
+ ctrl.addNew();
+ break;
+ case 'EDIT':
+ ctrl.edit(ctrl.targetId);
+ break;
+ }
+
+ scope.$watch('vm.errorMessages', function(current) {
+ if(current && current.length > 0) {
+ ctrl.toggleErrorMessage = true;
+ }
+ }, true);
+
+ });
+ });
+
+ ctrl.save = save;
+
+ function save(destination) {
+ if(destination) {
+ ctrl.toggleErrorMessage = false;
+ ctrl.errorMessages = [];
+
+ switch(ctrl.action) {
+ case 'ADD_NEW':
+ ctrl.create(destination);
+ break;
+ case 'EDIT':
+ ctrl.update(destination);
+ break;
+ }
+
+ $timeout(function() {
+ if(!ctrl.toggleErrorMessage) {
+ element.find('#createDestinationModal').modal('hide');
+ }
+ }, 50);
+ }
+ }
+ }
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/system-management/destination.directive.html b/static/resources/js/components/system-management/destination.directive.html
new file mode 100644
index 000000000..37774c994
--- /dev/null
+++ b/static/resources/js/components/system-management/destination.directive.html
@@ -0,0 +1,63 @@
+
+
diff --git a/static/resources/js/components/system-management/replication.directive.js b/static/resources/js/components/system-management/replication.directive.js
new file mode 100644
index 000000000..265e010ca
--- /dev/null
+++ b/static/resources/js/components/system-management/replication.directive.js
@@ -0,0 +1,93 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.system.management')
+ .directive('replication', replication);
+
+ ReplicationController.$inject = ['$scope', 'ListReplicationPolicyService', 'ToggleReplicationPolicyService', '$filter', 'trFilter'];
+
+ function ReplicationController($scope, ListReplicationPolicyService, ToggleReplicationPolicyService, $filter, trFilter) {
+
+ $scope.subsSubPane = 276;
+
+ var vm = this;
+ vm.retrieve = retrieve;
+ vm.search = search;
+ vm.togglePolicy = togglePolicy;
+ vm.editReplication = editReplication;
+ vm.retrieve();
+
+ function search() {
+ vm.retrieve();
+ }
+
+ function retrieve() {
+ ListReplicationPolicyService('', '', vm.replicationName)
+ .success(listReplicationPolicySuccess)
+ .error(listReplicationPolicyFailed);
+ }
+
+ function listReplicationPolicySuccess(data, status) {
+ vm.replications = data || [];
+ }
+
+ function listReplicationPolicyFailed(data, status) {
+ $scope.$emit('modalTitle', $filter('tr')('error'));
+ $scope.$emit('modalMessage', $filter('tr')('failed_to_list_replication'));
+ $scope.$emit('raiseError', true);
+ console.log('Failed to list replication policy.');
+ }
+
+ function togglePolicy(policyId, enabled) {
+ ToggleReplicationPolicyService(policyId, enabled)
+ .success(toggleReplicationPolicySuccess)
+ .error(toggleReplicationPolicyFailed);
+ }
+
+ function toggleReplicationPolicySuccess(data, status) {
+ console.log('Successful toggle replication policy.');
+ vm.retrieve();
+ }
+
+ function toggleReplicationPolicyFailed(data, status) {
+ $scope.$emit('modalTitle', $filter('tr')('error'));
+ $scope.$emit('modalMessage', $filter('tr')('failed_to_toggle_policy'));
+ $scope.$emit('raiseError', true);
+ console.log('Failed to toggle replication policy.');
+ }
+
+ function editReplication(policyId) {
+ vm.action = 'EDIT';
+ vm.policyId = policyId;
+ }
+ }
+
+ function replication() {
+ var directive = {
+ 'restrict': 'E',
+ 'templateUrl': '/static/resources/js/components/system-management/replication.directive.html',
+ 'scope': true,
+ 'controller': ReplicationController,
+ 'controllerAs': 'vm',
+ 'bindToController': true
+ };
+ return directive;
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/system-management/system-management.directive.html b/static/resources/js/components/system-management/system-management.directive.html
new file mode 100644
index 000000000..2005152c2
--- /dev/null
+++ b/static/resources/js/components/system-management/system-management.directive.html
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/static/resources/js/components/system-management/system-management.directive.js b/static/resources/js/components/system-management/system-management.directive.js
new file mode 100644
index 000000000..68d17938d
--- /dev/null
+++ b/static/resources/js/components/system-management/system-management.directive.js
@@ -0,0 +1,54 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.system.management')
+ .directive('systemManagement', systemManagement);
+
+ SystemManagementController.$inject = ['$scope', '$location'];
+
+ function SystemManagementController($scope, $location) {
+ var vm = this;
+ var currentTarget = $location.path().substring(1);
+
+ switch(currentTarget) {
+ case 'destinations':
+ case 'replication':
+ $location.path('/' + currentTarget);
+ vm.target = currentTarget;
+ break;
+ default:
+ $location.path('/destinations');
+ vm.target = 'destinations';
+ }
+
+ }
+
+ function systemManagement() {
+ var directive = {
+ 'restrict': 'E',
+ 'templateUrl': '/static/resources/js/components/system-management/system-management.directive.html',
+ 'scope': true,
+ 'controller': SystemManagementController,
+ 'controllerAs': 'vm',
+ 'bindToController': true
+ };
+ return directive;
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/system-management/system-management.module.js b/static/resources/js/components/system-management/system-management.module.js
new file mode 100644
index 000000000..f52f7aa1a
--- /dev/null
+++ b/static/resources/js/components/system-management/system-management.module.js
@@ -0,0 +1,22 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.system.management', []);
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/top-repository/top-repository.directive.html b/static/resources/js/components/top-repository/top-repository.directive.html
new file mode 100644
index 000000000..c45a7adfa
--- /dev/null
+++ b/static/resources/js/components/top-repository/top-repository.directive.html
@@ -0,0 +1,38 @@
+
+
// 'popular_repositories' | tr //
+
+
+
+
+
// 'repository_name' | tr //
+
// 'count' | tr //
+
// 'creator' | tr //
+
+
+
+
+
+
+
+
// 'no_top_repositories' | tr //
+
+
+
//t.name//
//t.count//
//t.creator === '' ? '-' : t.creator //
+
+
+
+
+
diff --git a/static/resources/js/components/top-repository/top-repository.directive.js b/static/resources/js/components/top-repository/top-repository.directive.js
new file mode 100644
index 000000000..800f7e767
--- /dev/null
+++ b/static/resources/js/components/top-repository/top-repository.directive.js
@@ -0,0 +1,58 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.top.repository')
+ .directive('topRepository', topRepository);
+
+ TopRepositoryController.$inject = ['$scope', 'ListTopRepositoryService', '$filter', 'trFilter'];
+
+ function TopRepositoryController($scope, ListTopRepositoryService, $filter, trFilter) {
+ var vm = this;
+
+ ListTopRepositoryService(5)
+ .success(listTopRepositorySuccess)
+ .error(listTopRepositoryFailed);
+
+ function listTopRepositorySuccess(data) {
+ vm.top10Repositories = data || [];
+ }
+
+ function listTopRepositoryFailed(data, status) {
+ $scope.$emit('modalTitle', $filter('tr')('error'));
+ $scope.$emit('modalMessage', $filter('tr')('failed_to_get_top_repo'));
+ $scope.$emit('raiseError', true);
+ console.log('Failed to get top repo:' + data);
+ }
+ }
+
+ function topRepository() {
+ var directive = {
+ 'restrict': 'E',
+ 'templateUrl': '/static/resources/js/components/top-repository/top-repository.directive.html',
+ 'controller': TopRepositoryController,
+ 'scope' : {
+ 'customBodyHeight': '='
+ },
+ 'controllerAs': 'vm',
+ 'bindToController': true
+ };
+ return directive;
+ }
+
+})();
diff --git a/static/resources/js/components/top-repository/top-repository.module.js b/static/resources/js/components/top-repository/top-repository.module.js
new file mode 100644
index 000000000..988f4e2f6
--- /dev/null
+++ b/static/resources/js/components/top-repository/top-repository.module.js
@@ -0,0 +1,24 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.top.repository', [
+ 'harbor.services.repository'
+ ]);
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/user-log/user-log.directive.html b/static/resources/js/components/user-log/user-log.directive.html
new file mode 100644
index 000000000..5500b0ffd
--- /dev/null
+++ b/static/resources/js/components/user-log/user-log.directive.html
@@ -0,0 +1,38 @@
+
+
+
+
+
+
// 'operation' | tr //
+
// 'details' | tr //
+
// 'user' | tr //
+
// 'creation_time' | tr //
+
+
+
+
+
+
+
+
// 'no_user_logs' | tr //
+
+
+
//t.operation//
//t.repo_name//
//t.username//
//t.op_time | dateL : 'YYYY-MM-DD HH:mm:ss'//
+
+
+
+
+
diff --git a/static/resources/js/components/user-log/user-log.directive.js b/static/resources/js/components/user-log/user-log.directive.js
new file mode 100644
index 000000000..b735b00ef
--- /dev/null
+++ b/static/resources/js/components/user-log/user-log.directive.js
@@ -0,0 +1,57 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.user.log')
+ .directive('userLog', userLog);
+
+ UserLogController.$inject = ['$scope', 'ListIntegratedLogService', '$filter', 'trFilter'];
+
+ function UserLogController($scope, ListIntegratedLogService, $filter, trFilter) {
+ var vm = this;
+
+ ListIntegratedLogService()
+ .success(listIntegratedLogSuccess)
+ .error(listIntegratedLogFailed);
+
+ function listIntegratedLogSuccess(data) {
+ vm.integratedLogs = data || []
+ }
+
+ function listIntegratedLogFailed(data, status) {
+ $scope.$emit('modalTitle', $filter('tr')('error'));
+ $scope.$emit('modalMessage', $filter('tr')('failed_to_get_user_log') + data);
+ $scope.$emit('raiseError', true);
+ console.log('Failed to get user logs:' + data);
+ }
+ }
+
+ function userLog() {
+ var directive = {
+ 'restrict': 'E',
+ 'templateUrl': '/static/resources/js/components/user-log/user-log.directive.html',
+ 'controller': UserLogController,
+ 'scope' : true,
+ 'controllerAs': 'vm',
+ 'bindToController': true
+ };
+
+ return directive;
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/user-log/user-log.module.js b/static/resources/js/components/user-log/user-log.module.js
new file mode 100644
index 000000000..6610262b1
--- /dev/null
+++ b/static/resources/js/components/user-log/user-log.module.js
@@ -0,0 +1,24 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.user.log', [
+ 'harbor.services.log'
+ ]);
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/user/list-user.directive.html b/static/resources/js/components/user/list-user.directive.html
new file mode 100644
index 000000000..f84eedc46
--- /dev/null
+++ b/static/resources/js/components/user/list-user.directive.html
@@ -0,0 +1,64 @@
+
+
+
+
diff --git a/static/resources/js/components/user/list-user.directive.js b/static/resources/js/components/user/list-user.directive.js
new file mode 100644
index 000000000..bbd7c929c
--- /dev/null
+++ b/static/resources/js/components/user/list-user.directive.js
@@ -0,0 +1,110 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.user')
+ .directive('listUser', listUser);
+
+ ListUserController.$inject = ['$scope', 'ListUserService', 'DeleteUserService', '$filter', 'trFilter'];
+
+ function ListUserController($scope, ListUserService, DeleteUserService, $filter, $trFilter) {
+
+ $scope.subsSubPane = 226;
+
+ var vm = this;
+
+ vm.username = '';
+ vm.searchUser = searchUser;
+ vm.deleteUser = deleteUser;
+ vm.confirmToDelete = confirmToDelete;
+ vm.retrieve = retrieve;
+
+ vm.retrieve();
+
+ function searchUser() {
+ vm.retrieve();
+ }
+
+ function deleteUser() {
+ DeleteUserService(vm.selectedUserId)
+ .success(deleteUserSuccess)
+ .error(deleteUserFailed);
+ }
+
+ function confirmToDelete(userId, username) {
+ vm.selectedUserId = userId;
+
+ $scope.$emit('modalTitle', $filter('tr')('confirm_delete_user_title'));
+ $scope.$emit('modalMessage', $filter('tr')('confirm_delete_user', [username]));
+
+ var emitInfo = {
+ 'confirmOnly': false,
+ 'contentType': 'text/plain',
+ 'action': vm.deleteUser
+ };
+
+ $scope.$emit('raiseInfo', emitInfo);
+ }
+
+ function retrieve() {
+ ListUserService(vm.username)
+ .success(listUserSuccess)
+ .error(listUserFailed);
+ }
+
+ function deleteUserSuccess(data, status) {
+ console.log('Successful delete user.');
+ vm.retrieve();
+ }
+
+ function deleteUserFailed(data, status) {
+ $scope.$emit('modalTitle', $filter('tr')('error'));
+ $scope.$emit('modalMessage', $filter('tr')('failed_to_delete_user'));
+ $scope.$emit('raiseError', true);
+ console.log('Failed to delete user.');
+ }
+
+ function listUserSuccess(data, status) {
+ vm.users = data;
+ }
+
+ function listUserFailed(data, status) {
+ $scope.$emit('modalTitle', $filter('tr')('error'));
+ $scope.$emit('modalMessage', $filter('tr')('failed_to_list_user'));
+ $scope.$emit('raiseError', true);
+ console.log('Failed to list user:' + data);
+ }
+ }
+
+ function listUser() {
+ var directive = {
+ 'restrict': 'E',
+ 'templateUrl': '/static/resources/js/components/user/list-user.directive.html',
+ 'link': link,
+ 'controller': ListUserController,
+ 'controllerAs': 'vm',
+ 'bindToController': true
+ };
+ return directive;
+
+ function link(scope, element, attrs) {
+
+ }
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/user/toggle-admin.directive.html b/static/resources/js/components/user/toggle-admin.directive.html
new file mode 100644
index 000000000..5c43a9d19
--- /dev/null
+++ b/static/resources/js/components/user/toggle-admin.directive.html
@@ -0,0 +1,16 @@
+
+
+
\ No newline at end of file
diff --git a/static/resources/js/components/user/toggle-admin.directive.js b/static/resources/js/components/user/toggle-admin.directive.js
new file mode 100644
index 000000000..09424b499
--- /dev/null
+++ b/static/resources/js/components/user/toggle-admin.directive.js
@@ -0,0 +1,80 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.user')
+ .directive('toggleAdmin', toggleAdmin);
+
+ ToggleAdminController.$inject = ['$scope', 'ToggleAdminService', '$filter', 'trFilter'];
+
+ function ToggleAdminController($scope, ToggleAdminService, $filter, trFilter) {
+ var vm = this;
+
+ vm.isAdmin = (vm.hasAdminRole == 1) ? true : false;
+ vm.enabled = vm.isAdmin ? 0 : 1;
+ vm.toggle = toggle;
+
+ function toggle() {
+ ToggleAdminService(vm.userId, vm.enabled)
+ .success(toggleAdminSuccess)
+ .error(toggleAdminFailed);
+ }
+
+ function toggleAdminSuccess(data, status) {
+ if(vm.isAdmin) {
+ vm.isAdmin = false;
+ }else{
+ vm.isAdmin = true;
+ }
+ console.log('Toggled userId:' + vm.userId + ' to admin:' + vm.isAdmin);
+ }
+
+ function toggleAdminFailed(data, status) {
+ $scope.$emit('modalTitle', $filter('tr')('error'));
+ $scope.$emit('modalMessage', $filter('tr')('failed_to_toggle_admin'));
+ $scope.$emit('raiseError', true);
+ if(vm.isAdmin) {
+ vm.isAdmin = false;
+ }else{
+ vm.isAdmin = true;
+ }
+ console.log('Failed to toggle admin:' + data);
+ }
+ }
+
+ function toggleAdmin() {
+ var directive = {
+ 'restrict': 'E',
+ 'templateUrl': '/static/resources/js/components/user/toggle-admin.directive.html',
+ 'scope': {
+ 'hasAdminRole': '=',
+ 'userId': '@'
+ },
+ 'link': link,
+ 'controller': ToggleAdminController,
+ 'controllerAs': 'vm',
+ 'bindToController': true
+ };
+ return directive;
+
+ function link(scope, element, attrs, ctrl) {
+
+ }
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/user/user.module.js b/static/resources/js/components/user/user.module.js
new file mode 100644
index 000000000..a81aa1614
--- /dev/null
+++ b/static/resources/js/components/user/user.module.js
@@ -0,0 +1,22 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.user', [
+ 'harbor.services.user']);
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/validator/confirm-password.validator.js b/static/resources/js/components/validator/confirm-password.validator.js
new file mode 100644
index 000000000..f52050a73
--- /dev/null
+++ b/static/resources/js/components/validator/confirm-password.validator.js
@@ -0,0 +1,47 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.validator')
+ .directive('compareTo', compareTo);
+
+ function compareTo() {
+ var directive = {
+ 'require' : 'ngModel',
+ 'scope':{
+ 'otherModelValue': '=compareTo'
+ },
+ 'link': link
+ };
+ return directive;
+
+ function link (scope, element, attrs, ctrl) {
+
+ ctrl.$validators.compareTo = validator;
+
+ function validator(modelValue) {
+ return modelValue === scope.otherModelValue;
+ }
+
+ scope.$watch("otherModelValue", function(current, origin) {
+ ctrl.$validate();
+ });
+ }
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/validator/invalid-chars.validator.js b/static/resources/js/components/validator/invalid-chars.validator.js
new file mode 100644
index 000000000..9e36f3096
--- /dev/null
+++ b/static/resources/js/components/validator/invalid-chars.validator.js
@@ -0,0 +1,55 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.validator')
+ .directive('invalidChars', invalidChars);
+
+ invalidChars.$inject = ['INVALID_CHARS'];
+
+ function invalidChars(INVALID_CHARS) {
+ var directive = {
+ 'require': 'ngModel',
+ 'link': link
+ };
+
+ return directive;
+
+ function link(scope, element, attrs, ctrl) {
+
+ ctrl.$validators.invalidChars = validator;
+
+ function validator(modelValue, viewValue) {
+ if(ctrl.$isEmpty(modelValue)) {
+ return true;
+ }
+
+ for(var i = 0; i < INVALID_CHARS.length; i++) {
+ if(modelValue.indexOf(INVALID_CHARS[i]) >= 0) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ }
+ }
+
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/validator/password.validator.js b/static/resources/js/components/validator/password.validator.js
new file mode 100644
index 000000000..3f67d7257
--- /dev/null
+++ b/static/resources/js/components/validator/password.validator.js
@@ -0,0 +1,44 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.validator')
+ .directive('password', password);
+
+ password.$inject = ['PASSWORD_REGEXP'];
+
+ function password(PASSWORD_REGEXP) {
+ var directive = {
+ 'require' : 'ngModel',
+ 'link': link
+ };
+ return directive;
+
+ function link (scope, element, attrs, ctrl) {
+
+ ctrl.$validators.password = validator;
+
+ function validator(modelValue, viewValue) {
+
+ return PASSWORD_REGEXP.test(modelValue);
+
+ }
+ }
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/validator/project-name.validator.js b/static/resources/js/components/validator/project-name.validator.js
new file mode 100644
index 000000000..3c36c5827
--- /dev/null
+++ b/static/resources/js/components/validator/project-name.validator.js
@@ -0,0 +1,41 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.validator')
+ .directive('projectName', projectName);
+
+ projectName.$inject = ['PROJECT_REGEXP']
+
+ function projectName(PROJECT_REGEXP) {
+ var directive = {
+ 'require': 'ngModel',
+ 'link': link
+ };
+ return directive;
+
+ function link(scope, element, attrs, ctrl) {
+ ctrl.$validators.projectName = validator;
+
+ function validator(modelValue, viewValue) {
+ return PROJECT_REGEXP.test(modelValue);
+ }
+ }
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/validator/user-exist.validator.js b/static/resources/js/components/validator/user-exist.validator.js
new file mode 100644
index 000000000..7fa7990ec
--- /dev/null
+++ b/static/resources/js/components/validator/user-exist.validator.js
@@ -0,0 +1,70 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.validator')
+ .directive('userExists', userExists);
+
+ userExists.$inject = ['UserExistService'];
+
+ function userExists(UserExistService) {
+ var directive = {
+ 'require': 'ngModel',
+ 'scope': {
+ 'target': '@'
+ },
+ 'link': link
+ };
+ return directive;
+
+ function link(scope, element, attrs, ctrl) {
+
+ var valid = true;
+
+ ctrl.$validators.userExists = validator;
+
+ function validator(modelValue, viewValue) {
+
+ console.log('modelValue:' + modelValue + ', viewValue:' + viewValue);
+
+ if(ctrl.$isEmpty(modelValue)) {
+ console.log('Model value is empty.');
+ return true;
+ }
+
+ UserExistService(attrs.target, modelValue)
+ .success(userExistSuccess)
+ .error(userExistFailed);
+
+ function userExistSuccess(data, status) {
+ valid = !data;
+ if(!valid) {
+ console.log('Model value already exists');
+ }
+ }
+
+ function userExistFailed(data, status) {
+ console.log('Failed to in retrieval:' + data);
+ }
+
+ return valid;
+ }
+ }
+
+ }
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/validator/validator.config.js b/static/resources/js/components/validator/validator.config.js
new file mode 100644
index 000000000..e9fe1cfde
--- /dev/null
+++ b/static/resources/js/components/validator/validator.config.js
@@ -0,0 +1,24 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.validator')
+ .constant('INVALID_CHARS', [",","~","#", "$", "%"])
+ .constant('PASSWORD_REGEXP', /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?!.*\s).{7,20}$/)
+ .constant('PROJECT_REGEXP', /^[a-z0-9](?:-*[a-z0-9])*(?:[._][a-z0-9](?:-*[a-z0-9])*)*$/);
+})();
\ No newline at end of file
diff --git a/static/resources/js/components/validator/validator.module.js b/static/resources/js/components/validator/validator.module.js
new file mode 100644
index 000000000..06988ab57
--- /dev/null
+++ b/static/resources/js/components/validator/validator.module.js
@@ -0,0 +1,24 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.validator', [
+ 'harbor.services.user'
+ ]);
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/forgot-password.js b/static/resources/js/forgot-password.js
deleted file mode 100644
index d6fdea319..000000000
--- a/static/resources/js/forgot-password.js
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- Copyright (c) 2016 VMware, Inc. All Rights Reserved.
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*/
-jQuery(function(){
-
- $("#divErrMsg").css({"display": "none"});
-
- validateOptions.Items = ["#EmailF"];
- function bindEnterKey(){
- $(document).on("keydown", function(e){
- if(e.keyCode == 13){
- e.preventDefault();
- if($("#txtCommonSearch").is(":focus")){
- document.location = "/search?q=" + $("#txtCommonSearch").val();
- }else{
- $("#btnSubmit").trigger("click");
- }
- }
- });
- }
- function unbindEnterKey(){
- $(document).off("keydown");
- }
- bindEnterKey();
- var spinner = new Spinner({scale:1}).spin();
-
- $("#btnSubmit").on("click", function(){
- validateOptions.Validate(function(){
- var username = $("#UsernameF").val();
- var email = $("#EmailF").val();
- $.ajax({
- "url":"/sendEmail",
- "type": "get",
- "data": {"username": username, "email": email},
- "beforeSend": function(e){
- unbindEnterKey();
- $("h1").append(spinner.el);
- $("#btnSubmit").prop("disabled", true);
- },
- "success": function(data, status, xhr){
- if(xhr && xhr.status == 200){
- $("#dlgModal")
- .dialogModal({
- "title": i18n.getMessage("title_forgot_password"),
- "content": i18n.getMessage("email_has_been_sent"),
- "callback": function(){
- document.location="/";
- }
- });
- }
-
- },
- "complete": function(){
- spinner.stop();
- $("#btnSubmit").prop("disabled", false);
- },
- "error": function(jqXhr, status, error){
- if(jqXhr){
- $("#dlgModal")
- .dialogModal({
- "title": i18n.getMessage("title_forgot_password"),
- "content": i18n.getMessage(jqXhr.responseText),
- "callback": function(){
- bindEnterKey();
- return;
- }
- });
- }
- }
- });
- });
- });
-});
\ No newline at end of file
diff --git a/static/resources/js/harbor.config.js b/static/resources/js/harbor.config.js
new file mode 100644
index 000000000..b67001fac
--- /dev/null
+++ b/static/resources/js/harbor.config.js
@@ -0,0 +1,120 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+ 'use strict';
+ angular
+ .module('harbor.app')
+ .config(function($interpolateProvider){
+ $interpolateProvider.startSymbol('//');
+ $interpolateProvider.endSymbol('//');
+ })
+ .config(function($httpProvider) {
+ $httpProvider.defaults.headers.common = {'Accept': 'application/json, text/javascript, */*; q=0.01'};
+ $httpProvider.interceptors.push('redirectInterceptor');
+ })
+ .service('redirectInterceptor', RedirectInterceptorService)
+ .factory('getParameterByName', getParameterByName)
+ .filter('dateL', localizeDate)
+ .filter('tr', tr);
+
+ RedirectInterceptorService.$inject = ['$q', '$window', '$location'];
+
+ function RedirectInterceptorService($q, $window, $location) {
+ return {
+ 'responseError': function(rejection) {
+ var url = rejection.config.url;
+ console.log('url:' + url);
+ var exclusion = [
+ '/',
+ '/search',
+ '/reset_password',
+ '/sign_up',
+ '/forgot_password',
+ '/api/targets/ping',
+ '/api/users/current',
+ '/api/repositories',
+ /^\/api\/projects\/[0-9]+\/members\/current$/
+ ];
+ var isExcluded = false;
+ for(var i in exclusion) {
+ switch(typeof(exclusion[i])) {
+ case 'string':
+ isExcluded = (exclusion[i] === url);
+ break;
+ case 'object':
+ isExcluded = exclusion[i].test(url);
+ break;
+ }
+ if(isExcluded) {
+ break;
+ }
+ }
+ if(!isExcluded && rejection.status === 401) {
+ $window.location.href = '/?last_url=' + encodeURIComponent(location.pathname + '#' + $location.url());
+ return;
+ }
+ return $q.reject(rejection);
+ }
+ };
+ }
+
+ function getParameterByName() {
+ return get;
+ function get(name, url) {
+ name = name.replace(/[\[\]]/g, "\\$&");
+ var regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)"),
+ results = regex.exec(url);
+ if (!results) {
+ return null;
+ }
+
+ if (!results[2]) {
+ return '';
+ }
+
+ return decodeURIComponent(results[2].replace(/\+/g, " "));
+ }
+ }
+
+ function localizeDate() {
+ return filter;
+
+ function filter(input, pattern) {
+ var d = new Date(input || '');
+ if(d.getTime() <= 0) return '-';
+ return moment(d).format(pattern);
+ }
+ }
+
+ tr.$inject = ['I18nService'];
+
+ function tr(I18nService) {
+ return tr;
+ function tr(label, params) {
+ var currentLanguage = I18nService().getCurrentLanguage();
+ var result = '';
+ if(label && label.length > 0){
+ result = I18nService().getValue(label, currentLanguage);
+ }
+ if(angular.isArray(params)) {
+ angular.forEach(params, function(value, index) {
+ result = result.replace('$' + index, params[index]);
+ });
+ }
+ return result;
+ }
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/harbor.constants.js b/static/resources/js/harbor.constants.js
new file mode 100644
index 000000000..2e5449842
--- /dev/null
+++ b/static/resources/js/harbor.constants.js
@@ -0,0 +1,21 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+ 'use strict';
+
+ angular
+ .module('harbor.app');
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/harbor.data.js b/static/resources/js/harbor.data.js
new file mode 100644
index 000000000..8dc1744ae
--- /dev/null
+++ b/static/resources/js/harbor.data.js
@@ -0,0 +1,56 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.app')
+ .factory('currentUser', currentUser)
+ .factory('currentProjectMember', currentProjectMember);
+
+ currentUser.$inject = ['$cookies', '$timeout'];
+
+ function currentUser($cookies, $timeout) {
+ return {
+ set: function(user) {
+ $cookies.putObject('user', user, {'path': '/'});
+ },
+ get: function() {
+ return $cookies.getObject('user');
+ },
+ unset: function() {
+ $cookies.remove('user', {'path': '/'});
+ }
+ };
+ }
+
+ currentProjectMember.$inject = ['$cookies'];
+
+ function currentProjectMember($cookies) {
+ return {
+ set: function(member) {
+ $cookies.putObject('member', member, {'path': '/'});
+ },
+ get: function() {
+ return $cookies.getObject('member');
+ },
+ unset: function() {
+ $cookies.remove('member', {'path': '/'});
+ }
+ };
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/harbor.initialize.js b/static/resources/js/harbor.initialize.js
new file mode 100644
index 000000000..c267bd383
--- /dev/null
+++ b/static/resources/js/harbor.initialize.js
@@ -0,0 +1,21 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+ 'use strict';
+
+ angular
+ .module('harbor.app');
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/harbor.module.js b/static/resources/js/harbor.module.js
new file mode 100644
index 000000000..500ae0f58
--- /dev/null
+++ b/static/resources/js/harbor.module.js
@@ -0,0 +1,65 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+ 'use strict';
+ angular
+ .module('harbor.app', [
+ 'ngMessages',
+ 'ngCookies',
+ 'harbor.session',
+ 'harbor.layout.element.height',
+ 'harbor.layout.header',
+ 'harbor.layout.footer',
+ 'harbor.layout.navigation',
+ 'harbor.layout.sign.up',
+ 'harbor.layout.add.new',
+ 'harbor.layout.account.setting',
+ 'harbor.layout.change.password',
+ 'harbor.layout.forgot.password',
+ 'harbor.layout.reset.password',
+ 'harbor.layout.index',
+ 'harbor.layout.dashboard',
+ 'harbor.layout.project',
+ 'harbor.layout.admin.option',
+ 'harbor.layout.search',
+ 'harbor.services.i18n',
+ 'harbor.services.project',
+ 'harbor.services.user',
+ 'harbor.services.repository',
+ 'harbor.services.project.member',
+ 'harbor.services.replication.policy',
+ 'harbor.services.replication.job',
+ 'harbor.services.destination',
+ 'harbor.summary',
+ 'harbor.user.log',
+ 'harbor.top.repository',
+ 'harbor.optional.menu',
+ 'harbor.modal.dialog',
+ 'harbor.sign.in',
+ 'harbor.search',
+ 'harbor.project',
+ 'harbor.details',
+ 'harbor.repository',
+ 'harbor.project.member',
+ 'harbor.user',
+ 'harbor.log',
+ 'harbor.validator',
+ 'harbor.replication',
+ 'harbor.system.management',
+ 'harbor.loading.progress',
+ 'harbor.inline.help',
+ 'harbor.dismissable.alerts'
+ ]);
+})();
diff --git a/static/resources/js/item-detail.js b/static/resources/js/item-detail.js
deleted file mode 100644
index bfab81536..000000000
--- a/static/resources/js/item-detail.js
+++ /dev/null
@@ -1,473 +0,0 @@
-/*
- Copyright (c) 2016 VMware, Inc. All Rights Reserved.
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*/
-jQuery(function(){
-
- $.when(
- new AjaxUtil({
- url: "/api/users/current",
- type: "get",
- error: function(jqXhr){
- if(jqXhr){
- if(jqXhr.status == 403){
- return false;
- }
- }
- }
- }).exec()
- ).then(function(){
- noNeedToLoginCallback();
- needToLoginCallback();
- }).fail(function(){
- noNeedToLoginCallback();
- });
-
- function noNeedToLoginCallback(){
-
- $("#tabItemDetail a:first").tab("show");
- $("#btnFilterOption button:first").addClass("active");
- $("#divErrMsg").hide();
-
- if($("#public").val() == 1){
- $("#tabItemDetail li:eq(1)").hide();
- $("#tabItemDetail li:eq(2)").hide();
- }
-
- listRepo($("#repoName").val());
-
- function listRepo(repoName){
-
- $("#divErrMsg").hide();
-
- new AjaxUtil({
- url: "/api/repositories?project_id=" + $("#projectId").val() + "&q=" + repoName,
- type: "get",
- success: function(data, status, xhr){
- if(xhr && xhr.status == 200){
- $("#accordionRepo").children().remove();
- if(data == null){
- $("#divErrMsg").show();
- $("#divErrMsg center").html(i18n.getMessage("no_repo_exists"));
- return;
- }
- $.each(data, function(i, e){
- var targetId = e.replace(/\//g, "------").replace(/\./g, "---");
- var row = '
');
- });
- }
-
- function getUserRoleCallback(userId){
- new AjaxUtil({
- url: "/api/projects/" + $("#projectId").val() + "/members/" + userId,
- type: "get",
- success: function(data, status, xhr){
- var user = data;
- $("#operationType").val("edit");
- $("#editUserId").val(user.user_id);
- $("#spnSearch").hide();
- $("#txtUserName").val(user.username);
- $("#txtUserName").prop("disabled", true);
- $("#btnSave").removeClass("disabled");
- $("#dlgUserTitle").text(i18n.getMessage("edit_members"));
- $("#lstRole input[name=chooseRole]:radio").not('[value=' + user.role_id + ']').prop("checked", false)
- $.each(user.roles, function(i, e){
- $("#lstRole input[name=chooseRole]:radio").filter('[value=' + e.role_id + ']').prop("checked", "checked");
- });
- }
- }).exec();
- }
- function listUser(username){
- $.when(
- new AjaxUtil({
- url: "/api/projects/" + $("#projectId").val() + "/members?username=" + (username == null ? "" : username),
- type: "get",
- errors: {
- 403: ""
- },
- success: function(data, status, xhr){
- return data || [];
- }
- }).exec()
- ).done(function(userList){
- listUserByProjectCallback(userList || []);
- $("#tblUser .glyphicon-pencil").on("click", function(e){
- var userId = $(this).attr("userid")
- getUserRoleCallback(userId);
- });
- $("#tblUser .glyphicon-trash").on("click", function(){
- var userId = $(this).attr("userid");
- new AjaxUtil({
- url: "/api/projects/" + $("#projectId").val() + "/members/" + userId,
- type: "delete",
- complete: function(jqXhr, status){
- if(jqXhr && jqXhr.status == 200){
- listUser(null);
- }
- }
- }).exec();
- });
- });
- }
- listUser(null);
- listOperationLogs();
-
- function listOperationLogs(){
- var projectId = $("#projectId").val();
-
- $.when(
- new AjaxUtil({
- url : "/api/projects/" + projectId + "/logs/filter",
- data: {},
- type: "post",
- success: function(data){
- return data || [];
- }
- }).exec()
- ).done(function(operationLogs){
- searchAccessLogCallback(operationLogs);
- });
- }
-
- $("#btnSearchUser").on("click", function(){
- var username = $("#txtSearchUser").val();
- if($.trim(username).length == 0){
- username = null;
- }
- listUser(username);
- });
-
- function toUTCSeconds(date, hour, min, sec) {
- var t = new Date(date);
- t.setHours(hour);
- t.setMinutes(min);
- t.setSeconds(sec);
- var utcTime = new Date(t.getUTCFullYear(),
- t.getUTCMonth(),
- t.getUTCDate(),
- t.getUTCHours(),
- t.getUTCMinutes(),
- t.getUTCSeconds());
- return utcTime.getTime() / 1000;
- }
-
- $("#btnFilterLog").on("click", function(){
-
- var projectId = $("#projectId").val();
- var username = $("#txtSearchUserName").val();
-
- var beginTimestamp = 0;
- var endTimestamp = 0;
-
- if($("#begindatepicker").val() != ""){
- beginTimestamp = toUTCSeconds($("#begindatepicker").val(), 0, 0, 0);
- }
- if($("#enddatepicker").val() != ""){
- endTimestamp = toUTCSeconds($("#enddatepicker").val(), 23, 59, 59);
- }
-
- new AjaxUtil({
- url: "/api/projects/" + projectId + "/logs/filter",
- data:{"username":username, "project_id" : Number(projectId), "keywords" : getKeyWords() , "begin_timestamp" : beginTimestamp, "end_timestamp" : endTimestamp},
- type: "post",
- success: function(data, status, xhr){
- if(xhr && xhr.status == 200){
- searchAccessLogCallback(data);
- }
- }
- }).exec();
- });
-
- $("#spnFilterOption input[name=chkAll]").on("click", function(){
- $("#spnFilterOption input[name=chkOperation]").prop("checked", $(this).prop("checked"));
- });
-
- $("#spnFilterOption input[name=chkOperation]").on("click", function(){
- if(!$(this).prop("checked")){
- $("#spnFilterOption input[name=chkAll]").prop("checked", false);
- }
-
- var selectedAll = true;
-
- $("#spnFilterOption input[name=chkOperation]").each(function(i, e){
- if(!$(e).prop("checked")){
- selectedAll = false;
- }
- });
-
- if(selectedAll){
- $("#spnFilterOption input[name=chkAll]").prop("checked", true);
- }
- });
-
- function getKeyWords(){
- var keywords = "";
- var checkedItemList=$("#spnFilterOption input[name=chkOperation]:checked");
- var keywords = [];
- $.each(checkedItemList, function(i, e){
- var itemValue = $(e).val();
- if(itemValue == "others" && $.trim($("#txtOthers").val()).length > 0){
- keywords.push($("#txtOthers").val());
- }else{
- keywords.push($(e).val());
- }
- });
- return keywords.join("/");
- }
-
- $('#datetimepicker1').datetimepicker({
- locale: i18n.getLocale(),
- ignoreReadonly: true,
- format: 'L',
- showClear: true
- });
- $('#datetimepicker2').datetimepicker({
- locale: i18n.getLocale(),
- ignoreReadonly: true,
- format: 'L',
- showClear: true
- });
- });
-}
-
-$(document).on("keydown", function(e){
- if(e.keyCode == 13){
- e.preventDefault();
- if($("#tabItemDetail li:eq(0)").is(":focus") || $("#txtRepoName").is(":focus")){
- $("#btnSearchRepo").trigger("click");
- }else if($("#tabItemDetail li:eq(1)").is(":focus") || $("#txtSearchUser").is(":focus")){
- $("#btnSearchUser").trigger("click");
- }else if($("#tabItemDetail li:eq(2)").is(":focus") || $("#txtSearchUserName").is(":focus")){
- $("#btnFilterLog").trigger("click");
- }else if($("#txtUserName").is(":focus") || $("#lstRole :radio").is(":focus")){
- $("#btnSave").trigger("click");
- }
- }
-});
-})
\ No newline at end of file
diff --git a/static/resources/js/layout/account-setting/account-setting.controller.js b/static/resources/js/layout/account-setting/account-setting.controller.js
new file mode 100644
index 000000000..764117348
--- /dev/null
+++ b/static/resources/js/layout/account-setting/account-setting.controller.js
@@ -0,0 +1,112 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.layout.account.setting')
+ .controller('AccountSettingController', AccountSettingController);
+
+ AccountSettingController.$inject = ['ChangePasswordService', 'UpdateUserService', '$filter', 'trFilter', '$scope', '$window', 'currentUser'];
+
+ function AccountSettingController(ChangePasswordService, UpdateUserService, $filter, trFilter, $scope, $window, currentUser) {
+
+ var vm = this;
+ vm.isOpen = false;
+
+ vm.hasError = false;
+ vm.errorMessage = '';
+
+ vm.reset = reset;
+ vm.confirm = confirm;
+ vm.updateUser = updateUser;
+ vm.cancel = cancel;
+
+ $scope.user = currentUser.get();
+ if(!$scope.user) {
+ $window.location.href = '/';
+ return;
+ }
+ var userId = $scope.user.user_id;
+
+ //Error message dialog handler for account setting.
+ $scope.$on('modalTitle', function(e, val) {
+ vm.modalTitle = val;
+ });
+
+ $scope.$on('modalMessage', function(e, val) {
+ vm.modalMessage = val;
+ });
+
+ $scope.$on('raiseError', function(e, val) {
+ if(val) {
+ vm.action = function() {
+ $scope.$broadcast('showDialog', false);
+ };
+ vm.contentType = 'text/plain';
+ vm.confirmOnly = true;
+ $scope.$broadcast('showDialog', true);
+ }
+ });
+
+ function reset() {
+ $scope.form.$setUntouched();
+ $scope.form.$setPristine();
+ vm.hasError = false;
+ vm.errorMessage = '';
+ }
+
+ function confirm() {
+ $window.location.href = '/dashboard';
+ }
+
+ function updateUser(user) {
+ vm.confirmOnly = true;
+ vm.action = vm.confirm;
+ if(user && angular.isDefined(user.username) && angular.isDefined(user.realname)) {
+ UpdateUserService(userId, user)
+ .success(updateUserSuccess)
+ .error(updateUserFailed);
+ currentUser.set(user);
+ }
+ }
+
+ function updateUserSuccess(data, status) {
+ vm.modalTitle = $filter('tr')('change_profile', []);
+ vm.modalMessage = $filter('tr')('successful_changed_profile', []);
+ $scope.$broadcast('showDialog', true);
+ }
+
+ function updateUserFailed(data, status) {
+ $scope.$emit('modalTitle', $filter('tr')('error'));
+ var message;
+ if(status === 409) {
+ message = $filter('tr')('email_has_been_taken');
+ }else{
+ message = $filter('tr')('failed_to_update_user') + data;
+ }
+ $scope.$emit('modalMessage', message);
+ $scope.$emit('raiseError', true);
+ console.log('Failed to update user.');
+ }
+
+ function cancel(form) {
+ $window.location.href = '/dashboard';
+ }
+
+ }
+
+})();
diff --git a/static/resources/js/layout/account-setting/account-setting.module.js b/static/resources/js/layout/account-setting/account-setting.module.js
new file mode 100644
index 000000000..3b0d9df8a
--- /dev/null
+++ b/static/resources/js/layout/account-setting/account-setting.module.js
@@ -0,0 +1,23 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.layout.account.setting', [
+ 'harbor.services.user']);
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/layout/add-new/add-new.controller.js b/static/resources/js/layout/add-new/add-new.controller.js
new file mode 100644
index 000000000..ce9c8ccd4
--- /dev/null
+++ b/static/resources/js/layout/add-new/add-new.controller.js
@@ -0,0 +1,29 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.layout.add.new')
+ .controller('AddNewController', AddNewController);
+
+ AddNewController.$inject = [];
+
+ function AddNewController() {
+ var vm = this;
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/layout/add-new/add-new.module.js b/static/resources/js/layout/add-new/add-new.module.js
new file mode 100644
index 000000000..05e34afac
--- /dev/null
+++ b/static/resources/js/layout/add-new/add-new.module.js
@@ -0,0 +1,22 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.layout.add.new', []);
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/layout/admin-option/admin-option.config.js b/static/resources/js/layout/admin-option/admin-option.config.js
new file mode 100644
index 000000000..78e21a6b0
--- /dev/null
+++ b/static/resources/js/layout/admin-option/admin-option.config.js
@@ -0,0 +1,22 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.layout.admin.option');
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/layout/admin-option/admin-option.controller.js b/static/resources/js/layout/admin-option/admin-option.controller.js
new file mode 100644
index 000000000..f383407c3
--- /dev/null
+++ b/static/resources/js/layout/admin-option/admin-option.controller.js
@@ -0,0 +1,94 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.layout.admin.option')
+ .controller('AdminOptionController', AdminOptionController);
+
+ AdminOptionController.$inject = ['$scope', '$timeout', '$location'];
+
+ function AdminOptionController($scope, $timeout, $location) {
+
+ $scope.subsSubPane = 296;
+
+ var vm = this;
+ vm.toggle = false;
+ vm.target = 'users';
+ vm.toggleAdminOption = toggleAdminOption;
+
+ $scope.$on('$locationChangeSuccess', function(e) {
+ if($location.path() === '') {
+ vm.target = 'users';
+ vm.toggle = false;
+ }else{
+ vm.target = 'system_management';
+ vm.toggle = true;
+ }
+ });
+
+ //Message dialog handler for admin-options.
+ $scope.$on('modalTitle', function(e, val) {
+ vm.modalTitle = val;
+ });
+
+ $scope.$on('modalMessage', function(e, val) {
+ vm.modalMessage = val;
+ });
+
+ $scope.$on('raiseError', function(e, val) {
+ if(val) {
+ vm.action = function() {
+ $scope.$broadcast('showDialog', false);
+ };
+ vm.contentType = 'text/plain';
+ vm.confirmOnly = true;
+
+ $timeout(function() {
+ $scope.$broadcast('showDialog', true);
+ }, 350);
+ }
+ });
+
+ $scope.$on('raiseInfo', function(e, val) {
+ if(val) {
+ vm.action = function() {
+ val.action();
+ $scope.$broadcast('showDialog', false);
+ }
+ vm.contentType = val.contentType;
+ vm.confirmOnly = val.confirmOnly;
+
+ $scope.$broadcast('showDialog', true);
+ }
+ });
+
+
+ function toggleAdminOption(e) {
+ switch(e.target) {
+ case 'users':
+ vm.toggle = false;
+ break;
+ case 'system_management':
+ vm.toggle = true;
+ break;
+ }
+ vm.target = e.target;
+ }
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/layout/admin-option/admin-option.module.js b/static/resources/js/layout/admin-option/admin-option.module.js
new file mode 100644
index 000000000..7f486a965
--- /dev/null
+++ b/static/resources/js/layout/admin-option/admin-option.module.js
@@ -0,0 +1,22 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.layout.admin.option', []);
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/layout/change-password/change-password.controller.js b/static/resources/js/layout/change-password/change-password.controller.js
new file mode 100644
index 000000000..f3c4244af
--- /dev/null
+++ b/static/resources/js/layout/change-password/change-password.controller.js
@@ -0,0 +1,114 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.layout.change.password')
+ .controller('ChangePasswordController', ChangePasswordController);
+
+ ChangePasswordController.$inject = ['ChangePasswordService', 'UpdateUserService', '$filter', 'trFilter', '$scope', '$window', 'currentUser'];
+
+ function ChangePasswordController(ChangePasswordService, UpdateUserService, $filter, trFilter, $scope, $window, currentUser) {
+
+ var vm = this;
+ vm.isOpen = false;
+
+ vm.hasError = false;
+ vm.errorMessage = '';
+
+ vm.reset = reset;
+
+ vm.confirm = confirm;
+ vm.updatePassword = updatePassword;
+ vm.cancel = cancel;
+
+ $scope.user = currentUser.get();
+ if(!$scope.user) {
+ $window.location.href = '/';
+ return;
+ }
+ var userId = $scope.user.user_id;
+
+ //Error message dialog handler for account setting.
+ $scope.$on('modalTitle', function(e, val) {
+ vm.modalTitle = val;
+ });
+
+ $scope.$on('modalMessage', function(e, val) {
+ vm.modalMessage = val;
+ });
+
+ $scope.$on('raiseError', function(e, val) {
+ if(val) {
+ vm.action = function() {
+ $scope.$broadcast('showDialog', false);
+ };
+ vm.contentType = 'text/plain';
+ vm.confirmOnly = true;
+ $scope.$broadcast('showDialog', true);
+ }
+ });
+
+ function reset() {
+ $scope.form.$setUntouched();
+ $scope.form.$setPristine();
+ vm.hasError = false;
+ vm.errorMessage = '';
+ }
+
+ function confirm() {
+ $window.location.href = '/dashboard';
+ }
+
+ function updatePassword(user) {
+ if(user && angular.isDefined(user.oldPassword) && angular.isDefined(user.password)) {
+ vm.action = vm.confirm;
+ ChangePasswordService(userId, user.oldPassword, user.password)
+ .success(changePasswordSuccess)
+ .error(changePasswordFailed);
+ }
+
+ }
+
+ function changePasswordSuccess(data, status) {
+ vm.modalTitle = $filter('tr')('change_password', []);
+ vm.modalMessage = $filter('tr')('successful_changed_password', []);
+ $scope.$broadcast('showDialog', true);
+ }
+
+ function changePasswordFailed(data, status) {
+
+ var message;
+ $scope.$emit('modalTitle', $filter('tr')('error'));
+ console.log('Failed to change password:' + data);
+ if(data == 'old_password_is_not_correct') {
+ message = $filter('tr')('old_password_is_incorrect');
+ }else{
+ message = $filter('tr')('failed_to_change_password');
+ }
+
+ $scope.$emit('modalMessage', message);
+ $scope.$emit('raiseError', true);
+ }
+
+ function cancel(form) {
+ $window.location.href = '/dashboard';
+ }
+
+ }
+
+})();
diff --git a/static/resources/js/layout/change-password/change-password.module.js b/static/resources/js/layout/change-password/change-password.module.js
new file mode 100644
index 000000000..ed7e81c6b
--- /dev/null
+++ b/static/resources/js/layout/change-password/change-password.module.js
@@ -0,0 +1,23 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.layout.change.password', [
+ 'harbor.services.user']);
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/layout/dashboard/dashboard.controller.js b/static/resources/js/layout/dashboard/dashboard.controller.js
new file mode 100644
index 000000000..bc5de1578
--- /dev/null
+++ b/static/resources/js/layout/dashboard/dashboard.controller.js
@@ -0,0 +1,50 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.layout.dashboard')
+ .controller('DashboardController', DashboardController);
+
+ DashboardController.$inject = ['$scope'];
+
+ function DashboardController($scope) {
+ var vm = this;
+ vm.customBodyHeight = {'height': '165px'};
+
+ //Error message dialog handler for dashboard.
+ $scope.$on('modalTitle', function(e, val) {
+ vm.modalTitle = val;
+ });
+
+ $scope.$on('modalMessage', function(e, val) {
+ vm.modalMessage = val;
+ });
+
+ $scope.$on('raiseError', function(e, val) {
+ if(val) {
+ vm.action = function() {
+ $scope.$broadcast('showDialog', false);
+ };
+ vm.contentType = 'text/plain';
+ vm.confirmOnly = true;
+ $scope.$broadcast('showDialog', true);
+ }
+ });
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/layout/dashboard/dashboard.module.js b/static/resources/js/layout/dashboard/dashboard.module.js
new file mode 100644
index 000000000..f9f24f9bd
--- /dev/null
+++ b/static/resources/js/layout/dashboard/dashboard.module.js
@@ -0,0 +1,24 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.layout.dashboard', [
+ 'harbor.services.repository'
+ ]);
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/layout/details/details.config.js b/static/resources/js/layout/details/details.config.js
new file mode 100644
index 000000000..cfcacca29
--- /dev/null
+++ b/static/resources/js/layout/details/details.config.js
@@ -0,0 +1,46 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.details')
+ .filter('name', nameFilter);
+
+ function nameFilter() {
+
+ return filter;
+
+ function filter(input, filterInput, key) {
+ input = input || [];
+ var filteredResults = [];
+
+ if (filterInput !== '') {
+ for(var i = 0; i < input.length; i++) {
+ var item = input[i];
+ if((key === "" && item.indexOf(filterInput) >= 0) || (key !== "" && item[key].indexOf(filterInput) >= 0)) {
+ filteredResults.push(item);
+ continue;
+ }
+ }
+ input = filteredResults;
+ }
+ return input;
+ }
+ }
+
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/layout/details/details.controller.js b/static/resources/js/layout/details/details.controller.js
new file mode 100644
index 000000000..c891c8e87
--- /dev/null
+++ b/static/resources/js/layout/details/details.controller.js
@@ -0,0 +1,76 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.details')
+ .controller('DetailsController', DetailsController);
+
+ DetailsController.$inject = ['$scope', '$timeout'];
+
+ function DetailsController($scope, $timeout) {
+ var vm = this;
+
+ vm.publicity = false;
+ vm.isProjectMember = false;
+
+ vm.togglePublicity = togglePublicity;
+
+ vm.sectionDefaultHeight = {'min-height': '579px'};
+
+ //Message dialog handler for details.
+ $scope.$on('modalTitle', function(e, val) {
+ vm.modalTitle = val;
+ });
+
+ $scope.$on('modalMessage', function(e, val) {
+ vm.modalMessage = val;
+ });
+
+ $scope.$on('raiseError', function(e, val) {
+ if(val) {
+ vm.action = function() {
+ $scope.$broadcast('showDialog', false);
+ };
+ vm.contentType = 'text/plain';
+ vm.confirmOnly = true;
+
+ $timeout(function() {
+ $scope.$broadcast('showDialog', true);
+ }, 350);
+ }
+ });
+
+ $scope.$on('raiseInfo', function(e, val) {
+ if(val) {
+ vm.action = function() {
+ val.action();
+ $scope.$broadcast('showDialog', false);
+ }
+ vm.contentType = val.contentType;
+ vm.confirmOnly = val.confirmOnly;
+
+ $scope.$broadcast('showDialog', true);
+ }
+ });
+
+ function togglePublicity(e) {
+ vm.publicity = e.publicity;
+ }
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/layout/details/details.module.js b/static/resources/js/layout/details/details.module.js
new file mode 100644
index 000000000..e60cd842e
--- /dev/null
+++ b/static/resources/js/layout/details/details.module.js
@@ -0,0 +1,25 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.details', [
+ 'harbor.services.project',
+ 'harbor.services.project.member'
+ ]);
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/layout/footer/footer.controller.js b/static/resources/js/layout/footer/footer.controller.js
new file mode 100644
index 000000000..5053c544f
--- /dev/null
+++ b/static/resources/js/layout/footer/footer.controller.js
@@ -0,0 +1,27 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.layout.footer')
+ .controller('FooterController', FooterController);
+
+ function FooterController() {
+ var vm = this;
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/layout/footer/footer.module.js b/static/resources/js/layout/footer/footer.module.js
new file mode 100644
index 000000000..ccdc389d4
--- /dev/null
+++ b/static/resources/js/layout/footer/footer.module.js
@@ -0,0 +1,22 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.layout.footer', []);
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/layout/forgot-password/forgot-password.controller.js b/static/resources/js/layout/forgot-password/forgot-password.controller.js
new file mode 100644
index 000000000..798fe7e02
--- /dev/null
+++ b/static/resources/js/layout/forgot-password/forgot-password.controller.js
@@ -0,0 +1,103 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.layout.forgot.password')
+ .controller('ForgotPasswordController', ForgotPasswordController);
+
+ ForgotPasswordController.$inject = ['SendMailService', '$window', '$scope', '$filter', 'trFilter'];
+
+ function ForgotPasswordController(SendMailService, $window, $scope, $filter, trFilter) {
+ var vm = this;
+
+ vm.hasError = false;
+ vm.show = false;
+ vm.errorMessage = '';
+
+ vm.reset = reset;
+ vm.sendMail = sendMail;
+
+ vm.confirm = confirm;
+ vm.toggleInProgress = false;
+
+ //Error message dialog handler for forgotting password.
+ $scope.$on('modalTitle', function(e, val) {
+ vm.modalTitle = val;
+ });
+
+ $scope.$on('modalMessage', function(e, val) {
+ vm.modalMessage = val;
+ });
+
+ $scope.$on('raiseError', function(e, val) {
+ if(val) {
+ vm.action = function() {
+ $scope.$broadcast('showDialog', false);
+ };
+ vm.contentType = 'text/plain';
+ vm.confirmOnly = true;
+ $scope.$broadcast('showDialog', true);
+ }
+ });
+
+ function reset(){
+ vm.hasError = false;
+ vm.errorMessage = '';
+ }
+
+ function sendMail(user) {
+ if(user && angular.isDefined(user.email)) {
+
+ vm.action = vm.confirm;
+
+ vm.toggleInProgress = true;
+ SendMailService(user.email)
+ .success(sendMailSuccess)
+ .error(sendMailFailed);
+ }
+ }
+
+ function sendMailSuccess(data, status) {
+ vm.toggleInProgress = false;
+ vm.modalTitle = $filter('tr')('forgot_password');
+ vm.modalMessage = $filter('tr')('mail_has_been_sent');
+ vm.confirmOnly = true;
+ $scope.$broadcast('showDialog', true);
+ }
+
+ function sendMailFailed(data, status) {
+ vm.toggleInProgress = false;
+ vm.hasError = true;
+ vm.errorMessage = data;
+
+ if(status === 500) {
+ $scope.$emit('modalTitle', $filter('tr')('error'));
+ $scope.$emit('modalMessage', $filter('tr')('failed_to_send_email'));
+ $scope.$emit('raiseError', true);
+ }
+ console.log('Failed to send mail:' + data);
+ }
+
+ function confirm() {
+ $window.location.href = '/';
+ }
+
+
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/layout/forgot-password/forgot-password.module.js b/static/resources/js/layout/forgot-password/forgot-password.module.js
new file mode 100644
index 000000000..7c5ae0dc0
--- /dev/null
+++ b/static/resources/js/layout/forgot-password/forgot-password.module.js
@@ -0,0 +1,24 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.layout.forgot.password', [
+ 'harbor.services.user'
+ ]);
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/layout/header/header.controller.js b/static/resources/js/layout/header/header.controller.js
new file mode 100644
index 000000000..869ab9d09
--- /dev/null
+++ b/static/resources/js/layout/header/header.controller.js
@@ -0,0 +1,47 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.layout.header')
+ .controller('HeaderController', HeaderController);
+
+ HeaderController.$inject = ['$scope', '$window', 'getParameterByName', '$location', 'currentUser'];
+
+ function HeaderController($scope, $window, getParameterByName, $location, currentUser) {
+ var vm = this;
+ vm.user = currentUser.get();
+
+ if(location.pathname === '/dashboard') {
+ vm.defaultUrl = '/dashboard';
+ }else{
+ vm.defaultUrl = '/';
+ }
+
+ $scope.$watch('vm.user', function(current) {
+ if(current) {
+ vm.defaultUrl = '/dashboard';
+ }
+ });
+
+ if($window.location.search) {
+ vm.searchInput = getParameterByName('q', $window.location.search);
+ console.log('vm.searchInput at header:' + vm.searchInput);
+ }
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/layout/header/header.module.js b/static/resources/js/layout/header/header.module.js
new file mode 100644
index 000000000..b9c84401d
--- /dev/null
+++ b/static/resources/js/layout/header/header.module.js
@@ -0,0 +1,24 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.layout.header', [
+ 'harbor.services.user',
+ 'harbor.services.i18n'
+ ]);
+})();
\ No newline at end of file
diff --git a/static/resources/js/layout/index/index.controller.js b/static/resources/js/layout/index/index.controller.js
new file mode 100644
index 000000000..a0dc20eb5
--- /dev/null
+++ b/static/resources/js/layout/index/index.controller.js
@@ -0,0 +1,105 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.layout.index')
+ .controller('IndexController', IndexController);
+
+ IndexController.$inject = ['$scope', '$filter', 'trFilter', '$timeout'];
+
+ function IndexController($scope, $filter, trFilter, $timeout) {
+
+ $scope.subsHeight = 110;
+ $scope.subsSection = 32;
+ $scope.subsSubPane = 226;
+
+ var vm = this;
+
+ vm.customBodyHeight = {'height': '180px'};
+ vm.viewAll = viewAll;
+
+ function viewAll() {
+ var indexDesc = $filter('tr')('index_desc', []);
+ var indexDesc1 = $filter('tr')('index_desc_1', []);
+ var indexDesc2 = $filter('tr')('index_desc_2', []);
+ var indexDesc3 = $filter('tr')('index_desc_3', []);
+ var indexDesc4 = $filter('tr')('index_desc_4', []);
+ var indexDesc5 = $filter('tr')('index_desc_5', []);
+ var indexDesc6 = $filter('tr')('index_desc_6', []);
+
+ $scope.$emit('modalTitle', $filter('tr')('harbor_intro_title'));
+ $scope.$emit('modalMessage', '
'+
+ indexDesc +
+ '
' +
+ '
' +
+ '
▪︎ ' + indexDesc1 + '
' +
+ '
▪︎ ' + indexDesc2 + '
' +
+ '
▪︎ ' + indexDesc3 + '
' +
+ '
▪︎ ' + indexDesc4 + '
' +
+ '
▪︎ ' + indexDesc5 + '
' +
+ '
▪︎ ' + indexDesc6 + '
' +
+ '
');
+ var emitInfo = {
+ 'contentType': 'text/html',
+ 'confirmOnly': true,
+ 'action': function() {
+ $scope.$broadcast('showDialog', false);
+ }
+ };
+ $scope.$emit('raiseInfo', emitInfo);
+ }
+
+ //Message dialog handler for index.
+ $scope.$on('modalTitle', function(e, val) {
+ vm.modalTitle = val;
+ });
+
+ $scope.$on('modalMessage', function(e, val) {
+ vm.modalMessage = val;
+ });
+
+ $scope.$on('raiseError', function(e, val) {
+ if(val) {
+ vm.action = function() {
+ $scope.$broadcast('showDialog', false);
+ };
+ vm.contentType = 'text/plain';
+ vm.confirmOnly = true;
+
+ $timeout(function() {
+ $scope.$broadcast('showDialog', true);
+ }, 350);
+ }
+ });
+
+ $scope.$on('raiseInfo', function(e, val) {
+ if(val) {
+ vm.action = function() {
+ val.action();
+ $scope.$broadcast('showDialog', false);
+ }
+ vm.contentType = val.contentType;
+ vm.confirmOnly = val.confirmOnly;
+
+ $scope.$broadcast('showDialog', true);
+ }
+ });
+
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/layout/index/index.module.js b/static/resources/js/layout/index/index.module.js
new file mode 100644
index 000000000..167a920fb
--- /dev/null
+++ b/static/resources/js/layout/index/index.module.js
@@ -0,0 +1,22 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.layout.index', []);
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/layout/navigation/navigation-admin-options.directive.html b/static/resources/js/layout/navigation/navigation-admin-options.directive.html
new file mode 100644
index 000000000..ecbd0fafe
--- /dev/null
+++ b/static/resources/js/layout/navigation/navigation-admin-options.directive.html
@@ -0,0 +1,21 @@
+
+
\ No newline at end of file
diff --git a/static/resources/js/layout/navigation/navigation-admin-options.directive.js b/static/resources/js/layout/navigation/navigation-admin-options.directive.js
new file mode 100644
index 000000000..89de7e4a4
--- /dev/null
+++ b/static/resources/js/layout/navigation/navigation-admin-options.directive.js
@@ -0,0 +1,65 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.layout.navigation')
+ .directive('navigationAdminOptions', navigationAdminOptions);
+
+ NavigationAdminOptions.$inject = ['$location'];
+
+ function NavigationAdminOptions($location) {
+ var vm = this;
+ vm.path = $location.path();
+ }
+
+ function navigationAdminOptions() {
+ var directive = {
+ 'restrict': 'E',
+ 'templateUrl': '/static/resources/js/layout/navigation/navigation-admin-options.directive.html',
+ 'scope': {
+ 'target': '='
+ },
+ 'link': link,
+ 'controller': NavigationAdminOptions,
+ 'controllerAs': 'vm',
+ 'bindToController': true
+ };
+ return directive;
+
+ function link(scope, element, attrs, ctrl) {
+ var visited = ctrl.path.substring(1);
+ console.log('visited:' + visited);
+
+ if(visited) {
+ element.find('a[tag="' + visited + '"]').addClass('active');
+ }else{
+ element.find('a:first').addClass('active');
+ }
+
+ element.find('a').on('click', click);
+
+ function click(event) {
+ element.find('a').removeClass('active');
+ $(event.target).addClass('active');
+ ctrl.target = $(this).attr('tag');
+ scope.$apply();
+ }
+ }
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/layout/navigation/navigation-details.directive.js b/static/resources/js/layout/navigation/navigation-details.directive.js
new file mode 100644
index 000000000..bf9b027c7
--- /dev/null
+++ b/static/resources/js/layout/navigation/navigation-details.directive.js
@@ -0,0 +1,80 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.layout.navigation')
+ .directive('navigationDetails', navigationDetails);
+
+ NavigationDetailsController.$inject = ['$window', '$location', '$scope', 'getParameterByName'];
+
+ function NavigationDetailsController($window, $location, $scope, getParameterByName) {
+ var vm = this;
+
+ vm.projectId = getParameterByName('project_id', $location.absUrl());
+
+ $scope.$on('$locationChangeSuccess', function() {
+ vm.projectId = getParameterByName('project_id', $location.absUrl());
+ });
+
+ vm.path = $location.path();
+ }
+
+ function navigationDetails() {
+ var directive = {
+ restrict: 'E',
+ templateUrl: '/navigation_detail?timestamp=' + new Date().getTime(),
+ link: link,
+ scope: {
+ 'target': '='
+ },
+ replace: true,
+ controller: NavigationDetailsController,
+ controllerAs: 'vm',
+ bindToController: true
+ };
+
+ return directive;
+
+ function link(scope, element, attrs, ctrl) {
+
+ var visited = ctrl.path.substring(1);
+ if(visited.indexOf('?') >= 0) {
+ visited = ctrl.url.substring(1, ctrl.url.indexOf('?'));
+ }
+
+ if(visited) {
+ element.find('a[tag="' + visited + '"]').addClass('active');
+ }else{
+ element.find('a:first').addClass('active');
+ }
+
+ ctrl.target = visited;
+ element.find('a').on('click', click);
+
+ function click(event) {
+ element.find('a').removeClass('active');
+ $(event.target).addClass('active');
+ ctrl.target = $(this).attr('tag');
+ scope.$apply();
+ }
+
+ }
+
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/layout/navigation/navigation-header.directive.js b/static/resources/js/layout/navigation/navigation-header.directive.js
new file mode 100644
index 000000000..d1655f909
--- /dev/null
+++ b/static/resources/js/layout/navigation/navigation-header.directive.js
@@ -0,0 +1,58 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.layout.navigation')
+ .directive('navigationHeader', navigationHeader);
+
+ NavigationHeaderController.$inject = ['$window', '$scope', 'currentUser', '$timeout'];
+
+ function NavigationHeaderController($window, $scope, currentUser, $timeout) {
+ var vm = this;
+ vm.url = $window.location.pathname;
+ }
+
+ function navigationHeader() {
+ var directive = {
+ restrict: 'E',
+ templateUrl: '/navigation_header?timestamp=' + new Date().getTime(),
+ link: link,
+ scope: true,
+ controller: NavigationHeaderController,
+ controllerAs: 'vm',
+ bindToController: true
+ };
+
+ return directive;
+
+ function link(scope, element, attrs, ctrl) {
+ var visited = ctrl.url;
+ console.log('visited:' + visited);
+ if (visited !== '' && visited !== '/') {
+ element.find('a[href*="' + visited + '"]').addClass('active');
+ }
+ element.find('a').on('click', click);
+ function click(event) {
+ element.find('a').removeClass('active');
+ $(event.target).not('span').addClass('active');
+ }
+ }
+
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/layout/navigation/navigation.module.js b/static/resources/js/layout/navigation/navigation.module.js
new file mode 100644
index 000000000..c1154f746
--- /dev/null
+++ b/static/resources/js/layout/navigation/navigation.module.js
@@ -0,0 +1,22 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.layout.navigation', []);
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/layout/project/project.controller.js b/static/resources/js/layout/project/project.controller.js
new file mode 100644
index 000000000..cb497daf5
--- /dev/null
+++ b/static/resources/js/layout/project/project.controller.js
@@ -0,0 +1,121 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.layout.project')
+ .controller('ProjectController', ProjectController);
+
+ ProjectController.$inject = ['$scope', 'ListProjectService', '$timeout', 'currentUser', 'getRole', '$filter', 'trFilter'];
+
+ function ProjectController($scope, ListProjectService, $timeout, currentUser, getRole, $filter, trFilter) {
+ var vm = this;
+
+ vm.isOpen = false;
+ vm.projectName = '';
+ vm.publicity = 0;
+
+ vm.retrieve = retrieve;
+ vm.showAddProject = showAddProject;
+ vm.searchProject = searchProject;
+ vm.showAddButton = showAddButton;
+ vm.togglePublicity = togglePublicity;
+ vm.user = currentUser.get();
+ vm.retrieve();
+ vm.getProjectRole = getProjectRole;
+
+
+ //Error message dialog handler for project.
+ $scope.$on('modalTitle', function(e, val) {
+ vm.modalTitle = val;
+ });
+
+ $scope.$on('modalMessage', function(e, val) {
+ vm.modalMessage = val;
+ });
+
+ $scope.$on('raiseError', function(e, val) {
+ if(val) {
+ vm.action = function() {
+ $scope.$broadcast('showDialog', false);
+ };
+ vm.contentType = 'text/plain';
+ vm.confirmOnly = true;
+ $scope.$broadcast('showDialog', true);
+ }
+ });
+
+
+ function retrieve() {
+ ListProjectService(vm.projectName, vm.publicity)
+ .success(listProjectSuccess)
+ .error(listProjectFailed);
+ }
+
+ function listProjectSuccess(data, status) {
+ vm.projects = data || [];
+ }
+
+ function getProjectRole(roleId) {
+ if(roleId !== 0) {
+ var role = getRole({'key': 'roleId', 'value': roleId});
+ return role.name;
+ }
+ return '';
+ }
+
+ function listProjectFailed(data, status) {
+ $scope.$emit('modalTitle', $filter('tr')('error'));
+ $scope.$emit('modalMessage', $filter('tr')('failed_to_get_project'));
+ $scope.$emit('raiseError', true);
+ console.log('Failed to get Project.');
+ }
+
+ $scope.$on('addedSuccess', function(e, val) {
+ vm.retrieve();
+ });
+
+ function showAddProject() {
+ if(vm.isOpen){
+ vm.isOpen = false;
+ }else{
+ vm.isOpen = true;
+ }
+ }
+
+ function searchProject() {
+ vm.retrieve();
+ }
+
+ function showAddButton() {
+ if(vm.publicity === 0) {
+ return true;
+ }else{
+ return false;
+ }
+ }
+
+ function togglePublicity(e) {
+ vm.publicity = e.publicity;
+ vm.isOpen = false;
+ vm.retrieve();
+ console.log('vm.publicity:' + vm.publicity);
+ }
+
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/layout/project/project.module.js b/static/resources/js/layout/project/project.module.js
new file mode 100644
index 000000000..82db3c9bb
--- /dev/null
+++ b/static/resources/js/layout/project/project.module.js
@@ -0,0 +1,26 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.layout.project', [
+ 'harbor.project.member',
+ 'harbor.services.project',
+ 'harbor.services.user'
+ ]);
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/layout/reset-password/reset-password.controller.js b/static/resources/js/layout/reset-password/reset-password.controller.js
new file mode 100644
index 000000000..3ee85fb3c
--- /dev/null
+++ b/static/resources/js/layout/reset-password/reset-password.controller.js
@@ -0,0 +1,100 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.layout.reset.password')
+ .controller('ResetPasswordController', ResetPasswordController);
+
+ ResetPasswordController.$inject = ['$scope', '$location', 'ResetPasswordService', '$window', 'getParameterByName', '$filter', 'trFilter'];
+
+ function ResetPasswordController($scope, $location, ResetPasswordService, $window, getParameterByName, $filter, trFilter) {
+ var vm = this;
+ vm.resetUuid = getParameterByName('reset_uuid', $location.absUrl());
+
+ vm.reset = reset;
+ vm.resetPassword = resetPassword;
+ vm.confirm = confirm;
+ vm.cancel = cancel;
+
+ vm.hasError = false;
+ vm.errorMessage = '';
+
+ //Error message dialog handler for resetting password.
+ $scope.$on('modalTitle', function(e, val) {
+ vm.modalTitle = val;
+ });
+
+ $scope.$on('modalMessage', function(e, val) {
+ vm.modalMessage = val;
+ });
+
+ $scope.$on('raiseError', function(e, val) {
+ if(val) {
+ vm.action = function() {
+ $scope.$broadcast('showDialog', false);
+ };
+ vm.contentType = 'text/plain';
+ vm.confirmOnly = true;
+ $scope.$broadcast('showDialog', true);
+ }
+ });
+
+ function reset() {
+ vm.hasError = false;
+ vm.errorMessage = '';
+ }
+
+ function resetPassword(user) {
+ if(user && angular.isDefined(user.password)) {
+
+ vm.action = vm.confirm;
+
+ console.log('rececived password:' + user.password + ', reset_uuid:' + vm.resetUuid);
+ ResetPasswordService(vm.resetUuid, user.password)
+ .success(resetPasswordSuccess)
+ .error(resetPasswordFailed);
+ }
+ }
+
+ function confirm() {
+ $window.location.href = '/';
+ }
+
+ function resetPasswordSuccess(data, status) {
+ vm.modalTitle = $filter('tr')('reset_password');
+ vm.modalMessage = $filter('tr')('successful_reset_password');
+ vm.confirmOnly = true;
+ $scope.$broadcast('showDialog', true);
+ }
+
+ function resetPasswordFailed(data) {
+ vm.hasError = true;
+
+ $scope.$emit('modalTitle', $filter('tr')('error'));
+ $scope.$emit('modalMessage', $filter('tr')('failed_to_reset_pasword') + data);
+ $scope.$emit('raiseError', true);
+
+ console.log('Failed to reset password:' + data);
+ }
+
+ function cancel() {
+ $window.location.href = '/';
+ }
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/layout/reset-password/reset-password.module.js b/static/resources/js/layout/reset-password/reset-password.module.js
new file mode 100644
index 000000000..ce10e0bb6
--- /dev/null
+++ b/static/resources/js/layout/reset-password/reset-password.module.js
@@ -0,0 +1,24 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.layout.reset.password', [
+ 'harbor.services.user'
+ ]);
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/layout/search/search.controller.js b/static/resources/js/layout/search/search.controller.js
new file mode 100644
index 000000000..37ad1d211
--- /dev/null
+++ b/static/resources/js/layout/search/search.controller.js
@@ -0,0 +1,69 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.layout.search')
+ .controller('SearchController', SearchController);
+
+ SearchController.$inject = ['$location', 'SearchService', '$scope', '$filter', 'trFilter', 'getParameterByName'];
+
+ function SearchController($location, SearchService, $scope, $filter, trFilter, getParameterByName) {
+ var vm = this;
+
+ vm.q = getParameterByName('q', $location.absUrl());
+ console.log('vm.q:' + vm.q);
+ SearchService(vm.q)
+ .success(searchSuccess)
+ .error(searchFailed);
+
+ //Error message dialog handler for search.
+ $scope.$on('modalTitle', function(e, val) {
+ vm.modalTitle = val;
+ });
+
+ $scope.$on('modalMessage', function(e, val) {
+ vm.modalMessage = val;
+ });
+
+ $scope.$on('raiseError', function(e, val) {
+ if(val) {
+ vm.action = function() {
+ $scope.$broadcast('showDialog', false);
+ };
+ vm.contentType = 'text/plain';
+ vm.confirmOnly = true;
+ $scope.$broadcast('showDialog', true);
+ }
+ });
+
+ function searchSuccess(data, status) {
+ vm.repository = data['repository'];
+ vm.project = data['project'];
+ }
+
+ function searchFailed(data, status) {
+
+ $scope.$emit('modalTitle', $filter('tr')('error'));
+ $scope.$emit('modalMessage', $filter('tr')('failed_in_search'));
+ $scope.$emit('raiseError', true);
+
+ console.log('Failed to search:' + data);
+ }
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/layout/search/search.module.js b/static/resources/js/layout/search/search.module.js
new file mode 100644
index 000000000..0e8f0fb7b
--- /dev/null
+++ b/static/resources/js/layout/search/search.module.js
@@ -0,0 +1,23 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.layout.search', []);
+
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/layout/sign-up/sign-up.controller.js b/static/resources/js/layout/sign-up/sign-up.controller.js
new file mode 100644
index 000000000..f182ee106
--- /dev/null
+++ b/static/resources/js/layout/sign-up/sign-up.controller.js
@@ -0,0 +1,107 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.layout.sign.up')
+ .controller('SignUpController', SignUpController);
+
+ SignUpController.$inject = ['$scope', 'SignUpService', '$window', '$filter', 'trFilter'];
+
+ function SignUpController($scope, SignUpService, $window, $filter, trFilter) {
+ var vm = this;
+
+ vm.user = {};
+ vm.signUp = signUp;
+ vm.confirm = confirm;
+
+ //Error message dialog handler for signing up.
+ $scope.$on('modalTitle', function(e, val) {
+ vm.modalTitle = val;
+ });
+
+ $scope.$on('modalMessage', function(e, val) {
+ vm.modalMessage = val;
+ });
+
+ $scope.$on('raiseError', function(e, val) {
+ if(val) {
+ vm.action = function() {
+ $scope.$broadcast('showDialog', false);
+ };
+ vm.contentType = 'text/plain';
+ vm.confirmOnly = true;
+ $scope.$broadcast('showDialog', true);
+ }
+ });
+
+ function signUp(user) {
+ var userObject = {
+ 'username': user.username,
+ 'email': user.email,
+ 'password': user.password,
+ 'realname': user.fullName,
+ 'comment': user.comment
+ };
+
+ vm.action = vm.confirm;
+
+ SignUpService(userObject)
+ .success(signUpSuccess)
+ .error(signUpFailed);
+ }
+
+ function signUpSuccess(data, status) {
+ var title;
+ var message;
+ if(vm.targetType) {
+ title = $filter('tr')('add_new_title');
+ message = $filter('tr')('successful_added');
+ }else{
+ title = $filter('tr')('sign_up');
+ message = $filter('tr')('successful_signed_up');
+ }
+ vm.modalTitle = title;
+ vm.modalMessage = message;
+ $scope.$broadcast('showDialog', true);
+ }
+
+ function signUpFailed(data, status) {
+ $scope.$emit('modalTitle', $filter('tr')('error'));
+ var message;
+ if(vm.targetType) {
+ message = $filter('tr')('failed_to_add_user');
+ }else{
+ message = $filter('tr')('failed_to_sign_up');
+ }
+ $scope.$emit('modalMessage', message);
+ $scope.$emit('raiseError', true);
+
+ console.log('Signed up failed.');
+ }
+
+ function confirm() {
+ if(location.pathname === '/add_new') {
+ $window.location.href = '/dashboard';
+ }else{
+ $window.location.href = '/';
+ }
+ }
+
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/layout/sign-up/sign-up.module.js b/static/resources/js/layout/sign-up/sign-up.module.js
new file mode 100644
index 000000000..c038e7789
--- /dev/null
+++ b/static/resources/js/layout/sign-up/sign-up.module.js
@@ -0,0 +1,23 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.layout.sign.up', [
+ 'harbor.services.user']);
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/project.js b/static/resources/js/project.js
deleted file mode 100644
index 427aa39dd..000000000
--- a/static/resources/js/project.js
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- Copyright (c) 2016 VMware, Inc. All Rights Reserved.
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*/
-jQuery(function(){
-
- new AjaxUtil({
- url: "/api/users/current",
- type: "get",
- success: function(data, status, xhr){
- if(xhr && xhr.status == 200){
- if(data.has_admin_role == 1) {
- renderForAdminRole();
- }
- renderForAnyRole();
- }
- }
- }).exec();
-
- function renderForAnyRole(){
- $("#tabProject a:first").tab("show");
-
- $(document).on("keydown", function(e){
- if(e.keyCode == 13){
- e.preventDefault();
- if($("#tabProject li:eq(0)").is(":focus") || $("#txtSearchProject").is(":focus")){
- $("#btnSearch").trigger("click");
- }else if($("#tabProject li:eq(1)").is(":focus") || $("#txtSearchPublicProjects").is(":focus")){
- $("#btnSearchPublicProjects").trigger("click");
- }else if($("#tabProject li:eq(1)").is(":focus") || $("#txtSearchUsername").is(":focus")){
- $("#btnSearchUsername").trigger("click");
- }else if($("#dlgAddProject").is(":focus") || $("#projectName").is(":focus")){
- $("#btnSave").trigger("click");
- }
- }
- });
-
- function listProject(projectName, isPublic){
- currentPublic = isPublic;
- $.when(
- new AjaxUtil({
- url: "/api/projects?is_public=" + isPublic + "&project_name=" + (projectName == null ? "" : projectName) + "×tamp=" + new Date().getTime(),
- type: "get",
- success: function(data, status, xhr){
- $("#tblProject tbody tr").remove();
- $.each(data || [], function(i, e){
- var row = '
');
- }
- });
- }
-});
\ No newline at end of file
diff --git a/static/resources/js/services/destination/services.create-destination.js b/static/resources/js/services/destination/services.create-destination.js
new file mode 100644
index 000000000..8a2c1f3ad
--- /dev/null
+++ b/static/resources/js/services/destination/services.create-destination.js
@@ -0,0 +1,38 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.services.destination')
+ .factory('CreateDestinationService', CreateDestinationService);
+
+ CreateDestinationService.$inject = ['$http'];
+
+ function CreateDestinationService($http) {
+ return createDestination;
+ function createDestination(name, endpoint, username, password) {
+ return $http
+ .post('/api/targets', {
+ 'name': name,
+ 'endpoint': endpoint,
+ 'username': username,
+ 'password': password
+ });
+ }
+ }
+
+})()
\ No newline at end of file
diff --git a/static/resources/js/services/destination/services.delete-destination.js b/static/resources/js/services/destination/services.delete-destination.js
new file mode 100644
index 000000000..6a34585da
--- /dev/null
+++ b/static/resources/js/services/destination/services.delete-destination.js
@@ -0,0 +1,33 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.services.destination')
+ .factory('DeleteDestinationService', DeleteDestinationService);
+
+ DeleteDestinationService.$inject = ['$http'];
+
+ function DeleteDestinationService($http) {
+ return deleteDestination;
+ function deleteDestination(targetId) {
+ return $http
+ .delete('/api/targets/' + targetId);
+ }
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/destination/services.destination.module.js b/static/resources/js/services/destination/services.destination.module.js
new file mode 100644
index 000000000..919d47734
--- /dev/null
+++ b/static/resources/js/services/destination/services.destination.module.js
@@ -0,0 +1,22 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.services.destination', []);
+
+})();
diff --git a/static/resources/js/services/destination/services.list-destination-policy.js b/static/resources/js/services/destination/services.list-destination-policy.js
new file mode 100644
index 000000000..9aae0445c
--- /dev/null
+++ b/static/resources/js/services/destination/services.list-destination-policy.js
@@ -0,0 +1,33 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.services.destination')
+ .factory('ListDestinationPolicyService', ListDestinationPolicyService);
+
+ ListDestinationPolicyService.$inject = ['$http'];
+
+ function ListDestinationPolicyService($http) {
+ return listDestinationPolicy;
+ function listDestinationPolicy(targetId) {
+ return $http
+ .get('/api/targets/' + targetId + '/policies/');
+ }
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/destination/services.list-destination.js b/static/resources/js/services/destination/services.list-destination.js
new file mode 100644
index 000000000..eb8a3f7c0
--- /dev/null
+++ b/static/resources/js/services/destination/services.list-destination.js
@@ -0,0 +1,37 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.services.destination')
+ .factory('ListDestinationService', ListDestinationService);
+
+ ListDestinationService.$inject = ['$http'];
+
+ function ListDestinationService($http) {
+ return listDestination;
+ function listDestination(targetId, name) {
+ return $http
+ .get('/api/targets/' + targetId, {
+ 'params': {
+ 'name': name
+ }
+ });
+ }
+ }
+
+})()
\ No newline at end of file
diff --git a/static/resources/js/services/destination/services.ping-destination.js b/static/resources/js/services/destination/services.ping-destination.js
new file mode 100644
index 000000000..58a103f66
--- /dev/null
+++ b/static/resources/js/services/destination/services.ping-destination.js
@@ -0,0 +1,57 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.services.destination')
+ .factory('PingDestinationService', PingDestinationService);
+
+ PingDestinationService.$inject = ['$http'];
+
+ function PingDestinationService($http) {
+ return pingDestination;
+ function pingDestination(target) {
+ var payload = {};
+ if(target['id']) {
+ payload = {'id': target['id']};
+ }else {
+ payload = {
+ 'name': target['name'],
+ 'endpoint': target['endpoint'],
+ 'username': target['username'],
+ 'password': target['password']
+ };
+ }
+
+ return $http({
+ 'method': 'POST',
+ 'url': '/api/targets/ping',
+ 'headers': {'Content-Type': 'application/x-www-form-urlencoded'},
+ 'transformRequest': function(obj) {
+ var str = [];
+ for(var p in obj) {
+ str.push(encodeURIComponent(p) + "=" + encodeURIComponent(obj[p]));
+ }
+ return str.join("&");
+ },
+ 'timeout': 30000,
+ 'data': payload
+ });
+ }
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/destination/services.update-destination.js b/static/resources/js/services/destination/services.update-destination.js
new file mode 100644
index 000000000..1791f4349
--- /dev/null
+++ b/static/resources/js/services/destination/services.update-destination.js
@@ -0,0 +1,38 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.services.destination')
+ .factory('UpdateDestinationService', UpdateDestinationService);
+
+ UpdateDestinationService.$inject = ['$http'];
+
+ function UpdateDestinationService($http) {
+ return updateDestination;
+ function updateDestination(targetId, target) {
+ return $http
+ .put('/api/targets/' + targetId, {
+ 'name': target.name,
+ 'endpoint': target.endpoint,
+ 'username': target.username,
+ 'password': target.password
+ });
+ }
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/i18n/locale_messages_en-US.js b/static/resources/js/services/i18n/locale_messages_en-US.js
new file mode 100644
index 000000000..68793ec7d
--- /dev/null
+++ b/static/resources/js/services/i18n/locale_messages_en-US.js
@@ -0,0 +1,270 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+var locale_messages = {
+ 'sign_in': 'Sign In',
+ 'sign_up': 'Sign Up',
+ 'forgot_password': 'Forgot Password',
+ 'login_now': 'Login Now',
+ 'its_easy_to_get_started': 'It\'s easy to get started ...',
+ 'icon_label_1': 'Anonymous repository access',
+ 'icon_label_2': 'Repositories managed by project',
+ 'icon_label_3': 'Role based access control',
+ 'why_use_harbor': 'Why use Harbor?',
+ 'index_desc': 'Project Harbor is an enterprise-class registry server, which extends the open source Docker Registry server by adding the functionality usually required by an enterprise, such as security, control, and management. Harbor is primarily designed to be a private registry - providing the needed security and control that enterprises require. It also helps minimize bandwidth usage, which is helpful to both improve productivity as well as performance.',
+ 'index_desc_1': 'Security: Keep their intellectual properties within their organizations.',
+ 'index_desc_2': 'Efficiency: A private registry server is set up within the organization\'s network and can reduce significantly the internet traffic to the public service. ',
+ 'index_desc_3': 'Access Control: RBAC (Role Based Access Control) is provided. User management can be integrated with existing enterprise identity services like AD/LDAP. ',
+ 'index_desc_4': 'Audit: All access to the registry are logged and can be used for audit purpose.',
+ 'index_desc_5': 'GUI: User friendly single-pane-of-glass management console.',
+ 'index_desc_6': 'Image Replication: Replicate images between instances.',
+ 'view_all': 'View all...',
+ 'repositories': 'Repositories',
+ 'project_repo_name': 'Project/Repository Name',
+ 'creation_time': 'Creation Time',
+ 'author': 'Author',
+ 'username': 'Username',
+ 'username_is_required': 'Username is required.',
+ 'username_has_been_taken': 'Username has been taken.',
+ 'username_is_too_long': 'Username is too long. (maximum 20 characters)',
+ 'username_contains_illegal_chars': 'Username contains illegal character(s).',
+ 'email': 'Email',
+ 'email_desc': 'The Email address will be used for resetting password.',
+ 'email_is_required': 'Email is required.',
+ 'email_has_been_taken': 'Email has been taken.',
+ 'email_content_illegal': 'Email format is illegal.',
+ 'email_does_not_exist': 'Email does not exist.',
+ 'email_is_too_long': 'Email is to long. (maximum 50 characters)',
+ 'full_name': 'Full Name',
+ 'full_name_desc': 'First name & Last name',
+ 'full_name_is_required': 'Full name is required.',
+ 'full_name_is_too_long': 'Full name is too long. (maximum 20 characters)',
+ 'full_name_contains_illegal_chars': 'Full name contains illegal character(s).',
+ 'password': 'Password',
+ 'password_desc': 'At least 7 characters with 1 lowercase letter, 1 capital letter and 1 numeric character.',
+ 'password_is_required': 'Password is required.',
+ 'password_is_invalid': 'Password is invalid. At least 7 characters with 1 lowercase letter, 1 capital letter and 1 numeric character.',
+ 'confirm_password': 'Confirm Password',
+ 'password_does_not_match': 'Passwords do not match.',
+ 'comments': 'Comments',
+ 'comment_is_too_long': 'Comment is too long. (maximum 20 characters)',
+ 'forgot_password_description': 'Please input the Email used when you signed up, a reset password Email will be sent to you.',
+ 'reset_password': 'Reset Password',
+ 'successful_reset_password': 'Password has been reset successfully.',
+ 'failed_to_change_password': 'Failed to change password.',
+ 'summary': 'Summary',
+ 'projects': 'Projects',
+ 'public_projects': 'Public Projects',
+ 'public': 'Public',
+ 'public_repositories': 'Public Repositories',
+ 'my_project_count': 'My Projects',
+ 'my_repo_count': 'My Repositories',
+ 'public_project_count': 'Public Projects',
+ 'public_repo_count': 'Public Repositories',
+ 'total_project_count': 'Total Projects',
+ 'total_repo_count': 'Total Repositories',
+ 'top_10_repositories': 'Top 10 Repositories',
+ 'repository_name': 'Repository Name',
+ 'size': 'Size',
+ 'count': 'Downloads',
+ 'creator': 'Creator',
+ 'no_top_repositories': 'No data, start with Harbor now!',
+ 'logs': 'Logs',
+ 'task_name': 'Task Name',
+ 'details': 'Details',
+ 'user': 'User',
+ 'no_user_logs': 'No data, start with Harbor now!',
+ 'users': 'Users',
+ 'my_projects': 'My Projects',
+ 'project_name': 'Project Name',
+ 'role': 'Role',
+ 'publicity': 'Publicity',
+ 'button_on': 'On',
+ 'button_off': 'Off',
+ 'new_project': 'New Project',
+ 'save': 'Save',
+ 'cancel': 'Cancel',
+ 'confirm': 'Confirm',
+ 'items': 'item(s)',
+ 'add_member': 'Add Member',
+ 'operation': 'Operation',
+ 'advanced_search': 'Advanced Search',
+ 'all': 'All',
+ 'others': 'Others',
+ 'search': 'Search',
+ 'duration': 'Duration',
+ 'from': 'From',
+ 'to': 'To',
+ 'timestamp': 'Timestamp',
+ 'dashboard': 'Dashboard',
+ 'admin_options': 'Admin Options',
+ 'account_setting': 'Account Settings',
+ 'log_out': 'Log Out',
+ 'registration_time': 'Registration Time',
+ 'system_management': 'System Management',
+ 'change_password': 'Change Password',
+ 'search_result': 'Search Result',
+ 'old_password': 'Old Password',
+ 'old_password_is_required': 'Old password is required.',
+ 'old_password_is_incorrect': 'Old password is incorrect.',
+ 'new_password_is_required': 'New password is required.',
+ 'new_password_is_invalid': 'New password is invalid. At least 7 characters with 1 lowercase letter, 1 capital letter and 1 numeric character.',
+ 'new_password': 'New Password',
+ 'username_already_exist': 'Username already exist.',
+ 'username_does_not_exist': 'Username does not exist.',
+ 'username_or_password_is_incorrect': 'Username or password is incorrect',
+ 'username_email': 'Username/Email',
+ 'project_name_is_required': 'Project name is required',
+ 'project_already_exist': 'Project already exist',
+ 'project_name_is_invalid': 'Project name is invalid, it should be all lowercase and with no space.',
+ 'project_name_is_too_short': 'Project name is too short, it should be greater than 4 characters.',
+ 'project_name_is_too_long': 'Project name is too long, it should be less than 30 characters.',
+ 'search_projects_or_repositories': 'Search projects or repositories',
+ 'tag': 'Tag',
+ 'image_details': 'Image Details',
+ 'pull_command': 'Pull Command',
+ 'alert_delete_repo_title': 'Confirm Deletion',
+ 'alert_delete_repo': 'All tags under this repository will be deleted. ' +
+ 'The space of this repository will be recycled during garbage collection. ' +
+ ' Delete repository "$0" now?',
+ 'alert_delete_tag_title': 'Confirm Deletion',
+ 'alert_delete_tag': 'Delete tag "$0" now?',
+ 'close': 'Close',
+ 'ok': 'OK',
+ 'welcome': 'Welcome to Harbor!',
+ 'continue' : 'Continue',
+ 'no_projects_add_new_project': 'No projects available now.',
+ 'no_repositories': 'No repositories found, please use "docker push" to upload images.',
+ 'failed_to_add_member': 'Project member can not be added, insuffient permissions.',
+ 'failed_to_change_member': 'Project member can not be changed, insuffient permissions.',
+ 'failed_to_delete_member': 'Project member can not be deleted, insuffient permissions.',
+ 'confirm_delete_user_title': 'User Deletion',
+ 'confirm_delete_user': 'Are you sure to delete the user "$0" ?',
+ 'confirm_delete_destination_title': 'Destination Deletion',
+ 'confirm_delete_destination': 'Are you sure to delete the destination "$0" ?',
+ 'replication': 'Replication',
+ 'name': 'Name',
+ 'description': 'Description',
+ 'destination': 'Destination',
+ 'start_time': 'Start Time',
+ 'last_start_time': 'Last Start Time',
+ 'end_time': 'End Time',
+ 'activation': 'Activation',
+ 'replication_jobs': 'Replication Jobs',
+ 'actions': 'Actions',
+ 'status': 'Status',
+ 'logs' : 'Logs',
+ 'enabled': 'Enabled',
+ 'enable': 'Enable',
+ 'disabled': 'Disabled',
+ 'disable': 'Disable',
+ 'no_replication_policies_add_new': 'No replication policies, please add new policy.',
+ 'no_replication_policies': 'No replication policies.',
+ 'no_replication_jobs': 'No replication jobs.',
+ 'no_destinations': 'No destinations, please add new destination.',
+ 'name_is_required': 'Name is required.',
+ 'name_is_too_long': 'Name is too long. (maximum 20 characters)',
+ 'description_is_too_long': 'Description is too long. ',
+ 'general_setting': 'General',
+ 'destination_setting': 'Destination Settings',
+ 'endpoint': 'Endpoint',
+ 'endpoint_is_required': 'Endpoint is required.',
+ 'test_connection': 'Test connection',
+ 'add_new_destination': 'New Destination',
+ 'edit_destination': 'Edit Destination',
+ 'successful_changed_password': 'Password has been changed successfully.',
+ 'change_profile': 'Change Profile',
+ 'successful_changed_profile': 'User profile has been changed successfully.',
+ 'administrator': 'Administrator',
+ 'popular_repositories': 'Popular Repositories',
+ 'harbor_intro_title': 'About Harbor',
+ 'mail_has_been_sent': 'Password resetting Email has been sent.',
+ 'send': 'Send',
+ 'successful_signed_up': 'Signed up successfully.',
+ 'add_new_policy': 'Add New Policy',
+ 'edit_policy': 'Edit Policy',
+ 'add_new_title': 'Add User',
+ 'add_new': 'Add',
+ 'successful_added': 'New user added successfully.',
+ 'copyright': 'Copyright',
+ 'all_rights_reserved': 'All Rights Reserved.',
+ 'pinging_target': 'Testing connection ...',
+ 'successful_ping_target': 'Connection tested successfully.',
+ 'failed_to_ping_target': 'Connetion test failed, please check your settings.',
+ 'policy_already_exists': 'Policy already exists.',
+ 'destination_already_exists': 'Destination already exists.',
+ 'refresh': 'Refresh',
+ 'select_all': 'Select All',
+ 'delete_tag': 'Delete Tag',
+ 'delete_repo': 'Delete Repo',
+ 'download_log': 'View Logs',
+ 'edit': 'Edit',
+ 'delete': 'Delete',
+ 'transfer': 'Transfer',
+ 'all': 'All',
+ 'pending': 'Pending',
+ 'running': 'Running',
+ 'finished': 'Finished',
+ 'canceled': 'Canceled',
+ 'stopped': 'Stopped',
+ 'retrying': 'Retrying',
+ 'error': 'Error',
+ 'failed_to_get_project_member': 'Failed to get current project member.',
+ 'failed_to_delete_repo': 'Failed to delete repository. ',
+ 'failed_to_delete_repo_insuffient_permissions': 'Failed to delete repository, insuffient permissions.',
+ 'failed_to_get_tag': 'Failed to get tag.',
+ 'failed_to_get_log': 'Failed to get logs.',
+ 'failed_to_get_project': 'Failed to get projects.',
+ 'failed_to_update_user': 'Failed to update user.',
+ 'failed_to_get_stat': 'Failed to get stat data.',
+ 'failed_to_get_top_repo': 'Failed to get top repositories.',
+ 'failed_to_get_user_log': 'Failed to get user logs.',
+ 'failed_to_send_email': 'Failed to send email.',
+ 'failed_to_reset_pasword': 'Failed to reset password.',
+ 'failed_in_search': 'Failed in search.',
+ 'failed_to_sign_up': 'Failed to sign up.',
+ 'failed_to_add_user': 'Failed to add user.',
+ 'failed_to_delete_user': 'Failed to delete user.',
+ 'failed_to_list_user': 'Failed to list user data.',
+ 'failed_to_toggle_admin': 'Failed to toggle admin user.',
+ 'failed_to_list_destination': 'Failed to list destinations.',
+ 'failed_to_list_replication': 'Failed to list replication policies.',
+ 'failed_to_toggle_policy': 'Failed to toggle replication policy.',
+ 'failed_to_create_replication_policy': 'Failed to create replication policy.',
+ 'failed_to_get_destination': 'Failed to get destination.',
+ 'failed_to_get_destination_policies': 'Failed to get destination policies.',
+ 'failed_to_get_replication_policy': 'Failed to get replication policy.',
+ 'failed_to_update_replication_policy': 'Failed to update replication policy.',
+ 'failed_to_delete_destination': 'Failed to delete destination.',
+ 'failed_to_create_destination': 'Failed to create destination.',
+ 'failed_to_update_destination': 'Failed to update destination.',
+ 'failed_to_toggle_publicity_insuffient_permissions': 'Failed to toggle project publicity, insuffient permissions.',
+ 'failed_to_toggle_publicity': 'Failed to toggle project publicity.',
+ 'project_admin': 'Project Admin',
+ 'developer': 'Developer',
+ 'guest': 'Guest',
+ 'inline_help_role_title': 'The Definitions of Roles',
+ 'inline_help_role': 'Project Admin: Project Admin has read/write and member management privileges to the project. ' +
+ 'Developer: Developer has read and write privileges to the project. ' +
+ 'Guest: Guest has read-only privilege for a specified project.',
+ 'inline_help_publicity_title': 'Publicity of Project',
+ 'inline_help_publicity': 'When a project is set to public, anyone will have read permission to the repositories under this project, and user will not need to run "docker login" before pulling images under this project.',
+ 'alert_job_contains_error': 'Found errors in the current replication jobs, please check.',
+ 'found_error_in_replication_job': 'Found $0 error(s).',
+ 'caution': 'Caution',
+ 'confirm_to_toggle_enabled_policy_title': 'Enable Policy',
+ 'confirm_to_toggle_enabled_policy': 'After enabling the policy, replication jobs will be triggered to replicate all repositories under the project to the destination of the policy. Please confirm to continue.',
+ 'confirm_to_toggle_disabled_policy_title': 'Disable Policy',
+ 'confirm_to_toggle_disabled_policy': 'After disabling the policy, running replication jobs of this policy will be canceled. Please confirm to continue.'
+};
diff --git a/static/resources/js/services/i18n/locale_messages_zh-CN.js b/static/resources/js/services/i18n/locale_messages_zh-CN.js
new file mode 100644
index 000000000..98bc435bb
--- /dev/null
+++ b/static/resources/js/services/i18n/locale_messages_zh-CN.js
@@ -0,0 +1,272 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+var locale_messages = {
+ 'sign_in': '登录',
+ 'sign_up': '注册',
+ 'forgot_password': '忘记密码',
+ 'login_now': '登录',
+ 'its_easy_to_get_started': '这很容易上手...',
+ 'icon_label_1': '匿名访问公开镜像仓库',
+ 'icon_label_2': '基于项目的镜像管理',
+ 'icon_label_3': '用户角色访问控制',
+ 'why_use_harbor': '为什么要使用Harbor？',
+ 'index_desc': 'Harbor是可靠的企业级Registry服务器。企业用户可使用Harbor搭建私有容器Registry服务，提高生产效率和安全度，既可应用于生产环境，也可以在开发环境中使用。',
+ 'index_desc_1': '安全: 确保知识产权在自己组织内部的管控之下。',
+ 'index_desc_2': '效率: 搭建组织内部的私有容器Registry服务，可显著降低访问公共Registry服务的网络需求。',
+ 'index_desc_3': '访问控制: 提供基于角色的访问控制，可集成企业目前拥有的用户管理系统（如:AD/LDAP）。',
+ 'index_desc_4': '审计: 所有访问Registry服务的操作均被记录，便于日后审计。',
+ 'index_desc_5': '管理界面: 具有友好易用图形管理界面。',
+ 'index_desc_6': '镜像复制: 在实例之间复制镜像。',
+ 'view_all': '显示全部...',
+ 'repositories': '镜像仓库',
+ 'project_repo_name': '项目/镜像仓库名称',
+ 'creation_time': '创建时间',
+ 'author': '作者',
+ 'username': '用户名',
+ 'username_is_required' : '用户名为必填项。',
+ 'username_has_been_taken' : '用户名已被占用。',
+ 'username_is_too_long' : '用户名长度超出限制。（最长为20个字符）',
+ 'username_contains_illegal_chars': '用户名包含不合法的字符。',
+ 'email': '邮箱',
+ 'email_desc': '此邮箱将用于重置密码。',
+ 'email_is_required' : '邮箱为必填项。',
+ 'email_has_been_taken' : '邮箱已被占用。',
+ 'email_content_illegal' : '邮箱格式不合法。',
+ 'email_does_not_exist' : '邮箱不存在。',
+ 'email_is_too_long': '邮箱名称长度超出限制。（最长为50个字符）',
+ 'full_name': '全名',
+ 'full_name_desc': '请输入全名。',
+ 'full_name_is_required' : '全名为必填项。',
+ 'full_name_is_too_long' : '全名长度超出限制。（最长为20个字符）',
+ 'full_name_contains_illegal_chars' : '全名包含不合法的字符。',
+ 'password': '密码',
+ 'password_desc': '至少输入 7个字符且包含 1个小写字母， 1个大写字母和 1个数字。',
+ 'password_is_required' : '密码为必填项。',
+ 'password_is_invalid' : '密码无效。至少输入 7个字符且包含 1个小写字母，1个大写字母和 1个数字。',
+ 'confirm_password': '确认密码',
+ 'password_does_not_match' : '两次密码输入不一致。',
+ 'comments': '备注',
+ 'comment_is_too_long' : '备注长度超出限制。（最长为20个字符）',
+ 'forgot_password_description': '重置邮件将发送到此邮箱。',
+ 'reset_password': '重置密码',
+ 'successful_reset_password': '重置密码成功。',
+ 'failed_to_change_password': '修改密码失败。',
+ 'summary': '摘要',
+ 'projects': '项目',
+ 'public_projects': '公开项目',
+ 'public': '公开',
+ 'public_repositories': '公开镜像仓库',
+ 'my_project_count': '我的项目',
+ 'my_repo_count': '我的镜像仓库',
+ 'public_project_count': '公开项目',
+ 'public_repo_count': '公开镜像仓库',
+ 'total_project_count': '全部项目',
+ 'total_repo_count': '全部镜像仓库',
+ 'top_10_repositories': 'Top 10 镜像仓库',
+ 'repository_name': '镜像仓库名',
+ 'size': '大小',
+ 'count': '下载次数',
+ 'creator': '创建者',
+ 'no_top_repositories': '暂时没有数据。',
+ 'logs': '日志',
+ 'task_name': '任务名称',
+ 'details': '详细信息',
+ 'user': '用户',
+ 'no_user_logs': '暂时没有数据。',
+ 'users': '用户',
+ 'my_projects': '我的项目',
+ 'project_name': '项目名称',
+ 'role': '角色',
+ 'publicity': '公开',
+ 'button_on': '是',
+ 'button_off': '否',
+ 'new_project': '新增项目',
+ 'save': '保存',
+ 'cancel': '取消',
+ 'confirm': '确认',
+ 'items': '条记录',
+ 'add_member': '新增成员',
+ 'operation': '操作',
+ 'advanced_search': '高级搜索',
+ 'all': '全部',
+ 'others': '其他',
+ 'search':'搜索',
+ 'duration': '持续时间',
+ 'from': '起始',
+ 'to': '结束',
+ 'timestamp': '时间戳',
+ 'dashboard': '控制面板',
+ 'admin_options': '管理员选项',
+ 'account_setting': '账户设置',
+ 'log_out': '注销',
+ 'registration_time': '注册时间',
+ 'system_management': '系统管理',
+ 'change_password': '修改密码',
+ 'search_result': '搜索结果',
+ 'old_password': '原密码',
+ 'old_password_is_required': '原密码为必填项。',
+ 'old_password_is_incorrect': '原密码不正确。',
+ 'new_password_is_required': '新密码为必填项。',
+ 'new_password_is_invalid': '新密码无效。至少输入 7个字符且包含 1个小写字母，1个大写字母和 1个数字。',
+ 'new_password': '新密码',
+ 'username_already_exist': '用户名已存在。',
+ 'username_does_not_exist': '用户名不存在。',
+ 'username_or_password_is_incorrect': '用户名或密码不正确。',
+ 'username_email': '用户名/邮箱',
+ 'project_name_is_required': '项目名称为必填项。',
+ 'project_already_exist': '项目已存在。',
+ 'project_name_is_invalid': '项目名称无效。全部为小写字母，且不能包含空格。',
+ 'project_name_is_too_short': '项目名称长度过短，至少多于4个字符。',
+ 'project_name_is_too_long': '项目名称长度超出限制，最长30个字符。',
+ 'search_projects_or_repositories': '搜索项目和镜像资源',
+ 'tag': '标签',
+ 'image_details': '镜像明细',
+ 'pull_command': 'Pull 命令',
+ 'alert_delete_repo_title': '确认删除',
+ 'alert_delete_repo': '即将删除镜像仓库下的所有标签，镜像空间将在垃圾回收过程中释放。 ' +
+ ' 是否删除镜像仓库 "$0" ?',
+ 'alert_delete_tag_title': '确认删除',
+ 'alert_delete_tag': '删除镜像标签 "$0" ?',
+ 'close': '关闭',
+ 'ok': '确认',
+ 'welcome': '欢迎使用Harbor!',
+ 'continue' : '继续',
+ 'no_projects_add_new_project': '当前没有项目。',
+ 'no_repositories': '未发现镜像，请用"docker push"命令上传镜像。',
+ 'failed_to_add_member': '无法添加项目成员，权限不足。',
+ 'failed_to_change_member': '无法修改项目成员，权限不足。',
+ 'failed_to_delete_member': '无法删除项目成员，权限不足。',
+ 'confirm_delete_user_title': '删除用户',
+ 'confirm_delete_user': '确认删除用户 "$0" ?',
+ 'confirm_delete_destination_title': '删除目标',
+ 'confirm_delete_destination': '确认删除目标 "$0"？',
+ 'replication': '复制',
+ 'name': '名称',
+ 'description': '描述',
+ 'destination': '目标',
+ 'start_time': '起始时间',
+ 'last_start_time': '上次起始时间',
+ 'end_time': '结束时间',
+ 'activation': '活动状态',
+ 'replication_jobs': '复制任务',
+ 'actions': '操作',
+ 'status': '状态',
+ 'logs': '日志',
+ 'enabled': '已启用',
+ 'enable': '启用',
+ 'disabled': '已停用',
+ 'disable': '停用',
+ 'no_replication_policies_add_new': '没有复制策略，请新增复制策略。',
+ 'no_replication_policies': '没有复制策略。',
+ 'no_replications': '没有复制策略。',
+ 'no_replication_jobs': '没有复制任务。',
+ 'no_destinations': '没有目标设置，请新增目标。',
+ 'name_is_required': '名称为必填项',
+ 'name_is_too_long': '名称长度超出限制。（最长为20个字符）',
+ 'description_is_too_long': '描述内容长度超出限制。',
+ 'general_setting': '一般设置',
+ 'destination_setting': '目标设置',
+ 'endpoint': '终端URL',
+ 'endpoint_is_required': '终端URL为必填项。',
+ 'test_connection': '测试连接',
+ 'add_new_destination': '新建目标',
+ 'edit_destination': '编辑目标',
+ 'successful_changed_password': '修改密码操作成功。',
+ 'change_profile': '修改账户信息',
+ 'successful_changed_profile': '修改账户信息操作成功。',
+ 'administrator': '管理员',
+ 'popular_repositories': '热门镜像仓库',
+ 'harbor_intro_title': '关于 Harbor',
+ 'mail_has_been_sent': '重置密码邮件已发送。',
+ 'send': '发送',
+ 'successful_signed_up': '注册成功。',
+ 'add_new_policy': '新增策略',
+ 'edit_policy': '修改策略',
+ 'add_new_title': '新增用户',
+ 'add_new': '新增',
+ 'successful_added': '新增用户成功。',
+ 'copyright': '版权所有',
+ 'all_rights_reserved': '保留所有权利。',
+ 'pinging_target': '正在测试连接……',
+ 'successful_ping_target': '测试连接目标成功。',
+ 'failed_to_ping_target': '测试连接目标失败，请检查设置。',
+ 'policy_already_exists': '策略已存在。',
+ 'destination_already_exists': '目标已存在。',
+ 'refresh': '刷新',
+ 'select_all': '全选',
+ 'delete_tag': '删除镜像标签',
+ 'delete_repo': '删除镜像仓库',
+ 'download_log': '查看日志',
+ 'edit': '修改',
+ 'delete': '删除',
+ 'all': '全部',
+ 'transfer': '复制',
+ 'pending': '等待中',
+ 'running': '进行中',
+ 'finished': '已完成',
+ 'canceled': '已取消',
+ 'stopped': '已终止',
+ 'retrying': '重试中',
+ 'error': '错误',
+ 'failed_to_get_project_member': '无法获取当前项目成员。',
+ 'failed_to_delete_repo': '无法删除镜像仓库。',
+ 'failed_to_delete_repo_insuffient_permissions': '无法删除镜像仓库，权限不足。',
+ 'failed_to_get_tag': '获取标签数据失败。',
+ 'failed_to_get_log': '获取日志数据失败。',
+ 'failed_to_get_project': '获取项目数据失败。',
+ 'failed_to_update_user': '更新用户信息失败。',
+ 'failed_to_get_stat': '获取统计数据失败。',
+ 'failed_to_get_top_repo': '获取热门镜像仓库数据失败。',
+ 'failed_to_get_user_log': '获取用户日志数据失败。',
+ 'failed_to_send_email': '发送邮件失败。',
+ 'failed_to_reset_pasword': '重置邮件失败。',
+ 'failed_in_search': '搜索操作失败。',
+ 'failed_to_sign_up': '注册用户失败。',
+ 'failed_to_add_user': '新增用户失败。',
+ 'failed_to_delete_user': '删除用户失败。',
+ 'failed_to_list_user': '获取用户数据失败。',
+ 'failed_to_toggle_admin': '切换管理员用户失败。',
+ 'failed_to_list_destination': '获取目标数据失败。',
+ 'failed_to_list_replication': '获取复制策略数据失败。',
+ 'failed_to_toggle_policy': '切换复制策略状态失败。',
+ 'failed_to_create_replication_policy': '创建复制策略失败。',
+ 'failed_to_get_destination': '获取目标失败。',
+ 'failed_to_get_destination_policies': '获取目标关联策略数据失败。',
+ 'failed_to_get_replication_policy': '获取复制策略失败。',
+ 'failed_to_update_replication_policy': '修改复制策略失败。',
+ 'failed_to_delete_destination': '删除目标失败。',
+ 'failed_to_create_destination': '创建目标失败。',
+ 'failed_to_update_destination': '修改目标失败。',
+ 'failed_to_toggle_publicity_insuffient_permissions': '切换项目公开性失败，权限不足。',
+ 'failed_to_toggle_publicity': '切换项目公开性失败。',
+ 'project_admin': '项目管理员',
+ 'developer': '开发人员',
+ 'guest': '访客',
+ 'inline_help_role_title': '角色定义',
+ 'inline_help_role': '项目管理员: “项目管理员”拥有一个项目的读/写和成员管理的权限。 '+
+ '开发人员: “开发人员” 拥有一个项目的读/写权限。 ' +
+ '访客: “访客”拥有特定项目的只读权限。',
+ 'inline_help_publicity_title': '公开项目',
+ 'inline_help_publicity': '当项目设为公开后，任何人都有此项目下镜像的读权限。命令行用户不需要“docker login”就可以拉取此项目下的镜像。',
+ 'alert_job_contains_error': '当前复制任务中包含错误，请检查。',
+ 'found_error_in_replication_job': '发现 $0 个错误。',
+ 'caution': '注意',
+ 'confirm_to_toggle_policy_title': '切换复制策略状态',
+ 'confirm_to_toggle_policy': '确认将复制策略 $0 切换为 $1 状态吗?',
+ 'confirm_to_toggle_enabled_policy_title': '启用策略',
+ 'confirm_to_toggle_enabled_policy': '启用策略后，系统将触发复制任务来同步项目下的所有镜像仓库到策略的目标实例。请确认继续。',
+ 'confirm_to_toggle_disabled_policy_title': '停用策略',
+ 'confirm_to_toggle_disabled_policy': '停用策略后，属于此策略的所有复制任务将终止。请确认继续。'
+};
diff --git a/static/resources/js/services/i18n/services.i18n.js b/static/resources/js/services/i18n/services.i18n.js
new file mode 100644
index 000000000..1f77a7c4f
--- /dev/null
+++ b/static/resources/js/services/i18n/services.i18n.js
@@ -0,0 +1,82 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.services.i18n')
+ .factory('I18nService', I18nService);
+
+ I18nService.$inject = ['$cookies', '$window'];
+
+ function I18nService($cookies, $window) {
+
+ var cookieOptions = {'path': '/'};
+
+ var messages = $.extend(true, {}, eval('locale_messages'));
+ var defaultLanguage = 'en-US';
+ var supportLanguages = {
+ 'en-US': 'English',
+ 'zh-CN': '中文'
+ };
+ var isSupportLanguage = function(language) {
+ for (var i in supportLanguages) {
+ if(language === String(i)) {
+ return true;
+ }
+ }
+ return false;
+ };
+
+
+ return tr;
+ function tr() {
+
+ return {
+ 'setCurrentLanguage': function(language) {
+ if(!angular.isDefined(language) || !isSupportLanguage(language)) {
+ language = defaultLanguage;
+ }
+ $cookies.put('language', language, cookieOptions);
+ },
+ 'setDefaultLanguage': function() {
+ $cookies.put('language', defaultLanguage, cookieOptions);
+ },
+ 'getCurrentLanguage': function() {
+ return $cookies.get('language') || defaultLanguage;
+ },
+ 'getLanguageName': function(language) {
+ if(!angular.isDefined(language) || !isSupportLanguage(language)) {
+ language = defaultLanguage;
+ }
+ $cookies.put('language', language, cookieOptions);
+ return supportLanguages[language];
+ },
+ 'getSupportLanguages': function() {
+ return supportLanguages;
+ },
+ 'unset': function(){
+ $cookies.put('language', defaultLanguage, cookieOptions);
+ },
+ 'getValue': function(key) {
+ return messages[key];
+ }
+ };
+
+ }
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/i18n/services.i18n.module.js b/static/resources/js/services/i18n/services.i18n.module.js
new file mode 100644
index 000000000..ddaa9f266
--- /dev/null
+++ b/static/resources/js/services/i18n/services.i18n.module.js
@@ -0,0 +1,22 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.services.i18n', []);
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/log/services.list-integrated-log.js b/static/resources/js/services/log/services.list-integrated-log.js
new file mode 100644
index 000000000..206bb63b7
--- /dev/null
+++ b/static/resources/js/services/log/services.list-integrated-log.js
@@ -0,0 +1,40 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+ 'use strict';
+
+ angular
+ .module('harbor.services.log')
+ .factory('ListIntegratedLogService', ListIntegratedLogService);
+
+ ListIntegratedLogService.$inject = ['$http', '$log'];
+
+ function ListIntegratedLogService($http, $log) {
+
+ return listIntegratedLog;
+
+ function listIntegratedLog(lines) {
+ $log.info('Get recent logs of the projects which the user is a member of:');
+ return $http
+ .get('/api/logs', {
+ 'params' : {
+ 'lines': lines,
+ }
+ });
+
+ }
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/log/services.list-log.js b/static/resources/js/services/log/services.list-log.js
new file mode 100644
index 000000000..732c36c50
--- /dev/null
+++ b/static/resources/js/services/log/services.list-log.js
@@ -0,0 +1,46 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.services.log')
+ .factory('ListLogService', ListLogService);
+
+ ListLogService.$inject = ['$http', '$log'];
+
+ function ListLogService($http, $log) {
+
+ return LogResult;
+
+ function LogResult(queryParams) {
+ var projectId = queryParams.projectId;
+ var username = queryParams.username;
+ var beginTimestamp = queryParams.beginTimestamp;
+ var endTimestamp = queryParams.endTimestamp;
+ var keywords = queryParams.keywords;
+
+ return $http
+ .post('/api/projects/' + projectId + '/logs/filter', {
+ 'begin_timestamp' : beginTimestamp,
+ 'end_timestamp' : endTimestamp,
+ 'keywords' : keywords,
+ 'project_id': Number(projectId),
+ 'username' : username
+ });
+ }
+ }
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/log/services.log.module.js b/static/resources/js/services/log/services.log.module.js
new file mode 100644
index 000000000..d07727291
--- /dev/null
+++ b/static/resources/js/services/log/services.log.module.js
@@ -0,0 +1,22 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.services.log', []);
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/project-member/services.add-project-member.js b/static/resources/js/services/project-member/services.add-project-member.js
new file mode 100644
index 000000000..a25b9ebfd
--- /dev/null
+++ b/static/resources/js/services/project-member/services.add-project-member.js
@@ -0,0 +1,39 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.services.project.member')
+ .factory('AddProjectMemberService', AddProjectMemberService);
+
+ AddProjectMemberService.$inject = ['$http', '$log'];
+
+ function AddProjectMemberService($http, $log) {
+
+ return AddProjectMember;
+
+ function AddProjectMember(projectId, roles, username) {
+ return $http
+ .post('/api/projects/' + projectId + '/members/', {
+ 'roles': [ Number(roles) ],
+ 'username': username
+ });
+ }
+
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/project-member/services.current-project-member.js b/static/resources/js/services/project-member/services.current-project-member.js
new file mode 100644
index 000000000..1be51ed92
--- /dev/null
+++ b/static/resources/js/services/project-member/services.current-project-member.js
@@ -0,0 +1,34 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.services.project.member')
+ .factory('CurrentProjectMemberService', CurrentProjectMemberService);
+
+ CurrentProjectMemberService.$inject = ['$http', '$log'];
+
+ function CurrentProjectMemberService($http, $log) {
+ return currentProjectMember;
+
+ function currentProjectMember(projectId) {
+ return $http
+ .get('/api/projects/' + projectId + '/members/current');
+ }
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/project-member/services.delete-project-member.js b/static/resources/js/services/project-member/services.delete-project-member.js
new file mode 100644
index 000000000..a1df3da11
--- /dev/null
+++ b/static/resources/js/services/project-member/services.delete-project-member.js
@@ -0,0 +1,36 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.services.project.member')
+ .factory('DeleteProjectMemberService', DeleteProjectMemberService);
+
+ DeleteProjectMemberService.$inject = ['$http', '$log'];
+
+ function DeleteProjectMemberService($http, $log) {
+
+ return DeleteProjectMember;
+
+ function DeleteProjectMember(projectId, userId) {
+ return $http
+ .delete('/api/projects/' + projectId + '/members/' + userId);
+ }
+
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/project-member/services.edit-project-member.js b/static/resources/js/services/project-member/services.edit-project-member.js
new file mode 100644
index 000000000..c84a239c1
--- /dev/null
+++ b/static/resources/js/services/project-member/services.edit-project-member.js
@@ -0,0 +1,38 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.services.project.member')
+ .factory('EditProjectMemberService', EditProjectMemberService);
+
+ EditProjectMemberService.$inject = ['$http', '$log'];
+
+ function EditProjectMemberService($http, $log) {
+
+ return EditProjectMember;
+
+ function EditProjectMember(projectId, userId, roleId) {
+ return $http
+ .put('/api/projects/' + projectId + '/members/' + userId, {
+ 'roles' : [ Number(roleId) ]
+ });
+ }
+
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/project-member/services.list-project-member.js b/static/resources/js/services/project-member/services.list-project-member.js
new file mode 100644
index 000000000..5e15d8753
--- /dev/null
+++ b/static/resources/js/services/project-member/services.list-project-member.js
@@ -0,0 +1,41 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.services.project.member')
+ .service('ListProjectMemberService', ListProjectMemberService);
+
+ ListProjectMemberService.$inject = ['$http', '$log'];
+
+ function ListProjectMemberService($http, $log) {
+
+ return ListProjectMember;
+
+ function ListProjectMember(projectId, queryParams) {
+ console.log('project_member project_id:' + projectId);
+ var username = queryParams.username;
+ return $http
+ .get('/api/projects/' + projectId + '/members', {
+ params: {
+ 'username': username
+ }
+ });
+ }
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/project-member/services.project-member.module.js b/static/resources/js/services/project-member/services.project-member.module.js
new file mode 100644
index 000000000..e2e4bb413
--- /dev/null
+++ b/static/resources/js/services/project-member/services.project-member.module.js
@@ -0,0 +1,22 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.services.project.member', []);
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/project/services.add-project.js b/static/resources/js/services/project/services.add-project.js
new file mode 100644
index 000000000..cb1986daa
--- /dev/null
+++ b/static/resources/js/services/project/services.add-project.js
@@ -0,0 +1,37 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+ 'use strict';
+
+ angular
+ .module('harbor.services.project')
+ .factory('AddProjectService', AddProjectService);
+
+ AddProjectService.$inject = ['$http', '$log'];
+
+ function AddProjectService($http, $log) {
+
+ return AddProject;
+
+ function AddProject(projectName, isPublic) {
+ return $http
+ .post('/api/projects', {
+ 'project_name': projectName,
+ 'public': isPublic
+ });
+ }
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/project/services.edit-project.js b/static/resources/js/services/project/services.edit-project.js
new file mode 100644
index 000000000..cd5e3584e
--- /dev/null
+++ b/static/resources/js/services/project/services.edit-project.js
@@ -0,0 +1,36 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+ 'use strict';
+
+ angular
+ .module('harbor.services.project')
+ .factory('EditProjectService', EditProjectService);
+
+ EditProjectService.$inject = ['$http', '$log'];
+
+ function EditProjectService($http, $log) {
+
+ return EditProject;
+
+ function EditProject(projectId, isPublic) {
+ return $http
+ .put('/api/projects/' + projectId, {
+ 'public': isPublic
+ });
+ }
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/project/services.get-project-by-id.js b/static/resources/js/services/project/services.get-project-by-id.js
new file mode 100644
index 000000000..feb0ef215
--- /dev/null
+++ b/static/resources/js/services/project/services.get-project-by-id.js
@@ -0,0 +1,36 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.services.project')
+ .factory('GetProjectById', GetProjectById);
+
+ GetProjectById.$inject = ['$http'];
+
+ function GetProjectById($http) {
+
+ return getProject;
+
+ function getProject(id) {
+ return $http
+ .get('/api/projects/' + id);
+ }
+
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/project/services.list-project.js b/static/resources/js/services/project/services.list-project.js
new file mode 100644
index 000000000..91d5d5dbe
--- /dev/null
+++ b/static/resources/js/services/project/services.list-project.js
@@ -0,0 +1,40 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+ 'use strict';
+
+ angular
+ .module('harbor.services.project')
+ .factory('ListProjectService', ListProjectService);
+
+ ListProjectService.$inject = ['$http', '$log'];
+
+ function ListProjectService($http, $log) {
+
+ return ListProject;
+
+ function ListProject(projectName, isPublic) {
+ $log.info('list project projectName:' + projectName, ', isPublic:' + isPublic);
+ return $http
+ .get('/api/projects', {
+ 'params' : {
+ 'is_public': isPublic,
+ 'project_name': projectName
+ }
+ });
+
+ }
+ }
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/project/services.project.module.js b/static/resources/js/services/project/services.project.module.js
new file mode 100644
index 000000000..f9a3c54a3
--- /dev/null
+++ b/static/resources/js/services/project/services.project.module.js
@@ -0,0 +1,21 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+ 'use strict';
+
+ angular
+ .module('harbor.services.project', []);
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/project/services.stat-project.js b/static/resources/js/services/project/services.stat-project.js
new file mode 100644
index 000000000..e471a162f
--- /dev/null
+++ b/static/resources/js/services/project/services.stat-project.js
@@ -0,0 +1,37 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.services.project')
+ .factory('StatProjectService', StatProjectService);
+
+ StatProjectService.$inject = ['$http', '$log'];
+
+ function StatProjectService($http, $log) {
+
+ return StatProject;
+
+ function StatProject() {
+ $log.info('statistics projects and repositories');
+ return $http
+ .get('/api/statistics');
+ }
+
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/project/services.toggle-project-publicity.js b/static/resources/js/services/project/services.toggle-project-publicity.js
new file mode 100644
index 000000000..dfb9f5ccb
--- /dev/null
+++ b/static/resources/js/services/project/services.toggle-project-publicity.js
@@ -0,0 +1,36 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.services.project')
+ .factory('ToggleProjectPublicityService', ToggleProjectPublicityService);
+
+ ToggleProjectPublicityService.$inject = ['$http'];
+
+ function ToggleProjectPublicityService($http) {
+ return toggleProjectPublicity;
+ function toggleProjectPublicity(projectId, isPublic) {
+ return $http
+ .put('/api/projects/' + projectId + '/publicity', {
+ 'public': isPublic
+ });
+ }
+
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/replication-job/services.list-replication-job.js b/static/resources/js/services/replication-job/services.list-replication-job.js
new file mode 100644
index 000000000..231da6608
--- /dev/null
+++ b/static/resources/js/services/replication-job/services.list-replication-job.js
@@ -0,0 +1,42 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.services.replication.job')
+ .factory('ListReplicationJobService', ListReplicationJobService);
+
+ ListReplicationJobService.$inject = ['$http'];
+
+ function ListReplicationJobService($http) {
+
+ return listReplicationJob;
+
+ function listReplicationJob(policyId, repository, status, startTime, endTime) {
+ return $http
+ .get('/api/jobs/replication/', {
+ 'params': {
+ 'policy_id': policyId,
+ 'repository': repository,
+ 'status': status,
+ 'start_time': startTime,
+ 'end_time': endTime
+ }
+ });
+ }
+ }
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/replication-job/services.replication-job.module.js b/static/resources/js/services/replication-job/services.replication-job.module.js
new file mode 100644
index 000000000..9b78fcd45
--- /dev/null
+++ b/static/resources/js/services/replication-job/services.replication-job.module.js
@@ -0,0 +1,22 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.services.replication.job', []);
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/replication-policy/services.create-replication-policy.js b/static/resources/js/services/replication-policy/services.create-replication-policy.js
new file mode 100644
index 000000000..96e7c1c77
--- /dev/null
+++ b/static/resources/js/services/replication-policy/services.create-replication-policy.js
@@ -0,0 +1,42 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.services.replication.policy')
+ .factory('CreateReplicationPolicyService', CreateReplicationPolicyService);
+
+ CreateReplicationPolicyService.$inject = ['$http'];
+
+ function CreateReplicationPolicyService($http) {
+ return createReplicationPolicy;
+
+ function createReplicationPolicy(policy) {
+ return $http
+ .post('/api/policies/replication', {
+ 'project_id': policy.projectId,
+ 'target_id': policy.targetId,
+ 'name': policy.name,
+ 'enabled': policy.enabled,
+ 'description': policy.description,
+ 'cron_str': policy.cronStr,
+ 'start_time': policy.startTime
+ })
+ }
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/replication-policy/services.list-replication-policy.js b/static/resources/js/services/replication-policy/services.list-replication-policy.js
new file mode 100644
index 000000000..dc93aa18b
--- /dev/null
+++ b/static/resources/js/services/replication-policy/services.list-replication-policy.js
@@ -0,0 +1,41 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.services.replication.policy')
+ .factory('ListReplicationPolicyService', ListReplicationPolicyService);
+
+ ListReplicationPolicyService.$inject = ['$http'];
+
+ function ListReplicationPolicyService($http) {
+
+ return listReplicationPolicy;
+
+ function listReplicationPolicy(policyId, projectId, name) {
+ return $http
+ .get('/api/policies/replication/' + policyId, {
+ 'params': {
+ 'project_id': projectId,
+ 'name': name
+ }
+ });
+ }
+
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/replication-policy/services.replication-policy.module.js b/static/resources/js/services/replication-policy/services.replication-policy.module.js
new file mode 100644
index 000000000..f01f674b2
--- /dev/null
+++ b/static/resources/js/services/replication-policy/services.replication-policy.module.js
@@ -0,0 +1,22 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.services.replication.policy', []);
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/replication-policy/services.toggle-replication-policy.js b/static/resources/js/services/replication-policy/services.toggle-replication-policy.js
new file mode 100644
index 000000000..635aa4f6f
--- /dev/null
+++ b/static/resources/js/services/replication-policy/services.toggle-replication-policy.js
@@ -0,0 +1,35 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.services.replication.policy')
+ .factory('ToggleReplicationPolicyService', ToggleReplicationPolicyService);
+
+ ToggleReplicationPolicyService.$inject = ['$http'];
+
+ function ToggleReplicationPolicyService($http) {
+ return toggleReplicationPolicy;
+ function toggleReplicationPolicy(policyId, enabled) {
+ return $http
+ .put('/api/policies/replication/' + policyId + '/enablement', {
+ 'enabled': enabled
+ });
+ }
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/replication-policy/services.update-replication-policy.js b/static/resources/js/services/replication-policy/services.update-replication-policy.js
new file mode 100644
index 000000000..fb49aeeac
--- /dev/null
+++ b/static/resources/js/services/replication-policy/services.update-replication-policy.js
@@ -0,0 +1,38 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.services.replication.policy')
+ .factory('UpdateReplicationPolicyService', UpdateReplicationPolicyService);
+
+ UpdateReplicationPolicyService.$inject = ['$http'];
+
+ function UpdateReplicationPolicyService($http) {
+ return updateReplicationPolicy;
+ function updateReplicationPolicy(policyId, policy) {
+ return $http
+ .put('/api/policies/replication/' + policyId, {
+ 'name': policy.name,
+ 'description': policy.description,
+ 'enabled': policy.enabled,
+ 'target_id': policy.targetId
+ });
+ }
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/repository/services.delete-repository.js b/static/resources/js/services/repository/services.delete-repository.js
new file mode 100644
index 000000000..7d2e39ef0
--- /dev/null
+++ b/static/resources/js/services/repository/services.delete-repository.js
@@ -0,0 +1,36 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+ 'use strict';
+
+ angular
+ .module('harbor.services.repository')
+ .factory('DeleteRepositoryService', DeleteRepositoryService);
+
+ DeleteRepositoryService.$inject = ['$http', '$log'];
+
+ function DeleteRepositoryService($http, $log) {
+
+ return DeleteRepository;
+
+ function DeleteRepository(repoName, tag) {
+ var params = (tag === '') ? {'repo_name' : repoName} : {'repo_name': repoName, 'tag': tag};
+ return $http
+ .delete('/api/repositories', {
+ 'params': params
+ });
+ }
+ }
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/repository/services.list-manifest.js b/static/resources/js/services/repository/services.list-manifest.js
new file mode 100644
index 000000000..b94d70c0c
--- /dev/null
+++ b/static/resources/js/services/repository/services.list-manifest.js
@@ -0,0 +1,38 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.services.repository')
+ .factory('ListManifestService', ListManifestService);
+
+ ListManifestService.$inject = ['$http', '$log'];
+
+ function ListManifestService($http, $log) {
+ return ListManifest;
+ function ListManifest(repoName, tag) {
+ return $http
+ .get('/api/repositories/manifests', {
+ 'params': {
+ 'repo_name': repoName,
+ 'tag': tag
+ }
+ });
+ }
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/repository/services.list-repository.js b/static/resources/js/services/repository/services.list-repository.js
new file mode 100644
index 000000000..5cdb5cc6b
--- /dev/null
+++ b/static/resources/js/services/repository/services.list-repository.js
@@ -0,0 +1,40 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+ 'use strict';
+
+ angular
+ .module('harbor.services.repository')
+ .factory('ListRepositoryService', ListRepositoryService);
+
+ ListRepositoryService.$inject = ['$http', '$log'];
+
+ function ListRepositoryService($http, $log) {
+
+ return ListRepository;
+
+ function ListRepository(projectId, q) {
+ $log.info('list repositories:' + projectId + ', q:' + q);
+
+ return $http
+ .get('/api/repositories', {
+ 'params':{
+ 'project_id': projectId,
+ 'q': q
+ }
+ });
+ }
+ }
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/repository/services.list-tag.js b/static/resources/js/services/repository/services.list-tag.js
new file mode 100644
index 000000000..74abd5026
--- /dev/null
+++ b/static/resources/js/services/repository/services.list-tag.js
@@ -0,0 +1,39 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.services.repository')
+ .factory('ListTagService', ListTagService);
+
+ ListTagService.$inject = ['$http', '$log'];
+
+ function ListTagService($http, $log) {
+ return ListTag;
+
+ function ListTag(repoName) {
+ return $http
+ .get('/api/repositories/tags', {
+ 'params': {
+ 'repo_name': repoName
+ }
+ });
+ }
+ }
+
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/repository/services.list-top-repository.js b/static/resources/js/services/repository/services.list-top-repository.js
new file mode 100644
index 000000000..6cd7ba97d
--- /dev/null
+++ b/static/resources/js/services/repository/services.list-top-repository.js
@@ -0,0 +1,40 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+ 'use strict';
+
+ angular
+ .module('harbor.services.repository')
+ .factory('ListTopRepositoryService', ListTopRepositoryService);
+
+ ListTopRepositoryService.$inject = ['$http', '$log'];
+
+ function ListTopRepositoryService($http, $log) {
+
+ return listTopRepository;
+
+ function listTopRepository(count) {
+ $log.info('Get public repositories which are accessed most:');
+ return $http
+ .get('/api/repositories/top', {
+ 'params' : {
+ 'count': count,
+ }
+ });
+
+ }
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/repository/services.repository.module.js b/static/resources/js/services/repository/services.repository.module.js
new file mode 100644
index 000000000..4a638d38c
--- /dev/null
+++ b/static/resources/js/services/repository/services.repository.module.js
@@ -0,0 +1,21 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+ 'use strict';
+
+ angular
+ .module('harbor.services.repository', []);
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/search/services.search.js b/static/resources/js/services/search/services.search.js
new file mode 100644
index 000000000..432310eea
--- /dev/null
+++ b/static/resources/js/services/search/services.search.js
@@ -0,0 +1,40 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.services.search')
+ .factory('SearchService', SearchService);
+
+ SearchService.$inject = ['$http', '$log'];
+
+ function SearchService($http, $log) {
+
+ return search;
+
+ function search(keywords) {
+ return $http
+ .get('/api/search',{
+ params: {
+ 'q': keywords
+ }
+ });
+ }
+
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/search/services.search.module.js b/static/resources/js/services/search/services.search.module.js
new file mode 100644
index 000000000..d2dbb4680
--- /dev/null
+++ b/static/resources/js/services/search/services.search.module.js
@@ -0,0 +1,22 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.services.search', []);
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/user/services.change-password.js b/static/resources/js/services/user/services.change-password.js
new file mode 100644
index 000000000..21fc8868c
--- /dev/null
+++ b/static/resources/js/services/user/services.change-password.js
@@ -0,0 +1,39 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.services.user')
+ .factory('ChangePasswordService', ChangePasswordService);
+
+ ChangePasswordService.$inject = ['$http', '$log'];
+
+ function ChangePasswordService($http, $log) {
+
+ return ChangePassword;
+
+ function ChangePassword(userId, oldPassword, newPassword) {
+ return $http
+ .put('/api/users/' + userId + '/password', {
+ 'old_password': oldPassword,
+ 'new_password': newPassword
+ });
+ }
+
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/user/services.current-user.js b/static/resources/js/services/user/services.current-user.js
new file mode 100644
index 000000000..577f53dca
--- /dev/null
+++ b/static/resources/js/services/user/services.current-user.js
@@ -0,0 +1,34 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.services.user')
+ .factory('CurrentUserService', CurrentUserService);
+
+ CurrentUserService.$inject = ['$http'];
+
+ function CurrentUserService($http, $log) {
+
+ return CurrentUser;
+
+ function CurrentUser() {
+ return $http
+ .get('/api/users/current');
+ }
+ }
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/user/services.delete-user.js b/static/resources/js/services/user/services.delete-user.js
new file mode 100644
index 000000000..85d5dd43a
--- /dev/null
+++ b/static/resources/js/services/user/services.delete-user.js
@@ -0,0 +1,36 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.services.user')
+ .factory('DeleteUserService', DeleteUserService);
+
+ DeleteUserService.$inject = ['$http', '$log'];
+
+ function DeleteUserService($http, $log) {
+
+ return DeleteUser;
+
+ function DeleteUser(userId) {
+ return $http
+ .delete('/api/users/' + userId);
+ }
+
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/user/services.is-admin.js b/static/resources/js/services/user/services.is-admin.js
new file mode 100644
index 000000000..8375f2f14
--- /dev/null
+++ b/static/resources/js/services/user/services.is-admin.js
@@ -0,0 +1,35 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.services.user')
+ .factory('IsAdminService', IsAdminService);
+
+ IsAdminService.$inject = ['$http', '$log'];
+
+ function IsAdminService($http, $log) {
+
+ return IsAdmin;
+
+ function IsAdmin() {
+
+ }
+
+ }
+
+})
\ No newline at end of file
diff --git a/static/resources/js/header-login.js b/static/resources/js/services/user/services.list-user.js
similarity index 58%
rename from static/resources/js/header-login.js
rename to static/resources/js/services/user/services.list-user.js
index 1bd5cda0d..fda39c897 100644
--- a/static/resources/js/header-login.js
+++ b/static/resources/js/services/user/services.list-user.js
@@ -12,21 +12,27 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-jQuery(function(){
- $("#btnSignUp").css({"visibility": "visible"});
-
- $(document).on("keydown", function(e){
- if(e.keyCode == 13){
- e.preventDefault();
- if($("#txtCommonSearch").is(":focus")){
- document.location = "/search?q=" + $("#txtCommonSearch").val();
- }
- }
- });
- $("#btnSignIn").on("click", function(){
- document.location = "/signIn";
- });
- $("#btnSignUp").on("click", function(){
- document.location = "/register";
- });
-});
\ No newline at end of file
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.services.user')
+ .factory('ListUserService', ListUserService);
+
+ ListUserService.$inject = ['$http', '$log'];
+
+ function ListUserService($http, $log) {
+
+ return listUser;
+
+ function listUser(username) {
+ return $http
+ .get('/api/users', {
+ 'params' : {
+ 'username': username
+ }
+ });
+ }
+ }
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/user/services.log-out.js b/static/resources/js/services/user/services.log-out.js
new file mode 100644
index 000000000..69bfb4dd3
--- /dev/null
+++ b/static/resources/js/services/user/services.log-out.js
@@ -0,0 +1,33 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.services.user')
+ .factory('LogOutService', LogOutService);
+
+ LogOutService.$inject = ['$http'];
+
+ function LogOutService($http) {
+ return logOut;
+ function logOut() {
+ return $http
+ .get('/log_out');
+ }
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/user/services.reset-password.js b/static/resources/js/services/user/services.reset-password.js
new file mode 100644
index 000000000..638f8eaa3
--- /dev/null
+++ b/static/resources/js/services/user/services.reset-password.js
@@ -0,0 +1,44 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.services.user')
+ .factory('ResetPasswordService', ResetPasswordService);
+
+ ResetPasswordService.$inject = ['$http', '$log'];
+
+ function ResetPasswordService($http, $log) {
+ return resetPassword;
+ function resetPassword(uuid, password) {
+ return $http({
+ method: 'POST',
+ url: '/reset',
+ headers: {'Content-Type': 'application/x-www-form-urlencoded'},
+ transformRequest: function(obj) {
+ var str = [];
+ for(var p in obj) {
+ str.push(encodeURIComponent(p) + "=" + encodeURIComponent(obj[p]));
+ }
+ return str.join("&");
+ },
+ data: {'reset_uuid': uuid, 'password': password}
+ });
+ }
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/user/services.send-mail.js b/static/resources/js/services/user/services.send-mail.js
new file mode 100644
index 000000000..dee323131
--- /dev/null
+++ b/static/resources/js/services/user/services.send-mail.js
@@ -0,0 +1,40 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.services.user')
+ .factory('SendMailService', SendMailService);
+
+ SendMailService.$inject = ['$http', '$log'];
+
+ function SendMailService($http, $log) {
+
+ return SendMail;
+
+ function SendMail(email) {
+ return $http
+ .get('/sendEmail', {
+ 'params': {
+ 'email': email
+ }
+ });
+ }
+
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/user/services.sign-in.js b/static/resources/js/services/user/services.sign-in.js
new file mode 100644
index 000000000..05010cc4f
--- /dev/null
+++ b/static/resources/js/services/user/services.sign-in.js
@@ -0,0 +1,45 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.services.user')
+ .factory('SignInService', SignInService);
+
+ SignInService.$inject = ['$http', '$log'];
+
+ function SignInService($http, $log) {
+
+ return SignIn;
+
+ function SignIn(principal, password) {
+ return $http({
+ method: 'POST',
+ url: '/login',
+ headers: {'Content-Type': 'application/x-www-form-urlencoded'},
+ transformRequest: function(obj) {
+ var str = [];
+ for(var p in obj) {
+ str.push(encodeURIComponent(p) + "=" + encodeURIComponent(obj[p]));
+ }
+ return str.join("&");
+ },
+ data: {'principal': principal, 'password': password}
+ });
+ }
+ }
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/user/services.sign-up.js b/static/resources/js/services/user/services.sign-up.js
new file mode 100644
index 000000000..099e18f45
--- /dev/null
+++ b/static/resources/js/services/user/services.sign-up.js
@@ -0,0 +1,40 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.services.user')
+ .factory('SignUpService', SignUpService);
+
+ SignUpService.$inject = ['$http', '$log'];
+
+ function SignUpService($http, $log) {
+
+ return SignUp;
+
+ function SignUp(user) {
+ return $http
+ .post('/api/users', {
+ 'username': user.username,
+ 'email': user.email,
+ 'password': user.password,
+ 'realname': user.realname,
+ 'comment': user.comment
+ });
+ }
+ }
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/user/services.toggle-admin.js b/static/resources/js/services/user/services.toggle-admin.js
new file mode 100644
index 000000000..287d7e9ec
--- /dev/null
+++ b/static/resources/js/services/user/services.toggle-admin.js
@@ -0,0 +1,38 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.services.user')
+ .factory('ToggleAdminService', ToggleAdminService);
+
+ ToggleAdminService.$inject = ['$http'];
+
+ function ToggleAdminService($http) {
+
+ return toggleAdmin;
+
+ function toggleAdmin(userId, enabled) {
+ return $http
+ .put('/api/users/' + userId + '/sysadmin', {
+ 'has_admin_role' : enabled
+ });
+ }
+
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/user/services.update-user.js b/static/resources/js/services/user/services.update-user.js
new file mode 100644
index 000000000..97892f0b1
--- /dev/null
+++ b/static/resources/js/services/user/services.update-user.js
@@ -0,0 +1,38 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.services.user')
+ .factory('UpdateUserService', UpdateUserService);
+
+ UpdateUserService.$inject = ['$http'];
+
+ function UpdateUserService($http) {
+ return updateUser;
+ function updateUser(userId, user) {
+ return $http
+ .put('/api/users/' + userId, {
+ 'username': user.username,
+ 'email': user.email,
+ 'realname': user.realname,
+ 'comment': user.comment
+ });
+ }
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/user/services.user-exist.js b/static/resources/js/services/user/services.user-exist.js
new file mode 100644
index 000000000..ba8a503e3
--- /dev/null
+++ b/static/resources/js/services/user/services.user-exist.js
@@ -0,0 +1,37 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.services.user')
+ .factory('UserExistService', UserExistService);
+
+ UserExistService.$inject = ['$http', '$log'];
+
+ function UserExistService($http, $log) {
+ return userExist;
+ function userExist(target, value) {
+ return $.ajax({
+ type: 'POST',
+ url: '/userExists',
+ async: false,
+ data: {'target': target, 'value': value}
+ });
+ }
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/services/user/services.user.module.js b/static/resources/js/services/user/services.user.module.js
new file mode 100644
index 000000000..36a9b9278
--- /dev/null
+++ b/static/resources/js/services/user/services.user.module.js
@@ -0,0 +1,22 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.services.user', []);
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/session/session.current-user.js b/static/resources/js/session/session.current-user.js
new file mode 100644
index 000000000..9e51af4cd
--- /dev/null
+++ b/static/resources/js/session/session.current-user.js
@@ -0,0 +1,47 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.session')
+ .controller('CurrentUserController', CurrentUserController);
+
+ CurrentUserController.$inject = ['$scope', 'CurrentUserService', 'currentUser', '$window', '$document'];
+
+ function CurrentUserController($scope, CurrentUserService, currentUser, $window, $document) {
+
+ var vm = this;
+
+ CurrentUserService()
+ .then(getCurrentUserComplete)
+ .catch(getCurrentUserFailed);
+
+ function getCurrentUserComplete(response) {
+ if(angular.isDefined(response)) {
+ currentUser.set(response.data);
+ if(location.pathname === '/') {
+ $window.location.href = '/dashboard';
+ }
+ }
+ }
+
+ function getCurrentUserFailed(e){
+ console.log('No session of current user.');
+ }
+ }
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/session/session.module.js b/static/resources/js/session/session.module.js
new file mode 100644
index 000000000..8158793bd
--- /dev/null
+++ b/static/resources/js/session/session.module.js
@@ -0,0 +1,24 @@
+/*
+ Copyright (c) 2016 VMware, Inc. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+(function() {
+
+ 'use strict';
+
+ angular
+ .module('harbor.session', [
+ 'harbor.services.user'
+ ]);
+
+})();
\ No newline at end of file
diff --git a/static/resources/js/sign-in.js b/static/resources/js/sign-in.js
deleted file mode 100644
index 2aaa24c5f..000000000
--- a/static/resources/js/sign-in.js
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- Copyright (c) 2016 VMware, Inc. All Rights Reserved.
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*/
-jQuery(function(){
-
- new AjaxUtil({
- url: "/api/users/current",
- type: "get",
- success: function(data, status, xhr){
- if(xhr && xhr.status == 200){
- document.location = "/registry/project";
- }
- },
- error: function(jqxhr){
- return false;
- }
- }).exec();
-
- $(document).on("keydown", function(e){
- if(e.keyCode == 13){
- e.preventDefault();
- if($("#Principal").is(":focus") || $("#Password").is(":focus") || $("#btnPageSignIn").is(":focus")){
- $("#btnPageSignIn").trigger("click");
- }
- }
- });
- $("#btnForgot").on("click", function(){
- document.location = "/forgotPassword";
- });
-
- $("#btnPageSignIn").on("click", function(){
-
- var principal = $.trim($("#Principal").val());
- var password = $.trim($("#Password").val());
-
- if($.trim(principal).length <= 0 || $.trim(password).length <= 0) {
- $("#dlgModal").dialogModal({"title": i18n.getMessage("title_login_failed"), "content": i18n.getMessage("input_your_username_and_password")});
- return;
- }
-
- $.ajax({
- url:'/login',
- data: {principal: principal, password: password},
- type: "post",
- success: function(jqXhr, status){
- var lastUri = location.search;
- if(lastUri != "" && lastUri.indexOf("=") > 0){
- document.location = decodeURIComponent(lastUri.split("=")[1]);
- }else{
- document.location = "/registry/project";
- }
- },
- error: function(jqXhr){
- var i18nKey = "";
- if(jqXhr.status == 500){
- i18nKey = "internal_error";
- }else{
- i18nKey = "check_your_username_or_password"
- }
- $("#dlgModal")
- .dialogModal({
- "title": i18n.getMessage("title_login_failed"),
- "content": i18n.getMessage(i18nKey)
- });
- }
- });
- });
-});
\ No newline at end of file
diff --git a/static/resources/js/validate-options.js b/static/resources/js/validate-options.js
deleted file mode 100644
index 492366ca7..000000000
--- a/static/resources/js/validate-options.js
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- Copyright (c) 2016 VMware, Inc. All Rights Reserved.
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*/
-var validateOptions = {
- "Result" : [],
- "Items" : [],
- "Validate": function(callback){
- for(var i = 0; i < this.Items.length; i++){
- if(validateCallback(this.Items[i]) == false){
- return false;
- }
- }
- callback();
- },
- "Username" :{
- "Required": { "value" : true, "errMsg" : i18n.getMessage("username_is_required")},
- "CheckExist": { "value" : function(value){
- var result = true;
- $.ajax({
- url: "/userExists",
- data: {"target": "username", "value" : value},
- dataType: "json",
- type: "post",
- async: false,
- success: function(data){
- result = data;
- }
- });
- return result;
- }, "errMsg" : i18n.getMessage("username_has_been_taken")},
- "MaxLength": {"value" : 20, "errMsg" : i18n.getMessage("username_is_too_long")},
- "IllegalChar": {"value": [",","~","#", "$", "%"] , "errMsg": i18n.getMessage("username_contains_illegal_chars")}
- },
- "Email" :{
- "Required": { "value" : true, "errMsg" : i18n.getMessage("email_is_required")},
- "RegExp": {"value": /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/,
- "errMsg": i18n.getMessage("email_contains_illegal_chars")},
- "CheckExist": { "value" : function(value){
- var result = true;
- $.ajax({
- url: "/userExists",
- data: {"target": "email", "value": value},
- dataType: "json",
- type: "post",
- async: false,
- success: function(data){
- result = data;
- }
- });
- return result;
- }, "errMsg" : i18n.getMessage("email_has_been_taken")}
- },
- "EmailF" :{
- "Required": { "value" : true, "errMsg" : i18n.getMessage("email_is_required")},
- "RegExp": {"value": /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/,
- "errMsg": i18n.getMessage("email_content_illegal")},
- "CheckIfNotExist": { "value" : function(value){
- var result = true;
- $.ajax({
- url: "/userExists",
- data: {"target": "email", "value": value},
- dataType: "json",
- type: "post",
- async: false,
- success: function(data){
- result = data;
- }
- });
- return result;
- }, "errMsg" : i18n.getMessage("email_does_not_exist")}
- },
- "Realname" :{
- "Required": { "value" : true, "errMsg" : i18n.getMessage("realname_is_required")},
- "MaxLength": {"value" : 20, "errMsg" : i18n.getMessage("realname_is_too_long")},
- "IllegalChar": {"value": [",","~","#", "$", "%"] , "errMsg": i18n.getMessage("realname_contains_illegal_chars")}
- },
- "OldPassword" :{
- "Required": { "value" : true, "errMsg" : i18n.getMessage("password_is_required")}
- },
- "Password" :{
- "Required": { "value" : true, "errMsg" : i18n.getMessage("password_is_required")},
- "RegExp": {"value" : /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?!.*\s).{7,20}$/, "errMsg" : i18n.getMessage("password_is_invalid")},
- "MaxLength": {"value" : 20, "errMsg" : i18n.getMessage("password_is_too_long")}
- },
- "ConfirmedPassword" :{
- "CompareWith": {"value" : "#Password", "errMsg" : i18n.getMessage("password_does_not_match")},
- "RegExp": {"value" : /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?!.*\s).{7,20}$/, "errMsg" : i18n.getMessage("password_is_invalid")}
- },
- "Comment" :{
- "MaxLength": {"value" : 20, "errMsg" : i18n.getMessage("comment_is_too_long")},
- "IllegalChar": {"value": [",","~","#", "$", "%"] , "errMsg": i18n.getMessage("comment_contains_illegal_chars")}
- },
- "projectName" :{
- "Required": { "value" : true, "errMsg" : i18n.getMessage("project_name_is_required")},
- "MinLength": {"value" : 4, "errMsg" : i18n.getMessage("project_name_is_too_short")},
- "MaxLength": {"value" : 30, "errMsg" : i18n.getMessage("project_name_is_too_long")},
- "IllegalChar": {"value": ["~","$","-", "\\", "[", "]", "{", "}", "(", ")", "&", "^", "%", "*", "<", ">", "\"", "'","/","?","@"] , "errMsg": i18n.getMessage("project_name_contains_illegal_chars")}
- }
-};
-function validateCallback(target){
-
- if (typeof target != "string"){
- target = this;
- }
-
- var isValid = true;
- var inputValue = $.trim($(target).val());
- var currentId = $(target).attr("id");
- var validateItem = validateOptions[currentId];
-
- var errMsg = "";
-
- for(var checkTitle in validateItem){
-
- var checkValue = validateItem[checkTitle].value;
-
- if(checkTitle == "Required" && checkValue && inputValue.length == 0){
- isValid = false;
- errMsg = validateItem[checkTitle].errMsg;
- break;
- }else if(checkTitle == "CheckOldPasswordIsCorrect" && checkValue(inputValue) == false){
- isValid = false;
- errMsg = validateItem[checkTitle].errMsg;
- break;
- }else if(checkTitle == "CheckExist" && checkValue(inputValue) == true){
- isValid = false;
- errMsg = validateItem[checkTitle].errMsg;
- break;
- }else if(checkTitle == "CheckIfNotExist" && checkValue(inputValue) == false){
- isValid = false;
- errMsg = validateItem[checkTitle].errMsg;
- break;
- }else if(checkTitle == "RegExp" && checkValue.test(inputValue) == false){
- isValid = false;
- errMsg = validateItem[checkTitle].errMsg;
- break;
- }else if(checkTitle == "MinLength" && inputValue.length < checkValue){
- isValid = false;
- errMsg = validateItem[checkTitle].errMsg;
- break;
- }else if(checkTitle == "MaxLength" && inputValue.length > checkValue){
- isValid = false;
- errMsg = validateItem[checkTitle].errMsg;
- break;
- }else if(checkTitle == "CompareWith" && $.trim($(checkValue).val()).length > 0 && inputValue != $.trim($(checkValue).val())){
- isValid = false;
- errMsg = validateItem[checkTitle].errMsg;
- break;
- }else if(checkTitle == "IllegalChar"){
- for(var i = 0; i < checkValue.length; i++){
- if(inputValue.indexOf(checkValue[i]) > -1){
- isValid = false;
- errMsg = validateItem[checkTitle].errMsg;
- }
- }
- break;
- }
- }
-
- if(isValid == false){
- $(target).parent().removeClass("has-success").addClass("has-error");
- $(target).siblings("span").removeClass("glyphicon-ok").addClass("glyphicon-warning-sign");
- $("#divErrMsg").css({"display": "block"});
- $("#divErrMsg").text(errMsg);
- }else {
- $(target).parent().removeClass("has-error").addClass("has-success");
- $(target).siblings("span").removeClass("glyphicon-warning-sign").addClass("glyphicon-ok");
- $("#divErrMsg").css({"display": "none"});
- }
- validateOptions.Result.push(isValid);
- return isValid;
-}
\ No newline at end of file
diff --git a/static/vendors/angularjs/angular-cookies.min.js b/static/vendors/angularjs/angular-cookies.min.js
new file mode 100644
index 000000000..38eec5bf3
--- /dev/null
+++ b/static/vendors/angularjs/angular-cookies.min.js
@@ -0,0 +1,9 @@
+/*
+ AngularJS v1.5.3
+ (c) 2010-2016 Google, Inc. http://angularjs.org
+ License: MIT
+*/
+(function(p,c,n){'use strict';function l(b,a,g){var d=g.baseHref(),k=b[0];return function(b,e,f){var g,h;f=f||{};h=f.expires;g=c.isDefined(f.path)?f.path:d;c.isUndefined(e)&&(h="Thu, 01 Jan 1970 00:00:00 GMT",e="");c.isString(h)&&(h=new Date(h));e=encodeURIComponent(b)+"="+encodeURIComponent(e);e=e+(g?";path="+g:"")+(f.domain?";domain="+f.domain:"");e+=h?";expires="+h.toUTCString():"";e+=f.secure?";secure":"";f=e.length+1;4096 4096 bytes)!");k.cookie=e}}c.module("ngCookies",["ng"]).provider("$cookies",[function(){var b=this.defaults={};this.$get=["$$cookieReader","$$cookieWriter",function(a,g){return{get:function(d){return a()[d]},getObject:function(d){return(d=this.get(d))?c.fromJson(d):d},getAll:function(){return a()},put:function(d,a,m){g(d,a,m?c.extend({},b,m):b)},putObject:function(d,b,a){this.put(d,c.toJson(b),a)},remove:function(a,k){g(a,n,k?c.extend({},b,k):b)}}}]}]);c.module("ngCookies").factory("$cookieStore",
+["$cookies",function(b){return{get:function(a){return b.getObject(a)},put:function(a,c){b.putObject(a,c)},remove:function(a){b.remove(a)}}}]);l.$inject=["$document","$log","$browser"];c.module("ngCookies").provider("$$cookieWriter",function(){this.$get=l})})(window,window.angular);
+//# sourceMappingURL=angular-cookies.min.js.map
diff --git a/static/vendors/angularjs/angular-messages.min.js b/static/vendors/angularjs/angular-messages.min.js
new file mode 100644
index 000000000..e3094439e
--- /dev/null
+++ b/static/vendors/angularjs/angular-messages.min.js
@@ -0,0 +1,12 @@
+/*
+ AngularJS v1.5.3
+ (c) 2010-2016 Google, Inc. http://angularjs.org
+ License: MIT
+*/
+(function(A,d,B){'use strict';function p(){return["$animate",function(w){return{restrict:"AE",transclude:"element",priority:1,terminal:!0,require:"^^ngMessages",link:function(n,l,a,c,m){var k=l[0],f,q=a.ngMessage||a.when;a=a.ngMessageExp||a.whenExp;var d=function(a){f=a?x(a)?a:a.split(/[\s,]+/):null;c.reRender()};a?(d(n.$eval(a)),n.$watchCollection(a,d)):d(q);var e,r;c.register(k,r={test:function(a){var g=f;a=g?x(g)?0<=g.indexOf(a):g.hasOwnProperty(a):void 0;return a},attach:function(){e||m(n,function(a){w.enter(a,
+null,l);e=a;var g=e.$$attachId=c.getAttachId();e.on("$destroy",function(){e&&e.$$attachId===g&&(c.deregister(k),r.detach())})})},detach:function(){if(e){var a=e;e=null;w.leave(a)}}})}}}]}var x=d.isArray,t=d.forEach,y=d.isString,z=d.element;d.module("ngMessages",[]).directive("ngMessages",["$animate",function(d){function n(a,c){return y(c)&&0===c.length||l(a.$eval(c))}function l(a){return y(a)?a.length:!!a}return{require:"ngMessages",restrict:"AE",controller:["$element","$scope","$attrs",function(a,
+c,m){function k(a,c){for(var b=c,f=[];b&&b!==a;){var h=b.$$ngMessageNode;if(h&&h.length)return e[h];b.childNodes.length&&-1==f.indexOf(b)?(f.push(b),b=b.childNodes[b.childNodes.length-1]):b.previousSibling?b=b.previousSibling:(b=b.parentNode,f.push(b))}}var f=this,q=0,p=0;this.getAttachId=function(){return p++};var e=this.messages={},r,s;this.render=function(g){g=g||{};r=!1;s=g;for(var e=n(c,m.ngMessagesMultiple)||n(c,m.multiple),b=[],q={},h=f.head,k=!1,p=0;null!=h;){p++;var u=h.message,v=!1;k||t(g,
+function(a,b){!v&&l(a)&&u.test(b)&&!q[b]&&(v=q[b]=!0,u.attach())});v?k=!e:b.push(u);h=h.next}t(b,function(a){a.detach()});b.length!==p?d.setClass(a,"ng-active","ng-inactive"):d.setClass(a,"ng-inactive","ng-active")};c.$watchCollection(m.ngMessages||m["for"],f.render);a.on("$destroy",function(){t(e,function(a){a.message.detach()})});this.reRender=function(){r||(r=!0,c.$evalAsync(function(){r&&s&&f.render(s)}))};this.register=function(g,c){var b=q.toString();e[b]={message:c};var d=a[0],h=e[b];f.head?
+(d=k(d,g))?(h.next=d.next,d.next=h):(h.next=f.head,f.head=h):f.head=h;g.$$ngMessageNode=b;q++;f.reRender()};this.deregister=function(c){var d=c.$$ngMessageNode;delete c.$$ngMessageNode;var b=e[d];(c=k(a[0],c))?c.next=b.next:f.head=b.next;delete e[d];f.reRender()}}]}}]).directive("ngMessagesInclude",["$templateRequest","$document","$compile",function(d,n,l){return{restrict:"AE",require:"^^ngMessages",link:function(a,c,m){var k=m.ngMessagesInclude||m.src;d(k).then(function(d){l(d)(a,function(a){c.after(a);
+a=l.$$createComment?l.$$createComment("ngMessagesInclude",k):n[0].createComment(" ngMessagesInclude: "+k+" ");a=z(a);c.after(a);c.remove()})})}}}]).directive("ngMessage",p()).directive("ngMessageExp",p())})(window,window.angular);
+//# sourceMappingURL=angular-messages.min.js.map
diff --git a/static/vendors/angularjs/angular.min.js b/static/vendors/angularjs/angular.min.js
new file mode 100644
index 000000000..ecdf96736
--- /dev/null
+++ b/static/vendors/angularjs/angular.min.js
@@ -0,0 +1,311 @@
+/*
+ AngularJS v1.5.3
+ (c) 2010-2016 Google, Inc. http://angularjs.org
+ License: MIT
+*/
+(function(T,P,u){'use strict';function O(a){return function(){var b=arguments[0],d;d="["+(a?a+":":"")+b+"] http://errors.angularjs.org/1.5.3/"+(a?a+"/":"")+b;for(b=1;b").append(a).html();try{return a[0].nodeType===Pa?N(d):d.match(/^(<[^>]+>)/)[1].replace(/^<([\w\-]+)/,function(a,b){return"<"+N(b)})}catch(c){return N(d)}}function wc(a){try{return decodeURIComponent(a)}catch(b){}}
+function xc(a){var b={};q((a||"").split("&"),function(a){var c,e,f;a&&(e=a=a.replace(/\+/g,"%20"),c=a.indexOf("="),-1!==c&&(e=a.substring(0,c),f=a.substring(c+1)),e=wc(e),A(e)&&(f=A(f)?wc(f):!0,va.call(b,e)?M(b[e])?b[e].push(f):b[e]=[b[e],f]:b[e]=f))});return b}function Sb(a){var b=[];q(a,function(a,c){M(a)?q(a,function(a){b.push(ja(c,!0)+(!0===a?"":"="+ja(a,!0)))}):b.push(ja(c,!0)+(!0===a?"":"="+ja(a,!0)))});return b.length?b.join("&"):""}function rb(a){return ja(a,!0).replace(/%26/gi,"&").replace(/%3D/gi,
+"=").replace(/%2B/gi,"+")}function ja(a,b){return encodeURIComponent(a).replace(/%40/gi,"@").replace(/%3A/gi,":").replace(/%24/g,"$").replace(/%2C/gi,",").replace(/%3B/gi,";").replace(/%20/g,b?"%20":"+")}function ce(a,b){var d,c,e=Qa.length;for(c=0;c/,">"));}b=b||[];b.unshift(["$provide",function(b){b.value("$rootElement",a)}]);d.debugInfoEnabled&&b.push(["$compileProvider",function(a){a.debugInfoEnabled(!0)}]);b.unshift("ng");c=eb(b,d.strictDi);c.invoke(["$rootScope",
+"$rootElement","$compile","$injector",function(a,b,c,d){a.$apply(function(){b.data("$injector",d);c(b)(a)})}]);return c},e=/^NG_ENABLE_DEBUG_INFO!/,f=/^NG_DEFER_BOOTSTRAP!/;T&&e.test(T.name)&&(d.debugInfoEnabled=!0,T.name=T.name.replace(e,""));if(T&&!f.test(T.name))return c();T.name=T.name.replace(f,"");ea.resumeBootstrap=function(a){q(a,function(a){b.push(a)});return c()};D(ea.resumeDeferredBootstrap)&&ea.resumeDeferredBootstrap()}function ee(){T.name="NG_ENABLE_DEBUG_INFO!"+T.name;T.location.reload()}
+function fe(a){a=ea.element(a).injector();if(!a)throw Ba("test");return a.get("$$testability")}function zc(a,b){b=b||"_";return a.replace(ge,function(a,c){return(c?b:"")+a.toLowerCase()})}function he(){var a;if(!Ac){var b=sb();($=z(b)?T.jQuery:b?T[b]:u)&&$.fn.on?(H=$,S($.fn,{scope:Ra.scope,isolateScope:Ra.isolateScope,controller:Ra.controller,injector:Ra.injector,inheritedData:Ra.inheritedData}),a=$.cleanData,$.cleanData=function(b){for(var c,e=0,f;null!=(f=b[e]);e++)(c=$._data(f,"events"))&&c.$destroy&&
+$(f).triggerHandler("$destroy");a(b)}):H=U;ea.element=H;Ac=!0}}function tb(a,b,d){if(!a)throw Ba("areq",b||"?",d||"required");return a}function Sa(a,b,d){d&&M(a)&&(a=a[a.length-1]);tb(D(a),b,"not a function, got "+(a&&"object"===typeof a?a.constructor.name||"Object":typeof a));return a}function Ta(a,b){if("hasOwnProperty"===a)throw Ba("badname",b);}function Bc(a,b,d){if(!b)return a;b=b.split(".");for(var c,e=a,f=b.length,g=0;g")+c[2];for(c=c[0];c--;)d=d.lastChild;f=cb(f,d.childNodes);d=e.firstChild;d.textContent=""}else f.push(b.createTextNode(a));e.textContent="";e.innerHTML="";q(f,function(a){e.appendChild(a)});return e}function Mc(a,
+b){var d=a.parentNode;d&&d.replaceChild(b,a);b.appendChild(a)}function U(a){if(a instanceof U)return a;var b;y(a)&&(a=W(a),b=!0);if(!(this instanceof U)){if(b&&"<"!=a.charAt(0))throw Vb("nosel");return new U(a)}if(b){b=P;var d;a=(d=Lf.exec(a))?[b.createElement(d[1])]:(d=Lc(a,b))?d.childNodes:[]}Nc(this,a)}function Wb(a){return a.cloneNode(!0)}function xb(a,b){b||gb(a);if(a.querySelectorAll)for(var d=a.querySelectorAll("*"),c=0,e=d.length;c=Da?!1:"function"===typeof a&&/^(?:class\s|constructor\()/.test(Function.prototype.toString.call(a));return d?(c.unshift(null),new (Function.prototype.bind.apply(a,c))):a.apply(b,c)},instantiate:function(a,b,c){var d=M(a)?a[a.length-1]:a;a=e(a,b,c);a.unshift(null);return new (Function.prototype.bind.apply(d,a))},get:d,annotate:eb.$$annotate,has:function(b){return n.hasOwnProperty(b+
+"Provider")||a.hasOwnProperty(b)}}}b=!0===b;var k={},l=[],m=new Ua([],!0),n={$provide:{provider:d(c),factory:d(f),service:d(function(a,b){return f(a,["$injector",function(a){return a.instantiate(b)}])}),value:d(function(a,b){return f(a,da(b),!1)}),constant:d(function(a,b){Ta(a,"constant");n[a]=b;F[a]=b}),decorator:function(a,b){var c=p.get(a+"Provider"),d=c.$get;c.$get=function(){var a=x.invoke(d,c);return x.invoke(b,null,{$delegate:a})}}}},p=n.$injector=h(n,function(a,b){ea.isString(b)&&l.push(b);
+throw Ia("unpr",l.join(" <- "));}),F={},L=h(F,function(a,b){var c=p.get(a+"Provider",b);return x.invoke(c.$get,c,u,a)}),x=L;n.$injectorProvider={$get:da(L)};var r=g(a),x=L.get("$injector");x.strictDi=b;q(r,function(a){a&&x.invoke(a)});return x}function Ve(){var a=!0;this.disableAutoScrolling=function(){a=!1};this.$get=["$window","$location","$rootScope",function(b,d,c){function e(a){var b=null;Array.prototype.some.call(a,function(a){if("a"===oa(a))return b=a,!0});return b}function f(a){if(a){a.scrollIntoView();
+var c;c=g.yOffset;D(c)?c=c():Pb(c)?(c=c[0],c="fixed"!==b.getComputedStyle(c).position?0:c.getBoundingClientRect().bottom):R(c)||(c=0);c&&(a=a.getBoundingClientRect().top,b.scrollBy(0,a-c))}else b.scrollTo(0,0)}function g(a){a=y(a)?a:d.hash();var b;a?(b=h.getElementById(a))?f(b):(b=e(h.getElementsByName(a)))?f(b):"top"===a&&f(null):f(null)}var h=b.document;a&&c.$watch(function(){return d.hash()},function(a,b){a===b&&""===a||Nf(function(){c.$evalAsync(g)})});return g}]}function ib(a,b){if(!a&&!b)return"";
+if(!a)return b;if(!b)return a;M(a)&&(a=a.join(" "));M(b)&&(b=b.join(" "));return a+" "+b}function Wf(a){y(a)&&(a=a.split(" "));var b=V();q(a,function(a){a.length&&(b[a]=!0)});return b}function Ja(a){return J(a)?a:{}}function Xf(a,b,d,c){function e(a){try{a.apply(null,Aa.call(arguments,1))}finally{if(L--,0===L)for(;x.length;)try{x.pop()()}catch(b){d.error(b)}}}function f(){t=null;g();h()}function g(){r=G();r=z(r)?null:r;na(r,I)&&(r=I);I=r}function h(){if(v!==k.url()||w!==r)v=k.url(),w=r,q(C,function(a){a(k.url(),
+r)})}var k=this,l=a.location,m=a.history,n=a.setTimeout,p=a.clearTimeout,F={};k.isMock=!1;var L=0,x=[];k.$$completeOutstandingRequest=e;k.$$incOutstandingRequestCount=function(){L++};k.notifyWhenNoOutstandingRequests=function(a){0===L?a():x.push(a)};var r,w,v=l.href,Q=b.find("base"),t=null,G=c.history?function(){try{return m.state}catch(a){}}:E;g();w=r;k.url=function(b,d,e){z(e)&&(e=null);l!==a.location&&(l=a.location);m!==a.history&&(m=a.history);if(b){var f=w===e;if(v===b&&(!c.history||f))return k;
+var h=v&&Ka(v)===Ka(b);v=b;w=e;if(!c.history||h&&f){if(!h||t)t=b;d?l.replace(b):h?(d=l,e=b.indexOf("#"),e=-1===e?"":b.substr(e),d.hash=e):l.href=b;l.href!==b&&(t=b)}else m[d?"replaceState":"pushState"](e,"",b),g(),w=r;return k}return t||l.href.replace(/%27/g,"'")};k.state=function(){return r};var C=[],K=!1,I=null;k.onUrlChange=function(b){if(!K){if(c.history)H(a).on("popstate",f);H(a).on("hashchange",f);K=!0}C.push(b);return b};k.$$applicationDestroyed=function(){H(a).off("hashchange popstate",f)};
+k.$$checkUrlChange=h;k.baseHref=function(){var a=Q.attr("href");return a?a.replace(/^(https?\:)?\/\/[^\/]*/,""):""};k.defer=function(a,b){var c;L++;c=n(function(){delete F[c];e(a)},b||0);F[c]=!0;return c};k.defer.cancel=function(a){return F[a]?(delete F[a],p(a),e(E),!0):!1}}function bf(){this.$get=["$window","$log","$sniffer","$document",function(a,b,d,c){return new Xf(a,c,b,d)}]}function cf(){this.$get=function(){function a(a,c){function e(a){a!=n&&(p?p==a&&(p=a.n):p=a,f(a.n,a.p),f(a,n),n=a,n.n=
+null)}function f(a,b){a!=b&&(a&&(a.p=b),b&&(b.n=a))}if(a in b)throw O("$cacheFactory")("iid",a);var g=0,h=S({},c,{id:a}),k=V(),l=c&&c.capacity||Number.MAX_VALUE,m=V(),n=null,p=null;return b[a]={put:function(a,b){if(!z(b)){if(ll&&this.remove(p.key);return b}},get:function(a){if(l";b=la.firstChild.attributes;var d=b[0];b.removeNamedItem(d.name);
+d.value=c;a.attributes.setNamedItem(d)}function B(a,b){try{a.addClass(b)}catch(c){}}function ba(a,b,c,d,e){a instanceof H||(a=H(a));for(var f=/\S+/,g=0,h=a.length;g").append(a).html())):c?Ra.clone.call(a):a;if(g)for(var h in g)d.data("$"+h+"Controller",g[h].instance);ba.$$addScopeInfo(d,b);c&&c(d,b);l&&l(b,d,d,f);return d}}function xa(a,b,c,d,e,f){function g(a,c,d,e){var f,k,l,m,n,p,G;if(r)for(G=Array(c.length),m=0;mB.priority)break;if(y=B.scope)B.templateUrl||(J(y)?(X("new/isolated scope",C||G,B,t),C=B):X("new/isolated scope",C,B,t)),G=G||B;L=B.name;if(!Ea&&(B.replace&&(B.templateUrl||B.template)||B.transclude&&!B.$$tlb)){for(y=ra+1;Ea=a[y++];)if(Ea.transclude&&!Ea.$$tlb||Ea.replace&&(Ea.templateUrl||Ea.template)){E=!0;break}Ea=!0}!B.templateUrl&&
+B.controller&&(y=B.controller,v=v||V(),X("'"+L+"' controller",v[L],B,t),v[L]=B);if(y=B.transclude)if(K=!0,B.$$tlb||(X("transclusion",I,B,t),I=B),"element"==y)Ca=!0,p=B.priority,Q=t,t=d.$$element=H(ba.$$createComment(L,d[L])),b=t[0],da(f,Aa.call(Q,0),b),Q[0].$$parentNode=Q[0].parentNode,s=Zb(E,Q,e,p,g&&g.name,{nonTlbTranscludeDirective:I});else{var P=V();Q=H(Wb(b)).contents();if(J(y)){Q=[];var Z=V(),Y=V();q(y,function(a,b){var c="?"===a.charAt(0);a=c?a.substring(1):a;Z[a]=b;P[b]=null;Y[b]=c});q(t.contents(),
+function(a){var b=Z[ya(oa(a))];b?(Y[b]=!0,P[b]=P[b]||[],P[b].push(a)):Q.push(a)});q(Y,function(a,b){if(!a)throw ga("reqslot",b);});for(var $ in P)P[$]&&(P[$]=Zb(E,P[$],e))}t.empty();s=Zb(E,Q,e,u,u,{needsNewScope:B.$$isolateScope||B.$$newScope});s.$$slots=P}if(B.template)if(x=!0,X("template",w,B,t),w=B,y=D(B.template)?B.template(t,d):B.template,y=ua(y),B.replace){g=B;Q=Ub.test(y)?Xc(ca(B.templateNamespace,W(y))):[];b=Q[0];if(1!=Q.length||1!==b.nodeType)throw ga("tplrt",L,"");da(f,t,b);N={$attr:{}};
+y=A(b,[],N);var ea=a.splice(ra+1,a.length-(ra+1));(C||G)&&Yc(y,C,G);a=a.concat(y).concat(ea);U(d,N);N=a.length}else t.html(y);if(B.templateUrl)x=!0,X("template",w,B,t),w=B,B.replace&&(g=B),n=aa(a.splice(ra,a.length-ra),t,d,f,K&&s,h,k,{controllerDirectives:v,newScopeDirective:G!==B&&G,newIsolateScopeDirective:C,templateDirective:w,nonTlbTranscludeDirective:I}),N=a.length;else if(B.compile)try{xa=B.compile(t,d,s),D(xa)?m(null,xa,R,Fa):xa&&m(xa.pre,xa.post,R,Fa)}catch(fa){c(fa,wa(t))}B.terminal&&(n.terminal=
+!0,p=Math.max(p,B.priority))}n.scope=G&&!0===G.scope;n.transcludeOnThisElement=K;n.templateOnThisElement=x;n.transclude=s;l.hasElementTranscludeDirective=Ca;return n}function jb(a,b,c,d){var e;if(y(b)){var f=b.match(k);b=b.substring(f[0].length);var g=f[1]||f[3],f="?"===f[2];"^^"===g?c=c.parent():e=(e=d&&d[b])&&e.instance;if(!e){var h="$"+b+"Controller";e=g?c.inheritedData(h):c.data(h)}if(!e&&!f)throw ga("ctreq",b,a);}else if(M(b))for(e=[],g=0,f=b.length;gn.priority)&&-1!=n.restrict.indexOf(g)){l&&(n=Qb(n,{$$start:l,$$end:m}));if(!n.$$bindings){var v=n,C=n,w=n.name,B={isolateScope:null,bindToController:null};J(C.scope)&&(!0===C.bindToController?(B.bindToController=d(C.scope,w,!0),B.isolateScope={}):B.isolateScope=d(C.scope,w,!1));J(C.bindToController)&&(B.bindToController=d(C.bindToController,w,!0));if(J(B.bindToController)){var I=C.controller,K=C.controllerAs;if(!I)throw ga("noctrl",
+w);if(!Uc(I,K))throw ga("noident",w);}var x=v.$$bindings=B;J(x.isolateScope)&&(n.$$isolateBindings=x.isolateScope)}b.push(n);k=n}}catch(t){c(t)}}return k}function R(b){if(e.hasOwnProperty(b))for(var c=a.get(b+"Directive"),d=0,f=c.length;d"+b+"";return c.childNodes[0].childNodes;default:return b}}function ea(a,b){if("srcdoc"==b)return G.HTML;var c=oa(a);if("xlinkHref"==b||"form"==c&&"action"==b||"img"!=c&&("src"==b||"ngSrc"==b))return G.RESOURCE_URL}
+function fa(a,c,d,e,f){var g=ea(a,e);f=h[e]||f;var k=b(d,!0,g,f);if(k){if("multiple"===e&&"select"===oa(a))throw ga("selmulti",wa(a));c.push({priority:100,compile:function(){return{pre:function(a,c,h){c=h.$$observers||(h.$$observers=V());if(l.test(e))throw ga("nodomevents");var m=h[e];m!==d&&(k=m&&b(m,!0,g,f),d=m);k&&(h[e]=k(a),(c[e]||(c[e]=[])).$$inter=!0,(h.$$observers&&h.$$observers[e].$$scope||a).$watch(k,function(a,b){"class"===e&&a!=b?h.$updateClass(a,b):h.$set(e,a)}))}}}})}}function da(a,b,
+c){var d=b[0],e=b.length,f=d.parentNode,g,h;if(a)for(g=0,h=a.length;g=b)return a;for(;b--;)8===a[b].nodeType&&
+Yf.call(a,b,1);return a}function Uc(a,b){if(b&&y(b))return b;if(y(a)){var d=ad.exec(a);if(d)return d[3]}}function df(){var a={},b=!1;this.has=function(b){return a.hasOwnProperty(b)};this.register=function(b,c){Ta(b,"controller");J(b)?S(a,b):a[b]=c};this.allowGlobals=function(){b=!0};this.$get=["$injector","$window",function(d,c){function e(a,b,c,d){if(!a||!J(a.$scope))throw O("$controller")("noscp",d,b);a.$scope[b]=c}return function(f,g,h,k){var l,m,n;h=!0===h;k&&y(k)&&(n=k);if(y(f)){k=f.match(ad);
+if(!k)throw Zf("ctrlfmt",f);m=k[1];n=n||k[3];f=a.hasOwnProperty(m)?a[m]:Bc(g.$scope,m,!0)||(b?Bc(c,m,!0):u);Sa(f,m,!0)}if(h)return h=(M(f)?f[f.length-1]:f).prototype,l=Object.create(h||null),n&&e(g,n,l,m||f.name),S(function(){var a=d.invoke(f,l,g,m);a!==l&&(J(a)||D(a))&&(l=a,n&&e(g,n,l,m||f.name));return l},{instance:l,identifier:n});l=d.instantiate(f,g,m);n&&e(g,n,l,m||f.name);return l}}]}function ef(){this.$get=["$window",function(a){return H(a.document)}]}function ff(){this.$get=["$log",function(a){return function(b,
+d){a.error.apply(a,arguments)}}]}function $b(a){return J(a)?fa(a)?a.toISOString():db(a):a}function lf(){this.$get=function(){return function(a){if(!a)return"";var b=[];pc(a,function(a,c){null===a||z(a)||(M(a)?q(a,function(a){b.push(ja(c)+"="+ja($b(a)))}):b.push(ja(c)+"="+ja($b(a))))});return b.join("&")}}}function mf(){this.$get=function(){return function(a){function b(a,e,f){null===a||z(a)||(M(a)?q(a,function(a,c){b(a,e+"["+(J(a)?c:"")+"]")}):J(a)&&!fa(a)?pc(a,function(a,c){b(a,e+(f?"":"[")+c+(f?
+"":"]"))}):d.push(ja(e)+"="+ja($b(a))))}if(!a)return"";var d=[];b(a,"",!0);return d.join("&")}}}function ac(a,b){if(y(a)){var d=a.replace($f,"").trim();if(d){var c=b("Content-Type");(c=c&&0===c.indexOf(bd))||(c=(c=d.match(ag))&&bg[c[0]].test(d));c&&(a=uc(d))}}return a}function cd(a){var b=V(),d;y(a)?q(a.split("\n"),function(a){d=a.indexOf(":");var e=N(W(a.substr(0,d)));a=W(a.substr(d+1));e&&(b[e]=b[e]?b[e]+", "+a:a)}):J(a)&&q(a,function(a,d){var f=N(d),g=W(a);f&&(b[f]=b[f]?b[f]+", "+g:g)});return b}
+function dd(a){var b;return function(d){b||(b=cd(a));return d?(d=b[N(d)],void 0===d&&(d=null),d):b}}function ed(a,b,d,c){if(D(c))return c(a,b,d);q(c,function(c){a=c(a,b,d)});return a}function kf(){var a=this.defaults={transformResponse:[ac],transformRequest:[function(a){return J(a)&&"[object File]"!==ka.call(a)&&"[object Blob]"!==ka.call(a)&&"[object FormData]"!==ka.call(a)?db(a):a}],headers:{common:{Accept:"application/json, text/plain, */*"},post:ia(bc),put:ia(bc),patch:ia(bc)},xsrfCookieName:"XSRF-TOKEN",
+xsrfHeaderName:"X-XSRF-TOKEN",paramSerializer:"$httpParamSerializer"},b=!1;this.useApplyAsync=function(a){return A(a)?(b=!!a,this):b};var d=!0;this.useLegacyPromiseExtensions=function(a){return A(a)?(d=!!a,this):d};var c=this.interceptors=[];this.$get=["$httpBackend","$$cookieReader","$cacheFactory","$rootScope","$q","$injector",function(e,f,g,h,k,l){function m(b){function c(a){var b=S({},a);b.data=ed(a.data,a.headers,a.status,f.transformResponse);a=a.status;return 200<=a&&300>a?b:k.reject(b)}function e(a,
+b){var c,d={};q(a,function(a,e){D(a)?(c=a(b),null!=c&&(d[e]=c)):d[e]=a});return d}if(!J(b))throw O("$http")("badreq",b);if(!y(b.url))throw O("$http")("badreq",b.url);var f=S({method:"get",transformRequest:a.transformRequest,transformResponse:a.transformResponse,paramSerializer:a.paramSerializer},b);f.headers=function(b){var c=a.headers,d=S({},b.headers),f,g,h,c=S({},c.common,c[N(b.method)]);a:for(f in c){g=N(f);for(h in d)if(N(h)===g)continue a;d[f]=c[f]}return e(d,ia(b))}(b);f.method=vb(f.method);
+f.paramSerializer=y(f.paramSerializer)?l.get(f.paramSerializer):f.paramSerializer;var g=[function(b){var d=b.headers,e=ed(b.data,dd(d),u,b.transformRequest);z(e)&&q(d,function(a,b){"content-type"===N(b)&&delete d[b]});z(b.withCredentials)&&!z(a.withCredentials)&&(b.withCredentials=a.withCredentials);return n(b,e).then(c,c)},u],h=k.when(f);for(q(L,function(a){(a.request||a.requestError)&&g.unshift(a.request,a.requestError);(a.response||a.responseError)&&g.push(a.response,a.responseError)});g.length;){b=
+g.shift();var m=g.shift(),h=h.then(b,m)}d?(h.success=function(a){Sa(a,"fn");h.then(function(b){a(b.data,b.status,b.headers,f)});return h},h.error=function(a){Sa(a,"fn");h.then(null,function(b){a(b.data,b.status,b.headers,f)});return h}):(h.success=fd("success"),h.error=fd("error"));return h}function n(c,d){function g(a,c,d,e){function f(){l(c,a,d,e)}K&&(200<=a&&300>a?K.put(L,[a,c,cd(d),e]):K.remove(L));b?h.$applyAsync(f):(f(),h.$$phase||h.$apply())}function l(a,b,d,e){b=-1<=b?b:0;(200<=b&&300>b?G.resolve:
+G.reject)({data:a,status:b,headers:dd(d),config:c,statusText:e})}function n(a){l(a.data,a.status,ia(a.headers()),a.statusText)}function t(){var a=m.pendingRequests.indexOf(c);-1!==a&&m.pendingRequests.splice(a,1)}var G=k.defer(),C=G.promise,K,I,qa=c.headers,L=p(c.url,c.paramSerializer(c.params));m.pendingRequests.push(c);C.then(t,t);!c.cache&&!a.cache||!1===c.cache||"GET"!==c.method&&"JSONP"!==c.method||(K=J(c.cache)?c.cache:J(a.cache)?a.cache:F);K&&(I=K.get(L),A(I)?I&&D(I.then)?I.then(n,n):M(I)?
+l(I[1],I[0],ia(I[2]),I[3]):l(I,200,{},"OK"):K.put(L,C));z(I)&&((I=gd(c.url)?f()[c.xsrfCookieName||a.xsrfCookieName]:u)&&(qa[c.xsrfHeaderName||a.xsrfHeaderName]=I),e(c.method,L,d,g,qa,c.timeout,c.withCredentials,c.responseType));return C}function p(a,b){0=l&&(v.resolve(r),x(Q.$$intervalId),delete g[Q.$$intervalId]);w||a.$apply()},k);g[Q.$$intervalId]=v;return Q}var g={};f.cancel=function(a){return a&&a.$$intervalId in g?(g[a.$$intervalId].reject("canceled"),b.clearInterval(a.$$intervalId),
+delete g[a.$$intervalId],!0):!1};return f}]}function cc(a){a=a.split("/");for(var b=a.length;b--;)a[b]=rb(a[b]);return a.join("/")}function hd(a,b){var d=sa(a);b.$$protocol=d.protocol;b.$$host=d.hostname;b.$$port=Y(d.port)||dg[d.protocol]||null}function id(a,b){var d="/"!==a.charAt(0);d&&(a="/"+a);var c=sa(a);b.$$path=decodeURIComponent(d&&"/"===c.pathname.charAt(0)?c.pathname.substring(1):c.pathname);b.$$search=xc(c.search);b.$$hash=decodeURIComponent(c.hash);b.$$path&&"/"!=b.$$path.charAt(0)&&(b.$$path=
+"/"+b.$$path)}function la(a,b){if(0===b.indexOf(a))return b.substr(a.length)}function Ka(a){var b=a.indexOf("#");return-1==b?a:a.substr(0,b)}function kb(a){return a.replace(/(#.+)|#$/,"$1")}function dc(a,b,d){this.$$html5=!0;d=d||"";hd(a,this);this.$$parse=function(a){var d=la(b,a);if(!y(d))throw Fb("ipthprfx",a,b);id(d,this);this.$$path||(this.$$path="/");this.$$compose()};this.$$compose=function(){var a=Sb(this.$$search),d=this.$$hash?"#"+rb(this.$$hash):"";this.$$url=cc(this.$$path)+(a?"?"+a:"")+
+d;this.$$absUrl=b+this.$$url.substr(1)};this.$$parseLinkUrl=function(c,e){if(e&&"#"===e[0])return this.hash(e.slice(1)),!0;var f,g;A(f=la(a,c))?(g=f,g=A(f=la(d,f))?b+(la("/",f)||f):a+g):A(f=la(b,c))?g=b+f:b==c+"/"&&(g=b);g&&this.$$parse(g);return!!g}}function ec(a,b,d){hd(a,this);this.$$parse=function(c){var e=la(a,c)||la(b,c),f;z(e)||"#"!==e.charAt(0)?this.$$html5?f=e:(f="",z(e)&&(a=c,this.replace())):(f=la(d,e),z(f)&&(f=e));id(f,this);c=this.$$path;var e=a,g=/^\/[A-Z]:(\/.*)/;0===f.indexOf(e)&&
+(f=f.replace(e,""));g.exec(f)||(c=(f=g.exec(c))?f[1]:c);this.$$path=c;this.$$compose()};this.$$compose=function(){var b=Sb(this.$$search),e=this.$$hash?"#"+rb(this.$$hash):"";this.$$url=cc(this.$$path)+(b?"?"+b:"")+e;this.$$absUrl=a+(this.$$url?d+this.$$url:"")};this.$$parseLinkUrl=function(b,d){return Ka(a)==Ka(b)?(this.$$parse(b),!0):!1}}function jd(a,b,d){this.$$html5=!0;ec.apply(this,arguments);this.$$parseLinkUrl=function(c,e){if(e&&"#"===e[0])return this.hash(e.slice(1)),!0;var f,g;a==Ka(c)?
+f=c:(g=la(b,c))?f=a+d+g:b===c+"/"&&(f=b);f&&this.$$parse(f);return!!f};this.$$compose=function(){var b=Sb(this.$$search),e=this.$$hash?"#"+rb(this.$$hash):"";this.$$url=cc(this.$$path)+(b?"?"+b:"")+e;this.$$absUrl=a+d+this.$$url}}function Gb(a){return function(){return this[a]}}function kd(a,b){return function(d){if(z(d))return this[a];this[a]=b(d);this.$$compose();return this}}function pf(){var a="",b={enabled:!1,requireBase:!0,rewriteLinks:!0};this.hashPrefix=function(b){return A(b)?(a=b,this):
+a};this.html5Mode=function(a){return Oa(a)?(b.enabled=a,this):J(a)?(Oa(a.enabled)&&(b.enabled=a.enabled),Oa(a.requireBase)&&(b.requireBase=a.requireBase),Oa(a.rewriteLinks)&&(b.rewriteLinks=a.rewriteLinks),this):b};this.$get=["$rootScope","$browser","$sniffer","$rootElement","$window",function(d,c,e,f,g){function h(a,b,d){var e=l.url(),f=l.$$state;try{c.url(a,b,d),l.$$state=c.state()}catch(g){throw l.url(e),l.$$state=f,g;}}function k(a,b){d.$broadcast("$locationChangeSuccess",l.absUrl(),a,l.$$state,
+b)}var l,m;m=c.baseHref();var n=c.url(),p;if(b.enabled){if(!m&&b.requireBase)throw Fb("nobase");p=n.substring(0,n.indexOf("/",n.indexOf("//")+2))+(m||"/");m=e.history?dc:jd}else p=Ka(n),m=ec;var F=p.substr(0,Ka(p).lastIndexOf("/")+1);l=new m(p,F,"#"+a);l.$$parseLinkUrl(n,n);l.$$state=c.state();var q=/^\s*(javascript|mailto):/i;f.on("click",function(a){if(b.rewriteLinks&&!a.ctrlKey&&!a.metaKey&&!a.shiftKey&&2!=a.which&&2!=a.button){for(var e=H(a.target);"a"!==oa(e[0]);)if(e[0]===f[0]||!(e=e.parent())[0])return;
+var h=e.prop("href"),k=e.attr("href")||e.attr("xlink:href");J(h)&&"[object SVGAnimatedString]"===h.toString()&&(h=sa(h.animVal).href);q.test(h)||!h||e.attr("target")||a.isDefaultPrevented()||!l.$$parseLinkUrl(h,k)||(a.preventDefault(),l.absUrl()!=c.url()&&(d.$apply(),g.angular["ff-684208-preventDefault"]=!0))}});kb(l.absUrl())!=kb(n)&&c.url(l.absUrl(),!0);var x=!0;c.onUrlChange(function(a,b){z(la(F,a))?g.location.href=a:(d.$evalAsync(function(){var c=l.absUrl(),e=l.$$state,f;a=kb(a);l.$$parse(a);
+l.$$state=b;f=d.$broadcast("$locationChangeStart",a,c,b,e).defaultPrevented;l.absUrl()===a&&(f?(l.$$parse(c),l.$$state=e,h(c,!1,e)):(x=!1,k(c,e)))}),d.$$phase||d.$digest())});d.$watch(function(){var a=kb(c.url()),b=kb(l.absUrl()),f=c.state(),g=l.$$replace,m=a!==b||l.$$html5&&e.history&&f!==l.$$state;if(x||m)x=!1,d.$evalAsync(function(){var b=l.absUrl(),c=d.$broadcast("$locationChangeStart",b,a,l.$$state,f).defaultPrevented;l.absUrl()===b&&(c?(l.$$parse(a),l.$$state=f):(m&&h(b,g,f===l.$$state?null:
+l.$$state),k(a,f)))});l.$$replace=!1});return l}]}function qf(){var a=!0,b=this;this.debugEnabled=function(b){return A(b)?(a=b,this):a};this.$get=["$window",function(d){function c(a){a instanceof Error&&(a.stack?a=a.message&&-1===a.stack.indexOf(a.message)?"Error: "+a.message+"\n"+a.stack:a.stack:a.sourceURL&&(a=a.message+"\n"+a.sourceURL+":"+a.line));return a}function e(a){var b=d.console||{},e=b[a]||b.log||E;a=!1;try{a=!!e.apply}catch(k){}return a?function(){var a=[];q(arguments,function(b){a.push(c(b))});
+return e.apply(b,a)}:function(a,b){e(a,null==b?"":b)}}return{log:e("log"),info:e("info"),warn:e("warn"),error:e("error"),debug:function(){var c=e("debug");return function(){a&&c.apply(b,arguments)}}()}}]}function Wa(a,b){if("__defineGetter__"===a||"__defineSetter__"===a||"__lookupGetter__"===a||"__lookupSetter__"===a||"__proto__"===a)throw ca("isecfld",b);return a}function eg(a){return a+""}function ta(a,b){if(a){if(a.constructor===a)throw ca("isecfn",b);if(a.window===a)throw ca("isecwindow",b);if(a.children&&
+(a.nodeName||a.prop&&a.attr&&a.find))throw ca("isecdom",b);if(a===Object)throw ca("isecobj",b);}return a}function ld(a,b){if(a){if(a.constructor===a)throw ca("isecfn",b);if(a===fg||a===gg||a===hg)throw ca("isecff",b);}}function Hb(a,b){if(a&&(a===(0).constructor||a===(!1).constructor||a==="".constructor||a==={}.constructor||a===[].constructor||a===Function.constructor))throw ca("isecaf",b);}function ig(a,b){return"undefined"!==typeof a?a:b}function md(a,b){return"undefined"===typeof a?b:"undefined"===
+typeof b?a:a+b}function aa(a,b){var d,c;switch(a.type){case s.Program:d=!0;q(a.body,function(a){aa(a.expression,b);d=d&&a.expression.constant});a.constant=d;break;case s.Literal:a.constant=!0;a.toWatch=[];break;case s.UnaryExpression:aa(a.argument,b);a.constant=a.argument.constant;a.toWatch=a.argument.toWatch;break;case s.BinaryExpression:aa(a.left,b);aa(a.right,b);a.constant=a.left.constant&&a.right.constant;a.toWatch=a.left.toWatch.concat(a.right.toWatch);break;case s.LogicalExpression:aa(a.left,
+b);aa(a.right,b);a.constant=a.left.constant&&a.right.constant;a.toWatch=a.constant?[]:[a];break;case s.ConditionalExpression:aa(a.test,b);aa(a.alternate,b);aa(a.consequent,b);a.constant=a.test.constant&&a.alternate.constant&&a.consequent.constant;a.toWatch=a.constant?[]:[a];break;case s.Identifier:a.constant=!1;a.toWatch=[a];break;case s.MemberExpression:aa(a.object,b);a.computed&&aa(a.property,b);a.constant=a.object.constant&&(!a.computed||a.property.constant);a.toWatch=[a];break;case s.CallExpression:d=
+a.filter?!b(a.callee.name).$stateful:!1;c=[];q(a.arguments,function(a){aa(a,b);d=d&&a.constant;a.constant||c.push.apply(c,a.toWatch)});a.constant=d;a.toWatch=a.filter&&!b(a.callee.name).$stateful?c:[a];break;case s.AssignmentExpression:aa(a.left,b);aa(a.right,b);a.constant=a.left.constant&&a.right.constant;a.toWatch=[a];break;case s.ArrayExpression:d=!0;c=[];q(a.elements,function(a){aa(a,b);d=d&&a.constant;a.constant||c.push.apply(c,a.toWatch)});a.constant=d;a.toWatch=c;break;case s.ObjectExpression:d=
+!0;c=[];q(a.properties,function(a){aa(a.value,b);d=d&&a.value.constant;a.value.constant||c.push.apply(c,a.value.toWatch)});a.constant=d;a.toWatch=c;break;case s.ThisExpression:a.constant=!1;a.toWatch=[];break;case s.LocalsExpression:a.constant=!1,a.toWatch=[]}}function nd(a){if(1==a.length){a=a[0].expression;var b=a.toWatch;return 1!==b.length?b:b[0]!==a?b:u}}function od(a){return a.type===s.Identifier||a.type===s.MemberExpression}function pd(a){if(1===a.body.length&&od(a.body[0].expression))return{type:s.AssignmentExpression,
+left:a.body[0].expression,right:{type:s.NGValueParameter},operator:"="}}function qd(a){return 0===a.body.length||1===a.body.length&&(a.body[0].expression.type===s.Literal||a.body[0].expression.type===s.ArrayExpression||a.body[0].expression.type===s.ObjectExpression)}function rd(a,b){this.astBuilder=a;this.$filter=b}function sd(a,b){this.astBuilder=a;this.$filter=b}function Ib(a){return"constructor"==a}function fc(a){return D(a.valueOf)?a.valueOf():jg.call(a)}function rf(){var a=V(),b=V(),d={"true":!0,
+"false":!1,"null":null,undefined:u};this.addLiteral=function(a,b){d[a]=b};this.$get=["$filter",function(c){function e(d,e,g){var p,t,G;g=g||x;switch(typeof d){case "string":G=d=d.trim();var C=g?b:a;p=C[G];if(!p){":"===d.charAt(0)&&":"===d.charAt(1)&&(t=!0,d=d.substring(2));p=g?L:F;var K=new gc(p);p=(new hc(K,c,p)).parse(d);p.constant?p.$$watchDelegate=m:t?p.$$watchDelegate=p.literal?l:k:p.inputs&&(p.$$watchDelegate=h);g&&(p=f(p));C[G]=p}return n(p,e);case "function":return n(d,e);default:return n(E,
+e)}}function f(a){function b(c,d,e,f){var g=x;x=!0;try{return a(c,d,e,f)}finally{x=g}}if(!a)return a;b.$$watchDelegate=a.$$watchDelegate;b.assign=f(a.assign);b.constant=a.constant;b.literal=a.literal;for(var c=0;a.inputs&&c=this.promise.$$state.status&&
+d&&d.length&&a(function(){for(var a,e,f=0,g=d.length;f
+a)for(b in l++,f)va.call(e,b)||(v--,delete f[b])}else f!==e&&(f=e,l++);return l}}c.$stateful=!0;var d=this,e,f,h,k=1t&&(z=4-t,A[z]||(A[z]=[]),A[z].push({msg:D(a.exp)?"fn: "+(a.exp.name||a.exp.toString()):a.exp,newVal:g,oldVal:k}));else if(a===c){q=!1;break a}}catch(H){f(H)}if(!(p=F.$$watchersCount&&
+F.$$childHead||F!==this&&F.$$nextSibling))for(;F!==this&&!(p=F.$$nextSibling);)F=F.$parent}while(F=p);if((q||v.length)&&!t--)throw w.$$phase=null,d("infdig",b,A);}while(q||v.length);for(w.$$phase=null;u.length;)try{u.shift()()}catch(J){f(J)}},$destroy:function(){if(!this.$$destroyed){var a=this.$parent;this.$broadcast("$destroy");this.$$destroyed=!0;this===w&&h.$$applicationDestroyed();p(this,-this.$$watchersCount);for(var b in this.$$listenerCount)F(this,this.$$listenerCount[b],b);a&&a.$$childHead==
+this&&(a.$$childHead=this.$$nextSibling);a&&a.$$childTail==this&&(a.$$childTail=this.$$prevSibling);this.$$prevSibling&&(this.$$prevSibling.$$nextSibling=this.$$nextSibling);this.$$nextSibling&&(this.$$nextSibling.$$prevSibling=this.$$prevSibling);this.$destroy=this.$digest=this.$apply=this.$evalAsync=this.$applyAsync=E;this.$on=this.$watch=this.$watchGroup=function(){return E};this.$$listeners={};this.$$nextSibling=null;l(this)}},$eval:function(a,b){return g(a)(this,b)},$evalAsync:function(a,b){w.$$phase||
+v.length||h.defer(function(){v.length&&w.$digest()});v.push({scope:this,expression:g(a),locals:b})},$$postDigest:function(a){u.push(a)},$apply:function(a){try{n("$apply");try{return this.$eval(a)}finally{w.$$phase=null}}catch(b){f(b)}finally{try{w.$digest()}catch(c){throw f(c),c;}}},$applyAsync:function(a){function b(){c.$eval(a)}var c=this;a&&t.push(b);a=g(a);r()},$on:function(a,b){var c=this.$$listeners[a];c||(this.$$listeners[a]=c=[]);c.push(b);var d=this;do d.$$listenerCount[a]||(d.$$listenerCount[a]=
+0),d.$$listenerCount[a]++;while(d=d.$parent);var e=this;return function(){var d=c.indexOf(b);-1!==d&&(c[d]=null,F(e,1,a))}},$emit:function(a,b){var c=[],d,e=this,g=!1,h={name:a,targetScope:e,stopPropagation:function(){g=!0},preventDefault:function(){h.defaultPrevented=!0},defaultPrevented:!1},k=cb([h],arguments,1),l,m;do{d=e.$$listeners[a]||c;h.currentScope=e;l=0;for(m=d.length;lDa)throw ua("iequirks");var c=ia(ma);c.isEnabled=function(){return a};c.trustAs=d.trustAs;c.getTrusted=d.getTrusted;c.valueOf=d.valueOf;a||(c.trustAs=c.getTrusted=function(a,b){return b},
+c.valueOf=$a);c.parseAs=function(a,d){var e=b(d);return e.literal&&e.constant?e:b(d,function(b){return c.getTrusted(a,b)})};var e=c.parseAs,f=c.getTrusted,g=c.trustAs;q(ma,function(a,b){var d=N(b);c[fb("parse_as_"+d)]=function(b){return e(a,b)};c[fb("get_trusted_"+d)]=function(b){return f(a,b)};c[fb("trust_as_"+d)]=function(b){return g(a,b)}});return c}]}function xf(){this.$get=["$window","$document",function(a,b){var d={},c=!(a.chrome&&a.chrome.app&&a.chrome.app.runtime)&&a.history&&a.history.pushState,
+e=Y((/android (\d+)/.exec(N((a.navigator||{}).userAgent))||[])[1]),f=/Boxee/i.test((a.navigator||{}).userAgent),g=b[0]||{},h,k=/^(Moz|webkit|ms)(?=[A-Z])/,l=g.body&&g.body.style,m=!1,n=!1;if(l){for(var p in l)if(m=k.exec(p)){h=m[0];h=h.substr(0,1).toUpperCase()+h.substr(1);break}h||(h="WebkitOpacity"in l&&"webkit");m=!!("transition"in l||h+"Transition"in l);n=!!("animation"in l||h+"Animation"in l);!e||m&&n||(m=y(l.webkitTransition),n=y(l.webkitAnimation))}return{history:!(!c||4>e||f),hasEvent:function(a){if("input"===
+a&&11>=Da)return!1;if(z(d[a])){var b=g.createElement("div");d[a]="on"+a in b}return d[a]},csp:Ga(),vendorPrefix:h,transitions:m,animations:n,android:e}}]}function zf(){var a;this.httpOptions=function(b){return b?(a=b,this):a};this.$get=["$templateCache","$http","$q","$sce",function(b,d,c,e){function f(g,h){f.totalPendingRequests++;y(g)&&b.get(g)||(g=e.getTrustedResourceUrl(g));var k=d.defaults&&d.defaults.transformResponse;M(k)?k=k.filter(function(a){return a!==ac}):k===ac&&(k=null);return d.get(g,
+S({cache:b,transformResponse:k},a))["finally"](function(){f.totalPendingRequests--}).then(function(a){b.put(g,a.data);return a.data},function(a){if(!h)throw lg("tpload",g,a.status,a.statusText);return c.reject(a)})}f.totalPendingRequests=0;return f}]}function Af(){this.$get=["$rootScope","$browser","$location",function(a,b,d){return{findBindings:function(a,b,d){a=a.getElementsByClassName("ng-binding");var g=[];q(a,function(a){var c=ea.element(a).data("$binding");c&&q(c,function(c){d?(new RegExp("(^|\\s)"+
+ud(b)+"(\\s|\\||$)")).test(c)&&g.push(a):-1!=c.indexOf(b)&&g.push(a)})});return g},findModels:function(a,b,d){for(var g=["ng-","data-ng-","ng\\:"],h=0;hc&&(c=e),c+=+a.slice(e+1),a=a.substring(0,e)):0>c&&(c=a.length);for(e=0;a.charAt(e)==jc;e++);if(e==(g=a.length))d=[0],c=1;else{for(g--;a.charAt(g)==jc;)g--;c-=e;d=[];for(f=0;e<=g;e++,f++)d[f]=+a.charAt(e)}c>Ed&&(d=d.splice(0,Ed-1),b=c-1,c=1);return{d:d,e:b,i:c}}function tg(a,b,d,c){var e=a.d,f=e.length-a.i;b=z(b)?Math.min(Math.max(d,f),c):+b;d=b+a.i;c=e[d];if(0d-1){for(c=0;c>d;c--)e.unshift(0),a.i++;e.unshift(1);a.i++}else e[d-1]++;for(;fh;)k.unshift(0),h++;0=b.lgSize&&h.unshift(k.splice(-b.lgSize).join(""));k.length>b.gSize;)h.unshift(k.splice(-b.gSize).join(""));k.length&&h.unshift(k.join(""));k=h.join(d);f.length&&(k+=c+f.join(""));e&&(k+="e+"+e)}return 0>a&&!g?b.negPre+k+b.negSuf:b.posPre+k+b.posSuf}function Jb(a,b,d,c){var e="";if(0>a||c&&0>=a)c?a=-a+1:(a=-a,e="-");for(a=""+a;a.length-d)f+=d;0===f&&-12==d&&(f=12);return Jb(f,b,c,e)}}function lb(a,b,d){return function(c,e){var f=c["get"+a](),g=vb((d?"STANDALONE":"")+(b?"SHORT":"")+a);return e[g][f]}}function Fd(a){var b=(new Date(a,0,1)).getDay();return new Date(a,0,(4>=b?5:12)-b)}function Gd(a){return function(b){var d=Fd(b.getFullYear());b=+new Date(b.getFullYear(),b.getMonth(),b.getDate()+(4-b.getDay()))-+d;b=1+Math.round(b/6048E5);return Jb(b,a)}}function kc(a,b){return 0>=a.getFullYear()?
+b.ERAS[0]:b.ERAS[1]}function zd(a){function b(a){var b;if(b=a.match(d)){a=new Date(0);var f=0,g=0,h=b[8]?a.setUTCFullYear:a.setFullYear,k=b[8]?a.setUTCHours:a.setHours;b[9]&&(f=Y(b[9]+b[10]),g=Y(b[9]+b[11]));h.call(a,Y(b[1]),Y(b[2])-1,Y(b[3]));f=Y(b[4]||0)-f;g=Y(b[5]||0)-g;h=Y(b[6]||0);b=Math.round(1E3*parseFloat("0."+(b[7]||0)));k.call(a,f,g,h,b)}return a}var d=/^(\d{4})-?(\d\d)-?(\d\d)(?:T(\d\d)(?::?(\d\d)(?::?(\d\d)(?:\.(\d+))?)?)?(Z|([+-])(\d\d):?(\d\d))?)?$/;return function(c,d,f){var g="",h=
+[],k,l;d=d||"mediumDate";d=a.DATETIME_FORMATS[d]||d;y(c)&&(c=ug.test(c)?Y(c):b(c));R(c)&&(c=new Date(c));if(!fa(c)||!isFinite(c.getTime()))return c;for(;d;)(l=vg.exec(d))?(h=cb(h,l,1),d=h.pop()):(h.push(d),d=null);var m=c.getTimezoneOffset();f&&(m=vc(f,m),c=Rb(c,f,!0));q(h,function(b){k=wg[b];g+=k?k(c,a.DATETIME_FORMATS,m):"''"===b?"'":b.replace(/(^'|'$)/g,"").replace(/''/g,"'")});return g}}function ng(){return function(a,b){z(b)&&(b=2);return db(a,b)}}function og(){return function(a,b,d){b=Infinity===
+Math.abs(Number(b))?Number(b):Y(b);if(isNaN(b))return a;R(a)&&(a=a.toString());if(!M(a)&&!y(a))return a;d=!d||isNaN(d)?0:Y(d);d=0>d?Math.max(0,a.length+d):d;return 0<=b?a.slice(d,d+b):0===d?a.slice(b,a.length):a.slice(Math.max(0,d+b),d)}}function Bd(a){function b(b,d){d=d?-1:1;return b.map(function(b){var c=1,h=$a;if(D(b))h=b;else if(y(b)){if("+"==b.charAt(0)||"-"==b.charAt(0))c="-"==b.charAt(0)?-1:1,b=b.substring(1);if(""!==b&&(h=a(b),h.constant))var k=h(),h=function(a){return a[k]}}return{get:h,
+descending:c*d}})}function d(a){switch(typeof a){case "number":case "boolean":case "string":return!0;default:return!1}}return function(a,e,f){if(null==a)return a;if(!za(a))throw O("orderBy")("notarray",a);M(e)||(e=[e]);0===e.length&&(e=["+"]);var g=b(e,f);g.push({get:function(){return{}},descending:f?-1:1});a=Array.prototype.map.call(a,function(a,b){return{value:a,predicateValues:g.map(function(c){var e=c.get(a);c=typeof e;if(null===e)c="string",e="null";else if("string"===c)e=e.toLowerCase();else if("object"===
+c)a:{if("function"===typeof e.valueOf&&(e=e.valueOf(),d(e)))break a;if(rc(e)&&(e=e.toString(),d(e)))break a;e=b}return{value:e,type:c}})}});a.sort(function(a,b){for(var c=0,d=0,e=g.length;db||37<=b&&40>=b||
+m(a,this,this.value)});if(e.hasEvent("paste"))b.on("paste cut",m)}b.on("change",l);if(Jd[g]&&c.$$hasNativeValidators&&g===d.type)b.on("keydown wheel mousedown",function(a){if(!k){var b=this.validity,c=b.badInput,d=b.typeMismatch;k=f.defer(function(){k=null;b.badInput===c&&b.typeMismatch===d||l(a)})}});c.$render=function(){var a=c.$isEmpty(c.$viewValue)?"":c.$viewValue;b.val()!==a&&b.val(a)}}function Mb(a,b){return function(d,c){var e,f;if(fa(d))return d;if(y(d)){'"'==d.charAt(0)&&'"'==d.charAt(d.length-
+1)&&(d=d.substring(1,d.length-1));if(xg.test(d))return new Date(d);a.lastIndex=0;if(e=a.exec(d))return e.shift(),f=c?{yyyy:c.getFullYear(),MM:c.getMonth()+1,dd:c.getDate(),HH:c.getHours(),mm:c.getMinutes(),ss:c.getSeconds(),sss:c.getMilliseconds()/1E3}:{yyyy:1970,MM:1,dd:1,HH:0,mm:0,ss:0,sss:0},q(e,function(a,c){c=x};g.$observe("min",function(a){x=
+p(a);h.$validate()})}if(A(g.max)||g.ngMax){var r;h.$validators.max=function(a){return!n(a)||z(r)||d(a)<=r};g.$observe("max",function(a){r=p(a);h.$validate()})}}}function Kd(a,b,d,c){(c.$$hasNativeValidators=J(b[0].validity))&&c.$parsers.push(function(a){var c=b.prop("validity")||{};return c.badInput||c.typeMismatch?u:a})}function Ld(a,b,d,c,e){if(A(c)){a=a(c);if(!a.constant)throw ob("constexpr",d,c);return a(b)}return e}function mc(a,b){a="ngClass"+a;return["$animate",function(d){function c(a,b){var c=
+[],d=0;a:for(;d(?:<\/\1>|)$/,Ub=/<|&#?\w+;/,Jf=/<([\w:-]+)/,Kf=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,ha={option:[1,'"],thead:[1,"
","
"],col:[2,
+"
","
"],tr:[2,"
","
"],td:[3,"
","
"],_default:[0,"",""]};ha.optgroup=ha.option;ha.tbody=ha.tfoot=ha.colgroup=ha.caption=ha.thead;ha.th=ha.td;var Rf=Node.prototype.contains||function(a){return!!(this.compareDocumentPosition(a)&16)},Ra=U.prototype={ready:function(a){function b(){d||(d=!0,a())}var d=!1;"complete"===P.readyState?setTimeout(b):(this.on("DOMContentLoaded",b),U(T).on("load",b))},toString:function(){var a=
+[];q(this,function(b){a.push(""+b)});return"["+a.join(", ")+"]"},eq:function(a){return 0<=a?H(this[a]):H(this[this.length+a])},length:0,push:zg,sort:[].sort,splice:[].splice},Eb={};q("multiple selected checked disabled readOnly required open".split(" "),function(a){Eb[N(a)]=a});var Sc={};q("input select option textarea button form details".split(" "),function(a){Sc[a]=!0});var $c={ngMinlength:"minlength",ngMaxlength:"maxlength",ngMin:"min",ngMax:"max",ngPattern:"pattern"};q({data:Xb,removeData:gb,
+hasData:function(a){for(var b in hb[a.ng339])return!0;return!1},cleanData:function(a){for(var b=0,d=a.length;b/,Uf=/^[^\(]*\(\s*([^\)]*)\)/m,Ag=/,/,Bg=/^\s*(_?)(\S+?)\1\s*$/,Sf=/((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg,Ia=O("$injector");eb.$$annotate=function(a,b,d){var c;if("function"===typeof a){if(!(c=a.$inject)){c=[];if(a.length){if(b)throw y(d)&&d||(d=a.name||Vf(a)),Ia("strictdi",d);b=Tc(a);q(b[1].split(Ag),function(a){a.replace(Bg,function(a,b,d){c.push(d)})})}a.$inject=c}}else M(a)?
+(b=a.length-1,Sa(a[b],"fn"),c=a.slice(0,b)):Sa(a,"fn",!0);return c};var Pd=O("$animate"),Ye=function(){this.$get=E},Ze=function(){var a=new Ua,b=[];this.$get=["$$AnimateRunner","$rootScope",function(d,c){function e(a,b,c){var d=!1;b&&(b=y(b)?b.split(" "):M(b)?b:[],q(b,function(b){b&&(d=!0,a[b]=c)}));return d}function f(){q(b,function(b){var c=a.get(b);if(c){var d=Wf(b.attr("class")),e="",f="";q(c,function(a,b){a!==!!d[b]&&(a?e+=(e.length?" ":"")+b:f+=(f.length?" ":"")+b)});q(b,function(a){e&&Cb(a,
+e);f&&Bb(a,f)});a.remove(b)}});b.length=0}return{enabled:E,on:E,off:E,pin:E,push:function(g,h,k,l){l&&l();k=k||{};k.from&&g.css(k.from);k.to&&g.css(k.to);if(k.addClass||k.removeClass)if(h=k.addClass,l=k.removeClass,k=a.get(g)||{},h=e(k,h,!0),l=e(k,l,!1),h||l)a.put(g,k),b.push(g),1===b.length&&c.$$postDigest(f);g=new d;g.complete();return g}}}]},We=["$provide",function(a){var b=this;this.$$registeredAnimations=Object.create(null);this.register=function(d,c){if(d&&"."!==d.charAt(0))throw Pd("notcsel",
+d);var e=d+"-animation";b.$$registeredAnimations[d.substr(1)]=e;a.factory(e,c)};this.classNameFilter=function(a){if(1===arguments.length&&(this.$$classNameFilter=a instanceof RegExp?a:null)&&/(\s+|\/)ng-animate(\s+|\/)/.test(this.$$classNameFilter.toString()))throw Pd("nongcls","ng-animate");return this.$$classNameFilter};this.$get=["$$animateQueue",function(a){function b(a,c,d){if(d){var h;a:{for(h=0;h <= >= && || ! = |".split(" "),function(a){Nb[a]=!0});var Fg={n:"\n",f:"\f",r:"\r",t:"\t",v:"\v","'":"'",'"':'"'},gc=function(a){this.options=a};gc.prototype={constructor:gc,lex:function(a){this.text=a;this.index=0;for(this.tokens=
+[];this.index=a&&"string"===typeof a},isWhitespace:function(a){return" "===a||"\r"===a||"\t"===a||"\n"===a||"\v"===a||"\u00a0"===a},isIdent:function(a){return"a"<=a&&"z">=a||"A"<=a&&"Z">=a||"_"===a||"$"===a},isExpOperator:function(a){return"-"===
+a||"+"===a||this.isNumber(a)},throwError:function(a,b,d){d=d||this.index;b=A(b)?"s "+b+"-"+this.index+" ["+this.text.substring(b,d)+"]":" "+d;throw ca("lexerr",a,b,this.text);},readNumber:function(){for(var a="",b=this.index;this.index","<=",">=");)a={type:s.BinaryExpression,
+operator:b.text,left:a,right:this.additive()};return a},additive:function(){for(var a=this.multiplicative(),b;b=this.expect("+","-");)a={type:s.BinaryExpression,operator:b.text,left:a,right:this.multiplicative()};return a},multiplicative:function(){for(var a=this.unary(),b;b=this.expect("*","/","%");)a={type:s.BinaryExpression,operator:b.text,left:a,right:this.unary()};return a},unary:function(){var a;return(a=this.expect("+","-","!"))?{type:s.UnaryExpression,operator:a.text,prefix:!0,argument:this.unary()}:
+this.primary()},primary:function(){var a;this.expect("(")?(a=this.filterChain(),this.consume(")")):this.expect("[")?a=this.arrayDeclaration():this.expect("{")?a=this.object():this.selfReferential.hasOwnProperty(this.peek().text)?a=pa(this.selfReferential[this.consume().text]):this.options.literals.hasOwnProperty(this.peek().text)?a={type:s.Literal,value:this.options.literals[this.consume().text]}:this.peek().identifier?a=this.identifier():this.peek().constant?a=this.constant():this.throwError("not a primary expression",
+this.peek());for(var b;b=this.expect("(","[",".");)"("===b.text?(a={type:s.CallExpression,callee:a,arguments:this.parseArguments()},this.consume(")")):"["===b.text?(a={type:s.MemberExpression,object:a,property:this.expression(),computed:!0},this.consume("]")):"."===b.text?a={type:s.MemberExpression,object:a,property:this.identifier(),computed:!1}:this.throwError("IMPOSSIBLE");return a},filter:function(a){a=[a];for(var b={type:s.CallExpression,callee:this.identifier(),arguments:a,filter:!0};this.expect(":");)a.push(this.expression());
+return b},parseArguments:function(){var a=[];if(")"!==this.peekToken().text){do a.push(this.expression());while(this.expect(","))}return a},identifier:function(){var a=this.consume();a.identifier||this.throwError("is not a valid identifier",a);return{type:s.Identifier,name:a.text}},constant:function(){return{type:s.Literal,value:this.consume().value}},arrayDeclaration:function(){var a=[];if("]"!==this.peekToken().text){do{if(this.peek("]"))break;a.push(this.expression())}while(this.expect(","))}this.consume("]");
+return{type:s.ArrayExpression,elements:a}},object:function(){var a=[],b;if("}"!==this.peekToken().text){do{if(this.peek("}"))break;b={type:s.Property,kind:"init"};this.peek().constant?b.key=this.constant():this.peek().identifier?b.key=this.identifier():this.throwError("invalid key",this.peek());this.consume(":");b.value=this.expression();a.push(b)}while(this.expect(","))}this.consume("}");return{type:s.ObjectExpression,properties:a}},throwError:function(a,b){throw ca("syntax",b.text,a,b.index+1,this.text,
+this.text.substring(b.index));},consume:function(a){if(0===this.tokens.length)throw ca("ueoe",this.text);var b=this.expect(a);b||this.throwError("is unexpected, expecting ["+a+"]",this.peek());return b},peekToken:function(){if(0===this.tokens.length)throw ca("ueoe",this.text);return this.tokens[0]},peek:function(a,b,d,c){return this.peekAhead(0,a,b,d,c)},peekAhead:function(a,b,d,c,e){if(this.tokens.length>a){a=this.tokens[a];var f=a.text;if(f===b||f===d||f===c||f===e||!(b||d||c||e))return a}return!1},
+expect:function(a,b,d,c){return(a=this.peek(a,b,d,c))?(this.tokens.shift(),a):!1},selfReferential:{"this":{type:s.ThisExpression},$locals:{type:s.LocalsExpression}}};rd.prototype={compile:function(a,b){var d=this,c=this.astBuilder.ast(a);this.state={nextId:0,filters:{},expensiveChecks:b,fn:{vars:[],body:[],own:{}},assign:{vars:[],body:[],own:{}},inputs:[]};aa(c,d.$filter);var e="",f;this.stage="assign";if(f=pd(c))this.state.computing="assign",e=this.nextId(),this.recurse(f,e),this.return_(e),e="fn.assign="+
+this.generateFunction("assign","s,v,l");f=nd(c.body);d.stage="inputs";q(f,function(a,b){var c="fn"+b;d.state[c]={vars:[],body:[],own:{}};d.state.computing=c;var e=d.nextId();d.recurse(a,e);d.return_(e);d.state.inputs.push(c);a.watchId=b});this.state.computing="fn";this.stage="main";this.recurse(c);e='"'+this.USE+" "+this.STRICT+'";\n'+this.filterPrefix()+"var fn="+this.generateFunction("fn","s,l,a,i")+e+this.watchFns()+"return fn;";e=(new Function("$filter","ensureSafeMemberName","ensureSafeObject",
+"ensureSafeFunction","getStringValue","ensureSafeAssignContext","ifDefined","plus","text",e))(this.$filter,Wa,ta,ld,eg,Hb,ig,md,a);this.state=this.stage=u;e.literal=qd(c);e.constant=c.constant;return e},USE:"use",STRICT:"strict",watchFns:function(){var a=[],b=this.state.inputs,d=this;q(b,function(b){a.push("var "+b+"="+d.generateFunction(b,"s"))});b.length&&a.push("fn.inputs=["+b.join(",")+"];");return a.join("")},generateFunction:function(a,b){return"function("+b+"){"+this.varsPrefix(a)+this.body(a)+
+"};"},filterPrefix:function(){var a=[],b=this;q(this.state.filters,function(d,c){a.push(d+"=$filter("+b.escape(c)+")")});return a.length?"var "+a.join(",")+";":""},varsPrefix:function(a){return this.state[a].vars.length?"var "+this.state[a].vars.join(",")+";":""},body:function(a){return this.state[a].body.join("")},recurse:function(a,b,d,c,e,f){var g,h,k=this,l,m;c=c||E;if(!f&&A(a.watchId))b=b||this.nextId(),this.if_("i",this.lazyAssign(b,this.computedMember("i",a.watchId)),this.lazyRecurse(a,b,d,
+c,e,!0));else switch(a.type){case s.Program:q(a.body,function(b,c){k.recurse(b.expression,u,u,function(a){h=a});c!==a.body.length-1?k.current().body.push(h,";"):k.return_(h)});break;case s.Literal:m=this.escape(a.value);this.assign(b,m);c(m);break;case s.UnaryExpression:this.recurse(a.argument,u,u,function(a){h=a});m=a.operator+"("+this.ifDefined(h,0)+")";this.assign(b,m);c(m);break;case s.BinaryExpression:this.recurse(a.left,u,u,function(a){g=a});this.recurse(a.right,u,u,function(a){h=a});m="+"===
+a.operator?this.plus(g,h):"-"===a.operator?this.ifDefined(g,0)+a.operator+this.ifDefined(h,0):"("+g+")"+a.operator+"("+h+")";this.assign(b,m);c(m);break;case s.LogicalExpression:b=b||this.nextId();k.recurse(a.left,b);k.if_("&&"===a.operator?b:k.not(b),k.lazyRecurse(a.right,b));c(b);break;case s.ConditionalExpression:b=b||this.nextId();k.recurse(a.test,b);k.if_(b,k.lazyRecurse(a.alternate,b),k.lazyRecurse(a.consequent,b));c(b);break;case s.Identifier:b=b||this.nextId();d&&(d.context="inputs"===k.stage?
+"s":this.assign(this.nextId(),this.getHasOwnProperty("l",a.name)+"?l:s"),d.computed=!1,d.name=a.name);Wa(a.name);k.if_("inputs"===k.stage||k.not(k.getHasOwnProperty("l",a.name)),function(){k.if_("inputs"===k.stage||"s",function(){e&&1!==e&&k.if_(k.not(k.nonComputedMember("s",a.name)),k.lazyAssign(k.nonComputedMember("s",a.name),"{}"));k.assign(b,k.nonComputedMember("s",a.name))})},b&&k.lazyAssign(b,k.nonComputedMember("l",a.name)));(k.state.expensiveChecks||Ib(a.name))&&k.addEnsureSafeObject(b);c(b);
+break;case s.MemberExpression:g=d&&(d.context=this.nextId())||this.nextId();b=b||this.nextId();k.recurse(a.object,g,u,function(){k.if_(k.notNull(g),function(){e&&1!==e&&k.addEnsureSafeAssignContext(g);if(a.computed)h=k.nextId(),k.recurse(a.property,h),k.getStringValue(h),k.addEnsureSafeMemberName(h),e&&1!==e&&k.if_(k.not(k.computedMember(g,h)),k.lazyAssign(k.computedMember(g,h),"{}")),m=k.ensureSafeObject(k.computedMember(g,h)),k.assign(b,m),d&&(d.computed=!0,d.name=h);else{Wa(a.property.name);e&&
+1!==e&&k.if_(k.not(k.nonComputedMember(g,a.property.name)),k.lazyAssign(k.nonComputedMember(g,a.property.name),"{}"));m=k.nonComputedMember(g,a.property.name);if(k.state.expensiveChecks||Ib(a.property.name))m=k.ensureSafeObject(m);k.assign(b,m);d&&(d.computed=!1,d.name=a.property.name)}},function(){k.assign(b,"undefined")});c(b)},!!e);break;case s.CallExpression:b=b||this.nextId();a.filter?(h=k.filter(a.callee.name),l=[],q(a.arguments,function(a){var b=k.nextId();k.recurse(a,b);l.push(b)}),m=h+"("+
+l.join(",")+")",k.assign(b,m),c(b)):(h=k.nextId(),g={},l=[],k.recurse(a.callee,h,g,function(){k.if_(k.notNull(h),function(){k.addEnsureSafeFunction(h);q(a.arguments,function(a){k.recurse(a,k.nextId(),u,function(a){l.push(k.ensureSafeObject(a))})});g.name?(k.state.expensiveChecks||k.addEnsureSafeObject(g.context),m=k.member(g.context,g.name,g.computed)+"("+l.join(",")+")"):m=h+"("+l.join(",")+")";m=k.ensureSafeObject(m);k.assign(b,m)},function(){k.assign(b,"undefined")});c(b)}));break;case s.AssignmentExpression:h=
+this.nextId();g={};if(!od(a.left))throw ca("lval");this.recurse(a.left,u,g,function(){k.if_(k.notNull(g.context),function(){k.recurse(a.right,h);k.addEnsureSafeObject(k.member(g.context,g.name,g.computed));k.addEnsureSafeAssignContext(g.context);m=k.member(g.context,g.name,g.computed)+a.operator+h;k.assign(b,m);c(b||m)})},1);break;case s.ArrayExpression:l=[];q(a.elements,function(a){k.recurse(a,k.nextId(),u,function(a){l.push(a)})});m="["+l.join(",")+"]";this.assign(b,m);c(m);break;case s.ObjectExpression:l=
+[];q(a.properties,function(a){k.recurse(a.value,k.nextId(),u,function(b){l.push(k.escape(a.key.type===s.Identifier?a.key.name:""+a.key.value)+":"+b)})});m="{"+l.join(",")+"}";this.assign(b,m);c(m);break;case s.ThisExpression:this.assign(b,"s");c("s");break;case s.LocalsExpression:this.assign(b,"l");c("l");break;case s.NGValueParameter:this.assign(b,"v"),c("v")}},getHasOwnProperty:function(a,b){var d=a+"."+b,c=this.current().own;c.hasOwnProperty(d)||(c[d]=this.nextId(!1,a+"&&("+this.escape(b)+" in "+
+a+")"));return c[d]},assign:function(a,b){if(a)return this.current().body.push(a,"=",b,";"),a},filter:function(a){this.state.filters.hasOwnProperty(a)||(this.state.filters[a]=this.nextId(!0));return this.state.filters[a]},ifDefined:function(a,b){return"ifDefined("+a+","+this.escape(b)+")"},plus:function(a,b){return"plus("+a+","+b+")"},return_:function(a){this.current().body.push("return ",a,";")},if_:function(a,b,d){if(!0===a)b();else{var c=this.current().body;c.push("if(",a,"){");b();c.push("}");
+d&&(c.push("else{"),d(),c.push("}"))}},not:function(a){return"!("+a+")"},notNull:function(a){return a+"!=null"},nonComputedMember:function(a,b){return a+"."+b},computedMember:function(a,b){return a+"["+b+"]"},member:function(a,b,d){return d?this.computedMember(a,b):this.nonComputedMember(a,b)},addEnsureSafeObject:function(a){this.current().body.push(this.ensureSafeObject(a),";")},addEnsureSafeMemberName:function(a){this.current().body.push(this.ensureSafeMemberName(a),";")},addEnsureSafeFunction:function(a){this.current().body.push(this.ensureSafeFunction(a),
+";")},addEnsureSafeAssignContext:function(a){this.current().body.push(this.ensureSafeAssignContext(a),";")},ensureSafeObject:function(a){return"ensureSafeObject("+a+",text)"},ensureSafeMemberName:function(a){return"ensureSafeMemberName("+a+",text)"},ensureSafeFunction:function(a){return"ensureSafeFunction("+a+",text)"},getStringValue:function(a){this.assign(a,"getStringValue("+a+")")},ensureSafeAssignContext:function(a){return"ensureSafeAssignContext("+a+",text)"},lazyRecurse:function(a,b,d,c,e,f){var g=
+this;return function(){g.recurse(a,b,d,c,e,f)}},lazyAssign:function(a,b){var d=this;return function(){d.assign(a,b)}},stringEscapeRegex:/[^ a-zA-Z0-9]/g,stringEscapeFn:function(a){return"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)},escape:function(a){if(y(a))return"'"+a.replace(this.stringEscapeRegex,this.stringEscapeFn)+"'";if(R(a))return a.toString();if(!0===a)return"true";if(!1===a)return"false";if(null===a)return"null";if("undefined"===typeof a)return"undefined";throw ca("esc");},nextId:function(a,
+b){var d="v"+this.state.nextId++;a||this.current().vars.push(d+(b?"="+b:""));return d},current:function(){return this.state[this.state.computing]}};sd.prototype={compile:function(a,b){var d=this,c=this.astBuilder.ast(a);this.expression=a;this.expensiveChecks=b;aa(c,d.$filter);var e,f;if(e=pd(c))f=this.recurse(e);e=nd(c.body);var g;e&&(g=[],q(e,function(a,b){var c=d.recurse(a);a.input=c;g.push(c);a.watchId=b}));var h=[];q(c.body,function(a){h.push(d.recurse(a.expression))});e=0===c.body.length?E:1===
+c.body.length?h[0]:function(a,b){var c;q(h,function(d){c=d(a,b)});return c};f&&(e.assign=function(a,b,c){return f(a,c,b)});g&&(e.inputs=g);e.literal=qd(c);e.constant=c.constant;return e},recurse:function(a,b,d){var c,e,f=this,g;if(a.input)return this.inputs(a.input,a.watchId);switch(a.type){case s.Literal:return this.value(a.value,b);case s.UnaryExpression:return e=this.recurse(a.argument),this["unary"+a.operator](e,b);case s.BinaryExpression:return c=this.recurse(a.left),e=this.recurse(a.right),
+this["binary"+a.operator](c,e,b);case s.LogicalExpression:return c=this.recurse(a.left),e=this.recurse(a.right),this["binary"+a.operator](c,e,b);case s.ConditionalExpression:return this["ternary?:"](this.recurse(a.test),this.recurse(a.alternate),this.recurse(a.consequent),b);case s.Identifier:return Wa(a.name,f.expression),f.identifier(a.name,f.expensiveChecks||Ib(a.name),b,d,f.expression);case s.MemberExpression:return c=this.recurse(a.object,!1,!!d),a.computed||(Wa(a.property.name,f.expression),
+e=a.property.name),a.computed&&(e=this.recurse(a.property)),a.computed?this.computedMember(c,e,b,d,f.expression):this.nonComputedMember(c,e,f.expensiveChecks,b,d,f.expression);case s.CallExpression:return g=[],q(a.arguments,function(a){g.push(f.recurse(a))}),a.filter&&(e=this.$filter(a.callee.name)),a.filter||(e=this.recurse(a.callee,!0)),a.filter?function(a,c,d,f){for(var n=[],p=0;p":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)>b(c,e,f,g);return d?{value:c}:c}},"binary<=":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,
+g)<=b(c,e,f,g);return d?{value:c}:c}},"binary>=":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)>=b(c,e,f,g);return d?{value:c}:c}},"binary&&":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)&&b(c,e,f,g);return d?{value:c}:c}},"binary||":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)||b(c,e,f,g);return d?{value:c}:c}},"ternary?:":function(a,b,d,c){return function(e,f,g,h){e=a(e,f,g,h)?b(e,f,g,h):d(e,f,g,h);return c?{value:e}:e}},value:function(a,b){return function(){return b?{context:u,
+name:u,value:a}:a}},identifier:function(a,b,d,c,e){return function(f,g,h,k){f=g&&a in g?g:f;c&&1!==c&&f&&!f[a]&&(f[a]={});g=f?f[a]:u;b&&ta(g,e);return d?{context:f,name:a,value:g}:g}},computedMember:function(a,b,d,c,e){return function(f,g,h,k){var l=a(f,g,h,k),m,n;null!=l&&(m=b(f,g,h,k),m+="",Wa(m,e),c&&1!==c&&(Hb(l),l&&!l[m]&&(l[m]={})),n=l[m],ta(n,e));return d?{context:l,name:m,value:n}:n}},nonComputedMember:function(a,b,d,c,e,f){return function(g,h,k,l){g=a(g,h,k,l);e&&1!==e&&(Hb(g),g&&!g[b]&&
+(g[b]={}));h=null!=g?g[b]:u;(d||Ib(b))&&ta(h,f);return c?{context:g,name:b,value:h}:h}},inputs:function(a,b){return function(d,c,e,f){return f?f[b]:a(d,c,e)}}};var hc=function(a,b,d){this.lexer=a;this.$filter=b;this.options=d;this.ast=new s(a,d);this.astCompiler=d.csp?new sd(this.ast,b):new rd(this.ast,b)};hc.prototype={constructor:hc,parse:function(a){return this.astCompiler.compile(a,this.options.expensiveChecks)}};var jg=Object.prototype.valueOf,ua=O("$sce"),ma={HTML:"html",CSS:"css",URL:"url",
+RESOURCE_URL:"resourceUrl",JS:"js"},lg=O("$compile"),Z=P.createElement("a"),wd=sa(T.location.href);xd.$inject=["$document"];Jc.$inject=["$provide"];var Ed=22,Dd=".",jc="0";yd.$inject=["$locale"];Ad.$inject=["$locale"];var wg={yyyy:X("FullYear",4,0,!1,!0),yy:X("FullYear",2,0,!0,!0),y:X("FullYear",1,0,!1,!0),MMMM:lb("Month"),MMM:lb("Month",!0),MM:X("Month",2,1),M:X("Month",1,1),LLLL:lb("Month",!1,!0),dd:X("Date",2),d:X("Date",1),HH:X("Hours",2),H:X("Hours",1),hh:X("Hours",2,-12),h:X("Hours",1,-12),
+mm:X("Minutes",2),m:X("Minutes",1),ss:X("Seconds",2),s:X("Seconds",1),sss:X("Milliseconds",3),EEEE:lb("Day"),EEE:lb("Day",!0),a:function(a,b){return 12>a.getHours()?b.AMPMS[0]:b.AMPMS[1]},Z:function(a,b,d){a=-1*d;return a=(0<=a?"+":"")+(Jb(Math[0=a.getFullYear()?b.ERANAMES[0]:b.ERANAMES[1]}},vg=/((?:[^yMLdHhmsaZEwG']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|L+|d+|H+|h+|m+|s+|a|Z|G+|w+))(.*)/,
+ug=/^\-?\d+$/;zd.$inject=["$locale"];var pg=da(N),qg=da(vb);Bd.$inject=["$parse"];var me=da({restrict:"E",compile:function(a,b){if(!b.href&&!b.xlinkHref)return function(a,b){if("a"===b[0].nodeName.toLowerCase()){var e="[object SVGAnimatedString]"===ka.call(b.prop("href"))?"xlink:href":"href";b.on("click",function(a){b.attr(e)||a.preventDefault()})}}}}),wb={};q(Eb,function(a,b){function d(a,d,e){a.$watch(e[c],function(a){e.$set(b,!!a)})}if("multiple"!=a){var c=ya("ng-"+b),e=d;"checked"===a&&(e=function(a,
+b,e){e.ngModel!==e[c]&&d(a,b,e)});wb[c]=function(){return{restrict:"A",priority:100,link:e}}}});q($c,function(a,b){wb[b]=function(){return{priority:100,link:function(a,c,e){if("ngPattern"===b&&"/"==e.ngPattern.charAt(0)&&(c=e.ngPattern.match(yg))){e.$set("ngPattern",new RegExp(c[1],c[2]));return}a.$watch(e[b],function(a){e.$set(b,a)})}}}});q(["src","srcset","href"],function(a){var b=ya("ng-"+a);wb[b]=function(){return{priority:99,link:function(d,c,e){var f=a,g=a;"href"===a&&"[object SVGAnimatedString]"===
+ka.call(c.prop("href"))&&(g="xlinkHref",e.$attr[g]="xlink:href",f=null);e.$observe(b,function(b){b?(e.$set(g,b),Da&&f&&c.prop(f,e[g])):"href"===a&&e.$set(g,null)})}}}});var Kb={$addControl:E,$$renameControl:function(a,b){a.$name=b},$removeControl:E,$setValidity:E,$setDirty:E,$setPristine:E,$setSubmitted:E};Hd.$inject=["$element","$attrs","$scope","$animate","$interpolate"];var Qd=function(a){return["$timeout","$parse",function(b,d){function c(a){return""===a?d('this[""]').assign:d(a).assign||E}return{name:"form",
+restrict:a?"EAC":"E",require:["form","^^?form"],controller:Hd,compile:function(d,f){d.addClass(Xa).addClass(pb);var g=f.name?"name":a&&f.ngForm?"ngForm":!1;return{pre:function(a,d,e,f){var n=f[0];if(!("action"in e)){var p=function(b){a.$apply(function(){n.$commitViewValue();n.$setSubmitted()});b.preventDefault()};d[0].addEventListener("submit",p,!1);d.on("$destroy",function(){b(function(){d[0].removeEventListener("submit",p,!1)},0,!1)})}(f[1]||n.$$parentForm).$addControl(n);var q=g?c(n.$name):E;g&&
+(q(a,n),e.$observe(g,function(b){n.$name!==b&&(q(a,u),n.$$parentForm.$$renameControl(n,b),q=c(n.$name),q(a,n))}));d.on("$destroy",function(){n.$$parentForm.$removeControl(n);q(a,u);S(n,Kb)})}}}}}]},ne=Qd(),Ae=Qd(!0),xg=/^\d{4,}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+(?:[+-][0-2]\d:[0-5]\d|Z)$/,Gg=/^[a-z][a-z\d.+-]*:\/*(?:[^:@]+(?::[^@]+)?@)?(?:[^\s:/?#]+|\[[a-f\d:]+\])(?::\d+)?(?:\/[^?#]*)?(?:\?[^#]*)?(?:#.*)?$/i,Hg=/^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i,
+Ig=/^\s*(\-|\+)?(\d+|(\d*(\.\d*)))([eE][+-]?\d+)?\s*$/,Rd=/^(\d{4,})-(\d{2})-(\d{2})$/,Sd=/^(\d{4,})-(\d\d)-(\d\d)T(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/,nc=/^(\d{4,})-W(\d\d)$/,Td=/^(\d{4,})-(\d\d)$/,Ud=/^(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/,Jd=V();q(["date","datetime-local","month","time","week"],function(a){Jd[a]=!0});var Vd={text:function(a,b,d,c,e,f){mb(a,b,d,c,e,f);lc(c)},date:nb("date",Rd,Mb(Rd,["yyyy","MM","dd"]),"yyyy-MM-dd"),"datetime-local":nb("datetimelocal",Sd,Mb(Sd,"yyyy MM dd HH mm ss sss".split(" ")),
+"yyyy-MM-ddTHH:mm:ss.sss"),time:nb("time",Ud,Mb(Ud,["HH","mm","ss","sss"]),"HH:mm:ss.sss"),week:nb("week",nc,function(a,b){if(fa(a))return a;if(y(a)){nc.lastIndex=0;var d=nc.exec(a);if(d){var c=+d[1],e=+d[2],f=d=0,g=0,h=0,k=Fd(c),e=7*(e-1);b&&(d=b.getHours(),f=b.getMinutes(),g=b.getSeconds(),h=b.getMilliseconds());return new Date(c,0,k.getDate()+e,d,f,g,h)}}return NaN},"yyyy-Www"),month:nb("month",Td,Mb(Td,["yyyy","MM"]),"yyyy-MM"),number:function(a,b,d,c,e,f){Kd(a,b,d,c);mb(a,b,d,c,e,f);c.$$parserName=
+"number";c.$parsers.push(function(a){return c.$isEmpty(a)?null:Ig.test(a)?parseFloat(a):u});c.$formatters.push(function(a){if(!c.$isEmpty(a)){if(!R(a))throw ob("numfmt",a);a=a.toString()}return a});if(A(d.min)||d.ngMin){var g;c.$validators.min=function(a){return c.$isEmpty(a)||z(g)||a>=g};d.$observe("min",function(a){A(a)&&!R(a)&&(a=parseFloat(a,10));g=R(a)&&!isNaN(a)?a:u;c.$validate()})}if(A(d.max)||d.ngMax){var h;c.$validators.max=function(a){return c.$isEmpty(a)||z(h)||a<=h};d.$observe("max",function(a){A(a)&&
+!R(a)&&(a=parseFloat(a,10));h=R(a)&&!isNaN(a)?a:u;c.$validate()})}},url:function(a,b,d,c,e,f){mb(a,b,d,c,e,f);lc(c);c.$$parserName="url";c.$validators.url=function(a,b){var d=a||b;return c.$isEmpty(d)||Gg.test(d)}},email:function(a,b,d,c,e,f){mb(a,b,d,c,e,f);lc(c);c.$$parserName="email";c.$validators.email=function(a,b){var d=a||b;return c.$isEmpty(d)||Hg.test(d)}},radio:function(a,b,d,c){z(d.name)&&b.attr("name",++qb);b.on("click",function(a){b[0].checked&&c.$setViewValue(d.value,a&&a.type)});c.$render=
+function(){b[0].checked=d.value==c.$viewValue};d.$observe("value",c.$render)},checkbox:function(a,b,d,c,e,f,g,h){var k=Ld(h,a,"ngTrueValue",d.ngTrueValue,!0),l=Ld(h,a,"ngFalseValue",d.ngFalseValue,!1);b.on("click",function(a){c.$setViewValue(b[0].checked,a&&a.type)});c.$render=function(){b[0].checked=c.$viewValue};c.$isEmpty=function(a){return!1===a};c.$formatters.push(function(a){return na(a,k)});c.$parsers.push(function(a){return a?k:l})},hidden:E,button:E,submit:E,reset:E,file:E},Dc=["$browser",
+"$sniffer","$filter","$parse",function(a,b,d,c){return{restrict:"E",require:["?ngModel"],link:{pre:function(e,f,g,h){h[0]&&(Vd[N(g.type)]||Vd.text)(e,f,g,h[0],b,a,d,c)}}}}],Jg=/^(true|false|\d+)$/,Se=function(){return{restrict:"A",priority:100,compile:function(a,b){return Jg.test(b.ngValue)?function(a,b,e){e.$set("value",a.$eval(e.ngValue))}:function(a,b,e){a.$watch(e.ngValue,function(a){e.$set("value",a)})}}}},se=["$compile",function(a){return{restrict:"AC",compile:function(b){a.$$addBindingClass(b);
+return function(b,c,e){a.$$addBindingInfo(c,e.ngBind);c=c[0];b.$watch(e.ngBind,function(a){c.textContent=z(a)?"":a})}}}}],ue=["$interpolate","$compile",function(a,b){return{compile:function(d){b.$$addBindingClass(d);return function(c,d,f){c=a(d.attr(f.$attr.ngBindTemplate));b.$$addBindingInfo(d,c.expressions);d=d[0];f.$observe("ngBindTemplate",function(a){d.textContent=z(a)?"":a})}}}}],te=["$sce","$parse","$compile",function(a,b,d){return{restrict:"A",compile:function(c,e){var f=b(e.ngBindHtml),g=
+b(e.ngBindHtml,function(a){return(a||"").toString()});d.$$addBindingClass(c);return function(b,c,e){d.$$addBindingInfo(c,e.ngBindHtml);b.$watch(g,function(){c.html(a.getTrustedHtml(f(b))||"")})}}}}],Re=da({restrict:"A",require:"ngModel",link:function(a,b,d,c){c.$viewChangeListeners.push(function(){a.$eval(d.ngChange)})}}),ve=mc("",!0),xe=mc("Odd",0),we=mc("Even",1),ye=Na({compile:function(a,b){b.$set("ngCloak",u);a.removeClass("ng-cloak")}}),ze=[function(){return{restrict:"A",scope:!0,controller:"@",
+priority:500}}],Ic={},Kg={blur:!0,focus:!0};q("click dblclick mousedown mouseup mouseover mouseout mousemove mouseenter mouseleave keydown keyup keypress submit focus blur copy cut paste".split(" "),function(a){var b=ya("ng-"+a);Ic[b]=["$parse","$rootScope",function(d,c){return{restrict:"A",compile:function(e,f){var g=d(f[b],null,!0);return function(b,d){d.on(a,function(d){var e=function(){g(b,{$event:d})};Kg[a]&&c.$$phase?b.$evalAsync(e):b.$apply(e)})}}}}]});var Ce=["$animate","$compile",function(a,
+b){return{multiElement:!0,transclude:"element",priority:600,terminal:!0,restrict:"A",$$tlb:!0,link:function(d,c,e,f,g){var h,k,l;d.$watch(e.ngIf,function(d){d?k||g(function(d,f){k=f;d[d.length++]=b.$$createComment("end ngIf",e.ngIf);h={clone:d};a.enter(d,c.parent(),c)}):(l&&(l.remove(),l=null),k&&(k.$destroy(),k=null),h&&(l=ub(h.clone),a.leave(l).then(function(){l=null}),h=null))})}}}],De=["$templateRequest","$anchorScroll","$animate",function(a,b,d){return{restrict:"ECA",priority:400,terminal:!0,
+transclude:"element",controller:ea.noop,compile:function(c,e){var f=e.ngInclude||e.src,g=e.onload||"",h=e.autoscroll;return function(c,e,m,n,p){var q=0,s,x,r,w=function(){x&&(x.remove(),x=null);s&&(s.$destroy(),s=null);r&&(d.leave(r).then(function(){x=null}),x=r,r=null)};c.$watch(f,function(f){var m=function(){!A(h)||h&&!c.$eval(h)||b()},t=++q;f?(a(f,!0).then(function(a){if(!c.$$destroyed&&t===q){var b=c.$new();n.template=a;a=p(b,function(a){w();d.enter(a,null,e).then(m)});s=b;r=a;s.$emit("$includeContentLoaded",
+f);c.$eval(g)}},function(){c.$$destroyed||t!==q||(w(),c.$emit("$includeContentError",f))}),c.$emit("$includeContentRequested",f)):(w(),n.template=null)})}}}}],Ue=["$compile",function(a){return{restrict:"ECA",priority:-400,require:"ngInclude",link:function(b,d,c,e){ka.call(d[0]).match(/SVG/)?(d.empty(),a(Lc(e.template,P).childNodes)(b,function(a){d.append(a)},{futureParentElement:d})):(d.html(e.template),a(d.contents())(b))}}}],Ee=Na({priority:450,compile:function(){return{pre:function(a,b,d){a.$eval(d.ngInit)}}}}),
+Qe=function(){return{restrict:"A",priority:100,require:"ngModel",link:function(a,b,d,c){var e=b.attr(d.$attr.ngList)||", ",f="false"!==d.ngTrim,g=f?W(e):e;c.$parsers.push(function(a){if(!z(a)){var b=[];a&&q(a.split(g),function(a){a&&b.push(f?W(a):a)});return b}});c.$formatters.push(function(a){return M(a)?a.join(e):u});c.$isEmpty=function(a){return!a||!a.length}}}},pb="ng-valid",Md="ng-invalid",Xa="ng-pristine",Lb="ng-dirty",Od="ng-pending",ob=O("ngModel"),Lg=["$scope","$exceptionHandler","$attrs",
+"$element","$parse","$animate","$timeout","$rootScope","$q","$interpolate",function(a,b,d,c,e,f,g,h,k,l){this.$modelValue=this.$viewValue=Number.NaN;this.$$rawModelValue=u;this.$validators={};this.$asyncValidators={};this.$parsers=[];this.$formatters=[];this.$viewChangeListeners=[];this.$untouched=!0;this.$touched=!1;this.$pristine=!0;this.$dirty=!1;this.$valid=!0;this.$invalid=!1;this.$error={};this.$$success={};this.$pending=u;this.$name=l(d.name||"",!1)(a);this.$$parentForm=Kb;var m=e(d.ngModel),
+n=m.assign,p=m,s=n,y=null,x,r=this;this.$$setOptions=function(a){if((r.$options=a)&&a.getterSetter){var b=e(d.ngModel+"()"),f=e(d.ngModel+"($$$p)");p=function(a){var c=m(a);D(c)&&(c=b(a));return c};s=function(a,b){D(m(a))?f(a,{$$$p:b}):n(a,b)}}else if(!m.assign)throw ob("nonassign",d.ngModel,wa(c));};this.$render=E;this.$isEmpty=function(a){return z(a)||""===a||null===a||a!==a};this.$$updateEmptyClasses=function(a){r.$isEmpty(a)?(f.removeClass(c,"ng-not-empty"),f.addClass(c,"ng-empty")):(f.removeClass(c,
+"ng-empty"),f.addClass(c,"ng-not-empty"))};var w=0;Id({ctrl:this,$element:c,set:function(a,b){a[b]=!0},unset:function(a,b){delete a[b]},$animate:f});this.$setPristine=function(){r.$dirty=!1;r.$pristine=!0;f.removeClass(c,Lb);f.addClass(c,Xa)};this.$setDirty=function(){r.$dirty=!0;r.$pristine=!1;f.removeClass(c,Xa);f.addClass(c,Lb);r.$$parentForm.$setDirty()};this.$setUntouched=function(){r.$touched=!1;r.$untouched=!0;f.setClass(c,"ng-untouched","ng-touched")};this.$setTouched=function(){r.$touched=
+!0;r.$untouched=!1;f.setClass(c,"ng-touched","ng-untouched")};this.$rollbackViewValue=function(){g.cancel(y);r.$viewValue=r.$$lastCommittedViewValue;r.$render()};this.$validate=function(){if(!R(r.$modelValue)||!isNaN(r.$modelValue)){var a=r.$$rawModelValue,b=r.$valid,c=r.$modelValue,d=r.$options&&r.$options.allowInvalid;r.$$runValidators(a,r.$$lastCommittedViewValue,function(e){d||b===e||(r.$modelValue=e?a:u,r.$modelValue!==c&&r.$$writeModelToScope())})}};this.$$runValidators=function(a,b,c){function d(){var c=
+!0;q(r.$validators,function(d,e){var g=d(a,b);c=c&&g;f(e,g)});return c?!0:(q(r.$asyncValidators,function(a,b){f(b,null)}),!1)}function e(){var c=[],d=!0;q(r.$asyncValidators,function(e,g){var h=e(a,b);if(!h||!D(h.then))throw ob("nopromise",h);f(g,u);c.push(h.then(function(){f(g,!0)},function(){d=!1;f(g,!1)}))});c.length?k.all(c).then(function(){g(d)},E):g(!0)}function f(a,b){h===w&&r.$setValidity(a,b)}function g(a){h===w&&c(a)}w++;var h=w;(function(){var a=r.$$parserName||"parse";if(z(x))f(a,null);
+else return x||(q(r.$validators,function(a,b){f(b,null)}),q(r.$asyncValidators,function(a,b){f(b,null)})),f(a,x),x;return!0})()?d()?e():g(!1):g(!1)};this.$commitViewValue=function(){var a=r.$viewValue;g.cancel(y);if(r.$$lastCommittedViewValue!==a||""===a&&r.$$hasNativeValidators)r.$$updateEmptyClasses(a),r.$$lastCommittedViewValue=a,r.$pristine&&this.$setDirty(),this.$$parseAndValidate()};this.$$parseAndValidate=function(){var b=r.$$lastCommittedViewValue;if(x=z(b)?u:!0)for(var c=0;ce||c.$isEmpty(b)||
+b.length<=e}}}}},Gc=function(){return{restrict:"A",require:"?ngModel",link:function(a,b,d,c){if(c){var e=0;d.$observe("minlength",function(a){e=Y(a)||0;c.$validate()});c.$validators.minlength=function(a,b){return c.$isEmpty(b)||b.length>=e}}}}};T.angular.bootstrap?T.console&&console.log("WARNING: Tried to load angular more than once."):(he(),je(ea),ea.module("ngLocale",[],["$provide",function(a){function b(a){a+="";var b=a.indexOf(".");return-1==b?0:a.length-b-1}a.value("$locale",{DATETIME_FORMATS:{AMPMS:["AM",
+"PM"],DAY:"Sunday Monday Tuesday Wednesday Thursday Friday Saturday".split(" "),ERANAMES:["Before Christ","Anno Domini"],ERAS:["BC","AD"],FIRSTDAYOFWEEK:6,MONTH:"January February March April May June July August September October November December".split(" "),SHORTDAY:"Sun Mon Tue Wed Thu Fri Sat".split(" "),SHORTMONTH:"Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec".split(" "),STANDALONEMONTH:"January February March April May June July August September October November December".split(" "),WEEKENDRANGE:[5,
+6],fullDate:"EEEE, MMMM d, y",longDate:"MMMM d, y",medium:"MMM d, y h:mm:ss a",mediumDate:"MMM d, y",mediumTime:"h:mm:ss a","short":"M/d/yy h:mm a",shortDate:"M/d/yy",shortTime:"h:mm a"},NUMBER_FORMATS:{CURRENCY_SYM:"$",DECIMAL_SEP:".",GROUP_SEP:",",PATTERNS:[{gSize:3,lgSize:3,maxFrac:3,minFrac:0,minInt:1,negPre:"-",negSuf:"",posPre:"",posSuf:""},{gSize:3,lgSize:3,maxFrac:2,minFrac:2,minInt:1,negPre:"-\u00a4",negSuf:"",posPre:"\u00a4",posSuf:""}]},id:"en-us",localeID:"en_US",pluralCat:function(a,
+c){var e=a|0,f=c;u===f&&(f=Math.min(b(a),3));Math.pow(10,f);return 1==e&&0==f?"one":"other"}})}]),H(P).ready(function(){de(P,yc)}))})(window,document);!window.angular.$$csp().noInlineStyle&&window.angular.element(document.head).prepend('');
+//# sourceMappingURL=angular.min.js.map
diff --git a/static/vendors/spinner.min.js b/static/vendors/spinner.min.js
deleted file mode 100644
index bd3ae4f4e..000000000
--- a/static/vendors/spinner.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// http://spin.js.org/#v2.3.2
-!function(a,b){"object"==typeof module&&module.exports?module.exports=b():"function"==typeof define&&define.amd?define(b):a.Spinner=b()}(this,function(){"use strict";function a(a,b){var c,d=document.createElement(a||"div");for(c in b)d[c]=b[c];return d}function b(a){for(var b=1,c=arguments.length;c>b;b++)a.appendChild(arguments[b]);return a}function c(a,b,c,d){var e=["opacity",b,~~(100*a),c,d].join("-"),f=.01+c/d*100,g=Math.max(1-(1-a)/b*(100-f),a),h=j.substring(0,j.indexOf("Animation")).toLowerCase(),i=h&&"-"+h+"-"||"";return m[e]||(k.insertRule("@"+i+"keyframes "+e+"{0%{opacity:"+g+"}"+f+"%{opacity:"+a+"}"+(f+.01)+"%{opacity:1}"+(f+b)%100+"%{opacity:"+a+"}100%{opacity:"+g+"}}",k.cssRules.length),m[e]=1),e}function d(a,b){var c,d,e=a.style;if(b=b.charAt(0).toUpperCase()+b.slice(1),void 0!==e[b])return b;for(d=0;d',c)}k.addRule(".spin-vml","behavior:url(#default#VML)"),h.prototype.lines=function(a,d){function f(){return e(c("group",{coordsize:k+" "+k,coordorigin:-j+" "+-j}),{width:k,height:k})}function h(a,h,i){b(m,b(e(f(),{rotation:360/d.lines*a+"deg",left:~~h}),b(e(c("roundrect",{arcsize:d.corners}),{width:j,height:d.scale*d.width,left:d.scale*d.radius,top:-d.scale*d.width>>1,filter:i}),c("fill",{color:g(d.color,a),opacity:d.opacity}),c("stroke",{opacity:0}))))}var i,j=d.scale*(d.length+d.width),k=2*d.scale*j,l=-(d.width+d.length)*d.scale*2+"px",m=e(f(),{position:"absolute",top:l,left:l});if(d.shadow)for(i=1;i<=d.lines;i++)h(i,-2,"progid:DXImageTransform.Microsoft.Blur(pixelradius=2,makeshadow=1,shadowopacity=.3)");for(i=1;i<=d.lines;i++)h(i);return b(a,m)},h.prototype.opacity=function(a,b,c,d){var e=a.firstChild;d=d.shadow&&d.lines||0,e&&b+d>1)+"px"})}for(var i,k=0,l=(f.lines-1)*(1-f.direction)/2;k: invalid syntax")
+}
diff --git a/vendor/github.com/astaxie/beego/config/fake.go b/vendor/github.com/astaxie/beego/config/fake.go
index 50aa5d4a4..7e3626087 100644
--- a/vendor/github.com/astaxie/beego/config/fake.go
+++ b/vendor/github.com/astaxie/beego/config/fake.go
@@ -46,12 +46,16 @@ func (c *fakeConfigContainer) DefaultString(key string, defaultval string) strin
}
func (c *fakeConfigContainer) Strings(key string) []string {
- return strings.Split(c.getData(key), ";")
+ v := c.getData(key)
+ if v == "" {
+ return nil
+ }
+ return strings.Split(v, ";")
}
func (c *fakeConfigContainer) DefaultStrings(key string, defaultval []string) []string {
v := c.Strings(key)
- if len(v) == 0 {
+ if v == nil {
return defaultval
}
return v
@@ -82,7 +86,7 @@ func (c *fakeConfigContainer) DefaultInt64(key string, defaultval int64) int64 {
}
func (c *fakeConfigContainer) Bool(key string) (bool, error) {
- return strconv.ParseBool(c.getData(key))
+ return ParseBool(c.getData(key))
}
func (c *fakeConfigContainer) DefaultBool(key string, defaultval bool) bool {
diff --git a/vendor/github.com/astaxie/beego/config/ini.go b/vendor/github.com/astaxie/beego/config/ini.go
index 59e84e1e5..9c19b9b1b 100644
--- a/vendor/github.com/astaxie/beego/config/ini.go
+++ b/vendor/github.com/astaxie/beego/config/ini.go
@@ -27,7 +27,6 @@ import (
"strings"
"sync"
"time"
- "unicode"
)
var (
@@ -97,9 +96,11 @@ func (ini *IniConfig) parseFile(name string) (*IniConfigContainer, error) {
}
if bComment != nil {
line = bytes.TrimLeft(line, string(bComment))
- line = bytes.TrimLeftFunc(line, unicode.IsSpace)
+ // Need append to a new line if multi-line comments.
+ if comment.Len() > 0 {
+ comment.WriteByte('\n')
+ }
comment.Write(line)
- comment.WriteByte('\n')
continue
}
@@ -194,7 +195,7 @@ type IniConfigContainer struct {
// Bool returns the boolean value for a given key.
func (c *IniConfigContainer) Bool(key string) (bool, error) {
- return strconv.ParseBool(c.getdata(key))
+ return ParseBool(c.getdata(key))
}
// DefaultBool returns the boolean value for a given key.
@@ -268,15 +269,20 @@ func (c *IniConfigContainer) DefaultString(key string, defaultval string) string
}
// Strings returns the []string value for a given key.
+// Return nil if config value does not exist or is empty.
func (c *IniConfigContainer) Strings(key string) []string {
- return strings.Split(c.String(key), ";")
+ v := c.String(key)
+ if v == "" {
+ return nil
+ }
+ return strings.Split(v, ";")
}
// DefaultStrings returns the []string value for a given key.
// if err != nil return defaltval
func (c *IniConfigContainer) DefaultStrings(key string, defaultval []string) []string {
v := c.Strings(key)
- if len(v) == 0 {
+ if v == nil {
return defaultval
}
return v
@@ -299,14 +305,35 @@ func (c *IniConfigContainer) SaveConfigFile(filename string) (err error) {
}
defer f.Close()
+ // Get section or key comments. Fixed #1607
+ getCommentStr := func(section, key string) string {
+ comment, ok := "", false
+ if len(key) == 0 {
+ comment, ok = c.sectionComment[section]
+ } else {
+ comment, ok = c.keyComment[section+"."+key]
+ }
+
+ if ok {
+ // Empty comment
+ if len(comment) == 0 || len(strings.TrimSpace(comment)) == 0 {
+ return string(bNumComment)
+ }
+ prefix := string(bNumComment)
+ // Add the line head character "#"
+ return prefix + strings.Replace(comment, lineBreak, lineBreak+prefix, -1)
+ }
+ return ""
+ }
+
buf := bytes.NewBuffer(nil)
// Save default section at first place
if dt, ok := c.data[defaultSection]; ok {
for key, val := range dt {
if key != " " {
// Write key comments.
- if v, ok := c.keyComment[key]; ok {
- if _, err = buf.WriteString(string(bNumComment) + v + lineBreak); err != nil {
+ if v := getCommentStr(defaultSection, key); len(v) > 0 {
+ if _, err = buf.WriteString(v + lineBreak); err != nil {
return err
}
}
@@ -327,8 +354,8 @@ func (c *IniConfigContainer) SaveConfigFile(filename string) (err error) {
for section, dt := range c.data {
if section != defaultSection {
// Write section comments.
- if v, ok := c.sectionComment[section]; ok {
- if _, err = buf.WriteString(string(bNumComment) + v + lineBreak); err != nil {
+ if v := getCommentStr(section, ""); len(v) > 0 {
+ if _, err = buf.WriteString(v + lineBreak); err != nil {
return err
}
}
@@ -341,8 +368,8 @@ func (c *IniConfigContainer) SaveConfigFile(filename string) (err error) {
for key, val := range dt {
if key != " " {
// Write key comments.
- if v, ok := c.keyComment[key]; ok {
- if _, err = buf.WriteString(string(bNumComment) + v + lineBreak); err != nil {
+ if v := getCommentStr(section, key); len(v) > 0 {
+ if _, err = buf.WriteString(v + lineBreak); err != nil {
return err
}
}
diff --git a/vendor/github.com/astaxie/beego/config/json.go b/vendor/github.com/astaxie/beego/config/json.go
index 65b4ac48a..fce517eb8 100644
--- a/vendor/github.com/astaxie/beego/config/json.go
+++ b/vendor/github.com/astaxie/beego/config/json.go
@@ -17,6 +17,7 @@ package config
import (
"encoding/json"
"errors"
+ "fmt"
"io/ioutil"
"os"
"strings"
@@ -70,12 +71,9 @@ type JSONConfigContainer struct {
func (c *JSONConfigContainer) Bool(key string) (bool, error) {
val := c.getData(key)
if val != nil {
- if v, ok := val.(bool); ok {
- return v, nil
- }
- return false, errors.New("not bool value")
+ return ParseBool(val)
}
- return false, errors.New("not exist key:" + key)
+ return false, fmt.Errorf("not exist key: %q", key)
}
// DefaultBool return the bool value if has no error
@@ -175,7 +173,7 @@ func (c *JSONConfigContainer) DefaultString(key string, defaultval string) strin
func (c *JSONConfigContainer) Strings(key string) []string {
stringVal := c.String(key)
if stringVal == "" {
- return []string{}
+ return nil
}
return strings.Split(c.String(key), ";")
}
@@ -183,7 +181,7 @@ func (c *JSONConfigContainer) Strings(key string) []string {
// DefaultStrings returns the []string value for a given key.
// if err != nil return defaltval
func (c *JSONConfigContainer) DefaultStrings(key string, defaultval []string) []string {
- if v := c.Strings(key); len(v) > 0 {
+ if v := c.Strings(key); v != nil {
return v
}
return defaultval
diff --git a/vendor/github.com/astaxie/beego/config/xml/xml.go b/vendor/github.com/astaxie/beego/config/xml/xml.go
deleted file mode 100644
index 4d48f7d2c..000000000
--- a/vendor/github.com/astaxie/beego/config/xml/xml.go
+++ /dev/null
@@ -1,229 +0,0 @@
-// Copyright 2014 beego Author. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package xml for config provider
-//
-// depend on github.com/beego/x2j
-//
-// go install github.com/beego/x2j
-//
-// Usage:
-// import(
-// _ "github.com/astaxie/beego/config/xml"
-// "github.com/astaxie/beego/config"
-// )
-//
-// cnf, err := config.NewConfig("xml", "config.xml")
-//
-// more docs http://beego.me/docs/module/config.md
-package xml
-
-import (
- "encoding/xml"
- "errors"
- "fmt"
- "io/ioutil"
- "os"
- "path"
- "strconv"
- "strings"
- "sync"
- "time"
-
- "github.com/astaxie/beego/config"
- "github.com/beego/x2j"
-)
-
-// Config is a xml config parser and implements Config interface.
-// xml configurations should be included in tag.
-// only support key/value pair as value as each item.
-type Config struct{}
-
-// Parse returns a ConfigContainer with parsed xml config map.
-func (xc *Config) Parse(filename string) (config.Configer, error) {
- file, err := os.Open(filename)
- if err != nil {
- return nil, err
- }
- defer file.Close()
-
- x := &ConfigContainer{data: make(map[string]interface{})}
- content, err := ioutil.ReadAll(file)
- if err != nil {
- return nil, err
- }
-
- d, err := x2j.DocToMap(string(content))
- if err != nil {
- return nil, err
- }
-
- x.data = d["config"].(map[string]interface{})
- return x, nil
-}
-
-// ParseData xml data
-func (xc *Config) ParseData(data []byte) (config.Configer, error) {
- // Save memory data to temporary file
- tmpName := path.Join(os.TempDir(), "beego", fmt.Sprintf("%d", time.Now().Nanosecond()))
- os.MkdirAll(path.Dir(tmpName), os.ModePerm)
- if err := ioutil.WriteFile(tmpName, data, 0655); err != nil {
- return nil, err
- }
- return xc.Parse(tmpName)
-}
-
-// ConfigContainer A Config represents the xml configuration.
-type ConfigContainer struct {
- data map[string]interface{}
- sync.Mutex
-}
-
-// Bool returns the boolean value for a given key.
-func (c *ConfigContainer) Bool(key string) (bool, error) {
- return strconv.ParseBool(c.data[key].(string))
-}
-
-// DefaultBool return the bool value if has no error
-// otherwise return the defaultval
-func (c *ConfigContainer) DefaultBool(key string, defaultval bool) bool {
- v, err := c.Bool(key)
- if err != nil {
- return defaultval
- }
- return v
-}
-
-// Int returns the integer value for a given key.
-func (c *ConfigContainer) Int(key string) (int, error) {
- return strconv.Atoi(c.data[key].(string))
-}
-
-// DefaultInt returns the integer value for a given key.
-// if err != nil return defaltval
-func (c *ConfigContainer) DefaultInt(key string, defaultval int) int {
- v, err := c.Int(key)
- if err != nil {
- return defaultval
- }
- return v
-}
-
-// Int64 returns the int64 value for a given key.
-func (c *ConfigContainer) Int64(key string) (int64, error) {
- return strconv.ParseInt(c.data[key].(string), 10, 64)
-}
-
-// DefaultInt64 returns the int64 value for a given key.
-// if err != nil return defaltval
-func (c *ConfigContainer) DefaultInt64(key string, defaultval int64) int64 {
- v, err := c.Int64(key)
- if err != nil {
- return defaultval
- }
- return v
-
-}
-
-// Float returns the float value for a given key.
-func (c *ConfigContainer) Float(key string) (float64, error) {
- return strconv.ParseFloat(c.data[key].(string), 64)
-}
-
-// DefaultFloat returns the float64 value for a given key.
-// if err != nil return defaltval
-func (c *ConfigContainer) DefaultFloat(key string, defaultval float64) float64 {
- v, err := c.Float(key)
- if err != nil {
- return defaultval
- }
- return v
-}
-
-// String returns the string value for a given key.
-func (c *ConfigContainer) String(key string) string {
- if v, ok := c.data[key].(string); ok {
- return v
- }
- return ""
-}
-
-// DefaultString returns the string value for a given key.
-// if err != nil return defaltval
-func (c *ConfigContainer) DefaultString(key string, defaultval string) string {
- v := c.String(key)
- if v == "" {
- return defaultval
- }
- return v
-}
-
-// Strings returns the []string value for a given key.
-func (c *ConfigContainer) Strings(key string) []string {
- return strings.Split(c.String(key), ";")
-}
-
-// DefaultStrings returns the []string value for a given key.
-// if err != nil return defaltval
-func (c *ConfigContainer) DefaultStrings(key string, defaultval []string) []string {
- v := c.Strings(key)
- if len(v) == 0 {
- return defaultval
- }
- return v
-}
-
-// GetSection returns map for the given section
-func (c *ConfigContainer) GetSection(section string) (map[string]string, error) {
- if v, ok := c.data[section]; ok {
- return v.(map[string]string), nil
- }
- return nil, errors.New("not exist setction")
-}
-
-// SaveConfigFile save the config into file
-func (c *ConfigContainer) SaveConfigFile(filename string) (err error) {
- // Write configuration file by filename.
- f, err := os.Create(filename)
- if err != nil {
- return err
- }
- defer f.Close()
- b, err := xml.MarshalIndent(c.data, " ", " ")
- if err != nil {
- return err
- }
- _, err = f.Write(b)
- return err
-}
-
-// Set writes a new value for key.
-func (c *ConfigContainer) Set(key, val string) error {
- c.Lock()
- defer c.Unlock()
- c.data[key] = val
- return nil
-}
-
-// DIY returns the raw value by a given key.
-func (c *ConfigContainer) DIY(key string) (v interface{}, err error) {
- if v, ok := c.data[key]; ok {
- return v, nil
- }
- return nil, errors.New("not exist key")
-}
-
-func init() {
- config.Register("xml", &Config{})
-}
diff --git a/vendor/github.com/astaxie/beego/config/yaml/yaml.go b/vendor/github.com/astaxie/beego/config/yaml/yaml.go
deleted file mode 100644
index f034d3ba3..000000000
--- a/vendor/github.com/astaxie/beego/config/yaml/yaml.go
+++ /dev/null
@@ -1,266 +0,0 @@
-// Copyright 2014 beego Author. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package yaml for config provider
-//
-// depend on github.com/beego/goyaml2
-//
-// go install github.com/beego/goyaml2
-//
-// Usage:
-// import(
-// _ "github.com/astaxie/beego/config/yaml"
-// "github.com/astaxie/beego/config"
-// )
-//
-// cnf, err := config.NewConfig("yaml", "config.yaml")
-//
-// more docs http://beego.me/docs/module/config.md
-package yaml
-
-import (
- "bytes"
- "encoding/json"
- "errors"
- "fmt"
- "io/ioutil"
- "log"
- "os"
- "path"
- "strings"
- "sync"
- "time"
-
- "github.com/astaxie/beego/config"
- "github.com/beego/goyaml2"
-)
-
-// Config is a yaml config parser and implements Config interface.
-type Config struct{}
-
-// Parse returns a ConfigContainer with parsed yaml config map.
-func (yaml *Config) Parse(filename string) (y config.Configer, err error) {
- cnf, err := ReadYmlReader(filename)
- if err != nil {
- return
- }
- y = &ConfigContainer{
- data: cnf,
- }
- return
-}
-
-// ParseData parse yaml data
-func (yaml *Config) ParseData(data []byte) (config.Configer, error) {
- // Save memory data to temporary file
- tmpName := path.Join(os.TempDir(), "beego", fmt.Sprintf("%d", time.Now().Nanosecond()))
- os.MkdirAll(path.Dir(tmpName), os.ModePerm)
- if err := ioutil.WriteFile(tmpName, data, 0655); err != nil {
- return nil, err
- }
- return yaml.Parse(tmpName)
-}
-
-// ReadYmlReader Read yaml file to map.
-// if json like, use json package, unless goyaml2 package.
-func ReadYmlReader(path string) (cnf map[string]interface{}, err error) {
- f, err := os.Open(path)
- if err != nil {
- return
- }
- defer f.Close()
-
- buf, err := ioutil.ReadAll(f)
- if err != nil || len(buf) < 3 {
- return
- }
-
- if string(buf[0:1]) == "{" {
- log.Println("Look like a Json, try json umarshal")
- err = json.Unmarshal(buf, &cnf)
- if err == nil {
- log.Println("It is Json Map")
- return
- }
- }
-
- data, err := goyaml2.Read(bytes.NewBuffer(buf))
- if err != nil {
- log.Println("Goyaml2 ERR>", string(buf), err)
- return
- }
-
- if data == nil {
- log.Println("Goyaml2 output nil? Pls report bug\n" + string(buf))
- return
- }
- cnf, ok := data.(map[string]interface{})
- if !ok {
- log.Println("Not a Map? >> ", string(buf), data)
- cnf = nil
- }
- return
-}
-
-// ConfigContainer A Config represents the yaml configuration.
-type ConfigContainer struct {
- data map[string]interface{}
- sync.Mutex
-}
-
-// Bool returns the boolean value for a given key.
-func (c *ConfigContainer) Bool(key string) (bool, error) {
- if v, ok := c.data[key].(bool); ok {
- return v, nil
- }
- return false, errors.New("not bool value")
-}
-
-// DefaultBool return the bool value if has no error
-// otherwise return the defaultval
-func (c *ConfigContainer) DefaultBool(key string, defaultval bool) bool {
- v, err := c.Bool(key)
- if err != nil {
- return defaultval
- }
- return v
-}
-
-// Int returns the integer value for a given key.
-func (c *ConfigContainer) Int(key string) (int, error) {
- if v, ok := c.data[key].(int64); ok {
- return int(v), nil
- }
- return 0, errors.New("not int value")
-}
-
-// DefaultInt returns the integer value for a given key.
-// if err != nil return defaltval
-func (c *ConfigContainer) DefaultInt(key string, defaultval int) int {
- v, err := c.Int(key)
- if err != nil {
- return defaultval
- }
- return v
-}
-
-// Int64 returns the int64 value for a given key.
-func (c *ConfigContainer) Int64(key string) (int64, error) {
- if v, ok := c.data[key].(int64); ok {
- return v, nil
- }
- return 0, errors.New("not bool value")
-}
-
-// DefaultInt64 returns the int64 value for a given key.
-// if err != nil return defaltval
-func (c *ConfigContainer) DefaultInt64(key string, defaultval int64) int64 {
- v, err := c.Int64(key)
- if err != nil {
- return defaultval
- }
- return v
-}
-
-// Float returns the float value for a given key.
-func (c *ConfigContainer) Float(key string) (float64, error) {
- if v, ok := c.data[key].(float64); ok {
- return v, nil
- }
- return 0.0, errors.New("not float64 value")
-}
-
-// DefaultFloat returns the float64 value for a given key.
-// if err != nil return defaltval
-func (c *ConfigContainer) DefaultFloat(key string, defaultval float64) float64 {
- v, err := c.Float(key)
- if err != nil {
- return defaultval
- }
- return v
-}
-
-// String returns the string value for a given key.
-func (c *ConfigContainer) String(key string) string {
- if v, ok := c.data[key].(string); ok {
- return v
- }
- return ""
-}
-
-// DefaultString returns the string value for a given key.
-// if err != nil return defaltval
-func (c *ConfigContainer) DefaultString(key string, defaultval string) string {
- v := c.String(key)
- if v == "" {
- return defaultval
- }
- return v
-}
-
-// Strings returns the []string value for a given key.
-func (c *ConfigContainer) Strings(key string) []string {
- return strings.Split(c.String(key), ";")
-}
-
-// DefaultStrings returns the []string value for a given key.
-// if err != nil return defaltval
-func (c *ConfigContainer) DefaultStrings(key string, defaultval []string) []string {
- v := c.Strings(key)
- if len(v) == 0 {
- return defaultval
- }
- return v
-}
-
-// GetSection returns map for the given section
-func (c *ConfigContainer) GetSection(section string) (map[string]string, error) {
- v, ok := c.data[section]
- if ok {
- return v.(map[string]string), nil
- }
- return nil, errors.New("not exist setction")
-}
-
-// SaveConfigFile save the config into file
-func (c *ConfigContainer) SaveConfigFile(filename string) (err error) {
- // Write configuration file by filename.
- f, err := os.Create(filename)
- if err != nil {
- return err
- }
- defer f.Close()
- err = goyaml2.Write(f, c.data)
- return err
-}
-
-// Set writes a new value for key.
-func (c *ConfigContainer) Set(key, val string) error {
- c.Lock()
- defer c.Unlock()
- c.data[key] = val
- return nil
-}
-
-// DIY returns the raw value by a given key.
-func (c *ConfigContainer) DIY(key string) (v interface{}, err error) {
- if v, ok := c.data[key]; ok {
- return v, nil
- }
- return nil, errors.New("not exist key")
-}
-
-func init() {
- config.Register("yaml", &Config{})
-}
diff --git a/vendor/github.com/astaxie/beego/context/context.go b/vendor/github.com/astaxie/beego/context/context.go
index db790ff2f..63a1313d2 100644
--- a/vendor/github.com/astaxie/beego/context/context.go
+++ b/vendor/github.com/astaxie/beego/context/context.go
@@ -24,11 +24,13 @@ package context
import (
"bufio"
+ "bytes"
"crypto/hmac"
"crypto/sha1"
"encoding/base64"
"errors"
"fmt"
+ "io"
"net"
"net/http"
"strconv"
@@ -59,7 +61,10 @@ type Context struct {
// Reset init Context, BeegoInput and BeegoOutput
func (ctx *Context) Reset(rw http.ResponseWriter, r *http.Request) {
ctx.Request = r
- ctx.ResponseWriter = &Response{rw, false, 0}
+ if ctx.ResponseWriter == nil {
+ ctx.ResponseWriter = &Response{}
+ }
+ ctx.ResponseWriter.reset(rw)
ctx.Input.Reset(ctx)
ctx.Output.Reset(ctx)
}
@@ -176,25 +181,43 @@ type Response struct {
Status int
}
+func (r *Response) reset(rw http.ResponseWriter) {
+ r.ResponseWriter = rw
+ r.Status = 0
+ r.Started = false
+}
+
// Write writes the data to the connection as part of an HTTP reply,
// and sets `started` to true.
// started means the response has sent out.
-func (w *Response) Write(p []byte) (int, error) {
- w.Started = true
- return w.ResponseWriter.Write(p)
+func (r *Response) Write(p []byte) (int, error) {
+ r.Started = true
+ return r.ResponseWriter.Write(p)
+}
+
+// Copy writes the data to the connection as part of an HTTP reply,
+// and sets `started` to true.
+// started means the response has sent out.
+func (r *Response) Copy(buf *bytes.Buffer) (int64, error) {
+ r.Started = true
+ return io.Copy(r.ResponseWriter, buf)
}
// WriteHeader sends an HTTP response header with status code,
// and sets `started` to true.
-func (w *Response) WriteHeader(code int) {
- w.Status = code
- w.Started = true
- w.ResponseWriter.WriteHeader(code)
+func (r *Response) WriteHeader(code int) {
+ if r.Status > 0 {
+ //prevent multiple response.WriteHeader calls
+ return
+ }
+ r.Status = code
+ r.Started = true
+ r.ResponseWriter.WriteHeader(code)
}
// Hijack hijacker for http
-func (w *Response) Hijack() (net.Conn, *bufio.ReadWriter, error) {
- hj, ok := w.ResponseWriter.(http.Hijacker)
+func (r *Response) Hijack() (net.Conn, *bufio.ReadWriter, error) {
+ hj, ok := r.ResponseWriter.(http.Hijacker)
if !ok {
return nil, nil, errors.New("webserver doesn't support hijacking")
}
@@ -202,15 +225,15 @@ func (w *Response) Hijack() (net.Conn, *bufio.ReadWriter, error) {
}
// Flush http.Flusher
-func (w *Response) Flush() {
- if f, ok := w.ResponseWriter.(http.Flusher); ok {
+func (r *Response) Flush() {
+ if f, ok := r.ResponseWriter.(http.Flusher); ok {
f.Flush()
}
}
// CloseNotify http.CloseNotifier
-func (w *Response) CloseNotify() <-chan bool {
- if cn, ok := w.ResponseWriter.(http.CloseNotifier); ok {
+func (r *Response) CloseNotify() <-chan bool {
+ if cn, ok := r.ResponseWriter.(http.CloseNotifier); ok {
return cn.CloseNotify()
}
return nil
diff --git a/vendor/github.com/astaxie/beego/context/input.go b/vendor/github.com/astaxie/beego/context/input.go
index c37204bdc..edfdf5302 100644
--- a/vendor/github.com/astaxie/beego/context/input.go
+++ b/vendor/github.com/astaxie/beego/context/input.go
@@ -287,6 +287,13 @@ func (input *BeegoInput) Params() map[string]string {
// SetParam will set the param with key and value
func (input *BeegoInput) SetParam(key, val string) {
+ // check if already exists
+ for i, v := range input.pnames {
+ if v == key && i <= len(input.pvalues) {
+ input.pvalues[i] = val
+ return
+ }
+ }
input.pvalues = append(input.pvalues, val)
input.pnames = append(input.pnames, key)
}
diff --git a/vendor/github.com/astaxie/beego/context/output.go b/vendor/github.com/astaxie/beego/context/output.go
index 2d756e271..174047020 100644
--- a/vendor/github.com/astaxie/beego/context/output.go
+++ b/vendor/github.com/astaxie/beego/context/output.go
@@ -21,7 +21,6 @@ import (
"errors"
"fmt"
"html/template"
- "io"
"mime"
"net/http"
"path/filepath"
@@ -57,7 +56,7 @@ func (output *BeegoOutput) Header(key, val string) {
// Body sets response body content.
// if EnableGzip, compress content string.
// it sends out response body directly.
-func (output *BeegoOutput) Body(content []byte) {
+func (output *BeegoOutput) Body(content []byte) error {
var encoding string
var buf = &bytes.Buffer{}
if output.EnableGzip {
@@ -75,7 +74,8 @@ func (output *BeegoOutput) Body(content []byte) {
output.Status = 0
}
- io.Copy(output.Context.ResponseWriter, buf)
+ _, err := output.Context.ResponseWriter.Copy(buf)
+ return err
}
// Cookie sets cookie value via given key.
@@ -97,9 +97,10 @@ func (output *BeegoOutput) Cookie(name string, value string, others ...interface
maxAge = v
}
- if maxAge > 0 {
+ switch {
+ case maxAge > 0:
fmt.Fprintf(&b, "; Expires=%s; Max-Age=%d", time.Now().Add(time.Duration(maxAge)*time.Second).UTC().Format(time.RFC1123), maxAge)
- } else {
+ case maxAge < 0:
fmt.Fprintf(&b, "; Max-Age=0")
}
}
@@ -186,8 +187,7 @@ func (output *BeegoOutput) JSON(data interface{}, hasIndent bool, coding bool) e
if coding {
content = []byte(stringsToJSON(string(content)))
}
- output.Body(content)
- return nil
+ return output.Body(content)
}
// JSONP writes jsonp to response body.
@@ -212,8 +212,7 @@ func (output *BeegoOutput) JSONP(data interface{}, hasIndent bool) error {
callbackContent.WriteString("(")
callbackContent.Write(content)
callbackContent.WriteString(");\r\n")
- output.Body(callbackContent.Bytes())
- return nil
+ return output.Body(callbackContent.Bytes())
}
// XML writes xml string to response body.
@@ -230,8 +229,7 @@ func (output *BeegoOutput) XML(data interface{}, hasIndent bool) error {
http.Error(output.Context.ResponseWriter, err.Error(), http.StatusInternalServerError)
return err
}
- output.Body(content)
- return nil
+ return output.Body(content)
}
// Download forces response for download file.
diff --git a/vendor/github.com/astaxie/beego/controller.go b/vendor/github.com/astaxie/beego/controller.go
index a2943d420..dc2758480 100644
--- a/vendor/github.com/astaxie/beego/controller.go
+++ b/vendor/github.com/astaxie/beego/controller.go
@@ -185,8 +185,7 @@ func (c *Controller) Render() error {
return err
}
c.Ctx.Output.Header("Content-Type", "text/html; charset=utf-8")
- c.Ctx.Output.Body(rb)
- return nil
+ return c.Ctx.Output.Body(rb)
}
// RenderString returns the rendered template string. Do not send out response.
@@ -197,33 +196,9 @@ func (c *Controller) RenderString() (string, error) {
// RenderBytes returns the bytes of rendered template string. Do not send out response.
func (c *Controller) RenderBytes() ([]byte, error) {
- //if the controller has set layout, then first get the tplname's content set the content to the layout
- var buf bytes.Buffer
- if c.Layout != "" {
- if c.TplName == "" {
- c.TplName = strings.ToLower(c.controllerName) + "/" + strings.ToLower(c.actionName) + "." + c.TplExt
- }
-
- if BConfig.RunMode == DEV {
- buildFiles := []string{c.TplName}
- if c.LayoutSections != nil {
- for _, sectionTpl := range c.LayoutSections {
- if sectionTpl == "" {
- continue
- }
- buildFiles = append(buildFiles, sectionTpl)
- }
- }
- BuildTemplate(BConfig.WebConfig.ViewsPath, buildFiles...)
- }
- if _, ok := BeeTemplates[c.TplName]; !ok {
- panic("can't find templatefile in the path:" + c.TplName)
- }
- err := BeeTemplates[c.TplName].ExecuteTemplate(&buf, c.TplName, c.Data)
- if err != nil {
- Trace("template Execute err:", err)
- return nil, err
- }
+ buf, err := c.renderTemplate()
+ //if the controller has set layout, then first get the tplName's content set the content to the layout
+ if err == nil && c.Layout != "" {
c.Data["LayoutContent"] = template.HTML(buf.String())
if c.LayoutSections != nil {
@@ -232,11 +207,9 @@ func (c *Controller) RenderBytes() ([]byte, error) {
c.Data[sectionName] = ""
continue
}
-
buf.Reset()
- err = BeeTemplates[sectionTpl].ExecuteTemplate(&buf, sectionTpl, c.Data)
+ err = executeTemplate(&buf, sectionTpl, c.Data)
if err != nil {
- Trace("template Execute err:", err)
return nil, err
}
c.Data[sectionName] = template.HTML(buf.String())
@@ -244,30 +217,32 @@ func (c *Controller) RenderBytes() ([]byte, error) {
}
buf.Reset()
- err = BeeTemplates[c.Layout].ExecuteTemplate(&buf, c.Layout, c.Data)
- if err != nil {
- Trace("template Execute err:", err)
- return nil, err
- }
- return buf.Bytes(), nil
+ executeTemplate(&buf, c.Layout, c.Data)
}
+ return buf.Bytes(), err
+}
+func (c *Controller) renderTemplate() (bytes.Buffer, error) {
+ var buf bytes.Buffer
if c.TplName == "" {
c.TplName = strings.ToLower(c.controllerName) + "/" + strings.ToLower(c.actionName) + "." + c.TplExt
}
if BConfig.RunMode == DEV {
- BuildTemplate(BConfig.WebConfig.ViewsPath, c.TplName)
+ buildFiles := []string{c.TplName}
+ if c.Layout != "" {
+ buildFiles = append(buildFiles, c.Layout)
+ if c.LayoutSections != nil {
+ for _, sectionTpl := range c.LayoutSections {
+ if sectionTpl == "" {
+ continue
+ }
+ buildFiles = append(buildFiles, sectionTpl)
+ }
+ }
+ }
+ BuildTemplate(BConfig.WebConfig.ViewsPath, buildFiles...)
}
- if _, ok := BeeTemplates[c.TplName]; !ok {
- panic("can't find templatefile in the path:" + c.TplName)
- }
- buf.Reset()
- err := BeeTemplates[c.TplName].ExecuteTemplate(&buf, c.TplName, c.Data)
- if err != nil {
- Trace("template Execute err:", err)
- return nil, err
- }
- return buf.Bytes(), nil
+ return buf, executeTemplate(&buf, c.TplName, c.Data)
}
// Redirect sends the redirection response to url with status code.
@@ -287,6 +262,7 @@ func (c *Controller) Abort(code string) {
// CustomAbort stops controller handler and show the error data, it's similar Aborts, but support status code and body.
func (c *Controller) CustomAbort(status int, body string) {
c.Ctx.ResponseWriter.WriteHeader(status)
+ //c.Ctx.Output.Status = status
// first panic from ErrorMaps, is is user defined error functions.
if _, ok := ErrorMaps[body]; ok {
panic(body)
diff --git a/vendor/github.com/astaxie/beego/error.go b/vendor/github.com/astaxie/beego/error.go
index 94151dd8b..4f48fab21 100644
--- a/vendor/github.com/astaxie/beego/error.go
+++ b/vendor/github.com/astaxie/beego/error.go
@@ -424,6 +424,7 @@ func exception(errCode string, ctx *context.Context) {
func executeError(err *errorInfo, ctx *context.Context, code int) {
if err.errorType == errorTypeHandler {
+ ctx.ResponseWriter.WriteHeader(code)
err.handler(ctx.ResponseWriter, ctx.Request)
return
}
diff --git a/vendor/github.com/astaxie/beego/grace/server.go b/vendor/github.com/astaxie/beego/grace/server.go
index f4512ded5..101bda56d 100644
--- a/vendor/github.com/astaxie/beego/grace/server.go
+++ b/vendor/github.com/astaxie/beego/grace/server.go
@@ -90,16 +90,15 @@ func (srv *Server) ListenAndServeTLS(certFile, keyFile string) (err error) {
addr = ":https"
}
- config := &tls.Config{}
- if srv.TLSConfig != nil {
- *config = *srv.TLSConfig
+ if srv.TLSConfig == nil {
+ srv.TLSConfig = &tls.Config{}
}
- if config.NextProtos == nil {
- config.NextProtos = []string{"http/1.1"}
+ if srv.TLSConfig.NextProtos == nil {
+ srv.TLSConfig.NextProtos = []string{"http/1.1"}
}
- config.Certificates = make([]tls.Certificate, 1)
- config.Certificates[0], err = tls.LoadX509KeyPair(certFile, keyFile)
+ srv.TLSConfig.Certificates = make([]tls.Certificate, 1)
+ srv.TLSConfig.Certificates[0], err = tls.LoadX509KeyPair(certFile, keyFile)
if err != nil {
return
}
@@ -113,7 +112,7 @@ func (srv *Server) ListenAndServeTLS(certFile, keyFile string) (err error) {
}
srv.tlsInnerListener = newGraceListener(l, srv)
- srv.GraceListener = tls.NewListener(srv.tlsInnerListener, config)
+ srv.GraceListener = tls.NewListener(srv.tlsInnerListener, srv.TLSConfig)
if srv.isChild {
process, err := os.FindProcess(os.Getppid())
diff --git a/vendor/github.com/astaxie/beego/hooks.go b/vendor/github.com/astaxie/beego/hooks.go
index 78abf8ef9..59b10b32f 100644
--- a/vendor/github.com/astaxie/beego/hooks.go
+++ b/vendor/github.com/astaxie/beego/hooks.go
@@ -68,13 +68,11 @@ func registerSession() error {
}
func registerTemplate() error {
- if BConfig.WebConfig.AutoRender {
- if err := BuildTemplate(BConfig.WebConfig.ViewsPath); err != nil {
- if BConfig.RunMode == DEV {
- Warn(err)
- }
- return err
+ if err := BuildTemplate(BConfig.WebConfig.ViewsPath); err != nil {
+ if BConfig.RunMode == DEV {
+ Warn(err)
}
+ return err
}
return nil
}
diff --git a/vendor/github.com/astaxie/beego/httplib/README.md b/vendor/github.com/astaxie/beego/httplib/README.md
deleted file mode 100644
index 6a72cf7cf..000000000
--- a/vendor/github.com/astaxie/beego/httplib/README.md
+++ /dev/null
@@ -1,97 +0,0 @@
-# httplib
-httplib is an libs help you to curl remote url.
-
-# How to use?
-
-## GET
-you can use Get to crawl data.
-
- import "github.com/astaxie/beego/httplib"
-
- str, err := httplib.Get("http://beego.me/").String()
- if err != nil {
- // error
- }
- fmt.Println(str)
-
-## POST
-POST data to remote url
-
- req := httplib.Post("http://beego.me/")
- req.Param("username","astaxie")
- req.Param("password","123456")
- str, err := req.String()
- if err != nil {
- // error
- }
- fmt.Println(str)
-
-## Set timeout
-
-The default timeout is `60` seconds, function prototype:
-
- SetTimeout(connectTimeout, readWriteTimeout time.Duration)
-
-Exmaple:
-
- // GET
- httplib.Get("http://beego.me/").SetTimeout(100 * time.Second, 30 * time.Second)
-
- // POST
- httplib.Post("http://beego.me/").SetTimeout(100 * time.Second, 30 * time.Second)
-
-
-## Debug
-
-If you want to debug the request info, set the debug on
-
- httplib.Get("http://beego.me/").Debug(true)
-
-## Set HTTP Basic Auth
-
- str, err := Get("http://beego.me/").SetBasicAuth("user", "passwd").String()
- if err != nil {
- // error
- }
- fmt.Println(str)
-
-## Set HTTPS
-
-If request url is https, You can set the client support TSL:
-
- httplib.SetTLSClientConfig(&tls.Config{InsecureSkipVerify: true})
-
-More info about the `tls.Config` please visit http://golang.org/pkg/crypto/tls/#Config
-
-## Set HTTP Version
-
-some servers need to specify the protocol version of HTTP
-
- httplib.Get("http://beego.me/").SetProtocolVersion("HTTP/1.1")
-
-## Set Cookie
-
-some http request need setcookie. So set it like this:
-
- cookie := &http.Cookie{}
- cookie.Name = "username"
- cookie.Value = "astaxie"
- httplib.Get("http://beego.me/").SetCookie(cookie)
-
-## Upload file
-
-httplib support mutil file upload, use `req.PostFile()`
-
- req := httplib.Post("http://beego.me/")
- req.Param("username","astaxie")
- req.PostFile("uploadfile1", "httplib.pdf")
- str, err := req.String()
- if err != nil {
- // error
- }
- fmt.Println(str)
-
-
-See godoc for further documentation and examples.
-
-* [godoc.org/github.com/astaxie/beego/httplib](https://godoc.org/github.com/astaxie/beego/httplib)
diff --git a/vendor/github.com/astaxie/beego/httplib/httplib.go b/vendor/github.com/astaxie/beego/httplib/httplib.go
deleted file mode 100644
index fb64a30a8..000000000
--- a/vendor/github.com/astaxie/beego/httplib/httplib.go
+++ /dev/null
@@ -1,552 +0,0 @@
-// Copyright 2014 beego Author. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package httplib is used as http.Client
-// Usage:
-//
-// import "github.com/astaxie/beego/httplib"
-//
-// b := httplib.Post("http://beego.me/")
-// b.Param("username","astaxie")
-// b.Param("password","123456")
-// b.PostFile("uploadfile1", "httplib.pdf")
-// b.PostFile("uploadfile2", "httplib.txt")
-// str, err := b.String()
-// if err != nil {
-// t.Fatal(err)
-// }
-// fmt.Println(str)
-//
-// more docs http://beego.me/docs/module/httplib.md
-package httplib
-
-import (
- "bytes"
- "compress/gzip"
- "crypto/tls"
- "encoding/json"
- "encoding/xml"
- "io"
- "io/ioutil"
- "log"
- "mime/multipart"
- "net"
- "net/http"
- "net/http/cookiejar"
- "net/http/httputil"
- "net/url"
- "os"
- "strings"
- "sync"
- "time"
-)
-
-var defaultSetting = BeegoHTTPSettings{
- UserAgent: "beegoServer",
- ConnectTimeout: 60 * time.Second,
- ReadWriteTimeout: 60 * time.Second,
- Gzip: true,
- DumpBody: true,
-}
-
-var defaultCookieJar http.CookieJar
-var settingMutex sync.Mutex
-
-// createDefaultCookie creates a global cookiejar to store cookies.
-func createDefaultCookie() {
- settingMutex.Lock()
- defer settingMutex.Unlock()
- defaultCookieJar, _ = cookiejar.New(nil)
-}
-
-// SetDefaultSetting Overwrite default settings
-func SetDefaultSetting(setting BeegoHTTPSettings) {
- settingMutex.Lock()
- defer settingMutex.Unlock()
- defaultSetting = setting
-}
-
-// NewBeegoRequest return *BeegoHttpRequest with specific method
-func NewBeegoRequest(rawurl, method string) *BeegoHTTPRequest {
- var resp http.Response
- u, err := url.Parse(rawurl)
- if err != nil {
- log.Println("Httplib:", err)
- }
- req := http.Request{
- URL: u,
- Method: method,
- Header: make(http.Header),
- Proto: "HTTP/1.1",
- ProtoMajor: 1,
- ProtoMinor: 1,
- }
- return &BeegoHTTPRequest{
- url: rawurl,
- req: &req,
- params: map[string][]string{},
- files: map[string]string{},
- setting: defaultSetting,
- resp: &resp,
- }
-}
-
-// Get returns *BeegoHttpRequest with GET method.
-func Get(url string) *BeegoHTTPRequest {
- return NewBeegoRequest(url, "GET")
-}
-
-// Post returns *BeegoHttpRequest with POST method.
-func Post(url string) *BeegoHTTPRequest {
- return NewBeegoRequest(url, "POST")
-}
-
-// Put returns *BeegoHttpRequest with PUT method.
-func Put(url string) *BeegoHTTPRequest {
- return NewBeegoRequest(url, "PUT")
-}
-
-// Delete returns *BeegoHttpRequest DELETE method.
-func Delete(url string) *BeegoHTTPRequest {
- return NewBeegoRequest(url, "DELETE")
-}
-
-// Head returns *BeegoHttpRequest with HEAD method.
-func Head(url string) *BeegoHTTPRequest {
- return NewBeegoRequest(url, "HEAD")
-}
-
-// BeegoHTTPSettings is the http.Client setting
-type BeegoHTTPSettings struct {
- ShowDebug bool
- UserAgent string
- ConnectTimeout time.Duration
- ReadWriteTimeout time.Duration
- TLSClientConfig *tls.Config
- Proxy func(*http.Request) (*url.URL, error)
- Transport http.RoundTripper
- EnableCookie bool
- Gzip bool
- DumpBody bool
-}
-
-// BeegoHTTPRequest provides more useful methods for requesting one url than http.Request.
-type BeegoHTTPRequest struct {
- url string
- req *http.Request
- params map[string][]string
- files map[string]string
- setting BeegoHTTPSettings
- resp *http.Response
- body []byte
- dump []byte
-}
-
-// GetRequest return the request object
-func (b *BeegoHTTPRequest) GetRequest() *http.Request {
- return b.req
-}
-
-// Setting Change request settings
-func (b *BeegoHTTPRequest) Setting(setting BeegoHTTPSettings) *BeegoHTTPRequest {
- b.setting = setting
- return b
-}
-
-// SetBasicAuth sets the request's Authorization header to use HTTP Basic Authentication with the provided username and password.
-func (b *BeegoHTTPRequest) SetBasicAuth(username, password string) *BeegoHTTPRequest {
- b.req.SetBasicAuth(username, password)
- return b
-}
-
-// SetEnableCookie sets enable/disable cookiejar
-func (b *BeegoHTTPRequest) SetEnableCookie(enable bool) *BeegoHTTPRequest {
- b.setting.EnableCookie = enable
- return b
-}
-
-// SetUserAgent sets User-Agent header field
-func (b *BeegoHTTPRequest) SetUserAgent(useragent string) *BeegoHTTPRequest {
- b.setting.UserAgent = useragent
- return b
-}
-
-// Debug sets show debug or not when executing request.
-func (b *BeegoHTTPRequest) Debug(isdebug bool) *BeegoHTTPRequest {
- b.setting.ShowDebug = isdebug
- return b
-}
-
-// DumpBody setting whether need to Dump the Body.
-func (b *BeegoHTTPRequest) DumpBody(isdump bool) *BeegoHTTPRequest {
- b.setting.DumpBody = isdump
- return b
-}
-
-// DumpRequest return the DumpRequest
-func (b *BeegoHTTPRequest) DumpRequest() []byte {
- return b.dump
-}
-
-// SetTimeout sets connect time out and read-write time out for BeegoRequest.
-func (b *BeegoHTTPRequest) SetTimeout(connectTimeout, readWriteTimeout time.Duration) *BeegoHTTPRequest {
- b.setting.ConnectTimeout = connectTimeout
- b.setting.ReadWriteTimeout = readWriteTimeout
- return b
-}
-
-// SetTLSClientConfig sets tls connection configurations if visiting https url.
-func (b *BeegoHTTPRequest) SetTLSClientConfig(config *tls.Config) *BeegoHTTPRequest {
- b.setting.TLSClientConfig = config
- return b
-}
-
-// Header add header item string in request.
-func (b *BeegoHTTPRequest) Header(key, value string) *BeegoHTTPRequest {
- b.req.Header.Set(key, value)
- return b
-}
-
-// SetHost set the request host
-func (b *BeegoHTTPRequest) SetHost(host string) *BeegoHTTPRequest {
- b.req.Host = host
- return b
-}
-
-// SetProtocolVersion Set the protocol version for incoming requests.
-// Client requests always use HTTP/1.1.
-func (b *BeegoHTTPRequest) SetProtocolVersion(vers string) *BeegoHTTPRequest {
- if len(vers) == 0 {
- vers = "HTTP/1.1"
- }
-
- major, minor, ok := http.ParseHTTPVersion(vers)
- if ok {
- b.req.Proto = vers
- b.req.ProtoMajor = major
- b.req.ProtoMinor = minor
- }
-
- return b
-}
-
-// SetCookie add cookie into request.
-func (b *BeegoHTTPRequest) SetCookie(cookie *http.Cookie) *BeegoHTTPRequest {
- b.req.Header.Add("Cookie", cookie.String())
- return b
-}
-
-// SetTransport set the setting transport
-func (b *BeegoHTTPRequest) SetTransport(transport http.RoundTripper) *BeegoHTTPRequest {
- b.setting.Transport = transport
- return b
-}
-
-// SetProxy set the http proxy
-// example:
-//
-// func(req *http.Request) (*url.URL, error) {
-// u, _ := url.ParseRequestURI("http://127.0.0.1:8118")
-// return u, nil
-// }
-func (b *BeegoHTTPRequest) SetProxy(proxy func(*http.Request) (*url.URL, error)) *BeegoHTTPRequest {
- b.setting.Proxy = proxy
- return b
-}
-
-// Param adds query param in to request.
-// params build query string as ?key1=value1&key2=value2...
-func (b *BeegoHTTPRequest) Param(key, value string) *BeegoHTTPRequest {
- if param, ok := b.params[key]; ok {
- b.params[key] = append(param, value)
- } else {
- b.params[key] = []string{value}
- }
- return b
-}
-
-// PostFile add a post file to the request
-func (b *BeegoHTTPRequest) PostFile(formname, filename string) *BeegoHTTPRequest {
- b.files[formname] = filename
- return b
-}
-
-// Body adds request raw body.
-// it supports string and []byte.
-func (b *BeegoHTTPRequest) Body(data interface{}) *BeegoHTTPRequest {
- switch t := data.(type) {
- case string:
- bf := bytes.NewBufferString(t)
- b.req.Body = ioutil.NopCloser(bf)
- b.req.ContentLength = int64(len(t))
- case []byte:
- bf := bytes.NewBuffer(t)
- b.req.Body = ioutil.NopCloser(bf)
- b.req.ContentLength = int64(len(t))
- }
- return b
-}
-
-// JSONBody adds request raw body encoding by JSON.
-func (b *BeegoHTTPRequest) JSONBody(obj interface{}) (*BeegoHTTPRequest, error) {
- if b.req.Body == nil && obj != nil {
- buf := bytes.NewBuffer(nil)
- enc := json.NewEncoder(buf)
- if err := enc.Encode(obj); err != nil {
- return b, err
- }
- b.req.Body = ioutil.NopCloser(buf)
- b.req.ContentLength = int64(buf.Len())
- b.req.Header.Set("Content-Type", "application/json")
- }
- return b, nil
-}
-
-func (b *BeegoHTTPRequest) buildURL(paramBody string) {
- // build GET url with query string
- if b.req.Method == "GET" && len(paramBody) > 0 {
- if strings.Index(b.url, "?") != -1 {
- b.url += "&" + paramBody
- } else {
- b.url = b.url + "?" + paramBody
- }
- return
- }
-
- // build POST/PUT/PATCH url and body
- if (b.req.Method == "POST" || b.req.Method == "PUT" || b.req.Method == "PATCH") && b.req.Body == nil {
- // with files
- if len(b.files) > 0 {
- pr, pw := io.Pipe()
- bodyWriter := multipart.NewWriter(pw)
- go func() {
- for formname, filename := range b.files {
- fileWriter, err := bodyWriter.CreateFormFile(formname, filename)
- if err != nil {
- log.Println("Httplib:", err)
- }
- fh, err := os.Open(filename)
- if err != nil {
- log.Println("Httplib:", err)
- }
- //iocopy
- _, err = io.Copy(fileWriter, fh)
- fh.Close()
- if err != nil {
- log.Println("Httplib:", err)
- }
- }
- for k, v := range b.params {
- for _, vv := range v {
- bodyWriter.WriteField(k, vv)
- }
- }
- bodyWriter.Close()
- pw.Close()
- }()
- b.Header("Content-Type", bodyWriter.FormDataContentType())
- b.req.Body = ioutil.NopCloser(pr)
- return
- }
-
- // with params
- if len(paramBody) > 0 {
- b.Header("Content-Type", "application/x-www-form-urlencoded")
- b.Body(paramBody)
- }
- }
-}
-
-func (b *BeegoHTTPRequest) getResponse() (*http.Response, error) {
- if b.resp.StatusCode != 0 {
- return b.resp, nil
- }
- resp, err := b.DoRequest()
- if err != nil {
- return nil, err
- }
- b.resp = resp
- return resp, nil
-}
-
-// DoRequest will do the client.Do
-func (b *BeegoHTTPRequest) DoRequest() (*http.Response, error) {
- var paramBody string
- if len(b.params) > 0 {
- var buf bytes.Buffer
- for k, v := range b.params {
- for _, vv := range v {
- buf.WriteString(url.QueryEscape(k))
- buf.WriteByte('=')
- buf.WriteString(url.QueryEscape(vv))
- buf.WriteByte('&')
- }
- }
- paramBody = buf.String()
- paramBody = paramBody[0 : len(paramBody)-1]
- }
-
- b.buildURL(paramBody)
- url, err := url.Parse(b.url)
- if err != nil {
- return nil, err
- }
-
- b.req.URL = url
-
- trans := b.setting.Transport
-
- if trans == nil {
- // create default transport
- trans = &http.Transport{
- TLSClientConfig: b.setting.TLSClientConfig,
- Proxy: b.setting.Proxy,
- Dial: TimeoutDialer(b.setting.ConnectTimeout, b.setting.ReadWriteTimeout),
- }
- } else {
- // if b.transport is *http.Transport then set the settings.
- if t, ok := trans.(*http.Transport); ok {
- if t.TLSClientConfig == nil {
- t.TLSClientConfig = b.setting.TLSClientConfig
- }
- if t.Proxy == nil {
- t.Proxy = b.setting.Proxy
- }
- if t.Dial == nil {
- t.Dial = TimeoutDialer(b.setting.ConnectTimeout, b.setting.ReadWriteTimeout)
- }
- }
- }
-
- var jar http.CookieJar
- if b.setting.EnableCookie {
- if defaultCookieJar == nil {
- createDefaultCookie()
- }
- jar = defaultCookieJar
- }
-
- client := &http.Client{
- Transport: trans,
- Jar: jar,
- }
-
- if b.setting.UserAgent != "" && b.req.Header.Get("User-Agent") == "" {
- b.req.Header.Set("User-Agent", b.setting.UserAgent)
- }
-
- if b.setting.ShowDebug {
- dump, err := httputil.DumpRequest(b.req, b.setting.DumpBody)
- if err != nil {
- log.Println(err.Error())
- }
- b.dump = dump
- }
- return client.Do(b.req)
-}
-
-// String returns the body string in response.
-// it calls Response inner.
-func (b *BeegoHTTPRequest) String() (string, error) {
- data, err := b.Bytes()
- if err != nil {
- return "", err
- }
-
- return string(data), nil
-}
-
-// Bytes returns the body []byte in response.
-// it calls Response inner.
-func (b *BeegoHTTPRequest) Bytes() ([]byte, error) {
- if b.body != nil {
- return b.body, nil
- }
- resp, err := b.getResponse()
- if err != nil {
- return nil, err
- }
- if resp.Body == nil {
- return nil, nil
- }
- defer resp.Body.Close()
- if b.setting.Gzip && resp.Header.Get("Content-Encoding") == "gzip" {
- reader, err := gzip.NewReader(resp.Body)
- if err != nil {
- return nil, err
- }
- b.body, err = ioutil.ReadAll(reader)
- } else {
- b.body, err = ioutil.ReadAll(resp.Body)
- }
- return b.body, err
-}
-
-// ToFile saves the body data in response to one file.
-// it calls Response inner.
-func (b *BeegoHTTPRequest) ToFile(filename string) error {
- f, err := os.Create(filename)
- if err != nil {
- return err
- }
- defer f.Close()
-
- resp, err := b.getResponse()
- if err != nil {
- return err
- }
- if resp.Body == nil {
- return nil
- }
- defer resp.Body.Close()
- _, err = io.Copy(f, resp.Body)
- return err
-}
-
-// ToJSON returns the map that marshals from the body bytes as json in response .
-// it calls Response inner.
-func (b *BeegoHTTPRequest) ToJSON(v interface{}) error {
- data, err := b.Bytes()
- if err != nil {
- return err
- }
- return json.Unmarshal(data, v)
-}
-
-// ToXML returns the map that marshals from the body bytes as xml in response .
-// it calls Response inner.
-func (b *BeegoHTTPRequest) ToXML(v interface{}) error {
- data, err := b.Bytes()
- if err != nil {
- return err
- }
- return xml.Unmarshal(data, v)
-}
-
-// Response executes request client gets response mannually.
-func (b *BeegoHTTPRequest) Response() (*http.Response, error) {
- return b.getResponse()
-}
-
-// TimeoutDialer returns functions of connection dialer with timeout settings for http.Transport Dial field.
-func TimeoutDialer(cTimeout time.Duration, rwTimeout time.Duration) func(net, addr string) (c net.Conn, err error) {
- return func(netw, addr string) (net.Conn, error) {
- conn, err := net.DialTimeout(netw, addr, cTimeout)
- if err != nil {
- return nil, err
- }
- err = conn.SetDeadline(time.Now().Add(rwTimeout))
- return conn, err
- }
-}
diff --git a/vendor/github.com/astaxie/beego/logs/conn.go b/vendor/github.com/astaxie/beego/logs/conn.go
index 3655bf514..1db1a427c 100644
--- a/vendor/github.com/astaxie/beego/logs/conn.go
+++ b/vendor/github.com/astaxie/beego/logs/conn.go
@@ -17,14 +17,14 @@ package logs
import (
"encoding/json"
"io"
- "log"
"net"
+ "time"
)
// connWriter implements LoggerInterface.
// it writes messages in keep-live tcp connection.
type connWriter struct {
- lg *log.Logger
+ lg *logWriter
innerWriter io.WriteCloser
ReconnectOnMsg bool `json:"reconnectOnMsg"`
Reconnect bool `json:"reconnect"`
@@ -42,17 +42,17 @@ func NewConn() Logger {
// Init init connection writer with json config.
// json config only need key "level".
-func (c *connWriter) Init(jsonconfig string) error {
- return json.Unmarshal([]byte(jsonconfig), c)
+func (c *connWriter) Init(jsonConfig string) error {
+ return json.Unmarshal([]byte(jsonConfig), c)
}
// WriteMsg write message in connection.
// if connection is down, try to re-connect.
-func (c *connWriter) WriteMsg(msg string, level int) error {
+func (c *connWriter) WriteMsg(when time.Time, msg string, level int) error {
if level > c.Level {
return nil
}
- if c.neddedConnectOnMsg() {
+ if c.needToConnectOnMsg() {
err := c.connect()
if err != nil {
return err
@@ -62,7 +62,8 @@ func (c *connWriter) WriteMsg(msg string, level int) error {
if c.ReconnectOnMsg {
defer c.innerWriter.Close()
}
- c.lg.Println(msg)
+
+ c.lg.println(when, msg)
return nil
}
@@ -94,11 +95,11 @@ func (c *connWriter) connect() error {
}
c.innerWriter = conn
- c.lg = log.New(conn, "", log.Ldate|log.Ltime)
+ c.lg = newLogWriter(conn)
return nil
}
-func (c *connWriter) neddedConnectOnMsg() bool {
+func (c *connWriter) needToConnectOnMsg() bool {
if c.Reconnect {
c.Reconnect = false
return true
diff --git a/vendor/github.com/astaxie/beego/logs/console.go b/vendor/github.com/astaxie/beego/logs/console.go
index 23e8ebcaf..05d08a42e 100644
--- a/vendor/github.com/astaxie/beego/logs/console.go
+++ b/vendor/github.com/astaxie/beego/logs/console.go
@@ -16,9 +16,9 @@ package logs
import (
"encoding/json"
- "log"
"os"
"runtime"
+ "time"
)
// brush is a color join function
@@ -34,51 +34,55 @@ func newBrush(color string) brush {
}
var colors = []brush{
- newBrush("1;37"), // Emergency white
- newBrush("1;36"), // Alert cyan
- newBrush("1;35"), // Critical magenta
- newBrush("1;31"), // Error red
- newBrush("1;33"), // Warning yellow
- newBrush("1;32"), // Notice green
- newBrush("1;34"), // Informational blue
- newBrush("1;34"), // Debug blue
+ newBrush("1;37"), // Emergency white
+ newBrush("1;36"), // Alert cyan
+ newBrush("1;35"), // Critical magenta
+ newBrush("1;31"), // Error red
+ newBrush("1;33"), // Warning yellow
+ newBrush("1;32"), // Notice green
+ newBrush("1;34"), // Informational blue
+ newBrush("1;34"), // Debug blue
}
// consoleWriter implements LoggerInterface and writes messages to terminal.
type consoleWriter struct {
- lg *log.Logger
- Level int `json:"level"`
+ lg *logWriter
+ Level int `json:"level"`
+ Colorful bool `json:"color"` //this filed is useful only when system's terminal supports color
}
// NewConsole create ConsoleWriter returning as LoggerInterface.
func NewConsole() Logger {
cw := &consoleWriter{
- lg: log.New(os.Stdout, "", log.Ldate|log.Ltime),
- Level: LevelDebug,
+ lg: newLogWriter(os.Stdout),
+ Level: LevelDebug,
+ Colorful: true,
}
return cw
}
// Init init console logger.
-// jsonconfig like '{"level":LevelTrace}'.
-func (c *consoleWriter) Init(jsonconfig string) error {
- if len(jsonconfig) == 0 {
+// jsonConfig like '{"level":LevelTrace}'.
+func (c *consoleWriter) Init(jsonConfig string) error {
+ if len(jsonConfig) == 0 {
return nil
}
- return json.Unmarshal([]byte(jsonconfig), c)
+ err := json.Unmarshal([]byte(jsonConfig), c)
+ if runtime.GOOS == "windows" {
+ c.Colorful = false
+ }
+ return err
}
// WriteMsg write message in console.
-func (c *consoleWriter) WriteMsg(msg string, level int) error {
+func (c *consoleWriter) WriteMsg(when time.Time, msg string, level int) error {
if level > c.Level {
return nil
}
- if goos := runtime.GOOS; goos == "windows" {
- c.lg.Println(msg)
- return nil
+ if c.Colorful {
+ msg = colors[level](msg)
}
- c.lg.Println(colors[level](msg))
-
+ c.lg.println(when, msg)
return nil
}
diff --git a/vendor/github.com/astaxie/beego/logs/es/es.go b/vendor/github.com/astaxie/beego/logs/es/es.go
deleted file mode 100644
index f8dc5f65b..000000000
--- a/vendor/github.com/astaxie/beego/logs/es/es.go
+++ /dev/null
@@ -1,80 +0,0 @@
-package es
-
-import (
- "encoding/json"
- "errors"
- "fmt"
- "net"
- "net/url"
- "time"
-
- "github.com/astaxie/beego/logs"
- "github.com/belogik/goes"
-)
-
-// NewES return a LoggerInterface
-func NewES() logs.Logger {
- cw := &esLogger{
- Level: logs.LevelDebug,
- }
- return cw
-}
-
-type esLogger struct {
- *goes.Connection
- DSN string `json:"dsn"`
- Level int `json:"level"`
-}
-
-// {"dsn":"http://localhost:9200/","level":1}
-func (el *esLogger) Init(jsonconfig string) error {
- err := json.Unmarshal([]byte(jsonconfig), el)
- if err != nil {
- return err
- }
- if el.DSN == "" {
- return errors.New("empty dsn")
- } else if u, err := url.Parse(el.DSN); err != nil {
- return err
- } else if u.Path == "" {
- return errors.New("missing prefix")
- } else if host, port, err := net.SplitHostPort(u.Host); err != nil {
- return err
- } else {
- conn := goes.NewConnection(host, port)
- el.Connection = conn
- }
- return nil
-}
-
-// WriteMsg will write the msg and level into es
-func (el *esLogger) WriteMsg(msg string, level int) error {
- if level > el.Level {
- return nil
- }
- t := time.Now()
- vals := make(map[string]interface{})
- vals["@timestamp"] = t.Format(time.RFC3339)
- vals["@msg"] = msg
- d := goes.Document{
- Index: fmt.Sprintf("%04d.%02d.%02d", t.Year(), t.Month(), t.Day()),
- Type: "logs",
- Fields: vals,
- }
- _, err := el.Index(d, nil)
- return err
-}
-
-// Destroy is a empty method
-func (el *esLogger) Destroy() {
-
-}
-
-// Flush is a empty method
-func (el *esLogger) Flush() {
-
-}
-
-func init() {
- logs.Register("es", NewES)
-}
diff --git a/vendor/github.com/astaxie/beego/logs/file.go b/vendor/github.com/astaxie/beego/logs/file.go
index 0eae734a0..9d3f78a05 100644
--- a/vendor/github.com/astaxie/beego/logs/file.go
+++ b/vendor/github.com/astaxie/beego/logs/file.go
@@ -53,9 +53,11 @@ type fileLogWriter struct {
Level int `json:"level"`
Perm os.FileMode `json:"perm"`
+
+ fileNameOnly, suffix string // like "project.log", project is fileNameOnly and .log is suffix
}
-// NewFileWriter create a FileLogWriter returning as LoggerInterface.
+// newFileWriter create a FileLogWriter returning as LoggerInterface.
func newFileWriter() Logger {
w := &fileLogWriter{
Filename: "",
@@ -89,6 +91,11 @@ func (w *fileLogWriter) Init(jsonConfig string) error {
if len(w.Filename) == 0 {
return errors.New("jsonconfig must have filename")
}
+ w.suffix = filepath.Ext(w.Filename)
+ w.fileNameOnly = strings.TrimSuffix(w.Filename, w.suffix)
+ if w.suffix == "" {
+ w.suffix = ".log"
+ }
err = w.startLogger()
return err
}
@@ -114,59 +121,19 @@ func (w *fileLogWriter) needRotate(size int, day int) bool {
}
// WriteMsg write logger message into file.
-func (w *fileLogWriter) WriteMsg(msg string, level int) error {
+func (w *fileLogWriter) WriteMsg(when time.Time, msg string, level int) error {
if level > w.Level {
return nil
}
- //2016/01/12 21:34:33
- now := time.Now()
- y, mo, d := now.Date()
- h, mi, s := now.Clock()
- //len(2006/01/02 15:03:04)==19
- var buf [20]byte
- t := 3
- for y >= 10 {
- p := y / 10
- buf[t] = byte('0' + y - p*10)
- y = p
- t--
- }
- buf[0] = byte('0' + y)
- buf[4] = '/'
- if mo > 9 {
- buf[5] = '1'
- buf[6] = byte('0' + mo - 9)
- } else {
- buf[5] = '0'
- buf[6] = byte('0' + mo)
- }
- buf[7] = '/'
- t = d / 10
- buf[8] = byte('0' + t)
- buf[9] = byte('0' + d - t*10)
- buf[10] = ' '
- t = h / 10
- buf[11] = byte('0' + t)
- buf[12] = byte('0' + h - t*10)
- buf[13] = ':'
- t = mi / 10
- buf[14] = byte('0' + t)
- buf[15] = byte('0' + mi - t*10)
- buf[16] = ':'
- t = s / 10
- buf[17] = byte('0' + t)
- buf[18] = byte('0' + s - t*10)
- buf[19] = ' '
- msg = string(buf[0:]) + msg + "\n"
-
+ h, d := formatTimeHeader(when)
+ msg = string(h) + msg + "\n"
if w.Rotate {
if w.needRotate(len(msg), d) {
w.Lock()
if w.needRotate(len(msg), d) {
- if err := w.doRotate(); err != nil {
+ if err := w.doRotate(when); err != nil {
fmt.Fprintf(os.Stderr, "FileLogWriter(%q): %s\n", w.Filename, err)
}
-
}
w.Unlock()
}
@@ -235,8 +202,8 @@ func (w *fileLogWriter) lines() (int, error) {
}
// DoRotate means it need to write file in new file.
-// new file name like xx.2013-01-01.2.log
-func (w *fileLogWriter) doRotate() error {
+// new file name like xx.2013-01-01.log (daily) or xx.001.log (by line or size)
+func (w *fileLogWriter) doRotate(logTime time.Time) error {
_, err := os.Lstat(w.Filename)
if err != nil {
return err
@@ -245,13 +212,13 @@ func (w *fileLogWriter) doRotate() error {
// Find the next available number
num := 1
fName := ""
- suffix := filepath.Ext(w.Filename)
- filenameOnly := strings.TrimSuffix(w.Filename, suffix)
- if suffix == "" {
- suffix = ".log"
- }
- for ; err == nil && num <= 999; num++ {
- fName = filenameOnly + fmt.Sprintf(".%s.%03d%s", time.Now().Format("2006-01-02"), num, suffix)
+ if w.MaxLines > 0 || w.MaxSize > 0 {
+ for ; err == nil && num <= 999; num++ {
+ fName = w.fileNameOnly + fmt.Sprintf(".%s.%03d%s", logTime.Format("2006-01-02"), num, w.suffix)
+ _, err = os.Lstat(fName)
+ }
+ } else {
+ fName = fmt.Sprintf("%s.%s%s", w.fileNameOnly, logTime.Format("2006-01-02"), w.suffix)
_, err = os.Lstat(fName)
}
// return error if the last file checked still existed
@@ -289,7 +256,8 @@ func (w *fileLogWriter) deleteOldLog() {
}()
if !info.IsDir() && info.ModTime().Unix() < (time.Now().Unix()-60*60*24*w.MaxDays) {
- if strings.HasPrefix(filepath.Base(path), filepath.Base(w.Filename)) {
+ if strings.HasPrefix(filepath.Base(path), w.fileNameOnly) &&
+ strings.HasSuffix(filepath.Base(path), w.suffix) {
os.Remove(path)
}
}
diff --git a/vendor/github.com/astaxie/beego/logs/log.go b/vendor/github.com/astaxie/beego/logs/log.go
index ccaaa3ad7..3b3e22081 100644
--- a/vendor/github.com/astaxie/beego/logs/log.go
+++ b/vendor/github.com/astaxie/beego/logs/log.go
@@ -40,6 +40,7 @@ import (
"runtime"
"strconv"
"sync"
+ "time"
)
// RFC5424 log message levels.
@@ -68,7 +69,7 @@ type loggerType func() Logger
// Logger defines the behavior of a log provider.
type Logger interface {
Init(config string) error
- WriteMsg(msg string, level int) error
+ WriteMsg(when time.Time, msg string, level int) error
Destroy()
Flush()
}
@@ -97,6 +98,8 @@ type BeeLogger struct {
loggerFuncCallDepth int
asynchronous bool
msgChan chan *logMsg
+ signalChan chan string
+ wg sync.WaitGroup
outputs []*nameLogger
}
@@ -108,6 +111,7 @@ type nameLogger struct {
type logMsg struct {
level int
msg string
+ when time.Time
}
var logMsgPool *sync.Pool
@@ -120,6 +124,7 @@ func NewLogger(channelLen int64) *BeeLogger {
bl.level = LevelDebug
bl.loggerFuncCallDepth = 2
bl.msgChan = make(chan *logMsg, channelLen)
+ bl.signalChan = make(chan string, 1)
return bl
}
@@ -131,6 +136,7 @@ func (bl *BeeLogger) Async() *BeeLogger {
return &logMsg{}
},
}
+ bl.wg.Add(1)
go bl.startLogger()
return bl
}
@@ -140,17 +146,25 @@ func (bl *BeeLogger) Async() *BeeLogger {
func (bl *BeeLogger) SetLogger(adapterName string, config string) error {
bl.lock.Lock()
defer bl.lock.Unlock()
- if log, ok := adapters[adapterName]; ok {
- lg := log()
- err := lg.Init(config)
- if err != nil {
- fmt.Fprintln(os.Stderr, "logs.BeeLogger.SetLogger: "+err.Error())
- return err
+
+ for _, l := range bl.outputs {
+ if l.name == adapterName {
+ return fmt.Errorf("logs: duplicate adaptername %q (you have set this logger before)", adapterName)
}
- bl.outputs = append(bl.outputs, &nameLogger{name: adapterName, Logger: lg})
- } else {
+ }
+
+ log, ok := adapters[adapterName]
+ if !ok {
return fmt.Errorf("logs: unknown adaptername %q (forgotten Register?)", adapterName)
}
+
+ lg := log()
+ err := lg.Init(config)
+ if err != nil {
+ fmt.Fprintln(os.Stderr, "logs.BeeLogger.SetLogger: "+err.Error())
+ return err
+ }
+ bl.outputs = append(bl.outputs, &nameLogger{name: adapterName, Logger: lg})
return nil
}
@@ -173,9 +187,9 @@ func (bl *BeeLogger) DelLogger(adapterName string) error {
return nil
}
-func (bl *BeeLogger) writeToLoggers(msg string, level int) {
+func (bl *BeeLogger) writeToLoggers(when time.Time, msg string, level int) {
for _, l := range bl.outputs {
- err := l.WriteMsg(msg, level)
+ err := l.WriteMsg(when, msg, level)
if err != nil {
fmt.Fprintf(os.Stderr, "unable to WriteMsg to adapter:%v,error:%v\n", l.name, err)
}
@@ -183,6 +197,7 @@ func (bl *BeeLogger) writeToLoggers(msg string, level int) {
}
func (bl *BeeLogger) writeMsg(logLevel int, msg string) error {
+ when := time.Now()
if bl.enableFuncCallDepth {
_, file, line, ok := runtime.Caller(bl.loggerFuncCallDepth)
if !ok {
@@ -196,9 +211,10 @@ func (bl *BeeLogger) writeMsg(logLevel int, msg string) error {
lm := logMsgPool.Get().(*logMsg)
lm.level = logLevel
lm.msg = msg
+ lm.when = when
bl.msgChan <- lm
} else {
- bl.writeToLoggers(msg, logLevel)
+ bl.writeToLoggers(when, msg, logLevel)
}
return nil
}
@@ -228,11 +244,26 @@ func (bl *BeeLogger) EnableFuncCallDepth(b bool) {
// start logger chan reading.
// when chan is not empty, write logs.
func (bl *BeeLogger) startLogger() {
+ gameOver := false
for {
select {
case bm := <-bl.msgChan:
- bl.writeToLoggers(bm.msg, bm.level)
+ bl.writeToLoggers(bm.when, bm.msg, bm.level)
logMsgPool.Put(bm)
+ case sg := <-bl.signalChan:
+ // Now should only send "flush" or "close" to bl.signalChan
+ bl.flush()
+ if sg == "close" {
+ for _, l := range bl.outputs {
+ l.Destroy()
+ }
+ bl.outputs = nil
+ gameOver = true
+ }
+ bl.wg.Done()
+ }
+ if gameOver {
+ break
}
}
}
@@ -341,17 +372,45 @@ func (bl *BeeLogger) Trace(format string, v ...interface{}) {
// Flush flush all chan data.
func (bl *BeeLogger) Flush() {
- for _, l := range bl.outputs {
- l.Flush()
+ if bl.asynchronous {
+ bl.signalChan <- "flush"
+ bl.wg.Wait()
+ bl.wg.Add(1)
+ return
}
+ bl.flush()
}
// Close close logger, flush all chan data and destroy all adapters in BeeLogger.
func (bl *BeeLogger) Close() {
+ if bl.asynchronous {
+ bl.signalChan <- "close"
+ bl.wg.Wait()
+ } else {
+ bl.flush()
+ for _, l := range bl.outputs {
+ l.Destroy()
+ }
+ bl.outputs = nil
+ }
+ close(bl.msgChan)
+ close(bl.signalChan)
+}
+
+// Reset close all outputs, and set bl.outputs to nil
+func (bl *BeeLogger) Reset() {
+ bl.Flush()
+ for _, l := range bl.outputs {
+ l.Destroy()
+ }
+ bl.outputs = nil
+}
+
+func (bl *BeeLogger) flush() {
for {
if len(bl.msgChan) > 0 {
bm := <-bl.msgChan
- bl.writeToLoggers(bm.msg, bm.level)
+ bl.writeToLoggers(bm.when, bm.msg, bm.level)
logMsgPool.Put(bm)
continue
}
@@ -359,6 +418,5 @@ func (bl *BeeLogger) Close() {
}
for _, l := range bl.outputs {
l.Flush()
- l.Destroy()
}
}
diff --git a/vendor/github.com/astaxie/beego/logs/logger.go b/vendor/github.com/astaxie/beego/logs/logger.go
new file mode 100644
index 000000000..323c41c56
--- /dev/null
+++ b/vendor/github.com/astaxie/beego/logs/logger.go
@@ -0,0 +1,80 @@
+// Copyright 2014 beego Author. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+
+package logs
+
+import (
+ "io"
+ "sync"
+ "time"
+)
+
+type logWriter struct {
+ sync.Mutex
+ writer io.Writer
+}
+
+func newLogWriter(wr io.Writer) *logWriter {
+ return &logWriter{writer: wr}
+}
+
+func (lg *logWriter) println(when time.Time, msg string) {
+ lg.Lock()
+ h, _ := formatTimeHeader(when)
+ lg.writer.Write(append(append(h, msg...), '\n'))
+ lg.Unlock()
+}
+
+func formatTimeHeader(when time.Time) ([]byte, int) {
+ y, mo, d := when.Date()
+ h, mi, s := when.Clock()
+ //len(2006/01/02 15:03:04)==19
+ var buf [20]byte
+ t := 3
+ for y >= 10 {
+ p := y / 10
+ buf[t] = byte('0' + y - p*10)
+ y = p
+ t--
+ }
+ buf[0] = byte('0' + y)
+ buf[4] = '/'
+ if mo > 9 {
+ buf[5] = '1'
+ buf[6] = byte('0' + mo - 9)
+ } else {
+ buf[5] = '0'
+ buf[6] = byte('0' + mo)
+ }
+ buf[7] = '/'
+ t = d / 10
+ buf[8] = byte('0' + t)
+ buf[9] = byte('0' + d - t*10)
+ buf[10] = ' '
+ t = h / 10
+ buf[11] = byte('0' + t)
+ buf[12] = byte('0' + h - t*10)
+ buf[13] = ':'
+ t = mi / 10
+ buf[14] = byte('0' + t)
+ buf[15] = byte('0' + mi - t*10)
+ buf[16] = ':'
+ t = s / 10
+ buf[17] = byte('0' + t)
+ buf[18] = byte('0' + s - t*10)
+ buf[19] = ' '
+
+ return buf[0:], d
+}
diff --git a/vendor/github.com/astaxie/beego/logs/multifile.go b/vendor/github.com/astaxie/beego/logs/multifile.go
new file mode 100644
index 000000000..b82ba2741
--- /dev/null
+++ b/vendor/github.com/astaxie/beego/logs/multifile.go
@@ -0,0 +1,116 @@
+// Copyright 2014 beego Author. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package logs
+
+import (
+ "encoding/json"
+ "time"
+)
+
+// A filesLogWriter manages several fileLogWriter
+// filesLogWriter will write logs to the file in json configuration and write the same level log to correspond file
+// means if the file name in configuration is project.log filesLogWriter will create project.error.log/project.debug.log
+// and write the error-level logs to project.error.log and write the debug-level logs to project.debug.log
+// the rotate attribute also acts like fileLogWriter
+type multiFileLogWriter struct {
+ writers [LevelDebug + 1 + 1]*fileLogWriter // the last one for fullLogWriter
+ fullLogWriter *fileLogWriter
+ Separate []string `json:"separate"`
+}
+
+var levelNames = [...]string{"emergency", "alert", "critical", "error", "warning", "notice", "info", "debug"}
+
+// Init file logger with json config.
+// jsonConfig like:
+// {
+// "filename":"logs/beego.log",
+// "maxLines":0,
+// "maxsize":0,
+// "daily":true,
+// "maxDays":15,
+// "rotate":true,
+// "perm":0600,
+// "separate":["emergency", "alert", "critical", "error", "warning", "notice", "info", "debug"],
+// }
+
+func (f *multiFileLogWriter) Init(config string) error {
+ writer := newFileWriter().(*fileLogWriter)
+ err := writer.Init(config)
+ if err != nil {
+ return err
+ }
+ f.fullLogWriter = writer
+ f.writers[LevelDebug+1] = writer
+
+ //unmarshal "separate" field to f.Separate
+ json.Unmarshal([]byte(config), f)
+
+ jsonMap := map[string]interface{}{}
+ json.Unmarshal([]byte(config), &jsonMap)
+
+ for i := LevelEmergency; i < LevelDebug+1; i++ {
+ for _, v := range f.Separate {
+ if v == levelNames[i] {
+ jsonMap["filename"] = f.fullLogWriter.fileNameOnly + "." + levelNames[i] + f.fullLogWriter.suffix
+ jsonMap["level"] = i
+ bs, _ := json.Marshal(jsonMap)
+ writer = newFileWriter().(*fileLogWriter)
+ writer.Init(string(bs))
+ f.writers[i] = writer
+ }
+ }
+ }
+
+ return nil
+}
+
+func (f *multiFileLogWriter) Destroy() {
+ for i := 0; i < len(f.writers); i++ {
+ if f.writers[i] != nil {
+ f.writers[i].Destroy()
+ }
+ }
+}
+
+func (f *multiFileLogWriter) WriteMsg(when time.Time, msg string, level int) error {
+ if f.fullLogWriter != nil {
+ f.fullLogWriter.WriteMsg(when, msg, level)
+ }
+ for i := 0; i < len(f.writers)-1; i++ {
+ if f.writers[i] != nil {
+ if level == f.writers[i].Level {
+ f.writers[i].WriteMsg(when, msg, level)
+ }
+ }
+ }
+ return nil
+}
+
+func (f *multiFileLogWriter) Flush() {
+ for i := 0; i < len(f.writers); i++ {
+ if f.writers[i] != nil {
+ f.writers[i].Flush()
+ }
+ }
+}
+
+// newFilesWriter create a FileLogWriter returning as LoggerInterface.
+func newFilesWriter() Logger {
+ return &multiFileLogWriter{}
+}
+
+func init() {
+ Register("multifile", newFilesWriter)
+}
diff --git a/vendor/github.com/astaxie/beego/logs/smtp.go b/vendor/github.com/astaxie/beego/logs/smtp.go
index 748462f9d..47f5a0c69 100644
--- a/vendor/github.com/astaxie/beego/logs/smtp.go
+++ b/vendor/github.com/astaxie/beego/logs/smtp.go
@@ -126,7 +126,7 @@ func (s *SMTPWriter) sendMail(hostAddressWithPort string, auth smtp.Auth, fromAd
// WriteMsg write message in smtp writer.
// it will send an email with subject and only this message.
-func (s *SMTPWriter) WriteMsg(msg string, level int) error {
+func (s *SMTPWriter) WriteMsg(when time.Time, msg string, level int) error {
if level > s.Level {
return nil
}
@@ -140,7 +140,7 @@ func (s *SMTPWriter) WriteMsg(msg string, level int) error {
// and send the email all in one step.
contentType := "Content-Type: text/plain" + "; charset=UTF-8"
mailmsg := []byte("To: " + strings.Join(s.RecipientAddresses, ";") + "\r\nFrom: " + s.FromAddress + "<" + s.FromAddress +
- ">\r\nSubject: " + s.Subject + "\r\n" + contentType + "\r\n\r\n" + fmt.Sprintf(".%s", time.Now().Format("2006-01-02 15:04:05")) + msg)
+ ">\r\nSubject: " + s.Subject + "\r\n" + contentType + "\r\n\r\n" + fmt.Sprintf(".%s", when.Format("2006-01-02 15:04:05")) + msg)
return s.sendMail(s.Host, auth, s.FromAddress, s.RecipientAddresses, mailmsg)
}
diff --git a/vendor/github.com/astaxie/beego/migration/ddl.go b/vendor/github.com/astaxie/beego/migration/ddl.go
deleted file mode 100644
index 51243337f..000000000
--- a/vendor/github.com/astaxie/beego/migration/ddl.go
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2014 beego Author. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package migration
-
-// Table store the tablename and Column
-type Table struct {
- TableName string
- Columns []*Column
-}
-
-// Create return the create sql
-func (t *Table) Create() string {
- return ""
-}
-
-// Drop return the drop sql
-func (t *Table) Drop() string {
- return ""
-}
-
-// Column define the columns name type and Default
-type Column struct {
- Name string
- Type string
- Default interface{}
-}
-
-// Create return create sql with the provided tbname and columns
-func Create(tbname string, columns ...Column) string {
- return ""
-}
-
-// Drop return the drop sql with the provided tbname and columns
-func Drop(tbname string, columns ...Column) string {
- return ""
-}
-
-// TableDDL is still in think
-func TableDDL(tbname string, columns ...Column) string {
- return ""
-}
diff --git a/vendor/github.com/astaxie/beego/migration/migration.go b/vendor/github.com/astaxie/beego/migration/migration.go
deleted file mode 100644
index 1591bc50d..000000000
--- a/vendor/github.com/astaxie/beego/migration/migration.go
+++ /dev/null
@@ -1,278 +0,0 @@
-// Copyright 2014 beego Author. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package migration is used for migration
-//
-// The table structure is as follow:
-//
-// CREATE TABLE `migrations` (
-// `id_migration` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'surrogate key',
-// `name` varchar(255) DEFAULT NULL COMMENT 'migration name, unique',
-// `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'date migrated or rolled back',
-// `statements` longtext COMMENT 'SQL statements for this migration',
-// `rollback_statements` longtext,
-// `status` enum('update','rollback') DEFAULT NULL COMMENT 'update indicates it is a normal migration while rollback means this migration is rolled back',
-// PRIMARY KEY (`id_migration`)
-// ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-package migration
-
-import (
- "errors"
- "sort"
- "strings"
- "time"
-
- "github.com/astaxie/beego"
- "github.com/astaxie/beego/orm"
-)
-
-// const the data format for the bee generate migration datatype
-const (
- DateFormat = "20060102_150405"
- DBDateFormat = "2006-01-02 15:04:05"
-)
-
-// Migrationer is an interface for all Migration struct
-type Migrationer interface {
- Up()
- Down()
- Reset()
- Exec(name, status string) error
- GetCreated() int64
-}
-
-var (
- migrationMap map[string]Migrationer
-)
-
-func init() {
- migrationMap = make(map[string]Migrationer)
-}
-
-// Migration the basic type which will implement the basic type
-type Migration struct {
- sqls []string
- Created string
-}
-
-// Up implement in the Inheritance struct for upgrade
-func (m *Migration) Up() {
-
-}
-
-// Down implement in the Inheritance struct for down
-func (m *Migration) Down() {
-
-}
-
-// SQL add sql want to execute
-func (m *Migration) SQL(sql string) {
- m.sqls = append(m.sqls, sql)
-}
-
-// Reset the sqls
-func (m *Migration) Reset() {
- m.sqls = make([]string, 0)
-}
-
-// Exec execute the sql already add in the sql
-func (m *Migration) Exec(name, status string) error {
- o := orm.NewOrm()
- for _, s := range m.sqls {
- beego.Info("exec sql:", s)
- r := o.Raw(s)
- _, err := r.Exec()
- if err != nil {
- return err
- }
- }
- return m.addOrUpdateRecord(name, status)
-}
-
-func (m *Migration) addOrUpdateRecord(name, status string) error {
- o := orm.NewOrm()
- if status == "down" {
- status = "rollback"
- p, err := o.Raw("update migrations set status = ?, rollback_statements = ?, created_at = ? where name = ?").Prepare()
- if err != nil {
- return nil
- }
- _, err = p.Exec(status, strings.Join(m.sqls, "; "), time.Now().Format(DBDateFormat), name)
- return err
- }
- status = "update"
- p, err := o.Raw("insert into migrations(name, created_at, statements, status) values(?,?,?,?)").Prepare()
- if err != nil {
- return err
- }
- _, err = p.Exec(name, time.Now().Format(DBDateFormat), strings.Join(m.sqls, "; "), status)
- return err
-}
-
-// GetCreated get the unixtime from the Created
-func (m *Migration) GetCreated() int64 {
- t, err := time.Parse(DateFormat, m.Created)
- if err != nil {
- return 0
- }
- return t.Unix()
-}
-
-// Register register the Migration in the map
-func Register(name string, m Migrationer) error {
- if _, ok := migrationMap[name]; ok {
- return errors.New("already exist name:" + name)
- }
- migrationMap[name] = m
- return nil
-}
-
-// Upgrade upgrate the migration from lasttime
-func Upgrade(lasttime int64) error {
- sm := sortMap(migrationMap)
- i := 0
- for _, v := range sm {
- if v.created > lasttime {
- beego.Info("start upgrade", v.name)
- v.m.Reset()
- v.m.Up()
- err := v.m.Exec(v.name, "up")
- if err != nil {
- beego.Error("execute error:", err)
- time.Sleep(2 * time.Second)
- return err
- }
- beego.Info("end upgrade:", v.name)
- i++
- }
- }
- beego.Info("total success upgrade:", i, " migration")
- time.Sleep(2 * time.Second)
- return nil
-}
-
-// Rollback rollback the migration by the name
-func Rollback(name string) error {
- if v, ok := migrationMap[name]; ok {
- beego.Info("start rollback")
- v.Reset()
- v.Down()
- err := v.Exec(name, "down")
- if err != nil {
- beego.Error("execute error:", err)
- time.Sleep(2 * time.Second)
- return err
- }
- beego.Info("end rollback")
- time.Sleep(2 * time.Second)
- return nil
- }
- beego.Error("not exist the migrationMap name:" + name)
- time.Sleep(2 * time.Second)
- return errors.New("not exist the migrationMap name:" + name)
-}
-
-// Reset reset all migration
-// run all migration's down function
-func Reset() error {
- sm := sortMap(migrationMap)
- i := 0
- for j := len(sm) - 1; j >= 0; j-- {
- v := sm[j]
- if isRollBack(v.name) {
- beego.Info("skip the", v.name)
- time.Sleep(1 * time.Second)
- continue
- }
- beego.Info("start reset:", v.name)
- v.m.Reset()
- v.m.Down()
- err := v.m.Exec(v.name, "down")
- if err != nil {
- beego.Error("execute error:", err)
- time.Sleep(2 * time.Second)
- return err
- }
- i++
- beego.Info("end reset:", v.name)
- }
- beego.Info("total success reset:", i, " migration")
- time.Sleep(2 * time.Second)
- return nil
-}
-
-// Refresh first Reset, then Upgrade
-func Refresh() error {
- err := Reset()
- if err != nil {
- beego.Error("execute error:", err)
- time.Sleep(2 * time.Second)
- return err
- }
- err = Upgrade(0)
- return err
-}
-
-type dataSlice []data
-
-type data struct {
- created int64
- name string
- m Migrationer
-}
-
-// Len is part of sort.Interface.
-func (d dataSlice) Len() int {
- return len(d)
-}
-
-// Swap is part of sort.Interface.
-func (d dataSlice) Swap(i, j int) {
- d[i], d[j] = d[j], d[i]
-}
-
-// Less is part of sort.Interface. We use count as the value to sort by
-func (d dataSlice) Less(i, j int) bool {
- return d[i].created < d[j].created
-}
-
-func sortMap(m map[string]Migrationer) dataSlice {
- s := make(dataSlice, 0, len(m))
- for k, v := range m {
- d := data{}
- d.created = v.GetCreated()
- d.name = k
- d.m = v
- s = append(s, d)
- }
- sort.Sort(s)
- return s
-}
-
-func isRollBack(name string) bool {
- o := orm.NewOrm()
- var maps []orm.Params
- num, err := o.Raw("select * from migrations where `name` = ? order by id_migration desc", name).Values(&maps)
- if err != nil {
- beego.Info("get name has error", err)
- return false
- }
- if num <= 0 {
- return false
- }
- if maps[0]["status"] == "rollback" {
- return true
- }
- return false
-}
diff --git a/vendor/github.com/astaxie/beego/namespace.go b/vendor/github.com/astaxie/beego/namespace.go
index 0dfdd7afd..4007d44cc 100644
--- a/vendor/github.com/astaxie/beego/namespace.go
+++ b/vendor/github.com/astaxie/beego/namespace.go
@@ -388,3 +388,10 @@ func NSNamespace(prefix string, params ...LinkNamespace) LinkNamespace {
ns.Namespace(n)
}
}
+
+// NSHandler add handler
+func NSHandler(rootpath string, h http.Handler) LinkNamespace {
+ return func(ns *Namespace) {
+ ns.Handler(rootpath, h)
+ }
+}
diff --git a/vendor/github.com/astaxie/beego/orm/db.go b/vendor/github.com/astaxie/beego/orm/db.go
index b62c165bc..314c3535e 100644
--- a/vendor/github.com/astaxie/beego/orm/db.go
+++ b/vendor/github.com/astaxie/beego/orm/db.go
@@ -113,7 +113,7 @@ func (d *dbBase) collectFieldValue(mi *modelInfo, fi *fieldInfo, ind reflect.Val
if fi.pk {
_, value, _ = getExistPk(mi, ind)
} else {
- field := ind.Field(fi.fieldIndex)
+ field := ind.FieldByIndex(fi.fieldIndex)
if fi.isFielder {
f := field.Addr().Interface().(Fielder)
value = f.RawValue()
@@ -517,9 +517,9 @@ func (d *dbBase) Delete(q dbQuerier, mi *modelInfo, ind reflect.Value, tz *time.
if num > 0 {
if mi.fields.pk.auto {
if mi.fields.pk.fieldType&IsPostiveIntegerField > 0 {
- ind.Field(mi.fields.pk.fieldIndex).SetUint(0)
+ ind.FieldByIndex(mi.fields.pk.fieldIndex).SetUint(0)
} else {
- ind.Field(mi.fields.pk.fieldIndex).SetInt(0)
+ ind.FieldByIndex(mi.fields.pk.fieldIndex).SetInt(0)
}
}
err := d.deleteRels(q, mi, []interface{}{pkValue}, tz)
@@ -859,13 +859,13 @@ func (d *dbBase) ReadBatch(q dbQuerier, qs *querySet, mi *modelInfo, cond *Condi
mmi = fi.relModelInfo
field := last
if last.Kind() != reflect.Invalid {
- field = reflect.Indirect(last.Field(fi.fieldIndex))
+ field = reflect.Indirect(last.FieldByIndex(fi.fieldIndex))
if field.IsValid() {
d.setColsValues(mmi, &field, mmi.fields.dbcols, trefs[:len(mmi.fields.dbcols)], tz)
for _, fi := range mmi.fields.fieldsReverse {
if fi.inModel && fi.reverseFieldInfo.mi == lastm {
if fi.reverseFieldInfo != nil {
- f := field.Field(fi.fieldIndex)
+ f := field.FieldByIndex(fi.fieldIndex)
if f.Kind() == reflect.Ptr {
f.Set(last.Addr())
}
@@ -1014,7 +1014,7 @@ func (d *dbBase) setColsValues(mi *modelInfo, ind *reflect.Value, cols []string,
fi := mi.fields.GetByColumn(column)
- field := ind.Field(fi.fieldIndex)
+ field := ind.FieldByIndex(fi.fieldIndex)
value, err := d.convertValueFromDB(fi, val, tz)
if err != nil {
@@ -1350,7 +1350,7 @@ setValue:
fieldType = fi.relModelInfo.fields.pk.fieldType
mf := reflect.New(fi.relModelInfo.addrField.Elem().Type())
field.Set(mf)
- f := mf.Elem().Field(fi.relModelInfo.fields.pk.fieldIndex)
+ f := mf.Elem().FieldByIndex(fi.relModelInfo.fields.pk.fieldIndex)
field = f
goto setValue
}
diff --git a/vendor/github.com/astaxie/beego/orm/db_alias.go b/vendor/github.com/astaxie/beego/orm/db_alias.go
index 79576b8e5..b6c833a71 100644
--- a/vendor/github.com/astaxie/beego/orm/db_alias.go
+++ b/vendor/github.com/astaxie/beego/orm/db_alias.go
@@ -59,6 +59,7 @@ var (
"postgres": DRPostgres,
"sqlite3": DRSqlite,
"tidb": DRTiDB,
+ "oracle": DROracle,
}
dbBasers = map[DriverType]dbBaser{
DRMySQL: newdbBaseMysql(),
@@ -151,7 +152,7 @@ func detectTZ(al *alias) {
al.Engine = "INNODB"
}
- case DRSqlite:
+ case DRSqlite, DROracle:
al.TZ = time.UTC
case DRPostgres:
diff --git a/vendor/github.com/astaxie/beego/orm/db_oracle.go b/vendor/github.com/astaxie/beego/orm/db_oracle.go
index 1e385c9a4..deca36ad6 100644
--- a/vendor/github.com/astaxie/beego/orm/db_oracle.go
+++ b/vendor/github.com/astaxie/beego/orm/db_oracle.go
@@ -14,6 +14,41 @@
package orm
+import (
+ "fmt"
+ "strings"
+)
+
+// oracle operators.
+var oracleOperators = map[string]string{
+ "exact": "= ?",
+ "gt": "> ?",
+ "gte": ">= ?",
+ "lt": "< ?",
+ "lte": "<= ?",
+ "//iendswith": "LIKE ?",
+}
+
+// oracle column field types.
+var oracleTypes = map[string]string{
+ "pk": "NOT NULL PRIMARY KEY",
+ "bool": "bool",
+ "string": "VARCHAR2(%d)",
+ "string-text": "VARCHAR2(%d)",
+ "time.Time-date": "DATE",
+ "time.Time": "TIMESTAMP",
+ "int8": "INTEGER",
+ "int16": "INTEGER",
+ "int32": "INTEGER",
+ "int64": "INTEGER",
+ "uint8": "INTEGER",
+ "uint16": "INTEGER",
+ "uint32": "INTEGER",
+ "uint64": "INTEGER",
+ "float64": "NUMBER",
+ "float64-decimal": "NUMBER(%d, %d)",
+}
+
// oracle dbBaser
type dbBaseOracle struct {
dbBase
@@ -27,3 +62,35 @@ func newdbBaseOracle() dbBaser {
b.ins = b
return b
}
+
+// OperatorSQL get oracle operator.
+func (d *dbBaseOracle) OperatorSQL(operator string) string {
+ return oracleOperators[operator]
+}
+
+// DbTypes get oracle table field types.
+func (d *dbBaseOracle) DbTypes() map[string]string {
+ return oracleTypes
+}
+
+//ShowTablesQuery show all the tables in database
+func (d *dbBaseOracle) ShowTablesQuery() string {
+ return "SELECT TABLE_NAME FROM USER_TABLES"
+}
+
+// Oracle
+func (d *dbBaseOracle) ShowColumnsQuery(table string) string {
+ return fmt.Sprintf("SELECT COLUMN_NAME FROM ALL_TAB_COLUMNS "+
+ "WHERE TABLE_NAME ='%s'", strings.ToUpper(table))
+}
+
+// check index is exist
+func (d *dbBaseOracle) IndexExists(db dbQuerier, table string, name string) bool {
+ row := db.QueryRow("SELECT COUNT(*) FROM USER_IND_COLUMNS, USER_INDEXES "+
+ "WHERE USER_IND_COLUMNS.INDEX_NAME = USER_INDEXES.INDEX_NAME "+
+ "AND USER_IND_COLUMNS.TABLE_NAME = ? AND USER_IND_COLUMNS.INDEX_NAME = ?", strings.ToUpper(table), strings.ToUpper(name))
+
+ var cnt int
+ row.Scan(&cnt)
+ return cnt > 0
+}
diff --git a/vendor/github.com/astaxie/beego/orm/db_utils.go b/vendor/github.com/astaxie/beego/orm/db_utils.go
index ae9b1625d..c97caf361 100644
--- a/vendor/github.com/astaxie/beego/orm/db_utils.go
+++ b/vendor/github.com/astaxie/beego/orm/db_utils.go
@@ -32,7 +32,7 @@ func getDbAlias(name string) *alias {
func getExistPk(mi *modelInfo, ind reflect.Value) (column string, value interface{}, exist bool) {
fi := mi.fields.pk
- v := ind.Field(fi.fieldIndex)
+ v := ind.FieldByIndex(fi.fieldIndex)
if fi.fieldType&IsPostiveIntegerField > 0 {
vu := v.Uint()
exist = vu > 0
diff --git a/vendor/github.com/astaxie/beego/orm/models_info_f.go b/vendor/github.com/astaxie/beego/orm/models_info_f.go
index 14e1f2c62..996a2f408 100644
--- a/vendor/github.com/astaxie/beego/orm/models_info_f.go
+++ b/vendor/github.com/astaxie/beego/orm/models_info_f.go
@@ -102,7 +102,7 @@ func newFields() *fields {
// single field info
type fieldInfo struct {
mi *modelInfo
- fieldIndex int
+ fieldIndex []int
fieldType int
dbcol bool
inModel bool
@@ -138,7 +138,7 @@ type fieldInfo struct {
}
// new field info
-func newFieldInfo(mi *modelInfo, field reflect.Value, sf reflect.StructField) (fi *fieldInfo, err error) {
+func newFieldInfo(mi *modelInfo, field reflect.Value, sf reflect.StructField, mName string) (fi *fieldInfo, err error) {
var (
tag string
tagValue string
@@ -278,7 +278,7 @@ checkType:
fi.column = getColumnName(fieldType, addrField, sf, tags["column"])
fi.addrValue = addrField
fi.sf = sf
- fi.fullName = mi.fullName + "." + sf.Name
+ fi.fullName = mi.fullName + mName + "." + sf.Name
fi.null = attrs["null"]
fi.index = attrs["index"]
diff --git a/vendor/github.com/astaxie/beego/orm/models_info_m.go b/vendor/github.com/astaxie/beego/orm/models_info_m.go
index 2654cdb5b..bbb82444d 100644
--- a/vendor/github.com/astaxie/beego/orm/models_info_m.go
+++ b/vendor/github.com/astaxie/beego/orm/models_info_m.go
@@ -36,11 +36,6 @@ type modelInfo struct {
// new model info
func newModelInfo(val reflect.Value) (info *modelInfo) {
- var (
- err error
- fi *fieldInfo
- sf reflect.StructField
- )
info = &modelInfo{}
info.fields = newFields()
@@ -53,13 +48,31 @@ func newModelInfo(val reflect.Value) (info *modelInfo) {
info.name = typ.Name()
info.fullName = getFullName(typ)
+ addModelFields(info, ind, "", []int{})
+
+ return
+}
+
+func addModelFields(info *modelInfo, ind reflect.Value, mName string, index []int) {
+ var (
+ err error
+ fi *fieldInfo
+ sf reflect.StructField
+ )
+
for i := 0; i < ind.NumField(); i++ {
field := ind.Field(i)
sf = ind.Type().Field(i)
if sf.PkgPath != "" {
continue
}
- fi, err = newFieldInfo(info, field, sf)
+ // add anonymous struct fields
+ if sf.Anonymous {
+ addModelFields(info, field, mName+"."+sf.Name, append(index, i))
+ continue
+ }
+
+ fi, err = newFieldInfo(info, field, sf, mName)
if err != nil {
if err == errSkipField {
@@ -84,7 +97,7 @@ func newModelInfo(val reflect.Value) (info *modelInfo) {
}
}
- fi.fieldIndex = i
+ fi.fieldIndex = append(index, i)
fi.mi = info
fi.inModel = true
}
@@ -93,8 +106,6 @@ func newModelInfo(val reflect.Value) (info *modelInfo) {
fmt.Println(fmt.Errorf("field: %s.%s, %s", ind.Type(), sf.Name, err))
os.Exit(2)
}
-
- return
}
// combine related model info to new model info.
diff --git a/vendor/github.com/astaxie/beego/orm/orm.go b/vendor/github.com/astaxie/beego/orm/orm.go
index d00d6d038..0ffb6b869 100644
--- a/vendor/github.com/astaxie/beego/orm/orm.go
+++ b/vendor/github.com/astaxie/beego/orm/orm.go
@@ -140,7 +140,7 @@ func (o *orm) ReadOrCreate(md interface{}, col1 string, cols ...string) (bool, i
return (err == nil), id, err
}
- return false, ind.Field(mi.fields.pk.fieldIndex).Int(), err
+ return false, ind.FieldByIndex(mi.fields.pk.fieldIndex).Int(), err
}
// insert model data to database
@@ -160,9 +160,9 @@ func (o *orm) Insert(md interface{}) (int64, error) {
func (o *orm) setPk(mi *modelInfo, ind reflect.Value, id int64) {
if mi.fields.pk.auto {
if mi.fields.pk.fieldType&IsPostiveIntegerField > 0 {
- ind.Field(mi.fields.pk.fieldIndex).SetUint(uint64(id))
+ ind.FieldByIndex(mi.fields.pk.fieldIndex).SetUint(uint64(id))
} else {
- ind.Field(mi.fields.pk.fieldIndex).SetInt(id)
+ ind.FieldByIndex(mi.fields.pk.fieldIndex).SetInt(id)
}
}
}
@@ -290,7 +290,7 @@ func (o *orm) LoadRelated(md interface{}, name string, args ...interface{}) (int
qs.orders = []string{order}
}
- find := ind.Field(fi.fieldIndex)
+ find := ind.FieldByIndex(fi.fieldIndex)
var nums int64
var err error
diff --git a/vendor/github.com/astaxie/beego/orm/orm_object.go b/vendor/github.com/astaxie/beego/orm/orm_object.go
index df5a6600e..8a5d85e28 100644
--- a/vendor/github.com/astaxie/beego/orm/orm_object.go
+++ b/vendor/github.com/astaxie/beego/orm/orm_object.go
@@ -51,9 +51,9 @@ func (o *insertSet) Insert(md interface{}) (int64, error) {
if id > 0 {
if o.mi.fields.pk.auto {
if o.mi.fields.pk.fieldType&IsPostiveIntegerField > 0 {
- ind.Field(o.mi.fields.pk.fieldIndex).SetUint(uint64(id))
+ ind.FieldByIndex(o.mi.fields.pk.fieldIndex).SetUint(uint64(id))
} else {
- ind.Field(o.mi.fields.pk.fieldIndex).SetInt(id)
+ ind.FieldByIndex(o.mi.fields.pk.fieldIndex).SetInt(id)
}
}
}
diff --git a/vendor/github.com/astaxie/beego/orm/orm_raw.go b/vendor/github.com/astaxie/beego/orm/orm_raw.go
index cbb18064f..5f88121cb 100644
--- a/vendor/github.com/astaxie/beego/orm/orm_raw.go
+++ b/vendor/github.com/astaxie/beego/orm/orm_raw.go
@@ -342,7 +342,7 @@ func (o *rawSet) QueryRow(containers ...interface{}) error {
for _, col := range columns {
if fi := sMi.fields.GetByColumn(col); fi != nil {
value := reflect.ValueOf(columnsMp[col]).Elem().Interface()
- o.setFieldValue(ind.FieldByIndex([]int{fi.fieldIndex}), value)
+ o.setFieldValue(ind.FieldByIndex(fi.fieldIndex), value)
}
}
} else {
@@ -480,7 +480,7 @@ func (o *rawSet) QueryRows(containers ...interface{}) (int64, error) {
for _, col := range columns {
if fi := sMi.fields.GetByColumn(col); fi != nil {
value := reflect.ValueOf(columnsMp[col]).Elem().Interface()
- o.setFieldValue(ind.FieldByIndex([]int{fi.fieldIndex}), value)
+ o.setFieldValue(ind.FieldByIndex(fi.fieldIndex), value)
}
}
} else {
diff --git a/vendor/github.com/astaxie/beego/orm/types.go b/vendor/github.com/astaxie/beego/orm/types.go
index 5fac5fed8..41933dd15 100644
--- a/vendor/github.com/astaxie/beego/orm/types.go
+++ b/vendor/github.com/astaxie/beego/orm/types.go
@@ -148,6 +148,10 @@ type QuerySeter interface {
// add OFFSET value
// same as Limit function's args[0]
Offset(offset interface{}) QuerySeter
+ // add GROUP BY expression
+ // for example:
+ // qs.GroupBy("id")
+ GroupBy(exprs ...string) QuerySeter
// add ORDER expression.
// "column" means ASC, "-column" means DESC.
// for example:
@@ -162,6 +166,12 @@ type QuerySeter interface {
// qs.RelatedSel("profile").One(&user)
// user.Profile.Age = 32
RelatedSel(params ...interface{}) QuerySeter
+ // Set Distinct
+ // for example:
+ // o.QueryTable("policy").Filter("Groups__Group__Users__User", user).
+ // Distinct().
+ // All(&permissions)
+ Distinct() QuerySeter
// return QuerySeter execution result number
// for example:
// num, err = qs.Filter("profile__age__gt", 28).Count()
diff --git a/vendor/github.com/astaxie/beego/parser.go b/vendor/github.com/astaxie/beego/parser.go
index b14d74b9a..46d023201 100644
--- a/vendor/github.com/astaxie/beego/parser.go
+++ b/vendor/github.com/astaxie/beego/parser.go
@@ -58,7 +58,7 @@ func parserPkg(pkgRealpath, pkgpath string) error {
rep := strings.NewReplacer("/", "_", ".", "_")
commentFilename = coomentPrefix + rep.Replace(pkgpath) + ".go"
if !compareFile(pkgRealpath) {
- Info(pkgRealpath + " has not changed, not reloading")
+ Info(pkgRealpath + " no changed")
return nil
}
genInfoList = make(map[string][]ControllerComments)
@@ -130,7 +130,7 @@ func parserComments(comments *ast.CommentGroup, funcName, controllerName, pkgpat
}
func genRouterCode() {
- os.Mkdir("routers", 0755)
+ os.Mkdir(path.Join(AppPath, "routers"), 0755)
Info("generate router from comments")
var (
globalinfo string
@@ -172,7 +172,7 @@ func genRouterCode() {
}
}
if globalinfo != "" {
- f, err := os.Create(path.Join("routers", commentFilename))
+ f, err := os.Create(path.Join(AppPath, "routers", commentFilename))
if err != nil {
panic(err)
}
@@ -182,7 +182,7 @@ func genRouterCode() {
}
func compareFile(pkgRealpath string) bool {
- if !utils.FileExists(path.Join("routers", commentFilename)) {
+ if !utils.FileExists(path.Join(AppPath, "routers", commentFilename)) {
return true
}
if utils.FileExists(lastupdateFilename) {
diff --git a/vendor/github.com/astaxie/beego/plugins/apiauth/apiauth.go b/vendor/github.com/astaxie/beego/plugins/apiauth/apiauth.go
deleted file mode 100644
index 8af08088d..000000000
--- a/vendor/github.com/astaxie/beego/plugins/apiauth/apiauth.go
+++ /dev/null
@@ -1,180 +0,0 @@
-// Copyright 2014 beego Author. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package apiauth provides handlers to enable apiauth support.
-//
-// Simple Usage:
-// import(
-// "github.com/astaxie/beego"
-// "github.com/astaxie/beego/plugins/apiauth"
-// )
-//
-// func main(){
-// // apiauth every request
-// beego.InsertFilter("*", beego.BeforeRouter,apiauth.APIBaiscAuth("appid","appkey"))
-// beego.Run()
-// }
-//
-// Advanced Usage:
-//
-// func getAppSecret(appid string) string {
-// // get appsecret by appid
-// // maybe store in configure, maybe in database
-// }
-//
-// beego.InsertFilter("*", beego.BeforeRouter,apiauth.APISecretAuth(getAppSecret, 360))
-//
-// Infomation:
-//
-// In the request user should include these params in the query
-//
-// 1. appid
-//
-// appid is assigned to the application
-//
-// 2. signature
-//
-// get the signature use apiauth.Signature()
-//
-// when you send to server remember use url.QueryEscape()
-//
-// 3. timestamp:
-//
-// send the request time, the format is yyyy-mm-dd HH:ii:ss
-//
-package apiauth
-
-import (
- "crypto/hmac"
- "crypto/sha256"
- "encoding/base64"
- "fmt"
- "net/url"
- "sort"
- "time"
-
- "github.com/astaxie/beego"
- "github.com/astaxie/beego/context"
-)
-
-// AppIDToAppSecret is used to get appsecret throw appid
-type AppIDToAppSecret func(string) string
-
-// APIBaiscAuth use the basic appid/appkey as the AppIdToAppSecret
-func APIBaiscAuth(appid, appkey string) beego.FilterFunc {
- ft := func(aid string) string {
- if aid == appid {
- return appkey
- }
- return ""
- }
- return APISecretAuth(ft, 300)
-}
-
-// APISecretAuth use AppIdToAppSecret verify and
-func APISecretAuth(f AppIDToAppSecret, timeout int) beego.FilterFunc {
- return func(ctx *context.Context) {
- if ctx.Input.Query("appid") == "" {
- ctx.ResponseWriter.WriteHeader(403)
- ctx.WriteString("miss query param: appid")
- return
- }
- appsecret := f(ctx.Input.Query("appid"))
- if appsecret == "" {
- ctx.ResponseWriter.WriteHeader(403)
- ctx.WriteString("not exist this appid")
- return
- }
- if ctx.Input.Query("signature") == "" {
- ctx.ResponseWriter.WriteHeader(403)
- ctx.WriteString("miss query param: signature")
- return
- }
- if ctx.Input.Query("timestamp") == "" {
- ctx.ResponseWriter.WriteHeader(403)
- ctx.WriteString("miss query param: timestamp")
- return
- }
- u, err := time.Parse("2006-01-02 15:04:05", ctx.Input.Query("timestamp"))
- if err != nil {
- ctx.ResponseWriter.WriteHeader(403)
- ctx.WriteString("timestamp format is error, should 2006-01-02 15:04:05")
- return
- }
- t := time.Now()
- if t.Sub(u).Seconds() > float64(timeout) {
- ctx.ResponseWriter.WriteHeader(403)
- ctx.WriteString("timeout! the request time is long ago, please try again")
- return
- }
- if ctx.Input.Query("signature") !=
- Signature(appsecret, ctx.Input.Method(), ctx.Request.Form, ctx.Input.URI()) {
- ctx.ResponseWriter.WriteHeader(403)
- ctx.WriteString("auth failed")
- }
- }
-}
-
-// Signature used to generate signature with the appsecret/method/params/RequestURI
-func Signature(appsecret, method string, params url.Values, RequestURI string) (result string) {
- var query string
- pa := make(map[string]string)
- for k, v := range params {
- pa[k] = v[0]
- }
- vs := mapSorter(pa)
- vs.Sort()
- for i := 0; i < vs.Len(); i++ {
- if vs.Keys[i] == "signature" {
- continue
- }
- if vs.Keys[i] != "" && vs.Vals[i] != "" {
- query = fmt.Sprintf("%v%v%v", query, vs.Keys[i], vs.Vals[i])
- }
- }
- stringToSign := fmt.Sprintf("%v\n%v\n%v\n", method, query, RequestURI)
-
- sha256 := sha256.New
- hash := hmac.New(sha256, []byte(appsecret))
- hash.Write([]byte(stringToSign))
- return base64.StdEncoding.EncodeToString(hash.Sum(nil))
-}
-
-type valSorter struct {
- Keys []string
- Vals []string
-}
-
-func mapSorter(m map[string]string) *valSorter {
- vs := &valSorter{
- Keys: make([]string, 0, len(m)),
- Vals: make([]string, 0, len(m)),
- }
- for k, v := range m {
- vs.Keys = append(vs.Keys, k)
- vs.Vals = append(vs.Vals, v)
- }
- return vs
-}
-
-func (vs *valSorter) Sort() {
- sort.Sort(vs)
-}
-
-func (vs *valSorter) Len() int { return len(vs.Keys) }
-func (vs *valSorter) Less(i, j int) bool { return vs.Keys[i] < vs.Keys[j] }
-func (vs *valSorter) Swap(i, j int) {
- vs.Vals[i], vs.Vals[j] = vs.Vals[j], vs.Vals[i]
- vs.Keys[i], vs.Keys[j] = vs.Keys[j], vs.Keys[i]
-}
diff --git a/vendor/github.com/astaxie/beego/plugins/auth/basic.go b/vendor/github.com/astaxie/beego/plugins/auth/basic.go
deleted file mode 100644
index c478044ab..000000000
--- a/vendor/github.com/astaxie/beego/plugins/auth/basic.go
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright 2014 beego Author. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package auth provides handlers to enable basic auth support.
-// Simple Usage:
-// import(
-// "github.com/astaxie/beego"
-// "github.com/astaxie/beego/plugins/auth"
-// )
-//
-// func main(){
-// // authenticate every request
-// beego.InsertFilter("*", beego.BeforeRouter,auth.Basic("username","secretpassword"))
-// beego.Run()
-// }
-//
-//
-// Advanced Usage:
-//
-// func SecretAuth(username, password string) bool {
-// return username == "astaxie" && password == "helloBeego"
-// }
-// authPlugin := auth.NewBasicAuthenticator(SecretAuth, "Authorization Required")
-// beego.InsertFilter("*", beego.BeforeRouter,authPlugin)
-package auth
-
-import (
- "encoding/base64"
- "net/http"
- "strings"
-
- "github.com/astaxie/beego"
- "github.com/astaxie/beego/context"
-)
-
-var defaultRealm = "Authorization Required"
-
-// Basic is the http basic auth
-func Basic(username string, password string) beego.FilterFunc {
- secrets := func(user, pass string) bool {
- return user == username && pass == password
- }
- return NewBasicAuthenticator(secrets, defaultRealm)
-}
-
-// NewBasicAuthenticator return the BasicAuth
-func NewBasicAuthenticator(secrets SecretProvider, Realm string) beego.FilterFunc {
- return func(ctx *context.Context) {
- a := &BasicAuth{Secrets: secrets, Realm: Realm}
- if username := a.CheckAuth(ctx.Request); username == "" {
- a.RequireAuth(ctx.ResponseWriter, ctx.Request)
- }
- }
-}
-
-// SecretProvider is the SecretProvider function
-type SecretProvider func(user, pass string) bool
-
-// BasicAuth store the SecretProvider and Realm
-type BasicAuth struct {
- Secrets SecretProvider
- Realm string
-}
-
-// CheckAuth Checks the username/password combination from the request. Returns
-// either an empty string (authentication failed) or the name of the
-// authenticated user.
-// Supports MD5 and SHA1 password entries
-func (a *BasicAuth) CheckAuth(r *http.Request) string {
- s := strings.SplitN(r.Header.Get("Authorization"), " ", 2)
- if len(s) != 2 || s[0] != "Basic" {
- return ""
- }
-
- b, err := base64.StdEncoding.DecodeString(s[1])
- if err != nil {
- return ""
- }
- pair := strings.SplitN(string(b), ":", 2)
- if len(pair) != 2 {
- return ""
- }
-
- if a.Secrets(pair[0], pair[1]) {
- return pair[0]
- }
- return ""
-}
-
-// RequireAuth http.Handler for BasicAuth which initiates the authentication process
-// (or requires reauthentication).
-func (a *BasicAuth) RequireAuth(w http.ResponseWriter, r *http.Request) {
- w.Header().Set("WWW-Authenticate", `Basic realm="`+a.Realm+`"`)
- w.WriteHeader(401)
- w.Write([]byte("401 Unauthorized\n"))
-}
diff --git a/vendor/github.com/astaxie/beego/plugins/cors/cors.go b/vendor/github.com/astaxie/beego/plugins/cors/cors.go
deleted file mode 100644
index 1e973a405..000000000
--- a/vendor/github.com/astaxie/beego/plugins/cors/cors.go
+++ /dev/null
@@ -1,226 +0,0 @@
-// Copyright 2014 beego Author. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package cors provides handlers to enable CORS support.
-// Usage
-// import (
-// "github.com/astaxie/beego"
-// "github.com/astaxie/beego/plugins/cors"
-// )
-//
-// func main() {
-// // CORS for https://foo.* origins, allowing:
-// // - PUT and PATCH methods
-// // - Origin header
-// // - Credentials share
-// beego.InsertFilter("*", beego.BeforeRouter, cors.Allow(&cors.Options{
-// AllowOrigins: []string{"https://*.foo.com"},
-// AllowMethods: []string{"PUT", "PATCH"},
-// AllowHeaders: []string{"Origin"},
-// ExposeHeaders: []string{"Content-Length"},
-// AllowCredentials: true,
-// }))
-// beego.Run()
-// }
-package cors
-
-import (
- "regexp"
- "strconv"
- "strings"
- "time"
-
- "github.com/astaxie/beego"
- "github.com/astaxie/beego/context"
-)
-
-const (
- headerAllowOrigin = "Access-Control-Allow-Origin"
- headerAllowCredentials = "Access-Control-Allow-Credentials"
- headerAllowHeaders = "Access-Control-Allow-Headers"
- headerAllowMethods = "Access-Control-Allow-Methods"
- headerExposeHeaders = "Access-Control-Expose-Headers"
- headerMaxAge = "Access-Control-Max-Age"
-
- headerOrigin = "Origin"
- headerRequestMethod = "Access-Control-Request-Method"
- headerRequestHeaders = "Access-Control-Request-Headers"
-)
-
-var (
- defaultAllowHeaders = []string{"Origin", "Accept", "Content-Type", "Authorization"}
- // Regex patterns are generated from AllowOrigins. These are used and generated internally.
- allowOriginPatterns = []string{}
-)
-
-// Options represents Access Control options.
-type Options struct {
- // If set, all origins are allowed.
- AllowAllOrigins bool
- // A list of allowed origins. Wild cards and FQDNs are supported.
- AllowOrigins []string
- // If set, allows to share auth credentials such as cookies.
- AllowCredentials bool
- // A list of allowed HTTP methods.
- AllowMethods []string
- // A list of allowed HTTP headers.
- AllowHeaders []string
- // A list of exposed HTTP headers.
- ExposeHeaders []string
- // Max age of the CORS headers.
- MaxAge time.Duration
-}
-
-// Header converts options into CORS headers.
-func (o *Options) Header(origin string) (headers map[string]string) {
- headers = make(map[string]string)
- // if origin is not allowed, don't extend the headers
- // with CORS headers.
- if !o.AllowAllOrigins && !o.IsOriginAllowed(origin) {
- return
- }
-
- // add allow origin
- if o.AllowAllOrigins {
- headers[headerAllowOrigin] = "*"
- } else {
- headers[headerAllowOrigin] = origin
- }
-
- // add allow credentials
- headers[headerAllowCredentials] = strconv.FormatBool(o.AllowCredentials)
-
- // add allow methods
- if len(o.AllowMethods) > 0 {
- headers[headerAllowMethods] = strings.Join(o.AllowMethods, ",")
- }
-
- // add allow headers
- if len(o.AllowHeaders) > 0 {
- headers[headerAllowHeaders] = strings.Join(o.AllowHeaders, ",")
- }
-
- // add exposed header
- if len(o.ExposeHeaders) > 0 {
- headers[headerExposeHeaders] = strings.Join(o.ExposeHeaders, ",")
- }
- // add a max age header
- if o.MaxAge > time.Duration(0) {
- headers[headerMaxAge] = strconv.FormatInt(int64(o.MaxAge/time.Second), 10)
- }
- return
-}
-
-// PreflightHeader converts options into CORS headers for a preflight response.
-func (o *Options) PreflightHeader(origin, rMethod, rHeaders string) (headers map[string]string) {
- headers = make(map[string]string)
- if !o.AllowAllOrigins && !o.IsOriginAllowed(origin) {
- return
- }
- // verify if requested method is allowed
- for _, method := range o.AllowMethods {
- if method == rMethod {
- headers[headerAllowMethods] = strings.Join(o.AllowMethods, ",")
- break
- }
- }
-
- // verify if requested headers are allowed
- var allowed []string
- for _, rHeader := range strings.Split(rHeaders, ",") {
- rHeader = strings.TrimSpace(rHeader)
- lookupLoop:
- for _, allowedHeader := range o.AllowHeaders {
- if strings.ToLower(rHeader) == strings.ToLower(allowedHeader) {
- allowed = append(allowed, rHeader)
- break lookupLoop
- }
- }
- }
-
- headers[headerAllowCredentials] = strconv.FormatBool(o.AllowCredentials)
- // add allow origin
- if o.AllowAllOrigins {
- headers[headerAllowOrigin] = "*"
- } else {
- headers[headerAllowOrigin] = origin
- }
-
- // add allowed headers
- if len(allowed) > 0 {
- headers[headerAllowHeaders] = strings.Join(allowed, ",")
- }
-
- // add exposed headers
- if len(o.ExposeHeaders) > 0 {
- headers[headerExposeHeaders] = strings.Join(o.ExposeHeaders, ",")
- }
- // add a max age header
- if o.MaxAge > time.Duration(0) {
- headers[headerMaxAge] = strconv.FormatInt(int64(o.MaxAge/time.Second), 10)
- }
- return
-}
-
-// IsOriginAllowed looks up if the origin matches one of the patterns
-// generated from Options.AllowOrigins patterns.
-func (o *Options) IsOriginAllowed(origin string) (allowed bool) {
- for _, pattern := range allowOriginPatterns {
- allowed, _ = regexp.MatchString(pattern, origin)
- if allowed {
- return
- }
- }
- return
-}
-
-// Allow enables CORS for requests those match the provided options.
-func Allow(opts *Options) beego.FilterFunc {
- // Allow default headers if nothing is specified.
- if len(opts.AllowHeaders) == 0 {
- opts.AllowHeaders = defaultAllowHeaders
- }
-
- for _, origin := range opts.AllowOrigins {
- pattern := regexp.QuoteMeta(origin)
- pattern = strings.Replace(pattern, "\\*", ".*", -1)
- pattern = strings.Replace(pattern, "\\?", ".", -1)
- allowOriginPatterns = append(allowOriginPatterns, "^"+pattern+"$")
- }
-
- return func(ctx *context.Context) {
- var (
- origin = ctx.Input.Header(headerOrigin)
- requestedMethod = ctx.Input.Header(headerRequestMethod)
- requestedHeaders = ctx.Input.Header(headerRequestHeaders)
- // additional headers to be added
- // to the response.
- headers map[string]string
- )
-
- if ctx.Input.Method() == "OPTIONS" &&
- (requestedMethod != "" || requestedHeaders != "") {
- headers = opts.PreflightHeader(origin, requestedMethod, requestedHeaders)
- for key, value := range headers {
- ctx.Output.Header(key, value)
- }
- return
- }
- headers = opts.Header(origin)
-
- for key, value := range headers {
- ctx.Output.Header(key, value)
- }
- }
-}
diff --git a/vendor/github.com/astaxie/beego/router.go b/vendor/github.com/astaxie/beego/router.go
index 726936dee..d0bf534f2 100644
--- a/vendor/github.com/astaxie/beego/router.go
+++ b/vendor/github.com/astaxie/beego/router.go
@@ -62,12 +62,12 @@ var (
}
// these beego.Controller's methods shouldn't reflect to AutoRouter
exceptMethod = []string{"Init", "Prepare", "Finish", "Render", "RenderString",
- "RenderBytes", "Redirect", "Abort", "StopRun", "UrlFor", "ServeJson", "ServeJsonp",
- "ServeXml", "Input", "ParseForm", "GetString", "GetStrings", "GetInt", "GetBool",
+ "RenderBytes", "Redirect", "Abort", "StopRun", "UrlFor", "ServeJSON", "ServeJSONP",
+ "ServeXML", "Input", "ParseForm", "GetString", "GetStrings", "GetInt", "GetBool",
"GetFloat", "GetFile", "SaveToFile", "StartSession", "SetSession", "GetSession",
"DelSession", "SessionRegenerateID", "DestroySession", "IsAjax", "GetSecureCookie",
"SetSecureCookie", "XsrfToken", "CheckXsrfCookie", "XsrfFormHtml",
- "GetControllerAndAction"}
+ "GetControllerAndAction", "ServeFormatted"}
urlPlaceholder = "{{placeholder}}"
// DefaultAccessLogFilter will skip the accesslog if return true
@@ -607,6 +607,7 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request)
)
context := p.pool.Get().(*beecontext.Context)
context.Reset(rw, r)
+
defer p.pool.Put(context)
defer p.recoverPanic(context)
diff --git a/vendor/github.com/astaxie/beego/session/couchbase/sess_couchbase.go b/vendor/github.com/astaxie/beego/session/couchbase/sess_couchbase.go
deleted file mode 100644
index d5be11d0b..000000000
--- a/vendor/github.com/astaxie/beego/session/couchbase/sess_couchbase.go
+++ /dev/null
@@ -1,243 +0,0 @@
-// Copyright 2014 beego Author. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package couchbase for session provider
-//
-// depend on github.com/couchbaselabs/go-couchbasee
-//
-// go install github.com/couchbaselabs/go-couchbase
-//
-// Usage:
-// import(
-// _ "github.com/astaxie/beego/session/couchbase"
-// "github.com/astaxie/beego/session"
-// )
-//
-// func init() {
-// globalSessions, _ = session.NewManager("couchbase", ``{"cookieName":"gosessionid","gclifetime":3600,"ProviderConfig":"http://host:port/, Pool, Bucket"}``)
-// go globalSessions.GC()
-// }
-//
-// more docs: http://beego.me/docs/module/session.md
-package couchbase
-
-import (
- "net/http"
- "strings"
- "sync"
-
- couchbase "github.com/couchbase/go-couchbase"
-
- "github.com/astaxie/beego/session"
-)
-
-var couchbpder = &Provider{}
-
-// SessionStore store each session
-type SessionStore struct {
- b *couchbase.Bucket
- sid string
- lock sync.RWMutex
- values map[interface{}]interface{}
- maxlifetime int64
-}
-
-// Provider couchabse provided
-type Provider struct {
- maxlifetime int64
- savePath string
- pool string
- bucket string
- b *couchbase.Bucket
-}
-
-// Set value to couchabse session
-func (cs *SessionStore) Set(key, value interface{}) error {
- cs.lock.Lock()
- defer cs.lock.Unlock()
- cs.values[key] = value
- return nil
-}
-
-// Get value from couchabse session
-func (cs *SessionStore) Get(key interface{}) interface{} {
- cs.lock.RLock()
- defer cs.lock.RUnlock()
- if v, ok := cs.values[key]; ok {
- return v
- }
- return nil
-}
-
-// Delete value in couchbase session by given key
-func (cs *SessionStore) Delete(key interface{}) error {
- cs.lock.Lock()
- defer cs.lock.Unlock()
- delete(cs.values, key)
- return nil
-}
-
-// Flush Clean all values in couchbase session
-func (cs *SessionStore) Flush() error {
- cs.lock.Lock()
- defer cs.lock.Unlock()
- cs.values = make(map[interface{}]interface{})
- return nil
-}
-
-// SessionID Get couchbase session store id
-func (cs *SessionStore) SessionID() string {
- return cs.sid
-}
-
-// SessionRelease Write couchbase session with Gob string
-func (cs *SessionStore) SessionRelease(w http.ResponseWriter) {
- defer cs.b.Close()
-
- bo, err := session.EncodeGob(cs.values)
- if err != nil {
- return
- }
-
- cs.b.Set(cs.sid, int(cs.maxlifetime), bo)
-}
-
-func (cp *Provider) getBucket() *couchbase.Bucket {
- c, err := couchbase.Connect(cp.savePath)
- if err != nil {
- return nil
- }
-
- pool, err := c.GetPool(cp.pool)
- if err != nil {
- return nil
- }
-
- bucket, err := pool.GetBucket(cp.bucket)
- if err != nil {
- return nil
- }
-
- return bucket
-}
-
-// SessionInit init couchbase session
-// savepath like couchbase server REST/JSON URL
-// e.g. http://host:port/, Pool, Bucket
-func (cp *Provider) SessionInit(maxlifetime int64, savePath string) error {
- cp.maxlifetime = maxlifetime
- configs := strings.Split(savePath, ",")
- if len(configs) > 0 {
- cp.savePath = configs[0]
- }
- if len(configs) > 1 {
- cp.pool = configs[1]
- }
- if len(configs) > 2 {
- cp.bucket = configs[2]
- }
-
- return nil
-}
-
-// SessionRead read couchbase session by sid
-func (cp *Provider) SessionRead(sid string) (session.Store, error) {
- cp.b = cp.getBucket()
-
- var doc []byte
-
- err := cp.b.Get(sid, &doc)
- var kv map[interface{}]interface{}
- if doc == nil {
- kv = make(map[interface{}]interface{})
- } else {
- kv, err = session.DecodeGob(doc)
- if err != nil {
- return nil, err
- }
- }
-
- cs := &SessionStore{b: cp.b, sid: sid, values: kv, maxlifetime: cp.maxlifetime}
- return cs, nil
-}
-
-// SessionExist Check couchbase session exist.
-// it checkes sid exist or not.
-func (cp *Provider) SessionExist(sid string) bool {
- cp.b = cp.getBucket()
- defer cp.b.Close()
-
- var doc []byte
-
- if err := cp.b.Get(sid, &doc); err != nil || doc == nil {
- return false
- }
- return true
-}
-
-// SessionRegenerate remove oldsid and use sid to generate new session
-func (cp *Provider) SessionRegenerate(oldsid, sid string) (session.Store, error) {
- cp.b = cp.getBucket()
-
- var doc []byte
- if err := cp.b.Get(oldsid, &doc); err != nil || doc == nil {
- cp.b.Set(sid, int(cp.maxlifetime), "")
- } else {
- err := cp.b.Delete(oldsid)
- if err != nil {
- return nil, err
- }
- _, _ = cp.b.Add(sid, int(cp.maxlifetime), doc)
- }
-
- err := cp.b.Get(sid, &doc)
- if err != nil {
- return nil, err
- }
- var kv map[interface{}]interface{}
- if doc == nil {
- kv = make(map[interface{}]interface{})
- } else {
- kv, err = session.DecodeGob(doc)
- if err != nil {
- return nil, err
- }
- }
-
- cs := &SessionStore{b: cp.b, sid: sid, values: kv, maxlifetime: cp.maxlifetime}
- return cs, nil
-}
-
-// SessionDestroy Remove bucket in this couchbase
-func (cp *Provider) SessionDestroy(sid string) error {
- cp.b = cp.getBucket()
- defer cp.b.Close()
-
- cp.b.Delete(sid)
- return nil
-}
-
-// SessionGC Recycle
-func (cp *Provider) SessionGC() {
- return
-}
-
-// SessionAll return all active session
-func (cp *Provider) SessionAll() int {
- return 0
-}
-
-func init() {
- session.Register("couchbase", couchbpder)
-}
diff --git a/vendor/github.com/astaxie/beego/session/ledis/ledis_session.go b/vendor/github.com/astaxie/beego/session/ledis/ledis_session.go
deleted file mode 100644
index 68f37b08c..000000000
--- a/vendor/github.com/astaxie/beego/session/ledis/ledis_session.go
+++ /dev/null
@@ -1,179 +0,0 @@
-// Package ledis provide session Provider
-package ledis
-
-import (
- "net/http"
- "strconv"
- "strings"
- "sync"
-
- "github.com/astaxie/beego/session"
- "github.com/siddontang/ledisdb/config"
- "github.com/siddontang/ledisdb/ledis"
-)
-
-var ledispder = &Provider{}
-var c *ledis.DB
-
-// SessionStore ledis session store
-type SessionStore struct {
- sid string
- lock sync.RWMutex
- values map[interface{}]interface{}
- maxlifetime int64
-}
-
-// Set value in ledis session
-func (ls *SessionStore) Set(key, value interface{}) error {
- ls.lock.Lock()
- defer ls.lock.Unlock()
- ls.values[key] = value
- return nil
-}
-
-// Get value in ledis session
-func (ls *SessionStore) Get(key interface{}) interface{} {
- ls.lock.RLock()
- defer ls.lock.RUnlock()
- if v, ok := ls.values[key]; ok {
- return v
- }
- return nil
-}
-
-// Delete value in ledis session
-func (ls *SessionStore) Delete(key interface{}) error {
- ls.lock.Lock()
- defer ls.lock.Unlock()
- delete(ls.values, key)
- return nil
-}
-
-// Flush clear all values in ledis session
-func (ls *SessionStore) Flush() error {
- ls.lock.Lock()
- defer ls.lock.Unlock()
- ls.values = make(map[interface{}]interface{})
- return nil
-}
-
-// SessionID get ledis session id
-func (ls *SessionStore) SessionID() string {
- return ls.sid
-}
-
-// SessionRelease save session values to ledis
-func (ls *SessionStore) SessionRelease(w http.ResponseWriter) {
- b, err := session.EncodeGob(ls.values)
- if err != nil {
- return
- }
- c.Set([]byte(ls.sid), b)
- c.Expire([]byte(ls.sid), ls.maxlifetime)
-}
-
-// Provider ledis session provider
-type Provider struct {
- maxlifetime int64
- savePath string
- db int
-}
-
-// SessionInit init ledis session
-// savepath like ledis server saveDataPath,pool size
-// e.g. 127.0.0.1:6379,100,astaxie
-func (lp *Provider) SessionInit(maxlifetime int64, savePath string) error {
- var err error
- lp.maxlifetime = maxlifetime
- configs := strings.Split(savePath, ",")
- if len(configs) == 1 {
- lp.savePath = configs[0]
- } else if len(configs) == 2 {
- lp.savePath = configs[0]
- lp.db, err = strconv.Atoi(configs[1])
- if err != nil {
- return err
- }
- }
- cfg := new(config.Config)
- cfg.DataDir = lp.savePath
- nowLedis, err := ledis.Open(cfg)
- c, err = nowLedis.Select(lp.db)
- if err != nil {
- println(err)
- return nil
- }
- return nil
-}
-
-// SessionRead read ledis session by sid
-func (lp *Provider) SessionRead(sid string) (session.Store, error) {
- kvs, err := c.Get([]byte(sid))
- var kv map[interface{}]interface{}
- if len(kvs) == 0 {
- kv = make(map[interface{}]interface{})
- } else {
- kv, err = session.DecodeGob(kvs)
- if err != nil {
- return nil, err
- }
- }
- ls := &SessionStore{sid: sid, values: kv, maxlifetime: lp.maxlifetime}
- return ls, nil
-}
-
-// SessionExist check ledis session exist by sid
-func (lp *Provider) SessionExist(sid string) bool {
- count, _ := c.Exists([]byte(sid))
- if count == 0 {
- return false
- }
- return true
-}
-
-// SessionRegenerate generate new sid for ledis session
-func (lp *Provider) SessionRegenerate(oldsid, sid string) (session.Store, error) {
- count, _ := c.Exists([]byte(sid))
- if count == 0 {
- // oldsid doesn't exists, set the new sid directly
- // ignore error here, since if it return error
- // the existed value will be 0
- c.Set([]byte(sid), []byte(""))
- c.Expire([]byte(sid), lp.maxlifetime)
- } else {
- data, _ := c.Get([]byte(oldsid))
- c.Set([]byte(sid), data)
- c.Expire([]byte(sid), lp.maxlifetime)
- }
- kvs, err := c.Get([]byte(sid))
- var kv map[interface{}]interface{}
- if len(kvs) == 0 {
- kv = make(map[interface{}]interface{})
- } else {
- kv, err = session.DecodeGob([]byte(kvs))
- if err != nil {
- return nil, err
- }
- }
- ls := &SessionStore{sid: sid, values: kv, maxlifetime: lp.maxlifetime}
- return ls, nil
-}
-
-// SessionDestroy delete ledis session by id
-func (lp *Provider) SessionDestroy(sid string) error {
- c.Del([]byte(sid))
- return nil
-}
-
-// SessionGC Impelment method, no used.
-func (lp *Provider) SessionGC() {
- return
-}
-
-// SessionAll return all active session
-func (lp *Provider) SessionAll() int {
- return 0
-}
-func init() {
- session.Register("ledis", ledispder)
-}
diff --git a/vendor/github.com/astaxie/beego/session/memcache/sess_memcache.go b/vendor/github.com/astaxie/beego/session/memcache/sess_memcache.go
deleted file mode 100644
index f1069bc93..000000000
--- a/vendor/github.com/astaxie/beego/session/memcache/sess_memcache.go
+++ /dev/null
@@ -1,232 +0,0 @@
-// Copyright 2014 beego Author. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package memcache for session provider
-//
-// depend on github.com/bradfitz/gomemcache/memcache
-//
-// go install github.com/bradfitz/gomemcache/memcache
-//
-// Usage:
-// import(
-// _ "github.com/astaxie/beego/session/memcache"
-// "github.com/astaxie/beego/session"
-// )
-//
-// func init() {
-// globalSessions, _ = session.NewManager("memcache", ``{"cookieName":"gosessionid","gclifetime":3600,"ProviderConfig":"127.0.0.1:11211"}``)
-// go globalSessions.GC()
-// }
-//
-// more docs: http://beego.me/docs/module/session.md
-package memcache
-
-import (
- "net/http"
- "strings"
- "sync"
-
- "github.com/astaxie/beego/session"
-
- "github.com/bradfitz/gomemcache/memcache"
-)
-
-var mempder = &MemProvider{}
-var client *memcache.Client
-
-// SessionStore memcache session store
-type SessionStore struct {
- sid string
- lock sync.RWMutex
- values map[interface{}]interface{}
- maxlifetime int64
-}
-
-// Set value in memcache session
-func (rs *SessionStore) Set(key, value interface{}) error {
- rs.lock.Lock()
- defer rs.lock.Unlock()
- rs.values[key] = value
- return nil
-}
-
-// Get value in memcache session
-func (rs *SessionStore) Get(key interface{}) interface{} {
- rs.lock.RLock()
- defer rs.lock.RUnlock()
- if v, ok := rs.values[key]; ok {
- return v
- }
- return nil
-}
-
-// Delete value in memcache session
-func (rs *SessionStore) Delete(key interface{}) error {
- rs.lock.Lock()
- defer rs.lock.Unlock()
- delete(rs.values, key)
- return nil
-}
-
-// Flush clear all values in memcache session
-func (rs *SessionStore) Flush() error {
- rs.lock.Lock()
- defer rs.lock.Unlock()
- rs.values = make(map[interface{}]interface{})
- return nil
-}
-
-// SessionID get memcache session id
-func (rs *SessionStore) SessionID() string {
- return rs.sid
-}
-
-// SessionRelease save session values to memcache
-func (rs *SessionStore) SessionRelease(w http.ResponseWriter) {
- b, err := session.EncodeGob(rs.values)
- if err != nil {
- return
- }
- item := memcache.Item{Key: rs.sid, Value: b, Expiration: int32(rs.maxlifetime)}
- client.Set(&item)
-}
-
-// MemProvider memcache session provider
-type MemProvider struct {
- maxlifetime int64
- conninfo []string
- poolsize int
- password string
-}
-
-// SessionInit init memcache session
-// savepath like
-// e.g. 127.0.0.1:9090
-func (rp *MemProvider) SessionInit(maxlifetime int64, savePath string) error {
- rp.maxlifetime = maxlifetime
- rp.conninfo = strings.Split(savePath, ";")
- client = memcache.New(rp.conninfo...)
- return nil
-}
-
-// SessionRead read memcache session by sid
-func (rp *MemProvider) SessionRead(sid string) (session.Store, error) {
- if client == nil {
- if err := rp.connectInit(); err != nil {
- return nil, err
- }
- }
- item, err := client.Get(sid)
- if err != nil && err == memcache.ErrCacheMiss {
- rs := &SessionStore{sid: sid, values: make(map[interface{}]interface{}), maxlifetime: rp.maxlifetime}
- return rs, nil
- }
- var kv map[interface{}]interface{}
- if len(item.Value) == 0 {
- kv = make(map[interface{}]interface{})
- } else {
- kv, err = session.DecodeGob(item.Value)
- if err != nil {
- return nil, err
- }
- }
- rs := &SessionStore{sid: sid, values: kv, maxlifetime: rp.maxlifetime}
- return rs, nil
-}
-
-// SessionExist check memcache session exist by sid
-func (rp *MemProvider) SessionExist(sid string) bool {
- if client == nil {
- if err := rp.connectInit(); err != nil {
- return false
- }
- }
- if item, err := client.Get(sid); err != nil || len(item.Value) == 0 {
- return false
- }
- return true
-}
-
-// SessionRegenerate generate new sid for memcache session
-func (rp *MemProvider) SessionRegenerate(oldsid, sid string) (session.Store, error) {
- if client == nil {
- if err := rp.connectInit(); err != nil {
- return nil, err
- }
- }
- var contain []byte
- if item, err := client.Get(sid); err != nil || len(item.Value) == 0 {
- // oldsid doesn't exists, set the new sid directly
- // ignore error here, since if it return error
- // the existed value will be 0
- item.Key = sid
- item.Value = []byte("")
- item.Expiration = int32(rp.maxlifetime)
- client.Set(item)
- } else {
- client.Delete(oldsid)
- item.Key = sid
- item.Expiration = int32(rp.maxlifetime)
- client.Set(item)
- contain = item.Value
- }
-
- var kv map[interface{}]interface{}
- if len(contain) == 0 {
- kv = make(map[interface{}]interface{})
- } else {
- var err error
- kv, err = session.DecodeGob(contain)
- if err != nil {
- return nil, err
- }
- }
-
- rs := &SessionStore{sid: sid, values: kv, maxlifetime: rp.maxlifetime}
- return rs, nil
-}
-
-// SessionDestroy delete memcache session by id
-func (rp *MemProvider) SessionDestroy(sid string) error {
- if client == nil {
- if err := rp.connectInit(); err != nil {
- return err
- }
- }
-
- err := client.Delete(sid)
- if err != nil {
- return err
- }
- return nil
-}
-
-func (rp *MemProvider) connectInit() error {
- client = memcache.New(rp.conninfo...)
- return nil
-}
-
-// SessionGC Impelment method, no used.
-func (rp *MemProvider) SessionGC() {
- return
-}
-
-// SessionAll return all activeSession
-func (rp *MemProvider) SessionAll() int {
- return 0
-}
-
-func init() {
- session.Register("memcache", mempder)
-}
diff --git a/vendor/github.com/astaxie/beego/session/mysql/sess_mysql.go b/vendor/github.com/astaxie/beego/session/mysql/sess_mysql.go
deleted file mode 100644
index 969d26c97..000000000
--- a/vendor/github.com/astaxie/beego/session/mysql/sess_mysql.go
+++ /dev/null
@@ -1,233 +0,0 @@
-// Copyright 2014 beego Author. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package mysql for session provider
-//
-// depends on github.com/go-sql-driver/mysql:
-//
-// go install github.com/go-sql-driver/mysql
-//
-// mysql session support need create table as sql:
-// CREATE TABLE `session` (
-// `session_key` char(64) NOT NULL,
-// `session_data` blob,
-// `session_expiry` int(11) unsigned NOT NULL,
-// PRIMARY KEY (`session_key`)
-// ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-//
-// Usage:
-// import(
-// _ "github.com/astaxie/beego/session/mysql"
-// "github.com/astaxie/beego/session"
-// )
-//
-// func init() {
-// globalSessions, _ = session.NewManager("mysql", ``{"cookieName":"gosessionid","gclifetime":3600,"ProviderConfig":"[username[:password]@][protocol[(address)]]/dbname[?param1=value1&...¶mN=valueN]"}``)
-// go globalSessions.GC()
-// }
-//
-// more docs: http://beego.me/docs/module/session.md
-package mysql
-
-import (
- "database/sql"
- "net/http"
- "sync"
- "time"
-
- "github.com/astaxie/beego/session"
- // import mysql driver
- _ "github.com/go-sql-driver/mysql"
-)
-
-var (
- // TableName store the session in MySQL
- TableName = "session"
- mysqlpder = &Provider{}
-)
-
-// SessionStore mysql session store
-type SessionStore struct {
- c *sql.DB
- sid string
- lock sync.RWMutex
- values map[interface{}]interface{}
-}
-
-// Set value in mysql session.
-// it is temp value in map.
-func (st *SessionStore) Set(key, value interface{}) error {
- st.lock.Lock()
- defer st.lock.Unlock()
- st.values[key] = value
- return nil
-}
-
-// Get value from mysql session
-func (st *SessionStore) Get(key interface{}) interface{} {
- st.lock.RLock()
- defer st.lock.RUnlock()
- if v, ok := st.values[key]; ok {
- return v
- }
- return nil
-}
-
-// Delete value in mysql session
-func (st *SessionStore) Delete(key interface{}) error {
- st.lock.Lock()
- defer st.lock.Unlock()
- delete(st.values, key)
- return nil
-}
-
-// Flush clear all values in mysql session
-func (st *SessionStore) Flush() error {
- st.lock.Lock()
- defer st.lock.Unlock()
- st.values = make(map[interface{}]interface{})
- return nil
-}
-
-// SessionID get session id of this mysql session store
-func (st *SessionStore) SessionID() string {
- return st.sid
-}
-
-// SessionRelease save mysql session values to database.
-// must call this method to save values to database.
-func (st *SessionStore) SessionRelease(w http.ResponseWriter) {
- defer st.c.Close()
- b, err := session.EncodeGob(st.values)
- if err != nil {
- return
- }
- st.c.Exec("UPDATE "+TableName+" set `session_data`=?, `session_expiry`=? where session_key=?",
- b, time.Now().Unix(), st.sid)
-
-}
-
-// Provider mysql session provider
-type Provider struct {
- maxlifetime int64
- savePath string
-}
-
-// connect to mysql
-func (mp *Provider) connectInit() *sql.DB {
- db, e := sql.Open("mysql", mp.savePath)
- if e != nil {
- return nil
- }
- return db
-}
-
-// SessionInit init mysql session.
-// savepath is the connection string of mysql.
-func (mp *Provider) SessionInit(maxlifetime int64, savePath string) error {
- mp.maxlifetime = maxlifetime
- mp.savePath = savePath
- return nil
-}
-
-// SessionRead get mysql session by sid
-func (mp *Provider) SessionRead(sid string) (session.Store, error) {
- c := mp.connectInit()
- row := c.QueryRow("select session_data from "+TableName+" where session_key=?", sid)
- var sessiondata []byte
- err := row.Scan(&sessiondata)
- if err == sql.ErrNoRows {
- c.Exec("insert into "+TableName+"(`session_key`,`session_data`,`session_expiry`) values(?,?,?)",
- sid, "", time.Now().Unix())
- }
- var kv map[interface{}]interface{}
- if len(sessiondata) == 0 {
- kv = make(map[interface{}]interface{})
- } else {
- kv, err = session.DecodeGob(sessiondata)
- if err != nil {
- return nil, err
- }
- }
- rs := &SessionStore{c: c, sid: sid, values: kv}
- return rs, nil
-}
-
-// SessionExist check mysql session exist
-func (mp *Provider) SessionExist(sid string) bool {
- c := mp.connectInit()
- defer c.Close()
- row := c.QueryRow("select session_data from "+TableName+" where session_key=?", sid)
- var sessiondata []byte
- err := row.Scan(&sessiondata)
- if err == sql.ErrNoRows {
- return false
- }
- return true
-}
-
-// SessionRegenerate generate new sid for mysql session
-func (mp *Provider) SessionRegenerate(oldsid, sid string) (session.Store, error) {
- c := mp.connectInit()
- row := c.QueryRow("select session_data from "+TableName+" where session_key=?", oldsid)
- var sessiondata []byte
- err := row.Scan(&sessiondata)
- if err == sql.ErrNoRows {
- c.Exec("insert into "+TableName+"(`session_key`,`session_data`,`session_expiry`) values(?,?,?)", oldsid, "", time.Now().Unix())
- }
- c.Exec("update "+TableName+" set `session_key`=? where session_key=?", sid, oldsid)
- var kv map[interface{}]interface{}
- if len(sessiondata) == 0 {
- kv = make(map[interface{}]interface{})
- } else {
- kv, err = session.DecodeGob(sessiondata)
- if err != nil {
- return nil, err
- }
- }
- rs := &SessionStore{c: c, sid: sid, values: kv}
- return rs, nil
-}
-
-// SessionDestroy delete mysql session by sid
-func (mp *Provider) SessionDestroy(sid string) error {
- c := mp.connectInit()
- c.Exec("DELETE FROM "+TableName+" where session_key=?", sid)
- c.Close()
- return nil
-}
-
-// SessionGC delete expired values in mysql session
-func (mp *Provider) SessionGC() {
- c := mp.connectInit()
- c.Exec("DELETE from "+TableName+" where session_expiry < ?", time.Now().Unix()-mp.maxlifetime)
- c.Close()
- return
-}
-
-// SessionAll count values in mysql session
-func (mp *Provider) SessionAll() int {
- c := mp.connectInit()
- defer c.Close()
- var total int
- err := c.QueryRow("SELECT count(*) as num from " + TableName).Scan(&total)
- if err != nil {
- return 0
- }
- return total
-}
-
-func init() {
- session.Register("mysql", mysqlpder)
-}
diff --git a/vendor/github.com/astaxie/beego/session/postgres/sess_postgresql.go b/vendor/github.com/astaxie/beego/session/postgres/sess_postgresql.go
deleted file mode 100644
index 73f9c13a9..000000000
--- a/vendor/github.com/astaxie/beego/session/postgres/sess_postgresql.go
+++ /dev/null
@@ -1,248 +0,0 @@
-// Copyright 2014 beego Author. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package postgres for session provider
-//
-// depends on github.com/lib/pq:
-//
-// go install github.com/lib/pq
-//
-//
-// needs this table in your database:
-//
-// CREATE TABLE session (
-// session_key char(64) NOT NULL,
-// session_data bytea,
-// session_expiry timestamp NOT NULL,
-// CONSTRAINT session_key PRIMARY KEY(session_key)
-// );
-//
-// will be activated with these settings in app.conf:
-//
-// SessionOn = true
-// SessionProvider = postgresql
-// SessionSavePath = "user=a password=b dbname=c sslmode=disable"
-// SessionName = session
-//
-//
-// Usage:
-// import(
-// _ "github.com/astaxie/beego/session/postgresql"
-// "github.com/astaxie/beego/session"
-// )
-//
-// func init() {
-// globalSessions, _ = session.NewManager("postgresql", ``{"cookieName":"gosessionid","gclifetime":3600,"ProviderConfig":"user=pqgotest dbname=pqgotest sslmode=verify-full"}``)
-// go globalSessions.GC()
-// }
-//
-// more docs: http://beego.me/docs/module/session.md
-package postgres
-
-import (
- "database/sql"
- "net/http"
- "sync"
- "time"
-
- "github.com/astaxie/beego/session"
- // import postgresql Driver
- _ "github.com/lib/pq"
-)
-
-var postgresqlpder = &Provider{}
-
-// SessionStore postgresql session store
-type SessionStore struct {
- c *sql.DB
- sid string
- lock sync.RWMutex
- values map[interface{}]interface{}
-}
-
-// Set value in postgresql session.
-// it is temp value in map.
-func (st *SessionStore) Set(key, value interface{}) error {
- st.lock.Lock()
- defer st.lock.Unlock()
- st.values[key] = value
- return nil
-}
-
-// Get value from postgresql session
-func (st *SessionStore) Get(key interface{}) interface{} {
- st.lock.RLock()
- defer st.lock.RUnlock()
- if v, ok := st.values[key]; ok {
- return v
- }
- return nil
-}
-
-// Delete value in postgresql session
-func (st *SessionStore) Delete(key interface{}) error {
- st.lock.Lock()
- defer st.lock.Unlock()
- delete(st.values, key)
- return nil
-}
-
-// Flush clear all values in postgresql session
-func (st *SessionStore) Flush() error {
- st.lock.Lock()
- defer st.lock.Unlock()
- st.values = make(map[interface{}]interface{})
- return nil
-}
-
-// SessionID get session id of this postgresql session store
-func (st *SessionStore) SessionID() string {
- return st.sid
-}
-
-// SessionRelease save postgresql session values to database.
-// must call this method to save values to database.
-func (st *SessionStore) SessionRelease(w http.ResponseWriter) {
- defer st.c.Close()
- b, err := session.EncodeGob(st.values)
- if err != nil {
- return
- }
- st.c.Exec("UPDATE session set session_data=$1, session_expiry=$2 where session_key=$3",
- b, time.Now().Format(time.RFC3339), st.sid)
-
-}
-
-// Provider postgresql session provider
-type Provider struct {
- maxlifetime int64
- savePath string
-}
-
-// connect to postgresql
-func (mp *Provider) connectInit() *sql.DB {
- db, e := sql.Open("postgres", mp.savePath)
- if e != nil {
- return nil
- }
- return db
-}
-
-// SessionInit init postgresql session.
-// savepath is the connection string of postgresql.
-func (mp *Provider) SessionInit(maxlifetime int64, savePath string) error {
- mp.maxlifetime = maxlifetime
- mp.savePath = savePath
- return nil
-}
-
-// SessionRead get postgresql session by sid
-func (mp *Provider) SessionRead(sid string) (session.Store, error) {
- c := mp.connectInit()
- row := c.QueryRow("select session_data from session where session_key=$1", sid)
- var sessiondata []byte
- err := row.Scan(&sessiondata)
- if err == sql.ErrNoRows {
- _, err = c.Exec("insert into session(session_key,session_data,session_expiry) values($1,$2,$3)",
- sid, "", time.Now().Format(time.RFC3339))
-
- if err != nil {
- return nil, err
- }
- } else if err != nil {
- return nil, err
- }
-
- var kv map[interface{}]interface{}
- if len(sessiondata) == 0 {
- kv = make(map[interface{}]interface{})
- } else {
- kv, err = session.DecodeGob(sessiondata)
- if err != nil {
- return nil, err
- }
- }
- rs := &SessionStore{c: c, sid: sid, values: kv}
- return rs, nil
-}
-
-// SessionExist check postgresql session exist
-func (mp *Provider) SessionExist(sid string) bool {
- c := mp.connectInit()
- defer c.Close()
- row := c.QueryRow("select session_data from session where session_key=$1", sid)
- var sessiondata []byte
- err := row.Scan(&sessiondata)
-
- if err == sql.ErrNoRows {
- return false
- }
- return true
-}
-
-// SessionRegenerate generate new sid for postgresql session
-func (mp *Provider) SessionRegenerate(oldsid, sid string) (session.Store, error) {
- c := mp.connectInit()
- row := c.QueryRow("select session_data from session where session_key=$1", oldsid)
- var sessiondata []byte
- err := row.Scan(&sessiondata)
- if err == sql.ErrNoRows {
- c.Exec("insert into session(session_key,session_data,session_expiry) values($1,$2,$3)",
- oldsid, "", time.Now().Format(time.RFC3339))
- }
- c.Exec("update session set session_key=$1 where session_key=$2", sid, oldsid)
- var kv map[interface{}]interface{}
- if len(sessiondata) == 0 {
- kv = make(map[interface{}]interface{})
- } else {
- kv, err = session.DecodeGob(sessiondata)
- if err != nil {
- return nil, err
- }
- }
- rs := &SessionStore{c: c, sid: sid, values: kv}
- return rs, nil
-}
-
-// SessionDestroy delete postgresql session by sid
-func (mp *Provider) SessionDestroy(sid string) error {
- c := mp.connectInit()
- c.Exec("DELETE FROM session where session_key=$1", sid)
- c.Close()
- return nil
-}
-
-// SessionGC delete expired values in postgresql session
-func (mp *Provider) SessionGC() {
- c := mp.connectInit()
- c.Exec("DELETE from session where EXTRACT(EPOCH FROM (current_timestamp - session_expiry)) > $1", mp.maxlifetime)
- c.Close()
- return
-}
-
-// SessionAll count values in postgresql session
-func (mp *Provider) SessionAll() int {
- c := mp.connectInit()
- defer c.Close()
- var total int
- err := c.QueryRow("SELECT count(*) as num from session").Scan(&total)
- if err != nil {
- return 0
- }
- return total
-}
-
-func init() {
- session.Register("postgresql", postgresqlpder)
-}
diff --git a/vendor/github.com/astaxie/beego/session/redis/sess_redis.go b/vendor/github.com/astaxie/beego/session/redis/sess_redis.go
deleted file mode 100644
index c46fa7cdf..000000000
--- a/vendor/github.com/astaxie/beego/session/redis/sess_redis.go
+++ /dev/null
@@ -1,256 +0,0 @@
-// Copyright 2014 beego Author. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package redis for session provider
-//
-// depend on github.com/garyburd/redigo/redis
-//
-// go install github.com/garyburd/redigo/redis
-//
-// Usage:
-// import(
-// _ "github.com/astaxie/beego/session/redis"
-// "github.com/astaxie/beego/session"
-// )
-//
-// func init() {
-// globalSessions, _ = session.NewManager("redis", ``{"cookieName":"gosessionid","gclifetime":3600,"ProviderConfig":"127.0.0.1:7070"}``)
-// go globalSessions.GC()
-// }
-//
-// more docs: http://beego.me/docs/module/session.md
-package redis
-
-import (
- "net/http"
- "strconv"
- "strings"
- "sync"
-
- "github.com/astaxie/beego/session"
-
- "github.com/garyburd/redigo/redis"
-)
-
-var redispder = &Provider{}
-
-// MaxPoolSize redis max pool size
-var MaxPoolSize = 100
-
-// SessionStore redis session store
-type SessionStore struct {
- p *redis.Pool
- sid string
- lock sync.RWMutex
- values map[interface{}]interface{}
- maxlifetime int64
-}
-
-// Set value in redis session
-func (rs *SessionStore) Set(key, value interface{}) error {
- rs.lock.Lock()
- defer rs.lock.Unlock()
- rs.values[key] = value
- return nil
-}
-
-// Get value in redis session
-func (rs *SessionStore) Get(key interface{}) interface{} {
- rs.lock.RLock()
- defer rs.lock.RUnlock()
- if v, ok := rs.values[key]; ok {
- return v
- }
- return nil
-}
-
-// Delete value in redis session
-func (rs *SessionStore) Delete(key interface{}) error {
- rs.lock.Lock()
- defer rs.lock.Unlock()
- delete(rs.values, key)
- return nil
-}
-
-// Flush clear all values in redis session
-func (rs *SessionStore) Flush() error {
- rs.lock.Lock()
- defer rs.lock.Unlock()
- rs.values = make(map[interface{}]interface{})
- return nil
-}
-
-// SessionID get redis session id
-func (rs *SessionStore) SessionID() string {
- return rs.sid
-}
-
-// SessionRelease save session values to redis
-func (rs *SessionStore) SessionRelease(w http.ResponseWriter) {
- b, err := session.EncodeGob(rs.values)
- if err != nil {
- return
- }
- c := rs.p.Get()
- defer c.Close()
- c.Do("SETEX", rs.sid, rs.maxlifetime, string(b))
-}
-
-// Provider redis session provider
-type Provider struct {
- maxlifetime int64
- savePath string
- poolsize int
- password string
- dbNum int
- poollist *redis.Pool
-}
-
-// SessionInit init redis session
-// savepath like redis server addr,pool size,password,dbnum
-// e.g. 127.0.0.1:6379,100,astaxie,0
-func (rp *Provider) SessionInit(maxlifetime int64, savePath string) error {
- rp.maxlifetime = maxlifetime
- configs := strings.Split(savePath, ",")
- if len(configs) > 0 {
- rp.savePath = configs[0]
- }
- if len(configs) > 1 {
- poolsize, err := strconv.Atoi(configs[1])
- if err != nil || poolsize <= 0 {
- rp.poolsize = MaxPoolSize
- } else {
- rp.poolsize = poolsize
- }
- } else {
- rp.poolsize = MaxPoolSize
- }
- if len(configs) > 2 {
- rp.password = configs[2]
- }
- if len(configs) > 3 {
- dbnum, err := strconv.Atoi(configs[3])
- if err != nil || dbnum < 0 {
- rp.dbNum = 0
- } else {
- rp.dbNum = dbnum
- }
- } else {
- rp.dbNum = 0
- }
- rp.poollist = redis.NewPool(func() (redis.Conn, error) {
- c, err := redis.Dial("tcp", rp.savePath)
- if err != nil {
- return nil, err
- }
- if rp.password != "" {
- if _, err := c.Do("AUTH", rp.password); err != nil {
- c.Close()
- return nil, err
- }
- }
- _, err = c.Do("SELECT", rp.dbNum)
- if err != nil {
- c.Close()
- return nil, err
- }
- return c, err
- }, rp.poolsize)
-
- return rp.poollist.Get().Err()
-}
-
-// SessionRead read redis session by sid
-func (rp *Provider) SessionRead(sid string) (session.Store, error) {
- c := rp.poollist.Get()
- defer c.Close()
-
- kvs, err := redis.String(c.Do("GET", sid))
- var kv map[interface{}]interface{}
- if len(kvs) == 0 {
- kv = make(map[interface{}]interface{})
- } else {
- kv, err = session.DecodeGob([]byte(kvs))
- if err != nil {
- return nil, err
- }
- }
-
- rs := &SessionStore{p: rp.poollist, sid: sid, values: kv, maxlifetime: rp.maxlifetime}
- return rs, nil
-}
-
-// SessionExist check redis session exist by sid
-func (rp *Provider) SessionExist(sid string) bool {
- c := rp.poollist.Get()
- defer c.Close()
-
- if existed, err := redis.Int(c.Do("EXISTS", sid)); err != nil || existed == 0 {
- return false
- }
- return true
-}
-
-// SessionRegenerate generate new sid for redis session
-func (rp *Provider) SessionRegenerate(oldsid, sid string) (session.Store, error) {
- c := rp.poollist.Get()
- defer c.Close()
-
- if existed, _ := redis.Int(c.Do("EXISTS", oldsid)); existed == 0 {
- // oldsid doesn't exists, set the new sid directly
- // ignore error here, since if it return error
- // the existed value will be 0
- c.Do("SET", sid, "", "EX", rp.maxlifetime)
- } else {
- c.Do("RENAME", oldsid, sid)
- c.Do("EXPIRE", sid, rp.maxlifetime)
- }
-
- kvs, err := redis.String(c.Do("GET", sid))
- var kv map[interface{}]interface{}
- if len(kvs) == 0 {
- kv = make(map[interface{}]interface{})
- } else {
- kv, err = session.DecodeGob([]byte(kvs))
- if err != nil {
- return nil, err
- }
- }
-
- rs := &SessionStore{p: rp.poollist, sid: sid, values: kv, maxlifetime: rp.maxlifetime}
- return rs, nil
-}
-
-// SessionDestroy delete redis session by id
-func (rp *Provider) SessionDestroy(sid string) error {
- c := rp.poollist.Get()
- defer c.Close()
-
- c.Do("DEL", sid)
- return nil
-}
-
-// SessionGC Impelment method, no used.
-func (rp *Provider) SessionGC() {
- return
-}
-
-// SessionAll return all activeSession
-func (rp *Provider) SessionAll() int {
- return 0
-}
-
-func init() {
- session.Register("redis", redispder)
-}
diff --git a/vendor/github.com/astaxie/beego/session/sess_mem.go b/vendor/github.com/astaxie/beego/session/sess_mem.go
index dd61ef573..64d8b0561 100644
--- a/vendor/github.com/astaxie/beego/session/sess_mem.go
+++ b/vendor/github.com/astaxie/beego/session/sess_mem.go
@@ -102,7 +102,7 @@ func (pder *MemProvider) SessionRead(sid string) (Store, error) {
pder.lock.RUnlock()
pder.lock.Lock()
newsess := &MemSessionStore{sid: sid, timeAccessed: time.Now(), value: make(map[interface{}]interface{})}
- element := pder.list.PushBack(newsess)
+ element := pder.list.PushFront(newsess)
pder.sessions[sid] = element
pder.lock.Unlock()
return newsess, nil
@@ -134,7 +134,7 @@ func (pder *MemProvider) SessionRegenerate(oldsid, sid string) (Store, error) {
pder.lock.RUnlock()
pder.lock.Lock()
newsess := &MemSessionStore{sid: sid, timeAccessed: time.Now(), value: make(map[interface{}]interface{})}
- element := pder.list.PushBack(newsess)
+ element := pder.list.PushFront(newsess)
pder.sessions[sid] = element
pder.lock.Unlock()
return newsess, nil
diff --git a/vendor/github.com/astaxie/beego/session/session.go b/vendor/github.com/astaxie/beego/session/session.go
index 39d475fc1..9fe99a174 100644
--- a/vendor/github.com/astaxie/beego/session/session.go
+++ b/vendor/github.com/astaxie/beego/session/session.go
@@ -201,7 +201,9 @@ func (manager *Manager) SessionDestroy(w http.ResponseWriter, r *http.Request) {
if err != nil || cookie.Value == "" {
return
}
- manager.provider.SessionDestroy(cookie.Value)
+
+ sid, _ := url.QueryUnescape(cookie.Value)
+ manager.provider.SessionDestroy(sid)
if manager.config.EnableSetCookie {
expiration := time.Now()
cookie = &http.Cookie{Name: manager.config.CookieName,
diff --git a/vendor/github.com/astaxie/beego/staticfile.go b/vendor/github.com/astaxie/beego/staticfile.go
index 9534ce914..0aad2c81e 100644
--- a/vendor/github.com/astaxie/beego/staticfile.go
+++ b/vendor/github.com/astaxie/beego/staticfile.go
@@ -93,12 +93,14 @@ type serveContentHolder struct {
var (
staticFileMap = make(map[string]*serveContentHolder)
- mapLock sync.Mutex
+ mapLock sync.RWMutex
)
func openFile(filePath string, fi os.FileInfo, acceptEncoding string) (bool, string, *serveContentHolder, error) {
mapKey := acceptEncoding + ":" + filePath
+ mapLock.RLock()
mapFile, _ := staticFileMap[mapKey]
+ mapLock.RUnlock()
if isOk(mapFile, fi) {
return mapFile.encoding != "", mapFile.encoding, mapFile, nil
}
diff --git a/vendor/github.com/astaxie/beego/swagger/docs_spec.go b/vendor/github.com/astaxie/beego/swagger/docs_spec.go
deleted file mode 100644
index 680324dc0..000000000
--- a/vendor/github.com/astaxie/beego/swagger/docs_spec.go
+++ /dev/null
@@ -1,160 +0,0 @@
-// Copyright 2014 beego Author. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package swagger struct definition
-package swagger
-
-// SwaggerVersion show the current swagger version
-const SwaggerVersion = "1.2"
-
-// ResourceListing list the resource
-type ResourceListing struct {
- APIVersion string `json:"apiVersion"`
- SwaggerVersion string `json:"swaggerVersion"` // e.g 1.2
- // BasePath string `json:"basePath"` obsolete in 1.1
- APIs []APIRef `json:"apis"`
- Info Information `json:"info"`
-}
-
-// APIRef description the api path and description
-type APIRef struct {
- Path string `json:"path"` // relative or absolute, must start with /
- Description string `json:"description"`
-}
-
-// Information show the API Information
-type Information struct {
- Title string `json:"title,omitempty"`
- Description string `json:"description,omitempty"`
- Contact string `json:"contact,omitempty"`
- TermsOfServiceURL string `json:"termsOfServiceUrl,omitempty"`
- License string `json:"license,omitempty"`
- LicenseURL string `json:"licenseUrl,omitempty"`
-}
-
-// APIDeclaration see https://github.com/wordnik/swagger-core/blob/scala_2.10-1.3-RC3/schemas/api-declaration-schema.json
-type APIDeclaration struct {
- APIVersion string `json:"apiVersion"`
- SwaggerVersion string `json:"swaggerVersion"`
- BasePath string `json:"basePath"`
- ResourcePath string `json:"resourcePath"` // must start with /
- Consumes []string `json:"consumes,omitempty"`
- Produces []string `json:"produces,omitempty"`
- APIs []API `json:"apis,omitempty"`
- Models map[string]Model `json:"models,omitempty"`
-}
-
-// API show tha API struct
-type API struct {
- Path string `json:"path"` // relative or absolute, must start with /
- Description string `json:"description"`
- Operations []Operation `json:"operations,omitempty"`
-}
-
-// Operation desc the Operation
-type Operation struct {
- HTTPMethod string `json:"httpMethod"`
- Nickname string `json:"nickname"`
- Type string `json:"type"` // in 1.1 = DataType
- // ResponseClass string `json:"responseClass"` obsolete in 1.2
- Summary string `json:"summary,omitempty"`
- Notes string `json:"notes,omitempty"`
- Parameters []Parameter `json:"parameters,omitempty"`
- ResponseMessages []ResponseMessage `json:"responseMessages,omitempty"` // optional
- Consumes []string `json:"consumes,omitempty"`
- Produces []string `json:"produces,omitempty"`
- Authorizations []Authorization `json:"authorizations,omitempty"`
- Protocols []Protocol `json:"protocols,omitempty"`
-}
-
-// Protocol support which Protocol
-type Protocol struct {
-}
-
-// ResponseMessage Show the
-type ResponseMessage struct {
- Code int `json:"code"`
- Message string `json:"message"`
- ResponseModel string `json:"responseModel"`
-}
-
-// Parameter desc the request parameters
-type Parameter struct {
- ParamType string `json:"paramType"` // path,query,body,header,form
- Name string `json:"name"`
- Description string `json:"description"`
- DataType string `json:"dataType"` // 1.2 needed?
- Type string `json:"type"` // integer
- Format string `json:"format"` // int64
- AllowMultiple bool `json:"allowMultiple"`
- Required bool `json:"required"`
- Minimum int `json:"minimum"`
- Maximum int `json:"maximum"`
-}
-
-// ErrorResponse desc response
-type ErrorResponse struct {
- Code int `json:"code"`
- Reason string `json:"reason"`
-}
-
-// Model define the data model
-type Model struct {
- ID string `json:"id"`
- Required []string `json:"required,omitempty"`
- Properties map[string]ModelProperty `json:"properties"`
-}
-
-// ModelProperty define the properties
-type ModelProperty struct {
- Type string `json:"type"`
- Description string `json:"description"`
- Items map[string]string `json:"items,omitempty"`
- Format string `json:"format"`
-}
-
-// Authorization see https://github.com/wordnik/swagger-core/wiki/authorizations
-type Authorization struct {
- LocalOAuth OAuth `json:"local-oauth"`
- APIKey APIKey `json:"apiKey"`
-}
-
-// OAuth see https://github.com/wordnik/swagger-core/wiki/authorizations
-type OAuth struct {
- Type string `json:"type"` // e.g. oauth2
- Scopes []string `json:"scopes"` // e.g. PUBLIC
- GrantTypes map[string]GrantType `json:"grantTypes"`
-}
-
-// GrantType see https://github.com/wordnik/swagger-core/wiki/authorizations
-type GrantType struct {
- LoginEndpoint Endpoint `json:"loginEndpoint"`
- TokenName string `json:"tokenName"` // e.g. access_code
- TokenRequestEndpoint Endpoint `json:"tokenRequestEndpoint"`
- TokenEndpoint Endpoint `json:"tokenEndpoint"`
-}
-
-// Endpoint see https://github.com/wordnik/swagger-core/wiki/authorizations
-type Endpoint struct {
- URL string `json:"url"`
- ClientIDName string `json:"clientIdName"`
- ClientSecretName string `json:"clientSecretName"`
- TokenName string `json:"tokenName"`
-}
-
-// APIKey see https://github.com/wordnik/swagger-core/wiki/authorizations
-type APIKey struct {
- Type string `json:"type"` // e.g. apiKey
- PassAs string `json:"passAs"` // e.g. header
-}
diff --git a/vendor/github.com/astaxie/beego/template.go b/vendor/github.com/astaxie/beego/template.go
index 363c67541..e6c43f871 100644
--- a/vendor/github.com/astaxie/beego/template.go
+++ b/vendor/github.com/astaxie/beego/template.go
@@ -18,23 +18,41 @@ import (
"errors"
"fmt"
"html/template"
+ "io"
"io/ioutil"
"os"
"path/filepath"
"regexp"
"strings"
+ "sync"
"github.com/astaxie/beego/utils"
)
var (
beegoTplFuncMap = make(template.FuncMap)
- // BeeTemplates caching map and supported template file extensions.
- BeeTemplates = make(map[string]*template.Template)
- // BeeTemplateExt stores the template extension which will build
- BeeTemplateExt = []string{"tpl", "html"}
+ // beeTemplates caching map and supported template file extensions.
+ beeTemplates = make(map[string]*template.Template)
+ templatesLock sync.RWMutex
+ // beeTemplateExt stores the template extension which will build
+ beeTemplateExt = []string{"tpl", "html"}
)
+func executeTemplate(wr io.Writer, name string, data interface{}) error {
+ if BConfig.RunMode == DEV {
+ templatesLock.RLock()
+ defer templatesLock.RUnlock()
+ }
+ if t, ok := beeTemplates[name]; ok {
+ err := t.ExecuteTemplate(wr, name, data)
+ if err != nil {
+ Trace("template Execute err:", err)
+ }
+ return err
+ }
+ panic("can't find templatefile in the path:" + name)
+}
+
func init() {
beegoTplFuncMap["dateformat"] = DateFormat
beegoTplFuncMap["date"] = Date
@@ -53,7 +71,6 @@ func init() {
beegoTplFuncMap["config"] = GetConfig
beegoTplFuncMap["map_get"] = MapGet
- // go1.2 added template funcs
// Comparisons
beegoTplFuncMap["eq"] = eq // ==
beegoTplFuncMap["ge"] = ge // >=
@@ -62,21 +79,25 @@ func init() {
beegoTplFuncMap["lt"] = lt // <
beegoTplFuncMap["ne"] = ne // !=
- beegoTplFuncMap["urlfor"] = URLFor // !=
+ beegoTplFuncMap["urlfor"] = URLFor // build a URL to match a Controller and it's method
}
// AddFuncMap let user to register a func in the template.
-func AddFuncMap(key string, funname interface{}) error {
- beegoTplFuncMap[key] = funname
+func AddFuncMap(key string, fn interface{}) error {
+ beegoTplFuncMap[key] = fn
return nil
}
-type templatefile struct {
+type templateFile struct {
root string
files map[string][]string
}
-func (tf *templatefile) visit(paths string, f os.FileInfo, err error) error {
+// visit will make the paths into two part,the first is subDir (without tf.root),the second is full path(without tf.root).
+// if tf.root="views" and
+// paths is "views/errors/404.html",the subDir will be "errors",the file will be "errors/404.html"
+// paths is "views/admin/errors/404.html",the subDir will be "admin/errors",the file will be "admin/errors/404.html"
+func (tf *templateFile) visit(paths string, f os.FileInfo, err error) error {
if f == nil {
return err
}
@@ -88,24 +109,16 @@ func (tf *templatefile) visit(paths string, f os.FileInfo, err error) error {
}
replace := strings.NewReplacer("\\", "/")
- a := []byte(paths)
- a = a[len([]byte(tf.root)):]
- file := strings.TrimLeft(replace.Replace(string(a)), "/")
- subdir := filepath.Dir(file)
- if _, ok := tf.files[subdir]; ok {
- tf.files[subdir] = append(tf.files[subdir], file)
- } else {
- m := make([]string, 1)
- m[0] = file
- tf.files[subdir] = m
- }
+ file := strings.TrimLeft(replace.Replace(paths[len(tf.root):]), "/")
+ subDir := filepath.Dir(file)
+ tf.files[subDir] = append(tf.files[subDir], file)
return nil
}
// HasTemplateExt return this path contains supported template extension of beego or not.
func HasTemplateExt(paths string) bool {
- for _, v := range BeeTemplateExt {
+ for _, v := range beeTemplateExt {
if strings.HasSuffix(paths, "."+v) {
return true
}
@@ -115,12 +128,12 @@ func HasTemplateExt(paths string) bool {
// AddTemplateExt add new extension for template.
func AddTemplateExt(ext string) {
- for _, v := range BeeTemplateExt {
+ for _, v := range beeTemplateExt {
if v == ext {
return
}
}
- BeeTemplateExt = append(BeeTemplateExt, ext)
+ beeTemplateExt = append(beeTemplateExt, ext)
}
// BuildTemplate will build all template files in a directory.
@@ -132,7 +145,7 @@ func BuildTemplate(dir string, files ...string) error {
}
return errors.New("dir open err")
}
- self := &templatefile{
+ self := &templateFile{
root: dir,
files: make(map[string][]string),
}
@@ -146,12 +159,14 @@ func BuildTemplate(dir string, files ...string) error {
for _, v := range self.files {
for _, file := range v {
if len(files) == 0 || utils.InSlice(file, files) {
+ templatesLock.Lock()
t, err := getTemplate(self.root, file, v...)
if err != nil {
Trace("parse template err:", file, err)
} else {
- BeeTemplates[file] = t
+ beeTemplates[file] = t
}
+ templatesLock.Unlock()
}
}
}
@@ -159,16 +174,16 @@ func BuildTemplate(dir string, files ...string) error {
}
func getTplDeep(root, file, parent string, t *template.Template) (*template.Template, [][]string, error) {
- var fileabspath string
+ var fileAbsPath string
if filepath.HasPrefix(file, "../") {
- fileabspath = filepath.Join(root, filepath.Dir(parent), file)
+ fileAbsPath = filepath.Join(root, filepath.Dir(parent), file)
} else {
- fileabspath = filepath.Join(root, file)
+ fileAbsPath = filepath.Join(root, file)
}
- if e := utils.FileExists(fileabspath); !e {
+ if e := utils.FileExists(fileAbsPath); !e {
panic("can't find template file:" + file)
}
- data, err := ioutil.ReadFile(fileabspath)
+ data, err := ioutil.ReadFile(fileAbsPath)
if err != nil {
return nil, [][]string{}, err
}
@@ -177,11 +192,11 @@ func getTplDeep(root, file, parent string, t *template.Template) (*template.Temp
return nil, [][]string{}, err
}
reg := regexp.MustCompile(BConfig.WebConfig.TemplateLeft + "[ ]*template[ ]+\"([^\"]+)\"")
- allsub := reg.FindAllStringSubmatch(string(data), -1)
- for _, m := range allsub {
+ allSub := reg.FindAllStringSubmatch(string(data), -1)
+ for _, m := range allSub {
if len(m) == 2 {
- tlook := t.Lookup(m[1])
- if tlook != nil {
+ tl := t.Lookup(m[1])
+ if tl != nil {
continue
}
if !HasTemplateExt(m[1]) {
@@ -193,17 +208,17 @@ func getTplDeep(root, file, parent string, t *template.Template) (*template.Temp
}
}
}
- return t, allsub, nil
+ return t, allSub, nil
}
func getTemplate(root, file string, others ...string) (t *template.Template, err error) {
t = template.New(file).Delims(BConfig.WebConfig.TemplateLeft, BConfig.WebConfig.TemplateRight).Funcs(beegoTplFuncMap)
- var submods [][]string
- t, submods, err = getTplDeep(root, file, "", t)
+ var subMods [][]string
+ t, subMods, err = getTplDeep(root, file, "", t)
if err != nil {
return nil, err
}
- t, err = _getTemplate(t, root, submods, others...)
+ t, err = _getTemplate(t, root, subMods, others...)
if err != nil {
return nil, err
@@ -211,44 +226,44 @@ func getTemplate(root, file string, others ...string) (t *template.Template, err
return
}
-func _getTemplate(t0 *template.Template, root string, submods [][]string, others ...string) (t *template.Template, err error) {
+func _getTemplate(t0 *template.Template, root string, subMods [][]string, others ...string) (t *template.Template, err error) {
t = t0
- for _, m := range submods {
+ for _, m := range subMods {
if len(m) == 2 {
- templ := t.Lookup(m[1])
- if templ != nil {
+ tpl := t.Lookup(m[1])
+ if tpl != nil {
continue
}
//first check filename
- for _, otherfile := range others {
- if otherfile == m[1] {
- var submods1 [][]string
- t, submods1, err = getTplDeep(root, otherfile, "", t)
+ for _, otherFile := range others {
+ if otherFile == m[1] {
+ var subMods1 [][]string
+ t, subMods1, err = getTplDeep(root, otherFile, "", t)
if err != nil {
Trace("template parse file err:", err)
- } else if submods1 != nil && len(submods1) > 0 {
- t, err = _getTemplate(t, root, submods1, others...)
+ } else if subMods1 != nil && len(subMods1) > 0 {
+ t, err = _getTemplate(t, root, subMods1, others...)
}
break
}
}
//second check define
- for _, otherfile := range others {
- fileabspath := filepath.Join(root, otherfile)
- data, err := ioutil.ReadFile(fileabspath)
+ for _, otherFile := range others {
+ fileAbsPath := filepath.Join(root, otherFile)
+ data, err := ioutil.ReadFile(fileAbsPath)
if err != nil {
continue
}
reg := regexp.MustCompile(BConfig.WebConfig.TemplateLeft + "[ ]*define[ ]+\"([^\"]+)\"")
- allsub := reg.FindAllStringSubmatch(string(data), -1)
- for _, sub := range allsub {
+ allSub := reg.FindAllStringSubmatch(string(data), -1)
+ for _, sub := range allSub {
if len(sub) == 2 && sub[1] == m[1] {
- var submods1 [][]string
- t, submods1, err = getTplDeep(root, otherfile, "", t)
+ var subMods1 [][]string
+ t, subMods1, err = getTplDeep(root, otherFile, "", t)
if err != nil {
Trace("template parse file err:", err)
- } else if submods1 != nil && len(submods1) > 0 {
- t, err = _getTemplate(t, root, submods1, others...)
+ } else if subMods1 != nil && len(subMods1) > 0 {
+ t, err = _getTemplate(t, root, subMods1, others...)
}
break
}
@@ -272,7 +287,9 @@ func SetStaticPath(url string, path string) *App {
if !strings.HasPrefix(url, "/") {
url = "/" + url
}
- url = strings.TrimRight(url, "/")
+ if url != "/" {
+ url = strings.TrimRight(url, "/")
+ }
BConfig.WebConfig.StaticDir[url] = path
return BeeApp
}
@@ -282,7 +299,9 @@ func DelStaticPath(url string) *App {
if !strings.HasPrefix(url, "/") {
url = "/" + url
}
- url = strings.TrimRight(url, "/")
+ if url != "/" {
+ url = strings.TrimRight(url, "/")
+ }
delete(BConfig.WebConfig.StaticDir, url)
return BeeApp
}
diff --git a/vendor/github.com/astaxie/beego/testing/assertions.go b/vendor/github.com/astaxie/beego/testing/assertions.go
deleted file mode 100644
index 96c5d4ddc..000000000
--- a/vendor/github.com/astaxie/beego/testing/assertions.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2014 beego Author. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package testing
diff --git a/vendor/github.com/astaxie/beego/testing/client.go b/vendor/github.com/astaxie/beego/testing/client.go
deleted file mode 100644
index c3737e9c6..000000000
--- a/vendor/github.com/astaxie/beego/testing/client.go
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright 2014 beego Author. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package testing
-
-import (
- "github.com/astaxie/beego/config"
- "github.com/astaxie/beego/httplib"
-)
-
-var port = ""
-var baseURL = "http://localhost:"
-
-// TestHTTPRequest beego test request client
-type TestHTTPRequest struct {
- httplib.BeegoHTTPRequest
-}
-
-func getPort() string {
- if port == "" {
- config, err := config.NewConfig("ini", "../conf/app.conf")
- if err != nil {
- return "8080"
- }
- port = config.String("httpport")
- return port
- }
- return port
-}
-
-// Get returns test client in GET method
-func Get(path string) *TestHTTPRequest {
- return &TestHTTPRequest{*httplib.Get(baseURL + getPort() + path)}
-}
-
-// Post returns test client in POST method
-func Post(path string) *TestHTTPRequest {
- return &TestHTTPRequest{*httplib.Post(baseURL + getPort() + path)}
-}
-
-// Put returns test client in PUT method
-func Put(path string) *TestHTTPRequest {
- return &TestHTTPRequest{*httplib.Put(baseURL + getPort() + path)}
-}
-
-// Delete returns test client in DELETE method
-func Delete(path string) *TestHTTPRequest {
- return &TestHTTPRequest{*httplib.Delete(baseURL + getPort() + path)}
-}
-
-// Head returns test client in HEAD method
-func Head(path string) *TestHTTPRequest {
- return &TestHTTPRequest{*httplib.Head(baseURL + getPort() + path)}
-}
diff --git a/vendor/github.com/astaxie/beego/tree.go b/vendor/github.com/astaxie/beego/tree.go
index a6ffe062e..0601099cd 100644
--- a/vendor/github.com/astaxie/beego/tree.go
+++ b/vendor/github.com/astaxie/beego/tree.go
@@ -141,7 +141,7 @@ func (t *Tree) addtree(segments []string, tree *Tree, wildcards []string, reg st
regexpStr = "([^.]+).(.+)"
params = params[1:]
} else {
- for range params {
+ for _ = range params {
regexpStr = "([^/]+)/" + regexpStr
}
}
@@ -254,7 +254,7 @@ func (t *Tree) addseg(segments []string, route interface{}, wildcards []string,
regexpStr = "/([^.]+).(.+)"
params = params[1:]
} else {
- for range params {
+ for _ = range params {
regexpStr = "/([^/]+)" + regexpStr
}
}
@@ -265,15 +265,14 @@ func (t *Tree) addseg(segments []string, route interface{}, wildcards []string,
}
t.wildcard.addseg(segments[1:], route, append(wildcards, params...), reg+regexpStr)
} else {
- var ok bool
var subTree *Tree
- for _, subTree = range t.fixrouters {
- if t.prefix == seg {
- ok = true
+ for _, sub := range t.fixrouters {
+ if sub.prefix == seg {
+ subTree = sub
break
}
}
- if !ok {
+ if subTree == nil {
subTree = NewTree()
subTree.prefix = seg
t.fixrouters = append(t.fixrouters, subTree)
@@ -390,7 +389,7 @@ type leafInfo struct {
func (leaf *leafInfo) match(wildcardValues []string, ctx *context.Context) (ok bool) {
//fmt.Println("Leaf:", wildcardValues, leaf.wildcards, leaf.regexps)
if leaf.regexps == nil {
- if len(wildcardValues) == 0 { // static path
+ if len(wildcardValues) == 0 && len(leaf.wildcards) == 0 { // static path
return true
}
// match *
@@ -420,7 +419,11 @@ func (leaf *leafInfo) match(wildcardValues []string, ctx *context.Context) (ok b
if len(strs) == 2 {
ctx.Input.SetParam(":ext", strs[1])
}
- ctx.Input.SetParam(":path", path.Join(path.Join(wildcardValues[index:len(wildcardValues)-1]...), strs[0]))
+ if index > (len(wildcardValues) - 1) {
+ ctx.Input.SetParam(":path", "")
+ } else {
+ ctx.Input.SetParam(":path", path.Join(path.Join(wildcardValues[index:len(wildcardValues)-1]...), strs[0]))
+ }
return true
}
// match :id
@@ -438,7 +441,9 @@ func (leaf *leafInfo) match(wildcardValues []string, ctx *context.Context) (ok b
}
matches := leaf.regexps.FindStringSubmatch(path.Join(wildcardValues...))
for i, match := range matches[1:] {
- ctx.Input.SetParam(leaf.wildcards[i], match)
+ if i < len(leaf.wildcards) {
+ ctx.Input.SetParam(leaf.wildcards[i], match)
+ }
}
return true
}
@@ -448,17 +453,11 @@ func (leaf *leafInfo) match(wildcardValues []string, ctx *context.Context) (ok b
// "/admin/" -> ["admin"]
// "/admin/users" -> ["admin", "users"]
func splitPath(key string) []string {
+ key = strings.Trim(key, "/ ")
if key == "" {
return []string{}
}
- elements := strings.Split(key, "/")
- if elements[0] == "" {
- elements = elements[1:]
- }
- if elements[len(elements)-1] == "" {
- elements = elements[:len(elements)-1]
- }
- return elements
+ return strings.Split(key, "/")
}
// "admin" -> false, nil, ""
@@ -542,13 +541,19 @@ func splitSegment(key string) (bool, []string, string) {
continue
}
}
- if v == ':' {
+ // Escape Sequence '\'
+ if i > 0 && key[i-1] == '\\' {
+ out = append(out, v)
+ } else if v == ':' {
param = make([]rune, 0)
start = true
} else if v == '(' {
startexp = true
start = false
- params = append(params, ":"+string(param))
+ if len(param) > 0 {
+ params = append(params, ":"+string(param))
+ param = make([]rune, 0)
+ }
paramsNum++
expt = make([]rune, 0)
expt = append(expt, '(')
diff --git a/vendor/github.com/astaxie/beego/utils/captcha/LICENSE b/vendor/github.com/astaxie/beego/utils/captcha/LICENSE
deleted file mode 100644
index 0ad73ae0e..000000000
--- a/vendor/github.com/astaxie/beego/utils/captcha/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2011-2014 Dmitry Chestnykh
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/vendor/github.com/astaxie/beego/utils/captcha/README.md b/vendor/github.com/astaxie/beego/utils/captcha/README.md
deleted file mode 100644
index dbc2026b1..000000000
--- a/vendor/github.com/astaxie/beego/utils/captcha/README.md
+++ /dev/null
@@ -1,45 +0,0 @@
-# Captcha
-
-an example for use captcha
-
-```
-package controllers
-
-import (
- "github.com/astaxie/beego"
- "github.com/astaxie/beego/cache"
- "github.com/astaxie/beego/utils/captcha"
-)
-
-var cpt *captcha.Captcha
-
-func init() {
- // use beego cache system store the captcha data
- store := cache.NewMemoryCache()
- cpt = captcha.NewWithFilter("/captcha/", store)
-}
-
-type MainController struct {
- beego.Controller
-}
-
-func (this *MainController) Get() {
- this.TplName = "index.tpl"
-}
-
-func (this *MainController) Post() {
- this.TplName = "index.tpl"
-
- this.Data["Success"] = cpt.VerifyReq(this.Ctx.Request)
-}
-```
-
-template usage
-
-```
-{{.Success}}
-
-```
diff --git a/vendor/github.com/astaxie/beego/utils/captcha/captcha.go b/vendor/github.com/astaxie/beego/utils/captcha/captcha.go
deleted file mode 100644
index 1a4a6edcb..000000000
--- a/vendor/github.com/astaxie/beego/utils/captcha/captcha.go
+++ /dev/null
@@ -1,269 +0,0 @@
-// Copyright 2014 beego Author. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package captcha implements generation and verification of image CAPTCHAs.
-// an example for use captcha
-//
-// ```
-// package controllers
-//
-// import (
-// "github.com/astaxie/beego"
-// "github.com/astaxie/beego/cache"
-// "github.com/astaxie/beego/utils/captcha"
-// )
-//
-// var cpt *captcha.Captcha
-//
-// func init() {
-// // use beego cache system store the captcha data
-// store := cache.NewMemoryCache()
-// cpt = captcha.NewWithFilter("/captcha/", store)
-// }
-//
-// type MainController struct {
-// beego.Controller
-// }
-//
-// func (this *MainController) Get() {
-// this.TplName = "index.tpl"
-// }
-//
-// func (this *MainController) Post() {
-// this.TplName = "index.tpl"
-//
-// this.Data["Success"] = cpt.VerifyReq(this.Ctx.Request)
-// }
-// ```
-//
-// template usage
-//
-// ```
-// {{.Success}}
-//
-// ```
-package captcha
-
-import (
- "fmt"
- "html/template"
- "net/http"
- "path"
- "strings"
- "time"
-
- "github.com/astaxie/beego"
- "github.com/astaxie/beego/cache"
- "github.com/astaxie/beego/context"
- "github.com/astaxie/beego/utils"
-)
-
-var (
- defaultChars = []byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}
-)
-
-const (
- // default captcha attributes
- challengeNums = 6
- expiration = 600 * time.Second
- fieldIDName = "captcha_id"
- fieldCaptchaName = "captcha"
- cachePrefix = "captcha_"
- defaultURLPrefix = "/captcha/"
-)
-
-// Captcha struct
-type Captcha struct {
- // beego cache store
- store cache.Cache
-
- // url prefix for captcha image
- URLPrefix string
-
- // specify captcha id input field name
- FieldIDName string
- // specify captcha result input field name
- FieldCaptchaName string
-
- // captcha image width and height
- StdWidth int
- StdHeight int
-
- // captcha chars nums
- ChallengeNums int
-
- // captcha expiration seconds
- Expiration time.Duration
-
- // cache key prefix
- CachePrefix string
-}
-
-// generate key string
-func (c *Captcha) key(id string) string {
- return c.CachePrefix + id
-}
-
-// generate rand chars with default chars
-func (c *Captcha) genRandChars() []byte {
- return utils.RandomCreateBytes(c.ChallengeNums, defaultChars...)
-}
-
-// Handler beego filter handler for serve captcha image
-func (c *Captcha) Handler(ctx *context.Context) {
- var chars []byte
-
- id := path.Base(ctx.Request.RequestURI)
- if i := strings.Index(id, "."); i != -1 {
- id = id[:i]
- }
-
- key := c.key(id)
-
- if len(ctx.Input.Query("reload")) > 0 {
- chars = c.genRandChars()
- if err := c.store.Put(key, chars, c.Expiration); err != nil {
- ctx.Output.SetStatus(500)
- ctx.WriteString("captcha reload error")
- beego.Error("Reload Create Captcha Error:", err)
- return
- }
- } else {
- if v, ok := c.store.Get(key).([]byte); ok {
- chars = v
- } else {
- ctx.Output.SetStatus(404)
- ctx.WriteString("captcha not found")
- return
- }
- }
-
- img := NewImage(chars, c.StdWidth, c.StdHeight)
- if _, err := img.WriteTo(ctx.ResponseWriter); err != nil {
- beego.Error("Write Captcha Image Error:", err)
- }
-}
-
-// CreateCaptchaHTML template func for output html
-func (c *Captcha) CreateCaptchaHTML() template.HTML {
- value, err := c.CreateCaptcha()
- if err != nil {
- beego.Error("Create Captcha Error:", err)
- return ""
- }
-
- // create html
- return template.HTML(fmt.Sprintf(``+
- ``+
- ``+
- ``, c.FieldIDName, value, c.URLPrefix, value, c.URLPrefix, value))
-}
-
-// CreateCaptcha create a new captcha id
-func (c *Captcha) CreateCaptcha() (string, error) {
- // generate captcha id
- id := string(utils.RandomCreateBytes(15))
-
- // get the captcha chars
- chars := c.genRandChars()
-
- // save to store
- if err := c.store.Put(c.key(id), chars, c.Expiration); err != nil {
- return "", err
- }
-
- return id, nil
-}
-
-// VerifyReq verify from a request
-func (c *Captcha) VerifyReq(req *http.Request) bool {
- req.ParseForm()
- return c.Verify(req.Form.Get(c.FieldIDName), req.Form.Get(c.FieldCaptchaName))
-}
-
-// Verify direct verify id and challenge string
-func (c *Captcha) Verify(id string, challenge string) (success bool) {
- if len(challenge) == 0 || len(id) == 0 {
- return
- }
-
- var chars []byte
-
- key := c.key(id)
-
- if v, ok := c.store.Get(key).([]byte); ok {
- chars = v
- } else {
- return
- }
-
- defer func() {
- // finally remove it
- c.store.Delete(key)
- }()
-
- if len(chars) != len(challenge) {
- return
- }
- // verify challenge
- for i, c := range chars {
- if c != challenge[i]-48 {
- return
- }
- }
-
- return true
-}
-
-// NewCaptcha create a new captcha.Captcha
-func NewCaptcha(urlPrefix string, store cache.Cache) *Captcha {
- cpt := &Captcha{}
- cpt.store = store
- cpt.FieldIDName = fieldIDName
- cpt.FieldCaptchaName = fieldCaptchaName
- cpt.ChallengeNums = challengeNums
- cpt.Expiration = expiration
- cpt.CachePrefix = cachePrefix
- cpt.StdWidth = stdWidth
- cpt.StdHeight = stdHeight
-
- if len(urlPrefix) == 0 {
- urlPrefix = defaultURLPrefix
- }
-
- if urlPrefix[len(urlPrefix)-1] != '/' {
- urlPrefix += "/"
- }
-
- cpt.URLPrefix = urlPrefix
-
- return cpt
-}
-
-// NewWithFilter create a new captcha.Captcha and auto AddFilter for serve captacha image
-// and add a template func for output html
-func NewWithFilter(urlPrefix string, store cache.Cache) *Captcha {
- cpt := NewCaptcha(urlPrefix, store)
-
- // create filter for serve captcha image
- beego.InsertFilter(cpt.URLPrefix+"*", beego.BeforeRouter, cpt.Handler)
-
- // add to template func map
- beego.AddFuncMap("create_captcha", cpt.CreateCaptchaHTML)
-
- return cpt
-}
diff --git a/vendor/github.com/astaxie/beego/utils/captcha/image.go b/vendor/github.com/astaxie/beego/utils/captcha/image.go
deleted file mode 100644
index 1057192aa..000000000
--- a/vendor/github.com/astaxie/beego/utils/captcha/image.go
+++ /dev/null
@@ -1,498 +0,0 @@
-// Copyright 2014 beego Author. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package captcha
-
-import (
- "bytes"
- "image"
- "image/color"
- "image/png"
- "io"
- "math"
-)
-
-const (
- fontWidth = 11
- fontHeight = 18
- blackChar = 1
-
- // Standard width and height of a captcha image.
- stdWidth = 240
- stdHeight = 80
- // Maximum absolute skew factor of a single digit.
- maxSkew = 0.7
- // Number of background circles.
- circleCount = 20
-)
-
-var font = [][]byte{
- { // 0
- 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0,
- 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0,
- 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0,
- 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0,
- 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0,
- 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1,
- 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0,
- 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0,
- 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0,
- 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0,
- },
- { // 1
- 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0,
- 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0,
- 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0,
- 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0,
- 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0,
- 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0,
- 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- },
- { // 2
- 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0,
- 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0,
- 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 0,
- 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0,
- 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0,
- 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0,
- 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0,
- 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0,
- 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0,
- 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0,
- 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- },
- { // 3
- 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0,
- 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0,
- 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0,
- 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0,
- 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1,
- 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0,
- 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0,
- },
- { // 4
- 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0,
- 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0,
- 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0,
- 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0,
- 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0,
- 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0,
- 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0,
- 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0,
- 0, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0,
- 0, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0,
- 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0,
- 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0,
- },
- { // 5
- 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
- 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
- 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0,
- 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1,
- 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0,
- 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0,
- },
- { // 6
- 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0,
- 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0,
- 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0,
- 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 1, 1, 0, 0, 1, 1, 1, 1, 0, 0, 0,
- 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0,
- 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0,
- 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1,
- 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1,
- 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0,
- 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0,
- 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0,
- },
- { // 7
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1,
- 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0,
- 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0,
- 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0,
- 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0,
- 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0,
- 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0,
- 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0,
- 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0,
- 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0,
- },
- { // 8
- 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0,
- 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0,
- 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1,
- 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1,
- 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1,
- 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1,
- 0, 0, 1, 1, 0, 0, 0, 0, 1, 1, 0,
- 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0,
- 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0,
- 0, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0,
- 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0,
- 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1,
- 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0,
- 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
- 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0,
- },
- { // 9
- 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0,
- 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0,
- 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 0,
- 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0,
- 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1,
- 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1,
- 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1,
- 0, 0, 0, 1, 1, 1, 1, 0, 0, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0,
- 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0,
- 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0,
- 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0,
- 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
- },
-}
-
-// Image struct
-type Image struct {
- *image.Paletted
- numWidth int
- numHeight int
- dotSize int
-}
-
-var prng = &siprng{}
-
-// randIntn returns a pseudorandom non-negative int in range [0, n).
-func randIntn(n int) int {
- return prng.Intn(n)
-}
-
-// randInt returns a pseudorandom int in range [from, to].
-func randInt(from, to int) int {
- return prng.Intn(to+1-from) + from
-}
-
-// randFloat returns a pseudorandom float64 in range [from, to].
-func randFloat(from, to float64) float64 {
- return (to-from)*prng.Float64() + from
-}
-
-func randomPalette() color.Palette {
- p := make([]color.Color, circleCount+1)
- // Transparent color.
- p[0] = color.RGBA{0xFF, 0xFF, 0xFF, 0x00}
- // Primary color.
- prim := color.RGBA{
- uint8(randIntn(129)),
- uint8(randIntn(129)),
- uint8(randIntn(129)),
- 0xFF,
- }
- p[1] = prim
- // Circle colors.
- for i := 2; i <= circleCount; i++ {
- p[i] = randomBrightness(prim, 255)
- }
- return p
-}
-
-// NewImage returns a new captcha image of the given width and height with the
-// given digits, where each digit must be in range 0-9.
-func NewImage(digits []byte, width, height int) *Image {
- m := new(Image)
- m.Paletted = image.NewPaletted(image.Rect(0, 0, width, height), randomPalette())
- m.calculateSizes(width, height, len(digits))
- // Randomly position captcha inside the image.
- maxx := width - (m.numWidth+m.dotSize)*len(digits) - m.dotSize
- maxy := height - m.numHeight - m.dotSize*2
- var border int
- if width > height {
- border = height / 5
- } else {
- border = width / 5
- }
- x := randInt(border, maxx-border)
- y := randInt(border, maxy-border)
- // Draw digits.
- for _, n := range digits {
- m.drawDigit(font[n], x, y)
- x += m.numWidth + m.dotSize
- }
- // Draw strike-through line.
- m.strikeThrough()
- // Apply wave distortion.
- m.distort(randFloat(5, 10), randFloat(100, 200))
- // Fill image with random circles.
- m.fillWithCircles(circleCount, m.dotSize)
- return m
-}
-
-// encodedPNG encodes an image to PNG and returns
-// the result as a byte slice.
-func (m *Image) encodedPNG() []byte {
- var buf bytes.Buffer
- if err := png.Encode(&buf, m.Paletted); err != nil {
- panic(err.Error())
- }
- return buf.Bytes()
-}
-
-// WriteTo writes captcha image in PNG format into the given writer.
-func (m *Image) WriteTo(w io.Writer) (int64, error) {
- n, err := w.Write(m.encodedPNG())
- return int64(n), err
-}
-
-func (m *Image) calculateSizes(width, height, ncount int) {
- // Goal: fit all digits inside the image.
- var border int
- if width > height {
- border = height / 4
- } else {
- border = width / 4
- }
- // Convert everything to floats for calculations.
- w := float64(width - border*2)
- h := float64(height - border*2)
- // fw takes into account 1-dot spacing between digits.
- fw := float64(fontWidth + 1)
- fh := float64(fontHeight)
- nc := float64(ncount)
- // Calculate the width of a single digit taking into account only the
- // width of the image.
- nw := w / nc
- // Calculate the height of a digit from this width.
- nh := nw * fh / fw
- // Digit too high?
- if nh > h {
- // Fit digits based on height.
- nh = h
- nw = fw / fh * nh
- }
- // Calculate dot size.
- m.dotSize = int(nh / fh)
- // Save everything, making the actual width smaller by 1 dot to account
- // for spacing between digits.
- m.numWidth = int(nw) - m.dotSize
- m.numHeight = int(nh)
-}
-
-func (m *Image) drawHorizLine(fromX, toX, y int, colorIdx uint8) {
- for x := fromX; x <= toX; x++ {
- m.SetColorIndex(x, y, colorIdx)
- }
-}
-
-func (m *Image) drawCircle(x, y, radius int, colorIdx uint8) {
- f := 1 - radius
- dfx := 1
- dfy := -2 * radius
- xo := 0
- yo := radius
-
- m.SetColorIndex(x, y+radius, colorIdx)
- m.SetColorIndex(x, y-radius, colorIdx)
- m.drawHorizLine(x-radius, x+radius, y, colorIdx)
-
- for xo < yo {
- if f >= 0 {
- yo--
- dfy += 2
- f += dfy
- }
- xo++
- dfx += 2
- f += dfx
- m.drawHorizLine(x-xo, x+xo, y+yo, colorIdx)
- m.drawHorizLine(x-xo, x+xo, y-yo, colorIdx)
- m.drawHorizLine(x-yo, x+yo, y+xo, colorIdx)
- m.drawHorizLine(x-yo, x+yo, y-xo, colorIdx)
- }
-}
-
-func (m *Image) fillWithCircles(n, maxradius int) {
- maxx := m.Bounds().Max.X
- maxy := m.Bounds().Max.Y
- for i := 0; i < n; i++ {
- colorIdx := uint8(randInt(1, circleCount-1))
- r := randInt(1, maxradius)
- m.drawCircle(randInt(r, maxx-r), randInt(r, maxy-r), r, colorIdx)
- }
-}
-
-func (m *Image) strikeThrough() {
- maxx := m.Bounds().Max.X
- maxy := m.Bounds().Max.Y
- y := randInt(maxy/3, maxy-maxy/3)
- amplitude := randFloat(5, 20)
- period := randFloat(80, 180)
- dx := 2.0 * math.Pi / period
- for x := 0; x < maxx; x++ {
- xo := amplitude * math.Cos(float64(y)*dx)
- yo := amplitude * math.Sin(float64(x)*dx)
- for yn := 0; yn < m.dotSize; yn++ {
- r := randInt(0, m.dotSize)
- m.drawCircle(x+int(xo), y+int(yo)+(yn*m.dotSize), r/2, 1)
- }
- }
-}
-
-func (m *Image) drawDigit(digit []byte, x, y int) {
- skf := randFloat(-maxSkew, maxSkew)
- xs := float64(x)
- r := m.dotSize / 2
- y += randInt(-r, r)
- for yo := 0; yo < fontHeight; yo++ {
- for xo := 0; xo < fontWidth; xo++ {
- if digit[yo*fontWidth+xo] != blackChar {
- continue
- }
- m.drawCircle(x+xo*m.dotSize, y+yo*m.dotSize, r, 1)
- }
- xs += skf
- x = int(xs)
- }
-}
-
-func (m *Image) distort(amplude float64, period float64) {
- w := m.Bounds().Max.X
- h := m.Bounds().Max.Y
-
- oldm := m.Paletted
- newm := image.NewPaletted(image.Rect(0, 0, w, h), oldm.Palette)
-
- dx := 2.0 * math.Pi / period
- for x := 0; x < w; x++ {
- for y := 0; y < h; y++ {
- xo := amplude * math.Sin(float64(y)*dx)
- yo := amplude * math.Cos(float64(x)*dx)
- newm.SetColorIndex(x, y, oldm.ColorIndexAt(x+int(xo), y+int(yo)))
- }
- }
- m.Paletted = newm
-}
-
-func randomBrightness(c color.RGBA, max uint8) color.RGBA {
- minc := min3(c.R, c.G, c.B)
- maxc := max3(c.R, c.G, c.B)
- if maxc > max {
- return c
- }
- n := randIntn(int(max-maxc)) - int(minc)
- return color.RGBA{
- uint8(int(c.R) + n),
- uint8(int(c.G) + n),
- uint8(int(c.B) + n),
- uint8(c.A),
- }
-}
-
-func min3(x, y, z uint8) (m uint8) {
- m = x
- if y < m {
- m = y
- }
- if z < m {
- m = z
- }
- return
-}
-
-func max3(x, y, z uint8) (m uint8) {
- m = x
- if y > m {
- m = y
- }
- if z > m {
- m = z
- }
- return
-}
diff --git a/vendor/github.com/astaxie/beego/utils/captcha/siprng.go b/vendor/github.com/astaxie/beego/utils/captcha/siprng.go
deleted file mode 100644
index 5e256cf93..000000000
--- a/vendor/github.com/astaxie/beego/utils/captcha/siprng.go
+++ /dev/null
@@ -1,277 +0,0 @@
-// Copyright 2014 beego Author. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package captcha
-
-import (
- "crypto/rand"
- "encoding/binary"
- "io"
- "sync"
-)
-
-// siprng is PRNG based on SipHash-2-4.
-type siprng struct {
- mu sync.Mutex
- k0, k1, ctr uint64
-}
-
-// siphash implements SipHash-2-4, accepting a uint64 as a message.
-func siphash(k0, k1, m uint64) uint64 {
- // Initialization.
- v0 := k0 ^ 0x736f6d6570736575
- v1 := k1 ^ 0x646f72616e646f6d
- v2 := k0 ^ 0x6c7967656e657261
- v3 := k1 ^ 0x7465646279746573
- t := uint64(8) << 56
-
- // Compression.
- v3 ^= m
-
- // Round 1.
- v0 += v1
- v1 = v1<<13 | v1>>(64-13)
- v1 ^= v0
- v0 = v0<<32 | v0>>(64-32)
-
- v2 += v3
- v3 = v3<<16 | v3>>(64-16)
- v3 ^= v2
-
- v0 += v3
- v3 = v3<<21 | v3>>(64-21)
- v3 ^= v0
-
- v2 += v1
- v1 = v1<<17 | v1>>(64-17)
- v1 ^= v2
- v2 = v2<<32 | v2>>(64-32)
-
- // Round 2.
- v0 += v1
- v1 = v1<<13 | v1>>(64-13)
- v1 ^= v0
- v0 = v0<<32 | v0>>(64-32)
-
- v2 += v3
- v3 = v3<<16 | v3>>(64-16)
- v3 ^= v2
-
- v0 += v3
- v3 = v3<<21 | v3>>(64-21)
- v3 ^= v0
-
- v2 += v1
- v1 = v1<<17 | v1>>(64-17)
- v1 ^= v2
- v2 = v2<<32 | v2>>(64-32)
-
- v0 ^= m
-
- // Compress last block.
- v3 ^= t
-
- // Round 1.
- v0 += v1
- v1 = v1<<13 | v1>>(64-13)
- v1 ^= v0
- v0 = v0<<32 | v0>>(64-32)
-
- v2 += v3
- v3 = v3<<16 | v3>>(64-16)
- v3 ^= v2
-
- v0 += v3
- v3 = v3<<21 | v3>>(64-21)
- v3 ^= v0
-
- v2 += v1
- v1 = v1<<17 | v1>>(64-17)
- v1 ^= v2
- v2 = v2<<32 | v2>>(64-32)
-
- // Round 2.
- v0 += v1
- v1 = v1<<13 | v1>>(64-13)
- v1 ^= v0
- v0 = v0<<32 | v0>>(64-32)
-
- v2 += v3
- v3 = v3<<16 | v3>>(64-16)
- v3 ^= v2
-
- v0 += v3
- v3 = v3<<21 | v3>>(64-21)
- v3 ^= v0
-
- v2 += v1
- v1 = v1<<17 | v1>>(64-17)
- v1 ^= v2
- v2 = v2<<32 | v2>>(64-32)
-
- v0 ^= t
-
- // Finalization.
- v2 ^= 0xff
-
- // Round 1.
- v0 += v1
- v1 = v1<<13 | v1>>(64-13)
- v1 ^= v0
- v0 = v0<<32 | v0>>(64-32)
-
- v2 += v3
- v3 = v3<<16 | v3>>(64-16)
- v3 ^= v2
-
- v0 += v3
- v3 = v3<<21 | v3>>(64-21)
- v3 ^= v0
-
- v2 += v1
- v1 = v1<<17 | v1>>(64-17)
- v1 ^= v2
- v2 = v2<<32 | v2>>(64-32)
-
- // Round 2.
- v0 += v1
- v1 = v1<<13 | v1>>(64-13)
- v1 ^= v0
- v0 = v0<<32 | v0>>(64-32)
-
- v2 += v3
- v3 = v3<<16 | v3>>(64-16)
- v3 ^= v2
-
- v0 += v3
- v3 = v3<<21 | v3>>(64-21)
- v3 ^= v0
-
- v2 += v1
- v1 = v1<<17 | v1>>(64-17)
- v1 ^= v2
- v2 = v2<<32 | v2>>(64-32)
-
- // Round 3.
- v0 += v1
- v1 = v1<<13 | v1>>(64-13)
- v1 ^= v0
- v0 = v0<<32 | v0>>(64-32)
-
- v2 += v3
- v3 = v3<<16 | v3>>(64-16)
- v3 ^= v2
-
- v0 += v3
- v3 = v3<<21 | v3>>(64-21)
- v3 ^= v0
-
- v2 += v1
- v1 = v1<<17 | v1>>(64-17)
- v1 ^= v2
- v2 = v2<<32 | v2>>(64-32)
-
- // Round 4.
- v0 += v1
- v1 = v1<<13 | v1>>(64-13)
- v1 ^= v0
- v0 = v0<<32 | v0>>(64-32)
-
- v2 += v3
- v3 = v3<<16 | v3>>(64-16)
- v3 ^= v2
-
- v0 += v3
- v3 = v3<<21 | v3>>(64-21)
- v3 ^= v0
-
- v2 += v1
- v1 = v1<<17 | v1>>(64-17)
- v1 ^= v2
- v2 = v2<<32 | v2>>(64-32)
-
- return v0 ^ v1 ^ v2 ^ v3
-}
-
-// rekey sets a new PRNG key, which is read from crypto/rand.
-func (p *siprng) rekey() {
- var k [16]byte
- if _, err := io.ReadFull(rand.Reader, k[:]); err != nil {
- panic(err.Error())
- }
- p.k0 = binary.LittleEndian.Uint64(k[0:8])
- p.k1 = binary.LittleEndian.Uint64(k[8:16])
- p.ctr = 1
-}
-
-// Uint64 returns a new pseudorandom uint64.
-// It rekeys PRNG on the first call and every 64 MB of generated data.
-func (p *siprng) Uint64() uint64 {
- p.mu.Lock()
- if p.ctr == 0 || p.ctr > 8*1024*1024 {
- p.rekey()
- }
- v := siphash(p.k0, p.k1, p.ctr)
- p.ctr++
- p.mu.Unlock()
- return v
-}
-
-func (p *siprng) Int63() int64 {
- return int64(p.Uint64() & 0x7fffffffffffffff)
-}
-
-func (p *siprng) Uint32() uint32 {
- return uint32(p.Uint64())
-}
-
-func (p *siprng) Int31() int32 {
- return int32(p.Uint32() & 0x7fffffff)
-}
-
-func (p *siprng) Intn(n int) int {
- if n <= 0 {
- panic("invalid argument to Intn")
- }
- if n <= 1<<31-1 {
- return int(p.Int31n(int32(n)))
- }
- return int(p.Int63n(int64(n)))
-}
-
-func (p *siprng) Int63n(n int64) int64 {
- if n <= 0 {
- panic("invalid argument to Int63n")
- }
- max := int64((1 << 63) - 1 - (1<<63)%uint64(n))
- v := p.Int63()
- for v > max {
- v = p.Int63()
- }
- return v % n
-}
-
-func (p *siprng) Int31n(n int32) int32 {
- if n <= 0 {
- panic("invalid argument to Int31n")
- }
- max := int32((1 << 31) - 1 - (1<<31)%uint32(n))
- v := p.Int31()
- for v > max {
- v = p.Int31()
- }
- return v % n
-}
-
-func (p *siprng) Float64() float64 { return float64(p.Int63()) / (1 << 63) }
diff --git a/vendor/github.com/astaxie/beego/utils/mail.go b/vendor/github.com/astaxie/beego/utils/mail.go
index 1d80a0391..10555a0a3 100644
--- a/vendor/github.com/astaxie/beego/utils/mail.go
+++ b/vendor/github.com/astaxie/beego/utils/mail.go
@@ -31,10 +31,13 @@ import (
"path/filepath"
"strconv"
"strings"
+ "sync"
)
const (
maxLineLength = 76
+
+ upperhex = "0123456789ABCDEF"
)
// Email is the type used for email messages
@@ -74,9 +77,6 @@ func NewEMail(config string) *Email {
if err != nil {
return nil
}
- if e.From == "" {
- e.From = e.Username
- }
return e
}
@@ -228,14 +228,21 @@ func (e *Email) Send() error {
to := make([]string, 0, len(e.To)+len(e.Cc)+len(e.Bcc))
to = append(append(append(to, e.To...), e.Cc...), e.Bcc...)
// Check to make sure there is at least one recipient and one "From" address
- if e.From == "" || len(to) == 0 {
- return errors.New("Must specify at least one From address and one To address")
+ if len(to) == 0 {
+ return errors.New("Must specify at least one To address")
}
- from, err := mail.ParseAddress(e.From)
+
+ from, err := mail.ParseAddress(e.Username)
if err != nil {
return err
}
- e.From = from.String()
+
+ if len(e.From) == 0 {
+ e.From = e.Username
+ }
+ // use mail's RFC 2047 to encode any string
+ e.Subject = qEncode("utf-8", e.Subject)
+
raw, err := e.Bytes()
if err != nil {
return err
@@ -342,3 +349,73 @@ func base64Wrap(w io.Writer, b []byte) {
w.Write(out)
}
}
+
+// Encode returns the encoded-word form of s. If s is ASCII without special
+// characters, it is returned unchanged. The provided charset is the IANA
+// charset name of s. It is case insensitive.
+// RFC 2047 encoded-word
+func qEncode(charset, s string) string {
+ if !needsEncoding(s) {
+ return s
+ }
+ return encodeWord(charset, s)
+}
+
+func needsEncoding(s string) bool {
+ for _, b := range s {
+ if (b < ' ' || b > '~') && b != '\t' {
+ return true
+ }
+ }
+ return false
+}
+
+// encodeWord encodes a string into an encoded-word.
+func encodeWord(charset, s string) string {
+ buf := getBuffer()
+
+ buf.WriteString("=?")
+ buf.WriteString(charset)
+ buf.WriteByte('?')
+ buf.WriteByte('q')
+ buf.WriteByte('?')
+
+ enc := make([]byte, 3)
+ for i := 0; i < len(s); i++ {
+ b := s[i]
+ switch {
+ case b == ' ':
+ buf.WriteByte('_')
+ case b <= '~' && b >= '!' && b != '=' && b != '?' && b != '_':
+ buf.WriteByte(b)
+ default:
+ enc[0] = '='
+ enc[1] = upperhex[b>>4]
+ enc[2] = upperhex[b&0x0f]
+ buf.Write(enc)
+ }
+ }
+ buf.WriteString("?=")
+
+ es := buf.String()
+ putBuffer(buf)
+ return es
+}
+
+var bufPool = sync.Pool{
+ New: func() interface{} {
+ return new(bytes.Buffer)
+ },
+}
+
+func getBuffer() *bytes.Buffer {
+ return bufPool.Get().(*bytes.Buffer)
+}
+
+func putBuffer(buf *bytes.Buffer) {
+ if buf.Len() > 1024 {
+ return
+ }
+ buf.Reset()
+ bufPool.Put(buf)
+}
diff --git a/vendor/github.com/astaxie/beego/utils/pagination/controller.go b/vendor/github.com/astaxie/beego/utils/pagination/controller.go
deleted file mode 100644
index 1d99cac5c..000000000
--- a/vendor/github.com/astaxie/beego/utils/pagination/controller.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2014 beego Author. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package pagination
-
-import (
- "github.com/astaxie/beego/context"
-)
-
-// SetPaginator Instantiates a Paginator and assigns it to context.Input.Data["paginator"].
-func SetPaginator(context *context.Context, per int, nums int64) (paginator *Paginator) {
- paginator = NewPaginator(context.Request, per, nums)
- context.Input.SetData("paginator", &paginator)
- return
-}
diff --git a/vendor/github.com/astaxie/beego/utils/pagination/doc.go b/vendor/github.com/astaxie/beego/utils/pagination/doc.go
deleted file mode 100644
index 9abc6d782..000000000
--- a/vendor/github.com/astaxie/beego/utils/pagination/doc.go
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-Package pagination provides utilities to setup a paginator within the
-context of a http request.
-
-Usage
-
-In your beego.Controller:
-
- package controllers
-
- import "github.com/astaxie/beego/utils/pagination"
-
- type PostsController struct {
- beego.Controller
- }
-
- func (this *PostsController) ListAllPosts() {
- // sets this.Data["paginator"] with the current offset (from the url query param)
- postsPerPage := 20
- paginator := pagination.SetPaginator(this.Ctx, postsPerPage, CountPosts())
-
- // fetch the next 20 posts
- this.Data["posts"] = ListPostsByOffsetAndLimit(paginator.Offset(), postsPerPage)
- }
-
-
-In your view templates:
-
- {{if .paginator.HasPages}}
-
\ No newline at end of file
diff --git a/views/change-password.htm b/views/change-password.htm
new file mode 100644
index 000000000..6526fb7e9
--- /dev/null
+++ b/views/change-password.htm
@@ -0,0 +1,77 @@
+
+
-
-
\ No newline at end of file
diff --git a/views/dashboard.htm b/views/dashboard.htm
new file mode 100644
index 000000000..3affdcea3
--- /dev/null
+++ b/views/dashboard.htm
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
// 'logs' | tr //
+
+
+
+
+
+
\ No newline at end of file
diff --git a/views/forgot-password.htm b/views/forgot-password.htm
new file mode 100644
index 000000000..389c981b1
--- /dev/null
+++ b/views/forgot-password.htm
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+
// 'forgot_password' | tr //
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/views/forgot-password.tpl b/views/forgot-password.tpl
deleted file mode 100644
index 0a2738479..000000000
--- a/views/forgot-password.tpl
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
-
{{i18n .Lang "title_forgot_password"}}
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/views/index.htm b/views/index.htm
new file mode 100644
index 000000000..9659b01d2
--- /dev/null
+++ b/views/index.htm
@@ -0,0 +1,74 @@
+
+
\ No newline at end of file
diff --git a/views/navigation-header.htm b/views/navigation-header.htm
new file mode 100644
index 000000000..5a4e9bf08
--- /dev/null
+++ b/views/navigation-header.htm
@@ -0,0 +1,23 @@
+
+{{ if eq .HasLoggedIn true }}
+
+{{ end }}
\ No newline at end of file
diff --git a/views/optional-menu.htm b/views/optional-menu.htm
new file mode 100644
index 000000000..6950fe206
--- /dev/null
+++ b/views/optional-menu.htm
@@ -0,0 +1,44 @@
+
+{{if eq .HasLoggedIn true }}
+
+{{ end }}
\ No newline at end of file
diff --git a/views/project.htm b/views/project.htm
new file mode 100644
index 000000000..d5bfb3122
--- /dev/null
+++ b/views/project.htm
@@ -0,0 +1,75 @@
+
+
-
-
\ No newline at end of file
diff --git a/views/repository.htm b/views/repository.htm
new file mode 100644
index 000000000..5248b7430
--- /dev/null
+++ b/views/repository.htm
@@ -0,0 +1,47 @@
+
+
+ {{.URL}}/reset_password?reset_uuid={{.UUID}}
+
\ No newline at end of file
diff --git a/views/reset-password.htm b/views/reset-password.htm
new file mode 100644
index 000000000..3da84e189
--- /dev/null
+++ b/views/reset-password.htm
@@ -0,0 +1,64 @@
+
+
+
+
+
+
+
// 'reset_password' | tr //
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/views/reset-password.tpl b/views/reset-password.tpl
deleted file mode 100644
index e98a5c27b..000000000
--- a/views/reset-password.tpl
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-
-
-
-
{{i18n .Lang "title_reset_password"}}
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/views/search.htm b/views/search.htm
new file mode 100644
index 000000000..7676c4b4e
--- /dev/null
+++ b/views/search.htm
@@ -0,0 +1,40 @@
+
+
\ No newline at end of file
diff --git a/views/sign-in.htm b/views/sign-in.htm
new file mode 100644
index 000000000..a4bd94975
--- /dev/null
+++ b/views/sign-in.htm
@@ -0,0 +1,65 @@
+
+{{ if eq .HasLoggedIn true }}
+
+
// 'welcome' | tr //
+
+
+
+
+{{ else }}
+
+{{ end }}
\ No newline at end of file
diff --git a/views/sign-in.tpl b/views/sign-in.tpl
deleted file mode 100644
index 86723ad01..000000000
--- a/views/sign-in.tpl
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/views/sign-up.htm b/views/sign-up.htm
new file mode 100644
index 000000000..4bae1a5d0
--- /dev/null
+++ b/views/sign-up.htm
@@ -0,0 +1,126 @@
+
+
`+
- ``, c.FieldIDName, value, c.URLPrefix, value, c.URLPrefix, value))
-}
-
-// CreateCaptcha create a new captcha id
-func (c *Captcha) CreateCaptcha() (string, error) {
- // generate captcha id
- id := string(utils.RandomCreateBytes(15))
-
- // get the captcha chars
- chars := c.genRandChars()
-
- // save to store
- if err := c.store.Put(c.key(id), chars, c.Expiration); err != nil {
- return "", err
- }
-
- return id, nil
-}
-
-// VerifyReq verify from a request
-func (c *Captcha) VerifyReq(req *http.Request) bool {
- req.ParseForm()
- return c.Verify(req.Form.Get(c.FieldIDName), req.Form.Get(c.FieldCaptchaName))
-}
-
-// Verify direct verify id and challenge string
-func (c *Captcha) Verify(id string, challenge string) (success bool) {
- if len(challenge) == 0 || len(id) == 0 {
- return
- }
-
- var chars []byte
-
- key := c.key(id)
-
- if v, ok := c.store.Get(key).([]byte); ok {
- chars = v
- } else {
- return
- }
-
- defer func() {
- // finally remove it
- c.store.Delete(key)
- }()
-
- if len(chars) != len(challenge) {
- return
- }
- // verify challenge
- for i, c := range chars {
- if c != challenge[i]-48 {
- return
- }
- }
-
- return true
-}
-
-// NewCaptcha create a new captcha.Captcha
-func NewCaptcha(urlPrefix string, store cache.Cache) *Captcha {
- cpt := &Captcha{}
- cpt.store = store
- cpt.FieldIDName = fieldIDName
- cpt.FieldCaptchaName = fieldCaptchaName
- cpt.ChallengeNums = challengeNums
- cpt.Expiration = expiration
- cpt.CachePrefix = cachePrefix
- cpt.StdWidth = stdWidth
- cpt.StdHeight = stdHeight
-
- if len(urlPrefix) == 0 {
- urlPrefix = defaultURLPrefix
- }
-
- if urlPrefix[len(urlPrefix)-1] != '/' {
- urlPrefix += "/"
- }
-
- cpt.URLPrefix = urlPrefix
-
- return cpt
-}
-
-// NewWithFilter create a new captcha.Captcha and auto AddFilter for serve captacha image
-// and add a template func for output html
-func NewWithFilter(urlPrefix string, store cache.Cache) *Captcha {
- cpt := NewCaptcha(urlPrefix, store)
-
- // create filter for serve captcha image
- beego.InsertFilter(cpt.URLPrefix+"*", beego.BeforeRouter, cpt.Handler)
-
- // add to template func map
- beego.AddFuncMap("create_captcha", cpt.CreateCaptchaHTML)
-
- return cpt
-}
diff --git a/vendor/github.com/astaxie/beego/utils/captcha/image.go b/vendor/github.com/astaxie/beego/utils/captcha/image.go
deleted file mode 100644
index 1057192aa..000000000
--- a/vendor/github.com/astaxie/beego/utils/captcha/image.go
+++ /dev/null
@@ -1,498 +0,0 @@
-// Copyright 2014 beego Author. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package captcha
-
-import (
- "bytes"
- "image"
- "image/color"
- "image/png"
- "io"
- "math"
-)
-
-const (
- fontWidth = 11
- fontHeight = 18
- blackChar = 1
-
- // Standard width and height of a captcha image.
- stdWidth = 240
- stdHeight = 80
- // Maximum absolute skew factor of a single digit.
- maxSkew = 0.7
- // Number of background circles.
- circleCount = 20
-)
-
-var font = [][]byte{
- { // 0
- 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0,
- 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0,
- 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0,
- 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0,
- 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0,
- 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1,
- 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0,
- 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0,
- 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0,
- 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0,
- },
- { // 1
- 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0,
- 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0,
- 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0,
- 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0,
- 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0,
- 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0,
- 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- },
- { // 2
- 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0,
- 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0,
- 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 0,
- 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0,
- 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0,
- 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0,
- 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0,
- 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0,
- 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0,
- 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0,
- 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- },
- { // 3
- 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0,
- 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0,
- 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0,
- 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0,
- 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1,
- 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0,
- 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0,
- },
- { // 4
- 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0,
- 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0,
- 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0,
- 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0,
- 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0,
- 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0,
- 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0,
- 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0,
- 0, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0,
- 0, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0,
- 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0,
- 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0,
- },
- { // 5
- 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
- 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
- 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0,
- 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1,
- 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 0,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0,
- 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0,
- },
- { // 6
- 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0,
- 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0,
- 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0,
- 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 1, 1, 0, 0, 1, 1, 1, 1, 0, 0, 0,
- 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0,
- 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0,
- 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1,
- 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1,
- 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0,
- 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0,
- 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0,
- },
- { // 7
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1,
- 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0,
- 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0,
- 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0,
- 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0,
- 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0,
- 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0,
- 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0,
- 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0,
- 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0,
- },
- { // 8
- 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0,
- 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0,
- 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1,
- 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1,
- 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1,
- 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1,
- 0, 0, 1, 1, 0, 0, 0, 0, 1, 1, 0,
- 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0,
- 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0,
- 0, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0,
- 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0,
- 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1,
- 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0,
- 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
- 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0,
- },
- { // 9
- 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0,
- 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0,
- 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 0,
- 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0,
- 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1,
- 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1,
- 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1,
- 0, 0, 0, 1, 1, 1, 1, 0, 0, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1,
- 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0,
- 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0,
- 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0,
- 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0,
- 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
- },
-}
-
-// Image struct
-type Image struct {
- *image.Paletted
- numWidth int
- numHeight int
- dotSize int
-}
-
-var prng = &siprng{}
-
-// randIntn returns a pseudorandom non-negative int in range [0, n).
-func randIntn(n int) int {
- return prng.Intn(n)
-}
-
-// randInt returns a pseudorandom int in range [from, to].
-func randInt(from, to int) int {
- return prng.Intn(to+1-from) + from
-}
-
-// randFloat returns a pseudorandom float64 in range [from, to].
-func randFloat(from, to float64) float64 {
- return (to-from)*prng.Float64() + from
-}
-
-func randomPalette() color.Palette {
- p := make([]color.Color, circleCount+1)
- // Transparent color.
- p[0] = color.RGBA{0xFF, 0xFF, 0xFF, 0x00}
- // Primary color.
- prim := color.RGBA{
- uint8(randIntn(129)),
- uint8(randIntn(129)),
- uint8(randIntn(129)),
- 0xFF,
- }
- p[1] = prim
- // Circle colors.
- for i := 2; i <= circleCount; i++ {
- p[i] = randomBrightness(prim, 255)
- }
- return p
-}
-
-// NewImage returns a new captcha image of the given width and height with the
-// given digits, where each digit must be in range 0-9.
-func NewImage(digits []byte, width, height int) *Image {
- m := new(Image)
- m.Paletted = image.NewPaletted(image.Rect(0, 0, width, height), randomPalette())
- m.calculateSizes(width, height, len(digits))
- // Randomly position captcha inside the image.
- maxx := width - (m.numWidth+m.dotSize)*len(digits) - m.dotSize
- maxy := height - m.numHeight - m.dotSize*2
- var border int
- if width > height {
- border = height / 5
- } else {
- border = width / 5
- }
- x := randInt(border, maxx-border)
- y := randInt(border, maxy-border)
- // Draw digits.
- for _, n := range digits {
- m.drawDigit(font[n], x, y)
- x += m.numWidth + m.dotSize
- }
- // Draw strike-through line.
- m.strikeThrough()
- // Apply wave distortion.
- m.distort(randFloat(5, 10), randFloat(100, 200))
- // Fill image with random circles.
- m.fillWithCircles(circleCount, m.dotSize)
- return m
-}
-
-// encodedPNG encodes an image to PNG and returns
-// the result as a byte slice.
-func (m *Image) encodedPNG() []byte {
- var buf bytes.Buffer
- if err := png.Encode(&buf, m.Paletted); err != nil {
- panic(err.Error())
- }
- return buf.Bytes()
-}
-
-// WriteTo writes captcha image in PNG format into the given writer.
-func (m *Image) WriteTo(w io.Writer) (int64, error) {
- n, err := w.Write(m.encodedPNG())
- return int64(n), err
-}
-
-func (m *Image) calculateSizes(width, height, ncount int) {
- // Goal: fit all digits inside the image.
- var border int
- if width > height {
- border = height / 4
- } else {
- border = width / 4
- }
- // Convert everything to floats for calculations.
- w := float64(width - border*2)
- h := float64(height - border*2)
- // fw takes into account 1-dot spacing between digits.
- fw := float64(fontWidth + 1)
- fh := float64(fontHeight)
- nc := float64(ncount)
- // Calculate the width of a single digit taking into account only the
- // width of the image.
- nw := w / nc
- // Calculate the height of a digit from this width.
- nh := nw * fh / fw
- // Digit too high?
- if nh > h {
- // Fit digits based on height.
- nh = h
- nw = fw / fh * nh
- }
- // Calculate dot size.
- m.dotSize = int(nh / fh)
- // Save everything, making the actual width smaller by 1 dot to account
- // for spacing between digits.
- m.numWidth = int(nw) - m.dotSize
- m.numHeight = int(nh)
-}
-
-func (m *Image) drawHorizLine(fromX, toX, y int, colorIdx uint8) {
- for x := fromX; x <= toX; x++ {
- m.SetColorIndex(x, y, colorIdx)
- }
-}
-
-func (m *Image) drawCircle(x, y, radius int, colorIdx uint8) {
- f := 1 - radius
- dfx := 1
- dfy := -2 * radius
- xo := 0
- yo := radius
-
- m.SetColorIndex(x, y+radius, colorIdx)
- m.SetColorIndex(x, y-radius, colorIdx)
- m.drawHorizLine(x-radius, x+radius, y, colorIdx)
-
- for xo < yo {
- if f >= 0 {
- yo--
- dfy += 2
- f += dfy
- }
- xo++
- dfx += 2
- f += dfx
- m.drawHorizLine(x-xo, x+xo, y+yo, colorIdx)
- m.drawHorizLine(x-xo, x+xo, y-yo, colorIdx)
- m.drawHorizLine(x-yo, x+yo, y+xo, colorIdx)
- m.drawHorizLine(x-yo, x+yo, y-xo, colorIdx)
- }
-}
-
-func (m *Image) fillWithCircles(n, maxradius int) {
- maxx := m.Bounds().Max.X
- maxy := m.Bounds().Max.Y
- for i := 0; i < n; i++ {
- colorIdx := uint8(randInt(1, circleCount-1))
- r := randInt(1, maxradius)
- m.drawCircle(randInt(r, maxx-r), randInt(r, maxy-r), r, colorIdx)
- }
-}
-
-func (m *Image) strikeThrough() {
- maxx := m.Bounds().Max.X
- maxy := m.Bounds().Max.Y
- y := randInt(maxy/3, maxy-maxy/3)
- amplitude := randFloat(5, 20)
- period := randFloat(80, 180)
- dx := 2.0 * math.Pi / period
- for x := 0; x < maxx; x++ {
- xo := amplitude * math.Cos(float64(y)*dx)
- yo := amplitude * math.Sin(float64(x)*dx)
- for yn := 0; yn < m.dotSize; yn++ {
- r := randInt(0, m.dotSize)
- m.drawCircle(x+int(xo), y+int(yo)+(yn*m.dotSize), r/2, 1)
- }
- }
-}
-
-func (m *Image) drawDigit(digit []byte, x, y int) {
- skf := randFloat(-maxSkew, maxSkew)
- xs := float64(x)
- r := m.dotSize / 2
- y += randInt(-r, r)
- for yo := 0; yo < fontHeight; yo++ {
- for xo := 0; xo < fontWidth; xo++ {
- if digit[yo*fontWidth+xo] != blackChar {
- continue
- }
- m.drawCircle(x+xo*m.dotSize, y+yo*m.dotSize, r, 1)
- }
- xs += skf
- x = int(xs)
- }
-}
-
-func (m *Image) distort(amplude float64, period float64) {
- w := m.Bounds().Max.X
- h := m.Bounds().Max.Y
-
- oldm := m.Paletted
- newm := image.NewPaletted(image.Rect(0, 0, w, h), oldm.Palette)
-
- dx := 2.0 * math.Pi / period
- for x := 0; x < w; x++ {
- for y := 0; y < h; y++ {
- xo := amplude * math.Sin(float64(y)*dx)
- yo := amplude * math.Cos(float64(x)*dx)
- newm.SetColorIndex(x, y, oldm.ColorIndexAt(x+int(xo), y+int(yo)))
- }
- }
- m.Paletted = newm
-}
-
-func randomBrightness(c color.RGBA, max uint8) color.RGBA {
- minc := min3(c.R, c.G, c.B)
- maxc := max3(c.R, c.G, c.B)
- if maxc > max {
- return c
- }
- n := randIntn(int(max-maxc)) - int(minc)
- return color.RGBA{
- uint8(int(c.R) + n),
- uint8(int(c.G) + n),
- uint8(int(c.B) + n),
- uint8(c.A),
- }
-}
-
-func min3(x, y, z uint8) (m uint8) {
- m = x
- if y < m {
- m = y
- }
- if z < m {
- m = z
- }
- return
-}
-
-func max3(x, y, z uint8) (m uint8) {
- m = x
- if y > m {
- m = y
- }
- if z > m {
- m = z
- }
- return
-}
diff --git a/vendor/github.com/astaxie/beego/utils/captcha/siprng.go b/vendor/github.com/astaxie/beego/utils/captcha/siprng.go
deleted file mode 100644
index 5e256cf93..000000000
--- a/vendor/github.com/astaxie/beego/utils/captcha/siprng.go
+++ /dev/null
@@ -1,277 +0,0 @@
-// Copyright 2014 beego Author. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package captcha
-
-import (
- "crypto/rand"
- "encoding/binary"
- "io"
- "sync"
-)
-
-// siprng is PRNG based on SipHash-2-4.
-type siprng struct {
- mu sync.Mutex
- k0, k1, ctr uint64
-}
-
-// siphash implements SipHash-2-4, accepting a uint64 as a message.
-func siphash(k0, k1, m uint64) uint64 {
- // Initialization.
- v0 := k0 ^ 0x736f6d6570736575
- v1 := k1 ^ 0x646f72616e646f6d
- v2 := k0 ^ 0x6c7967656e657261
- v3 := k1 ^ 0x7465646279746573
- t := uint64(8) << 56
-
- // Compression.
- v3 ^= m
-
- // Round 1.
- v0 += v1
- v1 = v1<<13 | v1>>(64-13)
- v1 ^= v0
- v0 = v0<<32 | v0>>(64-32)
-
- v2 += v3
- v3 = v3<<16 | v3>>(64-16)
- v3 ^= v2
-
- v0 += v3
- v3 = v3<<21 | v3>>(64-21)
- v3 ^= v0
-
- v2 += v1
- v1 = v1<<17 | v1>>(64-17)
- v1 ^= v2
- v2 = v2<<32 | v2>>(64-32)
-
- // Round 2.
- v0 += v1
- v1 = v1<<13 | v1>>(64-13)
- v1 ^= v0
- v0 = v0<<32 | v0>>(64-32)
-
- v2 += v3
- v3 = v3<<16 | v3>>(64-16)
- v3 ^= v2
-
- v0 += v3
- v3 = v3<<21 | v3>>(64-21)
- v3 ^= v0
-
- v2 += v1
- v1 = v1<<17 | v1>>(64-17)
- v1 ^= v2
- v2 = v2<<32 | v2>>(64-32)
-
- v0 ^= m
-
- // Compress last block.
- v3 ^= t
-
- // Round 1.
- v0 += v1
- v1 = v1<<13 | v1>>(64-13)
- v1 ^= v0
- v0 = v0<<32 | v0>>(64-32)
-
- v2 += v3
- v3 = v3<<16 | v3>>(64-16)
- v3 ^= v2
-
- v0 += v3
- v3 = v3<<21 | v3>>(64-21)
- v3 ^= v0
-
- v2 += v1
- v1 = v1<<17 | v1>>(64-17)
- v1 ^= v2
- v2 = v2<<32 | v2>>(64-32)
-
- // Round 2.
- v0 += v1
- v1 = v1<<13 | v1>>(64-13)
- v1 ^= v0
- v0 = v0<<32 | v0>>(64-32)
-
- v2 += v3
- v3 = v3<<16 | v3>>(64-16)
- v3 ^= v2
-
- v0 += v3
- v3 = v3<<21 | v3>>(64-21)
- v3 ^= v0
-
- v2 += v1
- v1 = v1<<17 | v1>>(64-17)
- v1 ^= v2
- v2 = v2<<32 | v2>>(64-32)
-
- v0 ^= t
-
- // Finalization.
- v2 ^= 0xff
-
- // Round 1.
- v0 += v1
- v1 = v1<<13 | v1>>(64-13)
- v1 ^= v0
- v0 = v0<<32 | v0>>(64-32)
-
- v2 += v3
- v3 = v3<<16 | v3>>(64-16)
- v3 ^= v2
-
- v0 += v3
- v3 = v3<<21 | v3>>(64-21)
- v3 ^= v0
-
- v2 += v1
- v1 = v1<<17 | v1>>(64-17)
- v1 ^= v2
- v2 = v2<<32 | v2>>(64-32)
-
- // Round 2.
- v0 += v1
- v1 = v1<<13 | v1>>(64-13)
- v1 ^= v0
- v0 = v0<<32 | v0>>(64-32)
-
- v2 += v3
- v3 = v3<<16 | v3>>(64-16)
- v3 ^= v2
-
- v0 += v3
- v3 = v3<<21 | v3>>(64-21)
- v3 ^= v0
-
- v2 += v1
- v1 = v1<<17 | v1>>(64-17)
- v1 ^= v2
- v2 = v2<<32 | v2>>(64-32)
-
- // Round 3.
- v0 += v1
- v1 = v1<<13 | v1>>(64-13)
- v1 ^= v0
- v0 = v0<<32 | v0>>(64-32)
-
- v2 += v3
- v3 = v3<<16 | v3>>(64-16)
- v3 ^= v2
-
- v0 += v3
- v3 = v3<<21 | v3>>(64-21)
- v3 ^= v0
-
- v2 += v1
- v1 = v1<<17 | v1>>(64-17)
- v1 ^= v2
- v2 = v2<<32 | v2>>(64-32)
-
- // Round 4.
- v0 += v1
- v1 = v1<<13 | v1>>(64-13)
- v1 ^= v0
- v0 = v0<<32 | v0>>(64-32)
-
- v2 += v3
- v3 = v3<<16 | v3>>(64-16)
- v3 ^= v2
-
- v0 += v3
- v3 = v3<<21 | v3>>(64-21)
- v3 ^= v0
-
- v2 += v1
- v1 = v1<<17 | v1>>(64-17)
- v1 ^= v2
- v2 = v2<<32 | v2>>(64-32)
-
- return v0 ^ v1 ^ v2 ^ v3
-}
-
-// rekey sets a new PRNG key, which is read from crypto/rand.
-func (p *siprng) rekey() {
- var k [16]byte
- if _, err := io.ReadFull(rand.Reader, k[:]); err != nil {
- panic(err.Error())
- }
- p.k0 = binary.LittleEndian.Uint64(k[0:8])
- p.k1 = binary.LittleEndian.Uint64(k[8:16])
- p.ctr = 1
-}
-
-// Uint64 returns a new pseudorandom uint64.
-// It rekeys PRNG on the first call and every 64 MB of generated data.
-func (p *siprng) Uint64() uint64 {
- p.mu.Lock()
- if p.ctr == 0 || p.ctr > 8*1024*1024 {
- p.rekey()
- }
- v := siphash(p.k0, p.k1, p.ctr)
- p.ctr++
- p.mu.Unlock()
- return v
-}
-
-func (p *siprng) Int63() int64 {
- return int64(p.Uint64() & 0x7fffffffffffffff)
-}
-
-func (p *siprng) Uint32() uint32 {
- return uint32(p.Uint64())
-}
-
-func (p *siprng) Int31() int32 {
- return int32(p.Uint32() & 0x7fffffff)
-}
-
-func (p *siprng) Intn(n int) int {
- if n <= 0 {
- panic("invalid argument to Intn")
- }
- if n <= 1<<31-1 {
- return int(p.Int31n(int32(n)))
- }
- return int(p.Int63n(int64(n)))
-}
-
-func (p *siprng) Int63n(n int64) int64 {
- if n <= 0 {
- panic("invalid argument to Int63n")
- }
- max := int64((1 << 63) - 1 - (1<<63)%uint64(n))
- v := p.Int63()
- for v > max {
- v = p.Int63()
- }
- return v % n
-}
-
-func (p *siprng) Int31n(n int32) int32 {
- if n <= 0 {
- panic("invalid argument to Int31n")
- }
- max := int32((1 << 31) - 1 - (1<<31)%uint32(n))
- v := p.Int31()
- for v > max {
- v = p.Int31()
- }
- return v % n
-}
-
-func (p *siprng) Float64() float64 { return float64(p.Int63()) / (1 << 63) }
diff --git a/vendor/github.com/astaxie/beego/utils/mail.go b/vendor/github.com/astaxie/beego/utils/mail.go
index 1d80a0391..10555a0a3 100644
--- a/vendor/github.com/astaxie/beego/utils/mail.go
+++ b/vendor/github.com/astaxie/beego/utils/mail.go
@@ -31,10 +31,13 @@ import (
"path/filepath"
"strconv"
"strings"
+ "sync"
)
const (
maxLineLength = 76
+
+ upperhex = "0123456789ABCDEF"
)
// Email is the type used for email messages
@@ -74,9 +77,6 @@ func NewEMail(config string) *Email {
if err != nil {
return nil
}
- if e.From == "" {
- e.From = e.Username
- }
return e
}
@@ -228,14 +228,21 @@ func (e *Email) Send() error {
to := make([]string, 0, len(e.To)+len(e.Cc)+len(e.Bcc))
to = append(append(append(to, e.To...), e.Cc...), e.Bcc...)
// Check to make sure there is at least one recipient and one "From" address
- if e.From == "" || len(to) == 0 {
- return errors.New("Must specify at least one From address and one To address")
+ if len(to) == 0 {
+ return errors.New("Must specify at least one To address")
}
- from, err := mail.ParseAddress(e.From)
+
+ from, err := mail.ParseAddress(e.Username)
if err != nil {
return err
}
- e.From = from.String()
+
+ if len(e.From) == 0 {
+ e.From = e.Username
+ }
+ // use mail's RFC 2047 to encode any string
+ e.Subject = qEncode("utf-8", e.Subject)
+
raw, err := e.Bytes()
if err != nil {
return err
@@ -342,3 +349,73 @@ func base64Wrap(w io.Writer, b []byte) {
w.Write(out)
}
}
+
+// Encode returns the encoded-word form of s. If s is ASCII without special
+// characters, it is returned unchanged. The provided charset is the IANA
+// charset name of s. It is case insensitive.
+// RFC 2047 encoded-word
+func qEncode(charset, s string) string {
+ if !needsEncoding(s) {
+ return s
+ }
+ return encodeWord(charset, s)
+}
+
+func needsEncoding(s string) bool {
+ for _, b := range s {
+ if (b < ' ' || b > '~') && b != '\t' {
+ return true
+ }
+ }
+ return false
+}
+
+// encodeWord encodes a string into an encoded-word.
+func encodeWord(charset, s string) string {
+ buf := getBuffer()
+
+ buf.WriteString("=?")
+ buf.WriteString(charset)
+ buf.WriteByte('?')
+ buf.WriteByte('q')
+ buf.WriteByte('?')
+
+ enc := make([]byte, 3)
+ for i := 0; i < len(s); i++ {
+ b := s[i]
+ switch {
+ case b == ' ':
+ buf.WriteByte('_')
+ case b <= '~' && b >= '!' && b != '=' && b != '?' && b != '_':
+ buf.WriteByte(b)
+ default:
+ enc[0] = '='
+ enc[1] = upperhex[b>>4]
+ enc[2] = upperhex[b&0x0f]
+ buf.Write(enc)
+ }
+ }
+ buf.WriteString("?=")
+
+ es := buf.String()
+ putBuffer(buf)
+ return es
+}
+
+var bufPool = sync.Pool{
+ New: func() interface{} {
+ return new(bytes.Buffer)
+ },
+}
+
+func getBuffer() *bytes.Buffer {
+ return bufPool.Get().(*bytes.Buffer)
+}
+
+func putBuffer(buf *bytes.Buffer) {
+ if buf.Len() > 1024 {
+ return
+ }
+ buf.Reset()
+ bufPool.Put(buf)
+}
diff --git a/vendor/github.com/astaxie/beego/utils/pagination/controller.go b/vendor/github.com/astaxie/beego/utils/pagination/controller.go
deleted file mode 100644
index 1d99cac5c..000000000
--- a/vendor/github.com/astaxie/beego/utils/pagination/controller.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2014 beego Author. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package pagination
-
-import (
- "github.com/astaxie/beego/context"
-)
-
-// SetPaginator Instantiates a Paginator and assigns it to context.Input.Data["paginator"].
-func SetPaginator(context *context.Context, per int, nums int64) (paginator *Paginator) {
- paginator = NewPaginator(context.Request, per, nums)
- context.Input.SetData("paginator", &paginator)
- return
-}
diff --git a/vendor/github.com/astaxie/beego/utils/pagination/doc.go b/vendor/github.com/astaxie/beego/utils/pagination/doc.go
deleted file mode 100644
index 9abc6d782..000000000
--- a/vendor/github.com/astaxie/beego/utils/pagination/doc.go
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-Package pagination provides utilities to setup a paginator within the
-context of a http request.
-
-Usage
-
-In your beego.Controller:
-
- package controllers
-
- import "github.com/astaxie/beego/utils/pagination"
-
- type PostsController struct {
- beego.Controller
- }
-
- func (this *PostsController) ListAllPosts() {
- // sets this.Data["paginator"] with the current offset (from the url query param)
- postsPerPage := 20
- paginator := pagination.SetPaginator(this.Ctx, postsPerPage, CountPosts())
-
- // fetch the next 20 posts
- this.Data["posts"] = ListPostsByOffsetAndLimit(paginator.Offset(), postsPerPage)
- }
-
-
-In your view templates:
-
- {{if .paginator.HasPages}}
- 
+ 
+ 
+ 
-