From b1243642039b62102ba90ccecdb51f1a38bd18f7 Mon Sep 17 00:00:00 2001
From: hucong <1422588487@qq.com>
Date: Mon, 1 Nov 2021 14:40:41 +0800
Subject: [PATCH 01/10] =?UTF-8?q?pr=E4=B8=AD=E7=94=A8=E6=88=B7=E5=90=8D?=
=?UTF-8?q?=E7=A7=B0=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/forge/Merge/MergeItem.js | 10 +++++-----
src/forge/Merge/MessageCount.js | 6 +++---
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js
index 61477c142..3e88eeb93 100644
--- a/src/forge/Merge/MergeItem.js
+++ b/src/forge/Merge/MergeItem.js
@@ -112,9 +112,9 @@ class MergeItem extends Component {
to={`/${item.is_original ? item.fork_project_user : owner}/${ item.is_original ? item.fork_project_identifier : projectsId }/tree/${turnbar(item.pull_request_head)}`}
className="maxW200px task-hide ver-middle" style={{maxWidth:"200px"}}
>
- {item.is_original
- ? item.fork_project_user
- : project_author_name}
+ {item.is_fork
+ ? item.pull_request_base
+ : item.author_name}
:{item.pull_request_head}
@@ -136,8 +136,8 @@ class MergeItem extends Component {
to={`/${owner}/${projectsId}/tree/${turnbar(item.pull_request_base)}`}
className="maxW200px task-hide ver-middle" style={{maxWidth:"200px"}}
>
- {/* {item.is_fork ? item.pull_request_base : `${item.author_name}:${item.pull_request_base}`} */}
- {project_author_name}:{item.pull_request_base}
+ {item.is_fork ? item.pull_request_base : `${item.author_name}:${item.pull_request_base}`}
+ {/* {project_author_name}:{item.pull_request_base} */}
}
diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js
index 6d01e8a37..d7f665dd3 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -365,10 +365,10 @@ class MessageCount extends Component {
- {data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}: {data.pull_request && data.pull_request.head}
+ {data.pull_request.is_fork ? data.pull_request_base.fork_project_user : data.issue.author_name}: {data.pull_request && data.pull_request.head}
@@ -383,7 +383,7 @@ class MessageCount extends Component {
to={`/${owner}/${projectsId}/tree/${data.pull_request.base}`}
className="ver-middle task-hide" style={{maxWidth:"200px"}} title={`${data.issue.project_author_name}:${data.pull_request.base}`}
>
- {data.issue.project_author_name}:{data.pull_request.base}
+ {data.issue.author_name}:{data.pull_request.base}
From 010edf3cb2ddded5d372adaada660d771fc577dc Mon Sep 17 00:00:00 2001
From: hucong <1422588487@qq.com>
Date: Fri, 5 Nov 2021 18:31:14 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E7=9B=AE=E5=BD=95=E8=B7=B3=E8=BD=AC?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/forge/Main/sub/ReadmeCatelogue.jsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/forge/Main/sub/ReadmeCatelogue.jsx b/src/forge/Main/sub/ReadmeCatelogue.jsx
index 6dab7d792..754f3cc22 100644
--- a/src/forge/Main/sub/ReadmeCatelogue.jsx
+++ b/src/forge/Main/sub/ReadmeCatelogue.jsx
@@ -36,7 +36,7 @@ function ReadmeCatelogue({ menuList , hash }) {
{
menu && menu.length>0?
-
+
{
menu.map((item,key)=>{
return(
From e04fb111943a13695a4440ca60e5eb6c16c0fe38 Mon Sep 17 00:00:00 2001
From: hucong <1422588487@qq.com>
Date: Fri, 5 Nov 2021 19:03:24 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E7=9B=AE=E5=BD=95=E8=B7=B3=E8=BD=AC?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/forge/Main/CoderDepotReadme.jsx | 3 +--
src/forge/Main/sub/ReadmeCatelogue.jsx | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/forge/Main/CoderDepotReadme.jsx b/src/forge/Main/CoderDepotReadme.jsx
index 315f70805..96c9b05ae 100644
--- a/src/forge/Main/CoderDepotReadme.jsx
+++ b/src/forge/Main/CoderDepotReadme.jsx
@@ -41,7 +41,7 @@ function CoderDepotReadme({ operate , history , readme , ChangeFile }){
return(
-
+
@@ -64,7 +64,6 @@ function CoderDepotReadme({ operate , history , readme , ChangeFile }){
{
- content &&
diff --git a/src/forge/Main/sub/ReadmeCatelogue.jsx b/src/forge/Main/sub/ReadmeCatelogue.jsx
index 754f3cc22..25af450a0 100644
--- a/src/forge/Main/sub/ReadmeCatelogue.jsx
+++ b/src/forge/Main/sub/ReadmeCatelogue.jsx
@@ -36,7 +36,7 @@ function ReadmeCatelogue({ menuList , hash }) {
{
menu && menu.length>0?
-
+
{
menu.map((item,key)=>{
return(
From 12d8f5bf5ddfc0ce39b1a01bc6fea74b1a18c4a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Mon, 8 Nov 2021 13:29:12 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E7=99=BB=E9=99=86=E6=B3=A8=E5=86=8C?=
=?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/App.js | 27 +-
src/AppConfig.js | 4 +-
src/forge/Head/Header.js | 18 +-
src/modules/login/LoginDialog.js | 12 +-
src/modules/login/educoder.png | Bin 17393 -> 5799 bytes
src/modules/loginRegister/Login.jsx | 139 ++++++++
.../loginRegister/LoginRegisterPage.jsx | 30 ++
.../loginRegister/LoginRegisterPage.scss | 237 +++++++++++++
src/modules/loginRegister/Register.jsx | 312 ++++++++++++++++++
src/modules/loginRegister/ResetPassword.jsx | 252 ++++++++++++++
src/modules/loginRegister/img/ball.png | Bin 0 -> 46419 bytes
src/modules/loginRegister/img/banner.png | Bin 0 -> 260733 bytes
src/modules/loginRegister/img/bg.png | Bin 0 -> 544745 bytes
src/modules/loginRegister/img/contBg.png | Bin 0 -> 384720 bytes
src/modules/loginRegister/img/img1.png | Bin 0 -> 33077 bytes
src/modules/loginRegister/img/img2.png | Bin 0 -> 39635 bytes
src/modules/loginRegister/img/loginBg.png | Bin 0 -> 279951 bytes
src/modules/loginRegister/img/logo.png | Bin 0 -> 25051 bytes
src/modules/loginRegister/img/registerBg.png | Bin 0 -> 397410 bytes
.../loginRegister/img/resetPasswordBg.png | Bin 0 -> 321195 bytes
src/modules/loginRegister/img/rightBg.png | Bin 0 -> 229620 bytes
21 files changed, 1018 insertions(+), 13 deletions(-)
create mode 100644 src/modules/loginRegister/Login.jsx
create mode 100644 src/modules/loginRegister/LoginRegisterPage.jsx
create mode 100644 src/modules/loginRegister/LoginRegisterPage.scss
create mode 100644 src/modules/loginRegister/Register.jsx
create mode 100644 src/modules/loginRegister/ResetPassword.jsx
create mode 100644 src/modules/loginRegister/img/ball.png
create mode 100644 src/modules/loginRegister/img/banner.png
create mode 100644 src/modules/loginRegister/img/bg.png
create mode 100644 src/modules/loginRegister/img/contBg.png
create mode 100644 src/modules/loginRegister/img/img1.png
create mode 100644 src/modules/loginRegister/img/img2.png
create mode 100644 src/modules/loginRegister/img/loginBg.png
create mode 100644 src/modules/loginRegister/img/logo.png
create mode 100644 src/modules/loginRegister/img/registerBg.png
create mode 100644 src/modules/loginRegister/img/resetPasswordBg.png
create mode 100644 src/modules/loginRegister/img/rightBg.png
diff --git a/src/App.js b/src/App.js
index 3072aca5b..ae698ffbb 100644
--- a/src/App.js
+++ b/src/App.js
@@ -97,13 +97,17 @@ const ProjectIndex = Loadable({
loading: Loading,
});
+const LoginRegisterPage = Loadable({
+ loader: () => import("./modules/loginRegister/LoginRegisterPage"),
+ loading: Loading,
+});
// const CreateMerge = Loadable({
// loader: () => import('./forge/Merge/NewMerge'),
// loading: Loading,
// })
// 此处仅维护前端可能的一级路由,不用进行项目或者组织判断的字段。
-const keyWord = ["explore", "settings", "setting", "mulan", "wiki", "issues", "setting", "trending", "code", "projects", "pulls", "mine", "login", "register", "email", "export", "nopage", "404", "403", "500", "501", "search", "organize"];
+const keyWord = ["explore", "settings", "setting", "mulan", "wiki", "issues", "setting", "trending", "code", "projects", "pulls", "mine", "login", "register", "email", "export", "nopage", "404", "403", "500", "501", "search", "organize","login","register","resetPassword"];
class App extends Component {
constructor(props) {
@@ -303,14 +307,14 @@ class App extends Component {
}>
- {
return ()
}
}
- />
+ /> */}
{/*403*/}
@@ -330,7 +334,24 @@ class App extends Component {
}
/>
+ {/* 登录 */}
+ }
+ >
+
+ {/* 注册 */}
+ }
+ >
+ {/* 忘记密码 */}
+ }
+ >
+
{/* 组织 */}
{
+ console.log('111',window.location.pathname);
//登录账号
- this.setState({
- isRender: true
- })
+ if(window.location.pathname === "/"){
+ window.location.href="/login";
+ }else{
+ this.setState({
+ isRender: true
+ })
+ }
}
educoderloginysl = () => {
+ //退出账号时清除登录页面的下次自动登录(用户再次打开登录页面时下次自动登录框不勾选)
+ cookie.remove("autologin");
//退出账号
var url = `/accounts/logout.json`;
axios.get((url)).then((result) => {
@@ -367,6 +375,7 @@ class NewHeader extends Component {
}
let search_url = settings && settings.common && settings.common.search;
+ console.log('Header.js',this.props)
return (