Commit 485c5199 authored by gitlabhq's avatar gitlabhq
Browse files

user dashboard

parent 59008c05fab2
class DashboardController < ApplicationController
def index
@projects = current_user.projects.all
@active_projects = @projects.select(&:last_activity_date).sort_by(&:last_activity_date).reverse
end
end
module DashboardHelper
def path_to_object(project, object)
case object.class.name.to_s
when "Issue" then project_issues_path(project, project.issues.find(object.id))
when "Grit::Commit" then project_commit_path(project, project.repo.commits(object.id).first)
else "#"
end
end
end
......@@ -119,6 +119,26 @@ def repo_exists?
repo rescue false
end
def last_activity
updates(1).first
rescue
nil
end
def last_activity_date
last_activity.try(:created_at)
end
def updates(n = 3)
[
fresh_commits(n),
issues.last(n),
notes.fresh.limit(n)
].compact.flatten.sort do |x, y|
y.created_at <=> x.created_at
end[0..n]
end
def commit(commit_id = nil)
if commit_id
repo.commits(commit_id).first
......@@ -131,16 +151,16 @@ def heads
@heads ||= repo.heads
end
def fresh_commits
def fresh_commits(n = 10)
commits = heads.map do |h|
repo.commits(h.name, 10)
repo.commits(h.name, n)
end.flatten.uniq { |c| c.id }
commits.sort! do |x, y|
y.committed_date <=> x.committed_date
end
commits[0..10]
commits[0..n]
end
def commits_since(date)
......
timeline
#dashboard-content.dashboard-content.content
%aside
%h4
%a.button-small.button-green{:href => ""} New Repository
Your Repositories
%ol.project-list
- @projects.each do |project|
%li
%a{:href => "#"}
%span.arrow
%span.project-name= project.name
%span.time
%strong Last activity:
= project.last_activity_date ? time_ago_in_words(project.last_activity_date) + " ago" : "Never"
#news-feed.news-feed
%h2.icon
%span>
Dashboard
- @active_projects.each do |project|
.project-box.project-updates.ui-box.ui-box-small.ui-box-big
%h3= project.name
.data
- project.updates.each do |update|
%a.project-update{:href => path_to_object(project, update)}
%img{:src => "http://placehold.it/40x40"}
%span.update-title [#{update.class.name}] added a matcher that helps debugging matching problems
%span.update-author
%strong= update.author.name
authored
= time_ago_in_words(update.created_at)
ago
%br
/ .project-update
/ .project-updates
/ #news-feed
/ #dashboard-content
......@@ -10,6 +10,7 @@
</div>
<div class="right">
<%= link_to truncate(@project.name, :length => 20), project_path(@project), :class => "current button" if @project && !@project.new_record? %>
<%= link_to 'Dashboard', dashboard_path, :class => current_page?(dashboard_path) ? "current button" : "button" %>
<%= link_to 'Projects', projects_path, :class => current_page?(projects_path) ? "current button" : "button" %>
<%= link_to('Admin', admin_root_path, :class => admin_namespace? ? "current button" : "button" ) if current_user.is_admin? %>
<%= link_to profile_path, :class => ((controller.controller_name == "keys" || controller.controller_name == "profile") ? "current button" : "button") do %>
......
......@@ -15,6 +15,7 @@
put "profile/password", :to => "profile#password_update"
put "profile/edit", :to => "profile#social_update"
get "profile", :to => "profile#show"
get "dashboard", :to => "dashboard#index"
#get "profile/:id", :to => "profile#show"
resources :projects, :only => [:new, :create, :index]
......
......@@ -8,4 +8,8 @@ def safe_message
rescue
"-- invalid encoding for commit message"
end
def created_at
committed_date
end
end
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment