diff --git a/README.md b/README.md index 311e91aea..9d456b372 100644 --- a/README.md +++ b/README.md @@ -470,10 +470,10 @@ http://localhost:3000/api/projects/3263 | jq |参数名|必选|类型|说明| -|-|-|- |id |是|int |项目id | -|name |是|string |项目名称 | -|description |是|string |项目描述 | -|project_category_id|是|int |项目类别id | -|project_language_id|是|int |项目语言id | +|name |否|string |项目名称 | +|description |否|string |项目描述 | +|project_category_id|否|int |项目类别id | +|project_language_id|否|int |项目语言id | |private |否|boolean|项目是否私有, true：为私有，false: 公开，默认为公开 | @@ -1274,11 +1274,15 @@ http://localhost:3000/api/18816895620/mirror_demo | jq |参数名|类型|说明| -|-|- |identifier |string|仓库标识| +|project_id |int|项目id| +|project_identifier|string|项目标识| |praises_count |int|点赞数量| |forked_count |int|fork数量| |watchers_count |int|关注数量| |branches_count |int|分支数量| |commits_count |int|总提交记录数量| +|praised |boolean|当前登录用户是否已点赞，true:已点赞，fasle:未点赞， 用户未登录状态为null| +|watched |boolean|当前登录用户是否已关注，true:已关注，fasle:未关注， 用户未登录状态为null| |permission |string|当前登录用户对该仓库的操作权限, Manager:管理员，可以在线编辑文件、在线新建文件、可以设置仓库的基本信息; Developer:开发人员，可在线编辑文件、在线新建文件、不能设置仓库信息; Reporter: 报告人员，只能查看信息，不能设置仓库信息、不能在线编辑文件、不能在线新建文件；用户未登录时也会返回Reporter, 说明也只有读取文件的权限 | |mirror_url |string|镜像地址, 只有通过镜像过来的项目才会有这个地址| |author |object|提交用户| @@ -1289,6 +1293,8 @@ http://localhost:3000/api/18816895620/mirror_demo | jq 返回值 ``` { + "project_id": 3263, + "project_identifier": "mirror_demo", "identifier": "mirror_demo", "praises_count": 1, "forked_count": 0, @@ -1296,6 +1302,8 @@ http://localhost:3000/api/18816895620/mirror_demo | jq "branches_count": 6, "commits_count": 105, "permission": "Manager", + "watched": true, + "praised": true, "mirror_url": "https://gitea.com/CasperVector/slew.git", "author": { "name": "18816895620", @@ -1488,7 +1496,7 @@ http://localhost:3000/api/projects/3263/praise_tread | jq |参数名|类型|说明| -|-|- |total_count |int|总条数| -|praises |array|关注数据| +|praises |array|点赞数据| |-- name |string|用户名称| |-- login |string|用户标识/登录名(login)| |-- image_url |string|用户头像| diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 988494f89..36f14edbf 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -328,7 +328,8 @@ class ApplicationController < ActionController::Base def current_user # User.current - User.find_by_id 50207 + User.find_by_id 36401 + # nil end ## 默认输出json @@ -355,21 +356,21 @@ class ApplicationController < ActionController::Base # 通关后，把最后一次成功的代码存到数据库 # type 0 创始内容， 1 最新内容 - def game_passed_code(path, myshixun, game_id) - # 如果代码窗口是隐藏的，则不用保存代码 - return if myshixun.shixun.hide_code || myshixun.shixun.vnc - file_content = git_fle_content myshixun.repo_path, path - #unless file_content.present? - # raise("获取文件代码异常") - #end - logger.info("#######game_id:#{game_id}, file_content:#{file_content}") - game_code = GameCode.where(:game_id => game_id, :path => path).first - if game_code.nil? - GameCode.create!(:game_id => game_id, :new_code => file_content, :path => path) - else - game_code.update_attributes!(:new_code => file_content) - end - end + # def game_passed_code(path, myshixun, game_id) + # # 如果代码窗口是隐藏的，则不用保存代码 + # return if myshixun.shixun.hide_code || myshixun.shixun.vnc + # file_content = git_fle_content myshixun.repo_path, path + # #unless file_content.present? + # # raise("获取文件代码异常") + # #end + # logger.info("#######game_id:#{game_id}, file_content:#{file_content}") + # game_code = GameCode.where(:game_id => game_id, :path => path).first + # if game_code.nil? + # GameCode.create!(:game_id => game_id, :new_code => file_content, :path => path) + # else + # game_code.update_attributes!(:new_code => file_content) + # end + # end # Post请求 def uri_post(uri, params) @@ -647,19 +648,20 @@ class ApplicationController < ActionController::Base render_not_found("未找到’#{params[:id]}’相关的项目") unless @project end + def find_project_with_identifier + @project = Project.find_by_identifier! params[:id] + render_not_found("未找到’#{params[:id]}’相关的项目") unless @project + end + def find_project_with_id - @project = Project.find params[:project_id] + @project = Project.find(params[:project_id] || params[:id]) rescue Exception => e logger_error(e.message) tip_exception(e.message) end def render_response(interactor) - if interactor.success? - render_ok - else - render_error(interactor.error) - end + interactor.success? ? render_ok : render_error(interactor.error) end private diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index c68c4eaa8..9a53d6191 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -3,6 +3,7 @@ class RepositoriesController < ApplicationController before_action :find_user, :find_repository, :authorizate! def show + @project = @repo.project @branches_count = Gitea::Repository::BranchesService.new(@user, @repo.identifier).call.size @commits_count = Gitea::Repository::Commits::ListService.new(@user, @repo.identifier).call[:total_count] end diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 2096a7dc9..c7e03708a 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -8,11 +8,11 @@ module ProjectsHelper end def render_zip_url(project, archive_name) - [gitea_domain, project.owner.login, project.identifier, "#{archive_name}.zip"].join('/') + [gitea_domain, project.owner.login, project.identifier, "archive", "#{archive_name}.zip"].join('/') end def render_tar_url(project, archive_name) - [gitea_domain, project.owner.login, project.identifier, "#{archive_name}.tar.gz"].join('/') + [gitea_domain, project.owner.login, project.identifier, "archive", "#{archive_name}.tar.gz"].join('/') end def render_http_url(project) diff --git a/app/views/repositories/show.json.jbuilder b/app/views/repositories/show.json.jbuilder index 1fc9700f7..7b1a5abe1 100644 --- a/app/views/repositories/show.json.jbuilder +++ b/app/views/repositories/show.json.jbuilder @@ -1,9 +1,13 @@ json.identifier @repo.identifier +json.project_id @project.id +json.project_identifier @project.identifier json.praises_count @repo.project.praises_count json.forked_count @repo.project.forked_count json.watchers_count @repo.project.watchers_count json.branches_count @branches_count json.commits_count @commits_count -json.permission render_edit_project_permission(current_user, @repo.project) +json.permission render_edit_project_permission(current_user, @project) json.mirror_url @repo.mirror_url +json.watched current_user&.watched?(@project) +json.praised current_user&.liked?(@project) json.partial! 'author', locals: { user: @repo.user } diff --git a/public/react/src/forge/Main/Detail.js b/public/react/src/forge/Main/Detail.js index 1b31010f7..700e10972 100644 --- a/public/react/src/forge/Main/Detail.js +++ b/public/react/src/forge/Main/Detail.js @@ -12,6 +12,10 @@ const FileNew = Loadable({ loader: () => import('../Newfile/Index'), loading: Loading, }) +const OrderNew = Loadable({ + loader: () => import('../Order/New'), + loading: Loading, +}) const OrderIndex = Loadable({ loader: () => import('../Order/order'), loading: Loading, @@ -30,7 +34,10 @@ class Detail extends Component{ projectDetail:undefined, isManager:false, isReporter:false, - isDeveloper:false + isDeveloper:false, + watchers_count:undefined , + praises_count:undefined , + forked_count:undefined } } @@ -48,16 +55,60 @@ class Detail extends Component{ projectDetail:result.data, isManager:result.data.permission && result.data.permission === "Manager", isReporter:result.data.permission && result.data.permission === "Reporter", - isDeveloper:result.data.permission && result.data.permission === "Developer" + isDeveloper:result.data.permission && result.data.permission === "Developer", + + watchers_count:result.data.watchers_count, + praises_count:result.data.praises_count, + forked_count:result.data.forked_count, }) } }).catch((error)=>{}) } + // 关注和取消关注 + focusFunc =(flag)=>{ + const { projectsId } = this.props.match.params; + if(flag){ + const url = `/projects/${projectsId}/watchers/follow.json`; + axios.post(url).then(result=>{ + if(result){ + this.props.showNotification('关注成功'); + } + }) + }else{ + const url = `/projects/${projectsId}/watchers/unfollow.json`; + axios.delete(url).then(result=>{ + if(result){ + this.props.showNotification('取消关注成功'); + } + }) + } + } + + // 点赞和取消点赞 + pariseFunc=(flag)=>{ + const { projectsId } = this.props.match.params; + if(flag){ + const url = `/projects/${projectsId}/praise_tread/like.json`; + axios.post(url).then(result=>{ + if(result){ + this.props.showNotification('点赞成功'); + } + }) + }else{ + const url = `/projects/${projectsId}/praise_tread/unlike.json`; + axios.delete(url).then(result=>{ + if(result){ + this.props.showNotification('取消点赞成功'); + } + }) + } + } + render(){ const { projectsId } = this.props.match.params; - const { projectDetail } = this.state; + const { projectDetail , watchers_count , praises_count , forked_count } = this.state; const url = this.props.history.location.pathname; return(
@@ -65,10 +116,19 @@ class Detail extends Component{

{projectDetail && projectDetail.author && projectDetail.author.name} / { projectDetail && projectDetail.identifier }

- - {projectDetail && projectDetail.watchers_count} - {projectDetail && projectDetail.praises_count} - {projectDetail && projectDetail.forked_count} + + + this.focusFunc(true)}>关注 + {watchers_count} + + + this.pariseFunc(true)}>点赞 + {praises_count} + + + Fork + {forked_count} +
@@ -83,6 +143,7 @@ class Detail extends Component{
+ {/* 新建文件 */} () @@ -93,6 +154,16 @@ class Detail extends Component{ (props) => () } > + + {/* 新建工单 */} + + () + } + > + + {/* 代码Index */} () diff --git a/public/react/src/forge/Main/list.css b/public/react/src/forge/Main/list.css index 7d0ec873e..2250a50e1 100644 --- a/public/react/src/forge/Main/list.css +++ b/public/react/src/forge/Main/list.css @@ -111,6 +111,32 @@ body,#root{ flex: 1; width: 0; } +.p-r-btn{ + display: flex; + align-items: center; +} +.p-r-btn > span{ + height: 35px; + line-height: 35px; + border:1px solid #f4f4f4; + border-radius: 5px; + display: block; + margin-left: 20px; + background-color: #fff; + display: flex; +} +.p-r-btn > span > a{ + display: flex; + align-items: center; + padding:0px 12px; + background:#ececec; +} +.p-r-btn > span > a:active{ + background: #f4f4f4; +} +.p-r-btn > span > span{ + padding:0px 8px; +} .p-r-tags{ display: flex; opacity: 1; diff --git a/public/react/src/forge/New/Index.js b/public/react/src/forge/New/Index.js index 2364a705a..5f68a77ef 100644 --- a/public/react/src/forge/New/Index.js +++ b/public/react/src/forge/New/Index.js @@ -1,5 +1,5 @@ import React , { Component } from 'react'; - +import { Link } from 'react-router-dom'; import { Input , Form , Select , Checkbox , Button , Divider } from 'antd'; import '../css/index.css'; @@ -285,7 +285,7 @@ class Index extends Component{

