From a2c5c1ea6f0187d433a5f5fd55aed68b515bd1d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Mon, 18 Oct 2021 16:54:16 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/SecuritySetting/Index.jsx           |  26 ++--
 .../SecuritySetting/notice/manager/Index.jsx  | 130 +++++++-----------
 2 files changed, 59 insertions(+), 97 deletions(-)

diff --git a/src/forge/SecuritySetting/Index.jsx b/src/forge/SecuritySetting/Index.jsx
index f897dea1..d9fa1bfa 100644
--- a/src/forge/SecuritySetting/Index.jsx
+++ b/src/forge/SecuritySetting/Index.jsx
@@ -63,7 +63,7 @@ function Index(props){
             {notice_url && <ul className="securityUl ul-border-buttom">
               <li>消息通知</li>
               <li className={(pathname.indexOf("/settings/notice")>-1 && pathname.indexOf("/settings/notice/config") == -1) || pathname.indexOf("/settings/notice/privateLetter")>-1 ?"active":""}><Link to={"/settings/notice"}><i className="iconfont icon-wodetongzhi"></i><span className="text-shodow-bold">我的通知</span></Link></li>
-              {/* <li className={pathname.indexOf("/settings/notice/config")>-1 ?"active":""}><Link to={'/settings/notice/config'}><i className="iconfont icon-tongzhiguanli"></i><span className="text-shodow-bold">通知管理</span></Link></li> */}
+              <li className={pathname.indexOf("/settings/notice/config")>-1 ?"active":""}><Link to={'/settings/notice/config'}><i className="iconfont icon-tongzhiguanli"></i><span className="text-shodow-bold">通知管理</span></Link></li>
             </ul>}
             <ul className="securityUl">
               <li>安全设置</li>
@@ -73,18 +73,24 @@ function Index(props){
           <LongWidth>
             <Gap>
               <Switch>
-                <Route
-                  path="/settings/notice"
-                  render={(p) => (
-                    <MyNoticeIndex {...props} {...p}/>
-                  )}
-                ></Route>
                 <Route
                   path="/settings/notice/config"
                   render={(p) => (
                     <NoticeManager {...props} {...p}/>
                   )}
                 ></Route>
+                <Route
+                  path="/settings/notice/privateLetter"
+                  render={(p)=>(
+                    <PrivateLetter{...props} {...p}/>
+                  )}
+                ></Route>
+                <Route
+                  path="/settings/notice"
+                  render={(p) => (
+                    <MyNoticeIndex {...props} {...p}/>
+                  )}
+                ></Route>
                 <Route
                   path="/settings/SSH/new"
                   render={(p) => (
@@ -103,12 +109,6 @@ function Index(props){
                     <SSHIndex {...props} {...p}/>
                   )}
                 ></Route>
-                <Route
-                  path="/settings/notice/privateLetter"
-                  render={(p)=>(
-                    <PrivateLetter{...props} {...p}/>
-                  )}
-                ></Route>
               </Switch>
             </Gap>
           </LongWidth>
diff --git a/src/forge/SecuritySetting/notice/manager/Index.jsx b/src/forge/SecuritySetting/notice/manager/Index.jsx
index ebe84bea..da1aac8d 100644
--- a/src/forge/SecuritySetting/notice/manager/Index.jsx
+++ b/src/forge/SecuritySetting/notice/manager/Index.jsx
@@ -1,10 +1,36 @@
-import { Button, Checkbox } from "antd";
-import React from "react";
-
+import { Checkbox } from "antd";
+import React, { useEffect, useState } from "react";
+import axios from 'axios';
 import './Index.scss';
 
 function NoticeManager(props){
+  const {current_user} = props;
 
+  const [settingTypes, setSettingTypes] = useState();
+  const [userNotification, setUserNotification] = useState();
+  const [userEmail, setUserEmail] = useState();
+
+  function getUserSettings(){
+    axios.get(`/users/${current_user.login}/template_message_settings.json`).then((response)=>{
+      if(response && response.status === 200 ){
+        setUserEmail(response.data.email_body);
+        setUserNotification(response.data.notification_body);
+      }
+    })
+  }
+
+  useEffect(()=>{
+    axios.get("/template_message_settings.json").then((response)=>{
+      if(response && response.status === 200 ){
+        setSettingTypes(response.data.setting_types);
+      }
+    })
+    getUserSettings();
+  },[])
+
+  console.log('settingTypes',settingTypes);
+  console.log('userNotification',userNotification,'userEmail',userEmail);
+  console.log(userNotification.ins)
   return(
     <div className="notice01">
       <div className="sshHead">
@@ -12,87 +38,23 @@ function NoticeManager(props){
       </div>
       <div>
         <span className="notice-manager-tip">您可以通过通知管理来选择接受通知的方式</span>
-        <div className="manager-cont-top">
-          我创建或负责的
-        </div>
-        <div className="manager-cont">
-          <div className="manager-cont-title">易修状态变更</div>
-          <Checkbox defaultChecked='true' disabled>站内信</Checkbox>
-          <Checkbox >邮件</Checkbox>
-        </div>
-        <div className="manager-cont">
-          <div className="manager-cont-title">易修截止日期到达最后一天</div>
-          <Checkbox defaultChecked='true' disabled>站内信</Checkbox>
-          <Checkbox >邮件</Checkbox>
-        </div>
-        <div className="manager-cont">
-          <div className="manager-cont-title">合并请求状态变更</div>
-          <Checkbox defaultChecked='true' disabled>站内信</Checkbox>
-          <Checkbox >邮件</Checkbox>
-        </div>
-        <div className="manager-cont">
-          <div className="manager-cont-title">易修有新的评论</div>
-          <Checkbox defaultChecked='true'>站内信</Checkbox>
-          <Checkbox >邮件</Checkbox>
-        </div>
-        <div className="manager-cont">
-          <div className="manager-cont-title">合并请求有新的评论</div>
-          <Checkbox defaultChecked='true'>站内信</Checkbox>
-          <Checkbox >邮件</Checkbox>
-        </div>
-
-        <div className="manager-cont-top">
-          我管理的仓库
-        </div>
-        <div className="manager-cont">
-          <div className="manager-cont-title">被关注</div>
-          <Checkbox defaultChecked='true'>站内信</Checkbox>
-          <Checkbox >邮件</Checkbox>
-        </div>
-        <div className="manager-cont">
-          <div className="manager-cont-title">被点赞</div>
-          <Checkbox defaultChecked='true'>站内信</Checkbox>
-          <Checkbox >邮件</Checkbox>
-        </div>
-        <div className="manager-cont">
-          <div className="manager-cont-title">被复刻</div>
-          <Checkbox defaultChecked='true'>站内信</Checkbox>
-          <Checkbox >邮件</Checkbox>
-        </div>
-        <div className="manager-cont">
-          <div className="manager-cont-title">有新的里程碑</div>
-          <Checkbox defaultChecked='true'>站内信</Checkbox>
-          <Checkbox >邮件</Checkbox>
-        </div>
-
-        <div className="manager-cont-top">
-          我关注的仓库
-        </div>
-        <div className="manager-cont">
-          <div className="manager-cont-title">被删除</div>
-          <Checkbox defaultChecked='true'>站内信</Checkbox>
-          <Checkbox >邮件</Checkbox>
-        </div>
-        <div className="manager-cont">
-          <div className="manager-cont-title">被转移</div>
-          <Checkbox defaultChecked='true'>站内信</Checkbox>
-          <Checkbox >邮件</Checkbox>
-        </div>
-        <div className="manager-cont">
-          <div className="manager-cont-title">有新的易修</div>
-          <Checkbox defaultChecked='true'>站内信</Checkbox>
-          <Checkbox >邮件</Checkbox>
-        </div>
-        <div className="manager-cont">
-          <div className="manager-cont-title">有新的合并请求</div>
-          <Checkbox defaultChecked='true'>站内信</Checkbox>
-          <Checkbox >邮件</Checkbox>
-        </div>
-        <div className="manager-cont">
-          <div className="manager-cont-title">有新的版本发布</div>
-          <Checkbox defaultChecked='true'>站内信</Checkbox>
-          <Checkbox >邮件</Checkbox>
-        </div>
+        {settingTypes && settingTypes.map((item,key)=>{
+          return(
+            item.type_name && <div>
+              <div className="manager-cont-top">{item.type_name}</div>
+              {item.settings.map((i, k) => {
+                console.log(userNotification.get(item.type.substring(item.type.indexOf("::")+2)+"::"+i.key));
+                return (
+                  <div className="manager-cont">
+                    <div className="manager-cont-title">{i.name}</div>
+                    <Checkbox defaultChecked='true' disabled = {i.notification_disabled}>站内信</Checkbox>
+                    <Checkbox disabled = {i.email_disabled}>邮件</Checkbox>
+                  </div>
+                )
+              })}
+            </div>
+          )
+        })}
       </div>
     </div>
   )

From 11b92ac52bce6a93bd8d0a20ded2687febf0513d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Tue, 19 Oct 2021 09:00:00 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/SecuritySetting/notice/manager/Index.jsx | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/forge/SecuritySetting/notice/manager/Index.jsx b/src/forge/SecuritySetting/notice/manager/Index.jsx
index da1aac8d..d45dc371 100644
--- a/src/forge/SecuritySetting/notice/manager/Index.jsx
+++ b/src/forge/SecuritySetting/notice/manager/Index.jsx
@@ -30,7 +30,6 @@ function NoticeManager(props){
 
   console.log('settingTypes',settingTypes);
   console.log('userNotification',userNotification,'userEmail',userEmail);
-  console.log(userNotification.ins)
   return(
     <div className="notice01">
       <div className="sshHead">
@@ -43,12 +42,12 @@ function NoticeManager(props){
             item.type_name && <div>
               <div className="manager-cont-top">{item.type_name}</div>
               {item.settings.map((i, k) => {
-                console.log(userNotification.get(item.type.substring(item.type.indexOf("::")+2)+"::"+i.key));
+                // console.log(userEmail[item.type.substring(item.type.indexOf("::")+2)+"::"+i.key]);
                 return (
                   <div className="manager-cont">
                     <div className="manager-cont-title">{i.name}</div>
-                    <Checkbox defaultChecked='true' disabled = {i.notification_disabled}>站内信</Checkbox>
-                    <Checkbox disabled = {i.email_disabled}>邮件</Checkbox>
+                    <Checkbox defaultChecked='true' defaultChecked = {i.notification_disabled} checked={userNotification[item.type.substring(item.type.indexOf("::")+2)+"::"+i.key]}>站内信</Checkbox>
+                    <Checkbox disabled = {i.email_disabled} defaultChecked={userEmail[item.type.substring(item.type.indexOf("::")+2)+"::"+i.key]}>邮件</Checkbox>
                   </div>
                 )
               })}

From fe1bacb98417a88453e9b72f48e48b462133716b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Tue, 19 Oct 2021 10:26:36 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E7=AE=A1=E7=90=86+?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=9F=BA=E6=9C=AC=E8=B5=84=E6=96=99=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84consolo=E8=AF=AD=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SecuritySetting/notice/manager/Index.jsx  | 46 +++++++++++--------
 src/forge/users/Material/Base.jsx             |  1 -
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/src/forge/SecuritySetting/notice/manager/Index.jsx b/src/forge/SecuritySetting/notice/manager/Index.jsx
index d45dc371..ca16f25e 100644
--- a/src/forge/SecuritySetting/notice/manager/Index.jsx
+++ b/src/forge/SecuritySetting/notice/manager/Index.jsx
@@ -10,26 +10,36 @@ function NoticeManager(props){
   const [userNotification, setUserNotification] = useState();
   const [userEmail, setUserEmail] = useState();
 
-  function getUserSettings(){
+  function onChange(type,e,setting){
+    let notification_body = userNotification;
+    let email_body = userEmail;
+    if(type){//站内信
+      notification_body[setting] = e.target.checked;
+    }else{//邮件
+      email_body[setting] = e.target.checked;
+    }
+    axios.post(`/users/${current_user.login}/template_message_settings/update_setting.json`,{
+      setting:{
+        notification_body:notification_body,
+        email_body:email_body
+      }
+    })
+  }
+
+  useEffect(()=>{
+    axios.get("/template_message_settings.json").then(response => {
+      if (response && response.status === 200) {
+        setSettingTypes(response.data.setting_types);
+      }
+    })
     axios.get(`/users/${current_user.login}/template_message_settings.json`).then((response)=>{
       if(response && response.status === 200 ){
         setUserEmail(response.data.email_body);
         setUserNotification(response.data.notification_body);
       }
     })
-  }
-
-  useEffect(()=>{
-    axios.get("/template_message_settings.json").then((response)=>{
-      if(response && response.status === 200 ){
-        setSettingTypes(response.data.setting_types);
-      }
-    })
-    getUserSettings();
   },[])
 
-  console.log('settingTypes',settingTypes);
-  console.log('userNotification',userNotification,'userEmail',userEmail);
   return(
     <div className="notice01">
       <div className="sshHead">
@@ -37,17 +47,17 @@ function NoticeManager(props){
       </div>
       <div>
         <span className="notice-manager-tip">您可以通过通知管理来选择接受通知的方式</span>
-        {settingTypes && settingTypes.map((item,key)=>{
+        {settingTypes && userNotification && userEmail && settingTypes.map((item,key)=>{
           return(
-            item.type_name && <div>
+            item.type_name && <div key={key}>
               <div className="manager-cont-top">{item.type_name}</div>
               {item.settings.map((i, k) => {
-                // console.log(userEmail[item.type.substring(item.type.indexOf("::")+2)+"::"+i.key]);
+                const setting = item.type.substring(item.type.indexOf("::")+2)+"::"+i.key;
                 return (
-                  <div className="manager-cont">
+                  <div className="manager-cont" key={k}>
                     <div className="manager-cont-title">{i.name}</div>
-                    <Checkbox defaultChecked='true' defaultChecked = {i.notification_disabled} checked={userNotification[item.type.substring(item.type.indexOf("::")+2)+"::"+i.key]}>站内信</Checkbox>
-                    <Checkbox disabled = {i.email_disabled} defaultChecked={userEmail[item.type.substring(item.type.indexOf("::")+2)+"::"+i.key]}>邮件</Checkbox>
+                    <Checkbox disabled = {i.notification_disabled} defaultChecked={userNotification[setting]} onChange={(e)=>{onChange(true,e,setting)}}>站内信</Checkbox>
+                    <Checkbox disabled = {i.email_disabled} defaultChecked={userEmail[setting]} onChange={(e)=>{onChange(false,e,setting)}}>邮件</Checkbox>
                   </div>
                 )
               })}
diff --git a/src/forge/users/Material/Base.jsx b/src/forge/users/Material/Base.jsx
index f9707ab0..61a9d6f1 100644
--- a/src/forge/users/Material/Base.jsx
+++ b/src/forge/users/Material/Base.jsx
@@ -11,7 +11,6 @@ export default Form.create()(
     const { getFieldDecorator, validateFields , setFieldsValue } = props && props.form;
     // const { username } = props && props.match && props.match.params;
     const { resetUserInfo , current_user } = props;
-    console.log(props);
 
     useEffect(()=>{
       if(current_user && current_user.login){

From 31af77e7040670d30877d24976186f38b960f788 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Tue, 19 Oct 2021 10:45:15 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SecuritySetting/notice/manager/Index.jsx  | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/forge/SecuritySetting/notice/manager/Index.jsx b/src/forge/SecuritySetting/notice/manager/Index.jsx
index ca16f25e..5ba82d60 100644
--- a/src/forge/SecuritySetting/notice/manager/Index.jsx
+++ b/src/forge/SecuritySetting/notice/manager/Index.jsx
@@ -23,6 +23,19 @@ function NoticeManager(props){
         notification_body:notification_body,
         email_body:email_body
       }
+    }).then(response=>{
+      if(response && response.status === 0){
+        getUserSettings();
+      }
+    })
+  }
+
+  function getUserSettings(){
+    axios.get(`/users/${current_user.login}/template_message_settings.json`).then((response)=>{
+      if(response && response.status === 200 ){
+        setUserEmail(response.data.email_body);
+        setUserNotification(response.data.notification_body);
+      }
     })
   }
 
@@ -32,12 +45,7 @@ function NoticeManager(props){
         setSettingTypes(response.data.setting_types);
       }
     })
-    axios.get(`/users/${current_user.login}/template_message_settings.json`).then((response)=>{
-      if(response && response.status === 200 ){
-        setUserEmail(response.data.email_body);
-        setUserNotification(response.data.notification_body);
-      }
-    })
+    getUserSettings();
   },[])
 
   return(

From cc62bde5b48dd34e5dc330c301e1acc24fb7cdd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Thu, 21 Oct 2021 11:02:15 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=20=E6=8F=90=E4=BA=A4=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=A4=9A=E8=A1=8C=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Main/list.scss | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/forge/Main/list.scss b/src/forge/Main/list.scss
index 83b4d5ee..59589fb6 100644
--- a/src/forge/Main/list.scss
+++ b/src/forge/Main/list.scss
@@ -734,7 +734,9 @@ a.color-grey-ccc:hover{
       border: 1px solid rgba(42, 97, 255, 0.23);
       border-radius: 4px;
       margin-left: 16px;
-      align-items: center;
+      & .treecopy{
+        margin-top: 20px;
+      }
       & .markdown-body table{
         background: #FAFCFF;
       }