From b4e2c6148afdb25f22377bbcda41253d3ea47582 Mon Sep 17 00:00:00 2001
From: caishi <c_15243705227@sina.com>
Date: Wed, 10 Nov 2021 15:07:39 +0800
Subject: [PATCH] logo and issues

---
 src/forge/Head/Header.js            |  10 ++++++++--
 src/forge/Head/img/logo.png         | Bin 0 -> 2692 bytes
 src/forge/Order/MilepostDetail.js   |  15 ++++++++++++---
 src/forge/Order/OrderItem.js        |   2 +-
 src/forge/SecuritySetting/Index.jsx |   8 +++++++-
 5 files changed, 28 insertions(+), 7 deletions(-)
 create mode 100644 src/forge/Head/img/logo.png

diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js
index 50a12943..8e496d80 100644
--- a/src/forge/Head/Header.js
+++ b/src/forge/Head/Header.js
@@ -3,7 +3,7 @@ import AccountProfile from "../../modules/user/AccountProfile";
 import { getImageUrl } from 'educoder'
 import axios from 'axios';
 import cookie from 'react-cookies';
-import { Input , notification , Dropdown ,Popover, Menu,Badge, Button } from 'antd';
+import { notification , Dropdown ,Popover, Menu,Badge } from 'antd';
 import { Link } from 'react-router-dom';
 
 import LoginDialog from '../../modules/login/LoginDialog';
@@ -15,7 +15,7 @@ import CheckProfile from '../Component/ProfileModal/Profile';
 
 import './header.scss';
 import NoticeContent from './NoticeContent';
-const $ = window.$
+import MainLogo from './img/logo.png';
 // TODO 这部分脚本从公共脚本中直接调用
 let old_url;
 
@@ -387,6 +387,12 @@ class NewHeader extends Component {
               {...this.props}
               {...this.state}
             /> : ""}
+            {
+              publicNav &&
+              <a href={settings && settings.new_course.default_url} className={"fl pr15"}>
+                <img src={MainLogo} alt="" style={{ heigth: "40px" }}/>
+              </a>
+            }
             {
               settings && settings.nav_logo_url ?
               <a href={settings && settings.new_course.default_url} className={"fl mr50"} style={{minWidth:"45px"}}>
diff --git a/src/forge/Head/img/logo.png b/src/forge/Head/img/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab71a10e82ebb1ceed327f12c7a8aa8dc91c8f83
GIT binary patch
literal 2692
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

literal 0
HcmV?d00001

diff --git a/src/forge/Order/MilepostDetail.js b/src/forge/Order/MilepostDetail.js
index 0f5d191e..f56945ca 100644
--- a/src/forge/Order/MilepostDetail.js
+++ b/src/forge/Order/MilepostDetail.js
@@ -211,7 +211,7 @@ class MilepostDetail extends Component {
 
     const { issue_chosen, issues, limit, page, search_count, data, isSpin , status_type } = this.state;
     const { projectsId, meilid ,owner} = this.props.match.params;
-
+    const { current_user , showLoginDialog , projectDetail } = this.props;
     const menu = (
       <Menu onClick={(e) => this.getOption(e)}>
         <Menu.Item key={'created_on'} value="desc">最新创建</Menu.Item>
@@ -239,8 +239,17 @@ class MilepostDetail extends Component {
               <span className="font-weight-bold">{data && data.percent && data.percent.toFixed(2)}%完成 </span>
             </span>
             <div className="milepostdiv">
-              <Link to={`/${owner}/${projectsId}/milestones/${meilid}/edit`} className="topWrapper_btn" style={{ marginRight: 15 }} >编辑里程碑</Link>
-              <CheckProfile {...this.props} sureFunc={()=>{this.props.history.push(`/${owner}/${projectsId}/issues/${meilid}/new`)}} className="topWrapper_btn">创建易修</CheckProfile>
+              {
+                (current_user && current_user.login) && ( projectDetail && projectDetail.permission && projectDetail.permission !== "Reporter") ?
+                <Link to={`/${owner}/${projectsId}/milestones/${meilid}/edit`} className="topWrapper_btn" style={{ marginRight: 15 }} >编辑里程碑</Link>
+                :""
+              }
+              {
+                current_user && current_user.login ?
+                <CheckProfile {...this.props} sureFunc={()=>{this.props.history.push(`/${owner}/${projectsId}/issues/${meilid}/new`)}} className="topWrapper_btn">创建易修</CheckProfile>
+                :
+                <a className="topWrapper_btn" onClick={showLoginDialog}>创建易修</a>
+              }
             </div>
           </FlexAJ>
         </div>
diff --git a/src/forge/Order/OrderItem.js b/src/forge/Order/OrderItem.js
index 08178864..b3b02ba4 100644
--- a/src/forge/Order/OrderItem.js
+++ b/src/forge/Order/OrderItem.js
@@ -52,7 +52,7 @@ class OrderItem extends Component {
         {current_user && current_user.login && checkbox}
         <div className="flex-1">
           <p className="mb10 df" style={{alignItems:"center"}}>
-            <Link to={`/${owner}/${projectsId}/issues/${item.id}`} target="_blank" title={item.name} className="hide-1 font-16 color-grey-3 lineh-30 mr10" style={{maxWidth:"370px"}}>{item.name}</Link>
+            <Link to={`/${owner}/${projectsId}/issues/${item.id}`} title={item.name} className="hide-1 font-16 color-grey-3 lineh-30 mr10" style={{maxWidth:"370px"}}>{item.name}</Link>
             {TagInfo(item.priority,"mr10")}
           </p>
           <p className="color-grey-6 font-12">
diff --git a/src/forge/SecuritySetting/Index.jsx b/src/forge/SecuritySetting/Index.jsx
index d9fa1bfa..4f47b33c 100644
--- a/src/forge/SecuritySetting/Index.jsx
+++ b/src/forge/SecuritySetting/Index.jsx
@@ -13,6 +13,7 @@ import { getImageUrl } from 'educoder';
 import { Link } from 'react-router-dom';
 
 import './Index.scss';
+import { useEffect } from "react";
 
 const MyNoticeIndex = Loadable({
   loader: () => import("./notice/myNotice/Index"),
@@ -43,10 +44,15 @@ const PrivateLetter = Loadable({
 });
 
 function Index(props){
-  const { current_user,mygetHelmetapi } = props;
+  const { current_user,mygetHelmetapi , checkIfLogin } = props;
   const { pathname } = props.location;
   const notice_url = mygetHelmetapi && mygetHelmetapi.common && mygetHelmetapi.common.notice;
 
+  useEffect(()=>{
+    if(checkIfLogin() === false){
+      props.history.push('/login');
+    }
+  },[])
   return(
     <div className="newMain clearfix whiteBack">
       <div className="boies">