只有企业所有人或拥有权限的企业成员才能看到

- this.props.onCancel()}>取消 + 取消
diff --git a/public/react/src/forge/Order/Nav.js b/public/react/src/forge/Order/Nav.js new file mode 100644 index 000000000..6afd7043e --- /dev/null +++ b/public/react/src/forge/Order/Nav.js @@ -0,0 +1,14 @@ +import React , { Component } from "react"; +import { Link } from 'react-router-dom'; +import './order.css' +class Nav extends Component{ + render(){ + return( +

+ 标签 + 里程 +

+ ) + } +} +export default Nav; \ No newline at end of file diff --git a/public/react/src/forge/Order/New.js b/public/react/src/forge/Order/New.js new file mode 100644 index 000000000..1eb00657f --- /dev/null +++ b/public/react/src/forge/Order/New.js @@ -0,0 +1,16 @@ +import React , { Component } from "react"; + +import Nav from './Nav'; + +class New extends Component{ + render(){ + return( +
+
+
+
+ ) + } +} +export default New; \ No newline at end of file diff --git a/public/react/src/forge/Order/order.css b/public/react/src/forge/Order/order.css index 41d2584ed..b5fce2185 100644 --- a/public/react/src/forge/Order/order.css +++ b/public/react/src/forge/Order/order.css @@ -28,7 +28,7 @@ } .topWrapper_btn { background: #21ba45; - color: #FFFFFF; + color: #FFFFFF!important; padding:0px 12px; text-align: center; height: 32px; diff --git a/public/react/src/forge/Order/order.js b/public/react/src/forge/Order/order.js index f19f8f048..7fffee83b 100644 --- a/public/react/src/forge/Order/order.js +++ b/public/react/src/forge/Order/order.js @@ -3,15 +3,12 @@ import {Link} from 'react-router-dom'; import { Input ,Dropdown , Menu , Icon } from 'antd'; import './order.css'; +import Nav from './Nav'; + import axios from 'axios'; const Search = Input.Search; -const tagList= ['release','test']; -const typeList= ['普通','悬赏']; -const categoryList=['缺陷','支持','任务','功能','周报']; -const levelList=['低','正常','高','紧急','立刻']; -const percentList=['0%','10%','20%','30%','40%','50%','60%','70%','80%','90%','100%']; class order extends Component{ constructor(props){ super(props); @@ -79,10 +76,7 @@ class order extends Component{ return(
-

- 标签 - 里程 -

+