[TOC]
", getTocContent()) cleanToc() } + // 循环匹配所有emoji let matchStr = str.match(strRegexSub); if(matchStr && matchStr.length>0){ for(var i=0;i < matchStr.length;i++){ diff --git a/src/forge/Account/Index.jsx b/src/forge/Account/Index.jsx new file mode 100644 index 000000000..18087d324 --- /dev/null +++ b/src/forge/Account/Index.jsx @@ -0,0 +1,38 @@ +import React , { useState } from 'react'; +import './index.scss'; +import logo from './image/logo.png'; +import { Menu } from 'antd'; +import Bind from './bind'; +import UnBind from './unbind'; + +function Index(props){ + const [ key , setKey ] = useState("0"); + + // 选择menu + function chooseMenuFunc(e){ + setKey(e.key) + } + return( +
+
+ )
+}
+export default Index;
\ No newline at end of file
diff --git a/src/forge/Account/bind.jsx b/src/forge/Account/bind.jsx
new file mode 100644
index 000000000..33453191b
--- /dev/null
+++ b/src/forge/Account/bind.jsx
@@ -0,0 +1,99 @@
+import React ,{ useState } from 'react';
+import { Form , Input , Button } from 'antd';
+import phone from './image/phone.svg';
+import lock from "./image/lock.png";
+import axios from 'axios';
+
+
+const phonereg = /^([1][3456789])\d{9}$/
+const emailreg = /^[a-zA-Z0-9]+([.\-_\\]*[a-zA-Z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/
+function Bind(props){
+ const { form } = props;
+
+ const { getFieldDecorator , getFieldsValue } = form;
+ const [ bindFlag , setBindFlag] = useState(true);
+ const type = props.match.params.type;
+
+ // 绑定登录
+ function bindloginFunc(){
+ const {username, password } = getFieldsValue();
+ if(username && password){
+ var url = '/bind_user.json';
+ axios.post(url,{
+ username,password,type
+ }).then(result=>{
+ if(result){
+ window.location.href = "/"+result.data.login;
+ }
+ })
+ }
+ }
+
+ function accountConfirm(r,v,c){
+ if(v){
+ const {password } = getFieldsValue();
+ if(!(phonereg.test(v) || emailreg.test(v))){
+ setBindFlag(true);
+ c(`请输入正确的手机号或邮箱地址`);
+ }else if(password){
+ setBindFlag(false);
+ }
+ }else{
+ c();
+ setBindFlag(true);
+ }
+ }
+ function psdConfirm(r,v,c){
+ if(v){
+ const { username } = getFieldsValue();
+ if(phonereg.test(username) || emailreg.test(username)){
+ setBindFlag(false);
+ }else{
+ setBindFlag(true);
+ }
+ }else{
+ c();
+ setBindFlag(true);
+ }
+ }
+ return(
+
+ 
+
+
+
+ 关联账号
+
+
+ {
+ key === "0" ?
+
+
+
+
+ )
+}
+export default Form.create({ name: 'Bind' })(Bind);
\ No newline at end of file
diff --git a/src/forge/Account/image/lock.png b/src/forge/Account/image/lock.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d5d27c2f6788dd40b7a26b81bd05e17d0c94ec3
GIT binary patch
literal 435
zcmV;k0ZjghP)
+
+
+ )
+}
+export default Form.create({ name: 'Bind' })(Bind);
\ No newline at end of file
diff --git a/src/forge/Main/CoderDepotReadme.jsx b/src/forge/Main/CoderDepotReadme.jsx
index 93d8b04c2..5e8bc3532 100644
--- a/src/forge/Main/CoderDepotReadme.jsx
+++ b/src/forge/Main/CoderDepotReadme.jsx
@@ -19,7 +19,6 @@ function CoderDepotReadme({ operate , history , readme , ChangeFile }){
},[readme])
useEffect(()=>{
- let path = history.location.pathname;
const items = $.map($("#readme").find("h1,h2,h3,h4,h5,h6"), function (el, _) {
const anchor = el.id;
const level = el.tagName.replace("H", "");
diff --git a/src/forge/Main/Index.scss b/src/forge/Main/Index.scss
index f17bc4805..a2ff111c4 100644
--- a/src/forge/Main/Index.scss
+++ b/src/forge/Main/Index.scss
@@ -521,7 +521,9 @@
}
}
}
-
+.readmeFile{
+ overflow: inherit;
+}
.readmeFile p{
white-space: normal;
}
\ No newline at end of file
From 7cf9e7b6f1f0bc4a85d6207803865f96c6d9be53 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Tue, 27 Dec 2022 14:18:46 +0800
Subject: [PATCH 02/10] =?UTF-8?q?update=20=E5=90=8C=E4=B8=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/App.js | 2 +-
src/forge/Account/bind.jsx | 3 +++
src/forge/Account/unbind.jsx | 7 ++++++-
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/App.js b/src/App.js
index 0d86e4341..b412c0e55 100644
--- a/src/App.js
+++ b/src/App.js
@@ -136,7 +136,7 @@ const WebIDE = Loadable({
// })
// 此处仅维护前端可能的一级路由，不用进行项目或者组织判断的字段。
-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", "aboutus","educoder", "glcc"];
+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", "aboutus","educoder", "glcc","bindlogin"];
class App extends Component {
constructor(props) {
diff --git a/src/forge/Account/bind.jsx b/src/forge/Account/bind.jsx
index 33453191b..aa009cb27 100644
--- a/src/forge/Account/bind.jsx
+++ b/src/forge/Account/bind.jsx
@@ -3,6 +3,7 @@ import { Form , Input , Button } from 'antd';
import phone from './image/phone.svg';
import lock from "./image/lock.png";
import axios from 'axios';
+import cookie from 'react-cookies';
const phonereg = /^([1][3456789])\d{9}$/
@@ -23,6 +24,8 @@ function Bind(props){
username,password,type
}).then(result=>{
if(result){
+ cookie.save("supplyphone",true);
+ cookie.save("login",result.data.login);
window.location.href = "/"+result.data.login;
}
})
diff --git a/src/forge/Account/unbind.jsx b/src/forge/Account/unbind.jsx
index 57db4d8e3..5bab356cc 100644
--- a/src/forge/Account/unbind.jsx
+++ b/src/forge/Account/unbind.jsx
@@ -5,6 +5,7 @@ import lock from "./image/lock.png";
import shield from './image/shield.png';
import phone from './image/phone.svg';
import axios from 'axios';
+import cookie from 'react-cookies';
import { setmiyah } from 'educoder';
const phonereg = /^([1][3456789])\d{9}$/
@@ -19,6 +20,7 @@ function Bind(props){
const [secondsStr, setSecondsStr] = useState(60);
const [ getCaptchaBut , setGetCaptchaBut ] = useState(true);
+ const type = props.match.params.type;
//判断用户名（username）是否注册
function usernameConfirm(rule, value, callback){
@@ -153,7 +155,8 @@ function Bind(props){
login: values.username,
password: values.password,
password_confirmation: values.confirm_password,
- code: values.captcha
+ code: values.captcha,
+ type
}).then(response=>{
if(response.data && response.data.status === -6){
//验证码不正确
@@ -161,6 +164,8 @@ function Bind(props){
}else if(response.data && response.data.status === 0){
//注册成功，页面跳转即可，注册后登录流程forge处理了
+ cookie.save("supplyphone",true);
+ cookie.save("login",response.data.login);
window.location.href = "/"+values.register_username;
}
})
From ef91e6ece94ef5b58148d689dd77fd3510e59094 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Thu, 29 Dec 2022 11:06:05 +0800
Subject: [PATCH 03/10] add
---
src/forge/users/Personal/Index.jsx | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/forge/users/Personal/Index.jsx b/src/forge/users/Personal/Index.jsx
index bff871d7c..4eaff92c2 100644
--- a/src/forge/users/Personal/Index.jsx
+++ b/src/forge/users/Personal/Index.jsx
@@ -12,13 +12,12 @@ function Personal(props){
const [ showedit , setShowEdit ] = useState(false);
const [ description ,setDescription ] = useState("");
const [ copyDescription ,setCopyDescription ] = useState("");
+ console.log(user);
useEffect(()=>{
- if(user && user.super_description){
- setDescription(user.super_description);
- setCopyDescription(user.super_description);
- setShowEdit(true);
- }
- },[user])
+ setDescription(user.super_description);
+ setCopyDescription(user.super_description);
+ setShowEdit(true);
+ },[user && user.super_description])
function onContentChange(value){
setDescription(value);
From acb87c7e09d579eddd96d73fedd8f673bd1f8ae9 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Fri, 30 Dec 2022 11:59:33 +0800
Subject: [PATCH 04/10] update
---
src/App.js | 2 +-
src/AppConfig.js | 4 +-
src/forge/Account/bind.jsx | 5 ++-
src/forge/Account/unbind.jsx | 66 +++++++++++++++++++++++++-----
src/forge/users/Personal/Index.jsx | 12 +++---
src/modules/login/LoginDialog.js | 4 +-
6 files changed, 70 insertions(+), 23 deletions(-)
diff --git a/src/App.js b/src/App.js
index b412c0e55..42f8bef51 100644
--- a/src/App.js
+++ b/src/App.js
@@ -159,7 +159,7 @@ class App extends Component {
const login = cookie.load("login");
let path = this.props.history.location.pathname;
- if(login && (path === "/login" || path === "/register" ||path === "/resetPassword" )){
+ if(login && (path === "/login" || path === "/register" || path === "/resetPassword" || path.indexOf("/bindlogin") >-1 )){
this.props.history.push(`/${login}`);
}
// 添加路由监听，决定组织还是个人
diff --git a/src/AppConfig.js b/src/AppConfig.js
index 74288bea1..e87c10bdf 100644
--- a/src/AppConfig.js
+++ b/src/AppConfig.js
@@ -26,7 +26,7 @@ if (isDev) {
}
debugType = window.location.search.indexOf('debug=t') !== -1 ? 'teacher' :
window.location.search.indexOf('debug=s') !== -1 ? 'student' :
- window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 'admin'
+ window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || ''
}
window._debugType = debugType;
export function initAxiosInterceptors(props) {
@@ -70,7 +70,7 @@ export function initAxiosInterceptors(props) {
if (response.data.status === -1) {
if (window.location.pathname.startsWith('/tasks/')) {
props.showSnackbar(response.data.message || '服务器异常，请联系管理员。')
- } else if(window.location.pathname.startsWith('/login') || window.location.pathname.startsWith('/register') || window.location.pathname.startsWith('/resetPassword')) {
+ } else if(window.location.pathname.startsWith('/login') || window.location.pathname.startsWith('/register') || window.location.pathname.startsWith('/resetPassword') || window.location.pathname.indexOf("/bindlogin/")>-1) {
return response;
} else {
notification.open({
diff --git a/src/forge/Account/bind.jsx b/src/forge/Account/bind.jsx
index aa009cb27..983c781b2 100644
--- a/src/forge/Account/bind.jsx
+++ b/src/forge/Account/bind.jsx
@@ -14,7 +14,6 @@ function Bind(props){
const { getFieldDecorator , getFieldsValue } = form;
const [ bindFlag , setBindFlag] = useState(true);
const type = props.match.params.type;
-
// 绑定登录
function bindloginFunc(){
const {username, password } = getFieldsValue();
@@ -23,10 +22,12 @@ function Bind(props){
axios.post(url,{
username,password,type
}).then(result=>{
- if(result){
+ if(result && result.data.status === 0){
cookie.save("supplyphone",true);
cookie.save("login",result.data.login);
window.location.href = "/"+result.data.login;
+ }else{
+ props.showNotification(result.data.message);
}
})
}
diff --git a/src/forge/Account/unbind.jsx b/src/forge/Account/unbind.jsx
index 5bab356cc..84232eaa1 100644
--- a/src/forge/Account/unbind.jsx
+++ b/src/forge/Account/unbind.jsx
@@ -49,29 +49,50 @@ function Bind(props){
setCaptchaFlag(true);
callback(`请输入正确的手机号或邮箱地址`);
}else{
- setCaptchaFlag(false);
- if(captcha && password && confirm_password && (password === confirm_password) && register_username){
- setBindFlag(false);
- }
+ axios.get(`/accounts/valid_email_and_phone.json`, {
+ params: {
+ login: value,
+ type: 1
+ }
+ }).then(response => {
+ if(response){
+ if (response.data.status === -2) {
+ callback(response.data.message);
+ } else {
+ setCaptchaFlag(false);
+ if(captcha && password && confirm_password && (password === confirm_password) && register_username){
+ setBindFlag(false);
+ }
+ }
+ callback();
+ }
+ })
}
- callback();
}else{
setBindFlag(true);
callback();
}
}
function psdConfirm(r,v,c){
- if(v){
+ if(!v){
+ setBindFlag(true);
+ c('请输入登录密码');
+ }else if(/(?!.*\s)(?!^[\u4e00-\u9fa5]+$)^.{8,16}$/.test(v)){
const { username , captcha , confirm_password , register_username } = getFieldsValue();
if(register_username && (phonereg.test(username) || emailreg.test(username)) && captcha && confirm_password && (v=== confirm_password) ){
setBindFlag(false);
}else{
setBindFlag(true);
}
- c();
+ c()
}else{
- c();
- setBindFlag(true);
+ if(v.length<8 || v.length>16){
+ setBindFlag(true);
+ c('密码长度为8-16个字符');
+ }else{
+ setBindFlag(true);
+ c('密码不能使用空格');
+ }
}
}
function captchaConfirm(r,v,c){
@@ -89,6 +110,28 @@ function Bind(props){
}
}
function repsdConfirm(r,v,c){
+ if(!v){
+ setBindFlag(true);
+ c("请重复输入登录密码");
+ }else if(/(?!.*\s)(?!^[\u4e00-\u9fa5]+$)^.{8,16}$/.test(v)){
+ const { username , password , register_username , captcha} = getFieldsValue();
+ if(v !== password){
+ c("两次输入的密码不一样");
+ }else if((phonereg.test(username) || emailreg.test(username)) && password && register_username && captcha){
+ setBindFlag(false);
+ }else{
+ setBindFlag(true);
+ }
+ c();
+ }else{
+ if(v.length<8 || v.length>16){
+ setBindFlag(true);
+ c('密码长度为8-16个字符');
+ }else{
+ setBindFlag(true);
+ c('密码不能使用空格');
+ }
+ }
if(v){
const { username , password , register_username , captcha} = getFieldsValue();
if(v !== password){
@@ -214,7 +257,8 @@ function Bind(props){
validator: (rule, value, callback) => { accountConfirm(rule, value, callback) }
}
],
- validateTrigger:"onInput",
+ validateTrigger:"onBlur",
+ validateFirst: true,
})(} size="large" placeholder="请输入手机号或邮箱地址"/>)}