diff --git a/assets/scripts/app/controllers.coffee b/assets/scripts/app/controllers.coffee index bd90010a..ecaddf41 100644 --- a/assets/scripts/app/controllers.coffee +++ b/assets/scripts/app/controllers.coffee @@ -26,3 +26,4 @@ require 'controllers/main/error' require 'controllers/builds/item' require 'controllers/queue' require 'controllers/running_jobs' +require 'controllers/dashboard/repositories' diff --git a/assets/scripts/app/controllers/dashboard/repositories.coffee b/assets/scripts/app/controllers/dashboard/repositories.coffee new file mode 100644 index 00000000..690233a2 --- /dev/null +++ b/assets/scripts/app/controllers/dashboard/repositories.coffee @@ -0,0 +1,19 @@ +Controller = Ember.Controller.extend + queryParams: ['filter'] + filter: null + + filteredRepositories: (-> + filter = @get('filter') + repos = @get('model') + + if filter + repos.filter (item, index) -> + + item.slug.match(new RegExp(filter)) + + else + repos + + ).property('filter', 'model') + +Travis.DashboardRepositoriesController = Controller diff --git a/assets/scripts/app/routes.coffee b/assets/scripts/app/routes.coffee index 66e0eb40..1f1fcf79 100644 --- a/assets/scripts/app/routes.coffee +++ b/assets/scripts/app/routes.coffee @@ -2,14 +2,17 @@ require 'travis/location' require 'routes/application' Ember.Router.reopen - location: (if testMode? then Ember.NoneLocation.create() else Travis.Location.create()) - handleURL: (url) -> url = url.replace(/#.*?$/, '') @_super(url) +Travis.Router.reopen + location: 'history' + Travis.Router.map -> - @resource 'dashboard' + @resource 'dashboard', -> + @route 'repositories', path: '/' + @resource 'main', path: '/', -> @resource 'getting_started' @route 'recent' @@ -80,3 +83,4 @@ require 'routes/settings' require 'routes/simple_layout' require 'routes/ssh_key' require 'routes/dashboard' +require 'routes/dashboard/repositories' diff --git a/assets/scripts/app/routes/dashboard.coffee b/assets/scripts/app/routes/dashboard.coffee index 5c823698..0921fd09 100644 --- a/assets/scripts/app/routes/dashboard.coffee +++ b/assets/scripts/app/routes/dashboard.coffee @@ -11,17 +11,4 @@ Route = TravisRoute.extend @get('stylesheetsManager').enable('main') @get('stylesheetsManager').disable('dashboard') - model: -> - #return new Ember.RSVP.Promise(->) - apiEndpoint = @get('config').api_endpoint - $.ajax(apiEndpoint + '/repos?member=lislis', { - beforeSend: (xhr) -> - xhr.setRequestHeader('accept', 'application/json; version=2') - }).then (response) -> - response.repos.map (elem) -> - [owner, name] = elem.slug.split('/') - elem.owner = owner - elem.name = name - Ember.Object.create(elem) - Travis.DashboardRoute = Route diff --git a/assets/scripts/app/routes/dashboard/repositories.coffee b/assets/scripts/app/routes/dashboard/repositories.coffee new file mode 100644 index 00000000..eded6211 --- /dev/null +++ b/assets/scripts/app/routes/dashboard/repositories.coffee @@ -0,0 +1,18 @@ +require 'routes/route' + +TravisRoute = Travis.Route + +Route = TravisRoute.extend + model: -> + apiEndpoint = @get('config').api_endpoint + $.ajax(apiEndpoint + '/repos?member=lislis', { + beforeSend: (xhr) -> + xhr.setRequestHeader('accept', 'application/json; version=2') + }).then (response) -> + response.repos.map (elem) -> + [owner, name] = elem.slug.split('/') + elem.owner = owner + elem.name = name + Ember.Object.create(elem) + +Travis.DashboardRepositoriesRoute = Route diff --git a/assets/scripts/app/templates/dashboard.hbs b/assets/scripts/app/templates/dashboard.hbs index 48f7c74a..e2147cab 100644 --- a/assets/scripts/app/templates/dashboard.hbs +++ b/assets/scripts/app/templates/dashboard.hbs @@ -1,21 +1 @@ -
-
- {{#each repo in model}} -
-
-
-
-
-

{{repo.owner}}

-

{{#link-to "repo" repo.owner repo.name }}{{repo.name}}{{/link-to}}

-
{{formatDuration repo.last_build_duration}}
-
{{formatTime repo.last_build_finished_at}}
-

{{#link-to "build" repo.owner repo.name repo.last_build_id}}#{{repo.last_build_number}} {{repo.last_build_state}}{{/link-to}}

-
-
-
-
-
- {{/each}} -
-
+{{outlet}} \ No newline at end of file diff --git a/assets/scripts/app/templates/dashboard/loading.hbs b/assets/scripts/app/templates/dashboard/loading.hbs new file mode 100644 index 00000000..24ab3189 --- /dev/null +++ b/assets/scripts/app/templates/dashboard/loading.hbs @@ -0,0 +1,12 @@ +
+
+
+
+
+
+
+

Hold tight.
+ We're consulting the internet.

+
+
+
diff --git a/assets/scripts/app/templates/dashboard/repositories.hbs b/assets/scripts/app/templates/dashboard/repositories.hbs new file mode 100644 index 00000000..a7412f18 --- /dev/null +++ b/assets/scripts/app/templates/dashboard/repositories.hbs @@ -0,0 +1,21 @@ +
+
+ {{#each repo in filteredRepositories}} +
+
+
+
+
+

{{repo.owner}}

+

{{#link-to "repo" repo.owner repo.name }}{{repo.name}}{{/link-to}}

+
{{formatDuration repo.last_build_duration}}
+
{{formatTime repo.last_build_finished_at}}
+

{{#link-to "build" repo.owner repo.name repo.last_build_id}}#{{repo.last_build_number}} {{repo.last_build_state}}{{/link-to}}

+
+
+
+
+
+ {{/each}} +
+
diff --git a/assets/scripts/app/templates/layouts/dashboard.hbs b/assets/scripts/app/templates/layouts/dashboard.hbs index 6f8fbbe8..c25c7de8 100644 --- a/assets/scripts/app/templates/layouts/dashboard.hbs +++ b/assets/scripts/app/templates/layouts/dashboard.hbs @@ -28,46 +28,46 @@ -