修改个人主页

app/views/users/_watch_user_detail.json.jbuilder

@@ -0,0 +1,8 @@
+user = target.watchable 
+
+json.format_time target.created_at.strftime("%Y-%m-%d")
+json.name user.try(:show_real_name)
+json.login user.try(:login)
+json.image_url url_to_avatar(user)
+json.is_current_user current_user.try(:id) == target.user_id
+json.is_watch current_user&.watched?(user)

app/views/users/fan_users.json.jbuilder

@@ -0,0 +1,4 @@
+json.count @watchers_count
+json.users do 
+  json.partial! "/users/watch_user_detail", collection: @watchers, as: :target
+end

app/views/users/get_user_info.json.jbuilder

@@ -12,6 +12,5 @@ json.user_phone_binded @user.phone.present?
 # json.email @user.mail
 json.profile_completed @user.profile_completed?
 json.professional_certification @user.professional_certification
-json.is_watch current_user&.watched?(@user)
 
 

app/views/users/projects.json.jbuilder

@@ -1,24 +1,6 @@
 json.count @total_count
 json.projects do
   json.array! @projects do |project|
-    user = project&.owner
-    json.members_count project.members_count
-    json.issues_count project.issues_count
-    json.changesets_count project&.project_score&.changeset_num.to_i
-    json.can_visited project.can_visited?
-    json.id project.id
-    json.identifier project.identifier
-    json.name project.name
-    json.is_public project.is_public
-    json.owner do
-      json.real_name user.present? ? user.try(:real_name) : "未知用户"
-      json.avatar_url user.present? ? url_to_avatar(user) : "avatars/User/b"
-    end
-    json.category do
-      json.name project&.project_category&.name
-    end
-    json.language do
-      json.name project&.project_language&.name
-    end
+    json.partial! "/projects/project_detail", project: project
   end
 end

app/views/users/show.json.jbuilder

@@ -1 +1,16 @@
-json.partial! 'users/user', locals: { user: @user }
+# json.partial! 'users/user', locals: { user: @user }
+
+json.username @user.full_name
+json.real_name @user.real_name
+json.login @user.login
+json.user_id @user.id
+json.image_url url_to_avatar(@user)
+json.admin @user.admin?
+json.user_identity @user.identity
+json.is_watch current_user&.watched?(@user)
+json.watched_count @user.fan_count   #粉丝
+json.watching_count @user.follow_count   #关注数
+json.undo_events @undo_events
+json.user_composes_count @user_composes_count
+json.common_projects_count @projects_common_count
+json.mirror_projects_count @projects_mirrior_count

app/views/users/watch_users.json.jbuilder

@@ -0,0 +1,4 @@
+json.count @watchers_count
+json.users do 
+  json.partial! "/users/watch_user_detail", collection: @watchers, as: :target
+end