Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus into develop

app/models/user.rb

@@ -701,6 +701,10 @@ class User < ApplicationRecord
     apply.present? && !apply.status.zero?
   end
 
+  def projects_count
+    Project.joins(:members).where(members: { user_id: self.id }).select(:id).size
+  end
+
   # 是否已经签到
   def attendance_signed?
     attendance = Attendance.find_by(user_id: id)

app/views/users/get_user_info.json.jbuilder

@@ -4,12 +4,13 @@ json.login @user.login
 json.user_id @user.id
 json.image_url url_to_avatar(@user)
 json.admin @user.admin?
-json.business @user.business?
 json.is_teacher @user.user_extension&.teacher?
 json.user_identity @user.identity
 json.tidding_count 0
 json.user_phone_binded @user.phone.present?
-json.phone @user.phone
+# json.phone @user.phone
-json.email @user.mail
+# json.email @user.mail
 json.profile_completed @user.profile_completed?
 json.professional_certification @user.professional_certification
+
+

app/views/users/homepage_info.json.jbuilder

@@ -6,9 +6,8 @@ json.fan_count @user.fan_count
 json.identity @user.identity
 json.brief_introduction @user.user_extension&.brief_introduction
 json.professional_certification @user.professional_certification
-json.phone_binded @user.phone_binded?
-json.email_binded @user.email_binded?
 json.followed User.current.watched?(@user)
+json.projects_count @user.projects_count
 
 # json.id @user.id
 # json.name @user.full_name

public/react/build/asset-manifest.json

@@ -1,5 +1,5 @@
 {
-  "./static/js/0.dff794ee.chunk.js": "./static/js/0.dff794ee.chunk.js",
+  "./static/js/0.24bc3056.chunk.js": "./static/js/0.24bc3056.chunk.js",
   "./static/js/1.f7fd2292.chunk.js": "./static/js/1.f7fd2292.chunk.js",
   "./static/js/10.1be71b42.chunk.js": "./static/js/10.1be71b42.chunk.js",
   "./static/js/100.41f2a409.chunk.js": "./static/js/100.41f2a409.chunk.js",
@@ -284,7 +284,7 @@
   "./static/js/98.a08b024b.chunk.js": "./static/js/98.a08b024b.chunk.js",
   "./static/js/99.07307f5a.chunk.js": "./static/js/99.07307f5a.chunk.js",
   "main.css": "./static/css/main.fd229636.css",
-  "main.js": "./static/js/main.c75c9911.js",
+  "main.js": "./static/js/main.5a200b9c.js",
   "static/media/KaTeX_AMS-Regular.ttf": "static/media/KaTeX_AMS-Regular.aaf4eee9.ttf",
   "static/media/KaTeX_AMS-Regular.woff": "static/media/KaTeX_AMS-Regular.7f06b4e3.woff",
   "static/media/KaTeX_AMS-Regular.woff2": "static/media/KaTeX_AMS-Regular.e78e28b4.woff2",

public/react/build/index.html

@@ -24,7 +24,7 @@
                 _host = 'https://ali-cdn.educoder.net/react/build/'
             }
             document.write('<script type="text/javascript" src="' + _host + 'js/js_min_all.js"><\/script>');
-            document.write('<script type="text/javascript" src="' + _host + 'static/js/main.c75c9911.js"><\/script>');
+            document.write('<script type="text/javascript" src="' + _host + 'static/js/main.5a200b9c.js"><\/script>');
          })()
       </script>
     <script>!function(){var t=location.href;"3007"===window.location.port?-1!=t.indexOf("/tasks/")?(document.write('<script type="text/javascript" src="https://newweb.educoder.net/assets/kindeditor/kindeditor.js"><\/script>'),document.write('<script type="text/javascript" src="/react/build/js/create_kindeditor.js?v=1.1.1"><\/script>'),document.write('<script type="text/javascript" src="https://newweb.educoder.net/javascripts/educoder/edu_application.js"><\/script>')):-1!=t.indexOf("/paths/")&&document.write('<script type="text/javascript" src="https://newweb.educoder.net/javascripts/educoder/edu_application.js"><\/script>'):-1!=t.indexOf("/tasks/")?(document.write('<script type="text/javascript" src="/assets/kindeditor/kindeditor.js"><\/script>'),document.write('<script type="text/javascript" src="/react/build/js/create_kindeditor.js?v=1.1.1"><\/script>'),document.write('<script type="text/javascript" src="/javascripts/educoder/edu_application.js"><\/script>')):-1!=t.indexOf("/paths/")&&document.write('<script type="text/javascript" src="/javascripts/educoder/edu_application.js"><\/script>')}()</script><script type="text/javascript" src="https://cdn.bootcss.com/quill/1.3.7/quill.core.min.js"></script></body></html>