From 39636be7b018b9121696ce7bdc462ab2c3c8185d Mon Sep 17 00:00:00 2001 From: Trygve Laugstøl Date: Fri, 11 Jan 2013 17:11:28 +0100 Subject: o Creating bin/web for running the web application. --- src/main/webapp/apps/app.css | 58 ----------- src/main/webapp/apps/app.js | 97 ------------------ src/main/webapp/apps/buildApp/build.html | 30 ------ src/main/webapp/apps/buildApp/buildApp.js | 12 --- src/main/webapp/apps/core/CoreResources.js | 25 ----- src/main/webapp/apps/core/PagingTableService.js | 72 -------------- src/main/webapp/apps/core/navbar.html | 17 ---- src/main/webapp/apps/frontPageApp/badge.html | 30 ------ src/main/webapp/apps/frontPageApp/badgeList.html | 46 --------- src/main/webapp/apps/frontPageApp/buildList.html | 50 ---------- src/main/webapp/apps/frontPageApp/frontPage.html | 31 ------ src/main/webapp/apps/frontPageApp/frontPageApp.js | 110 --------------------- src/main/webapp/apps/frontPageApp/person.html | 100 ------------------- src/main/webapp/apps/frontPageApp/personList.html | 47 --------- .../webapp/apps/jenkinsApp/JenkinsResources.js | 25 ----- src/main/webapp/apps/jenkinsApp/build.html | 43 -------- src/main/webapp/apps/jenkinsApp/jenkinsApp.js | 57 ----------- src/main/webapp/apps/jenkinsApp/job.html | 61 ------------ src/main/webapp/apps/jenkinsApp/server-list.html | 32 ------ src/main/webapp/apps/jenkinsApp/server.html | 64 ------------ 20 files changed, 1007 deletions(-) delete mode 100755 src/main/webapp/apps/app.css delete mode 100755 src/main/webapp/apps/app.js delete mode 100755 src/main/webapp/apps/buildApp/build.html delete mode 100755 src/main/webapp/apps/buildApp/buildApp.js delete mode 100644 src/main/webapp/apps/core/CoreResources.js delete mode 100755 src/main/webapp/apps/core/PagingTableService.js delete mode 100755 src/main/webapp/apps/core/navbar.html delete mode 100755 src/main/webapp/apps/frontPageApp/badge.html delete mode 100755 src/main/webapp/apps/frontPageApp/badgeList.html delete mode 100755 src/main/webapp/apps/frontPageApp/buildList.html delete mode 100755 src/main/webapp/apps/frontPageApp/frontPage.html delete mode 100755 src/main/webapp/apps/frontPageApp/frontPageApp.js delete mode 100755 src/main/webapp/apps/frontPageApp/person.html delete mode 100755 src/main/webapp/apps/frontPageApp/personList.html delete mode 100644 src/main/webapp/apps/jenkinsApp/JenkinsResources.js delete mode 100644 src/main/webapp/apps/jenkinsApp/build.html delete mode 100644 src/main/webapp/apps/jenkinsApp/jenkinsApp.js delete mode 100755 src/main/webapp/apps/jenkinsApp/job.html delete mode 100644 src/main/webapp/apps/jenkinsApp/server-list.html delete mode 100644 src/main/webapp/apps/jenkinsApp/server.html (limited to 'src/main/webapp/apps') diff --git a/src/main/webapp/apps/app.css b/src/main/webapp/apps/app.css deleted file mode 100755 index 3088282..0000000 --- a/src/main/webapp/apps/app.css +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Badges - */ -/* - bronze = #8c7853 - bronze ii = #a67d3d - */ - -.badge-level-1 { background-color: #a67d3d; color: #000000 } -.badge-level-2 { background-color: silver; color: #000000 } -.badge-level-3 { background-color: #ffd700; color: #000000 } - -/* - * Avatar - */ - -/* This has to match the Gravatar image */ -.avatar80 { - width: 80px; - height: 80px; -} - -/* - * - */ - -#content { - background-color: #ffffff; - padding-bottom: 60px; -} - -#footer { - background-color: #f5f5f5; - border-top: 1px solid #ccc; - color: #000000; -} - -#footer .container { - padding: 60px 0; -} - -#footer abbr[title] { - border-bottom: 1px dotted #000; -} - -#footer p { - margin-bottom: 0; - color: #777; -} - -#footer-links { - margin: 10px 0; -} - -#footer-links li { - display: inline; - margin-right: 10px; -} diff --git a/src/main/webapp/apps/app.js b/src/main/webapp/apps/app.js deleted file mode 100755 index 068f454..0000000 --- a/src/main/webapp/apps/app.js +++ /dev/null @@ -1,97 +0,0 @@ -var directives = angular.module('core.directives', []); - -directives.filter('countBadgeByLevel', function () { - return function (badges) { - // 5 levels - var levels = [0, 0, 0, 0, 0]; - angular.forEach(badges, function (value, key) { - levels[value.level - 1]++; - }); - return levels; - } -}); - -directives.filter('isodate', function () { - return function (date) { - return date.toISOString(); - } -}); - -directives.filter('gz', function () { - return function (num) { - if (angular.isArray(num)) { - var out = []; - angular.forEach(num, function (x) { - if (x > 0) { - out.push(x); - } - }); - - return out; - } - else if (angular.isNumber(num)) { - return num > 0; - } - console.log("fail"); - return undefined; - } -}); - -directives.directive('navbar', function () { - return { - restrict: 'E', - templateUrl: '/apps/core/navbar.html?noCache=' + noCache - }; -}); - -directives.directive('badge', function () { - return { - restrict: 'E', - scope: { - badgeDetail: '=badgeDetail' - }, - template: '' + - ' {{badgeDetail.badge.name}}' + - ' ' + - '' + - ' awarded to ' + - '{{badgeDetail.person.name}}. ' + - 'More' - } -}); - -directives.directive('badgeSpan', function () { - var template = - '' + - ' {{badge.name}}' + - ' ' + - ''; - - return { - restrict: 'E', - scope: { - badge: '=badge' - }, - template: template - } -}); - -directives.directive('personLink', function () { - return { - restrict: 'E', - scope: { - person: '=person' - }, - template: '{{person.name}}' - } -}); - -directives.directive('personAvatar', function () { - return { - restrict: 'E', - scope: { - person: '=person' - }, - template: '' - } -}); diff --git a/src/main/webapp/apps/buildApp/build.html b/src/main/webapp/apps/buildApp/build.html deleted file mode 100755 index fec38d2..0000000 --- a/src/main/webapp/apps/buildApp/build.html +++ /dev/null @@ -1,30 +0,0 @@ -
- -
-

Build

-
- -
-

Participants

- - - - - - - - - -
Date{{build.build.timestamp | date:'medium'}}
Status - SUCCESS - FAILURE -
-

Participants

- -

- {{participant.name}} -

- -
- -
diff --git a/src/main/webapp/apps/buildApp/buildApp.js b/src/main/webapp/apps/buildApp/buildApp.js deleted file mode 100755 index 170af16..0000000 --- a/src/main/webapp/apps/buildApp/buildApp.js +++ /dev/null @@ -1,12 +0,0 @@ -'use strict'; - -var buildApp = angular.module('buildApp', ['build', 'buildParticipant']).config(function ($routeProvider) { - $routeProvider. - when('/', {controller: BuildCtrl, templateUrl: '/apps/buildApp/build.html?noCache=' + noCache}); -}); - -function BuildCtrl($scope, Build, BuildParticipant) { - Build.get({uuid: uuid}, function(build) { - $scope.build = build; - }); -} diff --git a/src/main/webapp/apps/core/CoreResources.js b/src/main/webapp/apps/core/CoreResources.js deleted file mode 100644 index b258c85..0000000 --- a/src/main/webapp/apps/core/CoreResources.js +++ /dev/null @@ -1,25 +0,0 @@ -'use strict'; - -function Person($resource) { - return $resource('/resource/core/person/:uuid', {uuid: '@uuid'}); -} - -angular.module('person', ['ngResource']).factory('Person', Person); - -function Build($resource) { - return $resource('/resource/core/build/:uuid', {uuid: '@uuid'}); -} - -angular.module('build', ['ngResource']).factory('Build', Build); - -function BuildParticipant($resource) { - return $resource('/resource/core/build-participant/:uuid', {uuid: '@uuid'}); -} - -angular.module('buildParticipant', ['ngResource']).factory('BuildParticipant', BuildParticipant); - -function Badge($resource) { - return $resource('/resource/core/badge/:uuid', {uuid: '@uuid'}); -} - -angular.module('badge', ['ngResource']).factory('Badge', Badge); diff --git a/src/main/webapp/apps/core/PagingTableService.js b/src/main/webapp/apps/core/PagingTableService.js deleted file mode 100755 index af593df..0000000 --- a/src/main/webapp/apps/core/PagingTableService.js +++ /dev/null @@ -1,72 +0,0 @@ -function PagingTableService() { - var create = function ($scope, fetchCallback, options) { - options = options || {}; - var watcher = options.watcher || function(){}; - var self = { - rows: [], - startIndex: options.startIndex || 0, - count: options.count || 10 - }; - - var update = function(){ - fetchCallback(self.startIndex, self.count, function(data) { - self.rows = data.rows; - watcher(); - }); - }; - - self.first = function () { - self.startIndex = 0; - update(); - }; - - self.next = function () { - self.startIndex += self.count; - update(); - }; - - self.prev = function () { - if (self.startIndex == 0) { - return; - } - self.startIndex -= self.count; - update(); - }; - - // Do an initial fetch - update(); - - return self; - }; - - var defaultCallback = function(Resource, args) { - args = args || {}; - return function(startIndex, count, cb) { - if(startIndex) { - args.startIndex = startIndex; - } - if(count) { - args.count = count; - } - console.log("fetching", args); - Resource.query(args, function(data, headers) { - var totalResults = headers("total-results"); - console.log("totalResults", totalResults); - console.log("got data", data); - cb({ - totalResults: totalResults, - rows: data - }); - }); - }; - }; - - return { - create: create, - defaultCallback: defaultCallback - } -} - -angular. - module('pagingTableService', ['ngResource']). - factory('PagingTableService', PagingTableService); diff --git a/src/main/webapp/apps/core/navbar.html b/src/main/webapp/apps/core/navbar.html deleted file mode 100755 index 914258e..0000000 --- a/src/main/webapp/apps/core/navbar.html +++ /dev/null @@ -1,17 +0,0 @@ -
-
-
- Wat -
- -
-
-
-
diff --git a/src/main/webapp/apps/frontPageApp/badge.html b/src/main/webapp/apps/frontPageApp/badge.html deleted file mode 100755 index 92fc7ae..0000000 --- a/src/main/webapp/apps/frontPageApp/badge.html +++ /dev/null @@ -1,30 +0,0 @@ -
- - - -
-

Badge

-
- -
-
- The badge was awarded to at - {{badge.badge.createdDate | date:'medium'}}. -
-
- -
-
-

Details

-

- The badge was awarded for having {{badge.personalBadge.builds.length}} successful builds in a row: -

- -
-
- -
diff --git a/src/main/webapp/apps/frontPageApp/badgeList.html b/src/main/webapp/apps/frontPageApp/badgeList.html deleted file mode 100755 index 7671a55..0000000 --- a/src/main/webapp/apps/frontPageApp/badgeList.html +++ /dev/null @@ -1,46 +0,0 @@ -
- - - -
-

Badges Awarded

-
- - - -
-
-
-
-

{{date | date:'mediumDate'}}

-
-
-
-
- -
- -
-
-
- -
-
-
diff --git a/src/main/webapp/apps/frontPageApp/buildList.html b/src/main/webapp/apps/frontPageApp/buildList.html deleted file mode 100755 index 13a1dc3..0000000 --- a/src/main/webapp/apps/frontPageApp/buildList.html +++ /dev/null @@ -1,50 +0,0 @@ -
- - - -
-

Builds

-
- - - -
-
- - - - - - - - - - - -
{{build.build.timestamp | date:'medium'}} - SUCCESS - FAILURE -
- - - -
- -
-
-
diff --git a/src/main/webapp/apps/frontPageApp/frontPage.html b/src/main/webapp/apps/frontPageApp/frontPage.html deleted file mode 100755 index c3db55c..0000000 --- a/src/main/webapp/apps/frontPageApp/frontPage.html +++ /dev/null @@ -1,31 +0,0 @@ -
- - -
-

Recent

-
- -
-
-

Badges

- -
-
    -
  • - -
    • -
-
-
- -
-

Newcomers

- - -
-
-
diff --git a/src/main/webapp/apps/frontPageApp/frontPageApp.js b/src/main/webapp/apps/frontPageApp/frontPageApp.js deleted file mode 100755 index 6f80d0f..0000000 --- a/src/main/webapp/apps/frontPageApp/frontPageApp.js +++ /dev/null @@ -1,110 +0,0 @@ -'use strict'; - -var frontPageApp = angular.module('frontPageApp', ['ngGrid', 'person', 'badge', 'build', 'pagingTableService', 'core.directives']).config(function ($routeProvider) { - $routeProvider. - when('/', {controller: FrontPageCtrl, templateUrl: '/apps/frontPageApp/frontPage.html?noCache=' + noCache}). - when('/badge/', {controller: BadgeListCtrl, templateUrl: '/apps/frontPageApp/badgeList.html?noCache=' + noCache}). - when('/badge/:badgeUuid', {controller: BadgeCtrl, templateUrl: '/apps/frontPageApp/badge.html?noCache=' + noCache}). - when('/person/', {controller: PersonListCtrl, templateUrl: '/apps/frontPageApp/personList.html?noCache=' + noCache}). - when('/person/:personUuid', {controller: PersonCtrl, templateUrl: '/apps/frontPageApp/person.html?noCache=' + noCache}). - when('/build/', {controller: BuildListCtrl, templateUrl: '/apps/frontPageApp/buildList.html?noCache=' + noCache}); -}); - -function FrontPageCtrl($scope, Person, Badge) { - $scope.persons = Person.query(); - $scope.recentBadges = Badge.query(); -} - -function groupBy(array, size) { - var group = []; - var groups = []; - angular.forEach(array, function (element) { - group.push(element); - if (group.length == size) { - groups.push(group); - group = []; - } - }); - - if (group.length != 0) { - groups.push(group); - } - return groups; -} - -function BadgeListCtrl($scope, Badge, PagingTableService) { - var groupSize = 6; - - var personsWatcher = function () { - var withDay = _.map($scope.badges.rows, function(badge) { - badge.day = new Date(badge.badge.createdDate).clearTime().getTime(); -// badge.day.clearTime(); - return badge; - }); - - var byDay = _.groupBy(withDay, 'day'); - console.log("byDay", byDay); -// var dateGroups = _.map(byDay, function(group, date) { -// return {date: groupBy(group, groupSize)} -// }); - - $scope.badgeGroups = byDay; - }; - - $scope.badges = PagingTableService.create($scope, PagingTableService.defaultCallback(Badge), - {count: groupSize * 6, watcher: personsWatcher}); - - $scope.badgeGroups = []; -} - -function BadgeCtrl($scope, $routeParams, Badge) { - var badgeUuid = $routeParams.badgeUuid; - Badge.get({uuid: badgeUuid}, function (badge) { - $scope.badge = badge; - }); -} - -function PersonListCtrl($scope, Person, PagingTableService) { - var groupSize = 4; - var personsWatcher = function () { - $scope.personGroups = groupBy($scope.persons.rows, groupSize); - }; - - $scope.persons = PagingTableService.create($scope, PagingTableService.defaultCallback(Person, {orderBy: "name"}), - {count: groupSize * 6, watcher: personsWatcher}); - - $scope.personGroups = []; -} - -function PersonCtrl($scope, $routeParams, Person, Build, PagingTableService) { - var personUuid = $routeParams.personUuid; - - $scope.mode = 'overview'; - $scope.builds = PagingTableService.create($scope, PagingTableService.defaultCallback(Build, {person: personUuid})); - - $scope.setMode = function(mode) { - $scope.mode = mode; - switch(mode) { - case 'builds': - var builds = $scope.builds; - - console.log("$scope.builds.length=" + builds.rows.length); - if (builds.rows.length == 0) { - $scope.builds.first(); - } - break; - } - }; - - Person.get({uuid: personUuid}, function (person) { - $scope.person = person; - }); - - Build.query({person: personUuid}, function (builds) { - $scope.recentBuilds = builds; - }); -} - -function BuildListCtrl($scope, Build, PagingTableService) { - $scope.builds = PagingTableService.create($scope, PagingTableService.defaultCallback(Build, {fields: "detailed"})); -} diff --git a/src/main/webapp/apps/frontPageApp/person.html b/src/main/webapp/apps/frontPageApp/person.html deleted file mode 100755 index ba5c18d..0000000 --- a/src/main/webapp/apps/frontPageApp/person.html +++ /dev/null @@ -1,100 +0,0 @@ -
- - - -
-

{{person.person.name}}

-
- - - -
-
-

Upcoming

- - - - - -
{{badge.name}} -
-
-
-
- -

Badges

-
    -
  • - - {{badge.name}} - - - - - - {{badge.createdDate | date:'medium'}} -
    • -
-
-
-

Recent builds

- - - - - - - - - - - -
{{build.timestamp | date:'medium'}}{{{true: 'Success', false: 'Failure'}[build.success]}}Details
-
-
- -
-

Builds

- - - - - - - - - - - - - - - - - - -
DateSuccess
{{build.timestamp | date:'medium'}}{{build.success}}
- -
-
-
diff --git a/src/main/webapp/apps/frontPageApp/personList.html b/src/main/webapp/apps/frontPageApp/personList.html deleted file mode 100755 index 5d7d8c6..0000000 --- a/src/main/webapp/apps/frontPageApp/personList.html +++ /dev/null @@ -1,47 +0,0 @@ -
- - - -
-

People

-
- - - -
-
-
-
-
- - {{person.person.name}} -
- - x {{level}} - -
-
-
- -
-
-
diff --git a/src/main/webapp/apps/jenkinsApp/JenkinsResources.js b/src/main/webapp/apps/jenkinsApp/JenkinsResources.js deleted file mode 100644 index 89f3139..0000000 --- a/src/main/webapp/apps/jenkinsApp/JenkinsResources.js +++ /dev/null @@ -1,25 +0,0 @@ -'use strict'; - -function JenkinsServer($resource) { - return $resource('/resource/jenkins/server/:uuid', {uuid: '@uuid'}); -} - -angular. - module('jenkinsServer', ['ngResource']). - factory('JenkinsServer', JenkinsServer); - -function JenkinsJob($resource) { - return $resource('/resource/jenkins/job/:uuid', {uuid: '@uuid'}); -} - -angular. - module('jenkinsJob', ['ngResource']). - factory('JenkinsJob', JenkinsJob); - -function JenkinsBuild($resource) { - return $resource('/resource/jenkins/build/:uuid', {uuid: '@uuid'}); -} - -angular. - module('jenkinsBuild', ['ngResource']). - factory('JenkinsBuild', JenkinsBuild); diff --git a/src/main/webapp/apps/jenkinsApp/build.html b/src/main/webapp/apps/jenkinsApp/build.html deleted file mode 100644 index 7239c90..0000000 --- a/src/main/webapp/apps/jenkinsApp/build.html +++ /dev/null @@ -1,43 +0,0 @@ -
- - - -
-

Jenkins Build

-
- - - -

Overview

- - - - - - - - - - - - - - - -
Timestamp{{details.build.timestamp | date:'medium'}}
Number{{details.build.number}}
Duration{{details.build.duration / 1000 | number:0}}s
- -

Users

- - - - - - -
{{user.uuid}}
- -
diff --git a/src/main/webapp/apps/jenkinsApp/jenkinsApp.js b/src/main/webapp/apps/jenkinsApp/jenkinsApp.js deleted file mode 100644 index e42c67b..0000000 --- a/src/main/webapp/apps/jenkinsApp/jenkinsApp.js +++ /dev/null @@ -1,57 +0,0 @@ -'use strict'; - -var jenkinsApp = angular.module('jenkinsApp', ['jenkinsServer', 'jenkinsJob', 'jenkinsBuild', 'core.directives', 'pagingTableService']).config(function ($routeProvider) { - $routeProvider. - when('/', {controller: ServerListCtrl, templateUrl: '/apps/jenkinsApp/server-list.html?noCache=' + noCache}). - when('/server/:uuid', {controller: ServerCtrl, templateUrl: '/apps/jenkinsApp/server.html?noCache=' + noCache}). - when('/job/:uuid', {controller: JobCtrl, templateUrl: '/apps/jenkinsApp/job.html?noCache=' + noCache}). - when('/build/:uuid', {controller: BuildCtrl, templateUrl: '/apps/jenkinsApp/build.html?noCache=' + noCache}); -}); - -function ServerListCtrl($scope, $location, JenkinsServer) { - JenkinsServer.query(function (servers) { - $scope.servers = servers; - }); - - $scope.showServers = function () { $location.path('/'); }; - $scope.showServer = function (uuid) { $location.path('/server/' + uuid); }; -} - -function ServerCtrl($scope, $location, $routeParams, JenkinsServer, JenkinsJob, PagingTableService) { - var serverUuid = $routeParams.uuid; - - JenkinsServer.get({uuid: serverUuid}, function (server) { - $scope.server = server; - }); - - $scope.jobs = PagingTableService.create($scope, PagingTableService.defaultCallback(JenkinsJob, {server: serverUuid})); - - $scope.showServers = function () { $location.path('/'); }; - $scope.showJob = function (uuid) { $location.path('/job/' + uuid); }; -} - -function JobCtrl($scope, $location, $routeParams, JenkinsJob, JenkinsBuild, PagingTableService) { - var jobUuid = $routeParams.uuid; - - JenkinsJob.get({uuid: jobUuid}, function (details) { - $scope.details = details; - }); - - $scope.builds = PagingTableService.create($scope, PagingTableService.defaultCallback(JenkinsBuild, {job: jobUuid})); - - $scope.showServers = function () { $location.path('/'); }; - $scope.showServer = function () { $location.path('/server/' + $scope.job.server); }; - $scope.showBuild = function (uuid) { $location.path('/build/' + uuid); }; -} - -function BuildCtrl($scope, $location, $routeParams, JenkinsBuild) { - var buildUuid = $routeParams.uuid; - - JenkinsBuild.get({uuid: buildUuid}, function (details) { - $scope.details = details; - }); - - $scope.showServers = function () { $location.path('/'); }; - $scope.showServer = function (uuid) { $location.path('/server/' + $scope.server.uuid); }; - $scope.showJob = function (uuid) { $location.path('/job/' + $scope.build.job); }; -} diff --git a/src/main/webapp/apps/jenkinsApp/job.html b/src/main/webapp/apps/jenkinsApp/job.html deleted file mode 100755 index 8942ab7..0000000 --- a/src/main/webapp/apps/jenkinsApp/job.html +++ /dev/null @@ -1,61 +0,0 @@ -
- - - -
-

Jenkins Job

-
- - - -

Overview

- - - - - - - - - - - - -
URL{{details.job.displayName}}
Build count{{details.buildCount}}
- -

Recent Builds

- - - - - - - - - - - - - - - - - - - - -
BuildResult
{{build.timestamp | date:'medium'}}{{build.result}}
- -
-
diff --git a/src/main/webapp/apps/jenkinsApp/server-list.html b/src/main/webapp/apps/jenkinsApp/server-list.html deleted file mode 100644 index 9e297e6..0000000 --- a/src/main/webapp/apps/jenkinsApp/server-list.html +++ /dev/null @@ -1,32 +0,0 @@ -
- - - -
-

Jenkins Servers

-
- -
    -
  • All Servers
    • -
- - - - - - - - - - - - - - - - - - -
URLEnabled
{{server.url}}{{server.enabled}}Visit -
-
diff --git a/src/main/webapp/apps/jenkinsApp/server.html b/src/main/webapp/apps/jenkinsApp/server.html deleted file mode 100644 index 7fbd9f5..0000000 --- a/src/main/webapp/apps/jenkinsApp/server.html +++ /dev/null @@ -1,64 +0,0 @@ -
- - - - -
-

Jenkins Server

-
- - - -

Overview

- - - - - - - - - - - - - - - -
URL{{server.url}}
Enabled{{server.enabled}}
Stats{{server.jobCount}} jobs, {{server.buildCount}} builds
- -

Recent Jobs

- - - - - - - - - - - - - - - - - - - -
Job
{{job.createdDate | date:'medium'}}{{job.displayName}}{{job.uuid}}
- -
- -
-- cgit v1.2.3