diff --git a/src/AppConfig.js b/src/AppConfig.js index 5f8a5d7bb..df3388a28 100644 --- a/src/AppConfig.js +++ b/src/AppConfig.js @@ -32,9 +32,9 @@ export function initAxiosInterceptors(props) { // 判断网络是否连接 initOnlineOfflineListener(); - var proxy = "https://testforgeplus.trustie.net"; + // var proxy = "https://testforgeplus.trustie.net"; // var proxy = "http://172.20.32.201:4000"; - // var proxy = "https://www.gitlink.org.cn"; + var proxy = "https://www.gitlink.org.cn"; //响应前的设置 axios.interceptors.request.use( @@ -48,9 +48,9 @@ export function initAxiosInterceptors(props) { if (window.location.port === "3007") { config.url = `${proxy}${url}`; if (config.url.indexOf('?') === -1) { - config.url = `${config.url}?debug=admin`; + config.url = `${config.url}`; } else { - config.url = `${config.url}&debug=admin`; + config.url = `${config.url}`; } } else { config.url = url; diff --git a/src/modules/login/CCF.png b/src/modules/login/CCF.png new file mode 100644 index 000000000..4d5df8ee4 Binary files /dev/null and b/src/modules/login/CCF.png differ diff --git a/src/modules/login/LoginDialog.css b/src/modules/login/LoginDialog.css index f5226c667..31bd66b8e 100644 --- a/src/modules/login/LoginDialog.css +++ b/src/modules/login/LoginDialog.css @@ -8,9 +8,6 @@ /* 影响notification */ /* z-index: 20000; */ } - #DialogID .dialogBox { - width: 400px; - } .MuiPaper-elevation24-45{ box-shadow:none !important; } @@ -24,7 +21,7 @@ top: -64px !important; } #log_reg_content{ - width:405px !important; + width:445px !important; border-radius:6px; box-shadow:4px 8px 12px rgba(76,76,76,0.3); } @@ -158,4 +155,4 @@ .MuiModal-root-15 { z-index: 10001 !important; -} +} \ No newline at end of file diff --git a/src/modules/login/LoginDialog.js b/src/modules/login/LoginDialog.js index f927ca488..7315fc0a6 100644 --- a/src/modules/login/LoginDialog.js +++ b/src/modules/login/LoginDialog.js @@ -1,19 +1,13 @@ import React, { Component } from 'react'; - import Dialog from 'material-ui/Dialog'; -import { notification , Tooltip } from 'antd'; - +import { notification } from 'antd'; import axios from 'axios'; -import educoderLogo from './educoder.png'; -import qqlogo from './qq@2x.png'; -import WeChatlogo from './WeChat@2x.png'; -import giteelogo from './gitee.png'; -import githublogo from './github.png'; import cookie from 'react-cookies'; import './LoginDialog.css'; import { broadcastChannelPostMessage } from 'educoder' import Notcompletedysl from "../user/Notcompletedysl"; import { Encrypt } from '../../common/Env'; +import OtherLogin from '../loginRegister/component/otherLogin'; const $ = window.$; var wait = 60; @@ -416,20 +410,12 @@ class LoginDialog extends Component { MyEduCoderModals: false }) }; - setMyEduCoderModals = () => { - this.setState({ - MyEduCoderModals: true - }) - }; onKeydowns = (e) => { let { disabled } = this.state; if (disabled === false && e.keyCode === 13) { this.loginEDU() } }; - getloginurl = (url) => { - window.location.href = url; - }; openNotifications = (btn) => { // type 1 成功提示绿色 2提醒颜色黄色 3错误提示红色 notification.open({ @@ -441,28 +427,6 @@ class LoginDialog extends Component { }, }); } - openqqlogin = () => { - this.setState({ - qqlogin: true - }) - window.location.href = `https://graph.qq.com/oauth2.0/show?which=Login&display=pc&client_id=101508858&redirect_uri=https%3a%2f%2fwww.educoder.net%2fotherloginqq&state=null,${window.location.host}&response_type=code` - } - - openphoneqqlogin = () => { - window.open( - `https://xui.ptlogin2.qq.com/cgi-bin/xlogin?appid=716027609&pt_3rd_aid=101508858&daid=383&pt_skey_valid=0&style=35&s_url=http%3A%2F%2Fconnect.qq.com&refer_cgi=authorize&which=&client_id=101508858&response_type=code&scope=get_user_info&redirect_uri=https%3a%2f%2fwww.educoder.net%2fotherloginqq&state=null,${window.location.host}&response_type=code` - ) - } - - getTContainer = () => { - return document.body; - } - hideweixinlogin = () => { - this.setState({ - weixinlogin: false, - qqlogin: false - }) - } render() { @@ -487,7 +451,7 @@ class LoginDialog extends Component { { ` #DialogID .dialogBox { - width: 405px !important; + width: 445px !important; } .dialogBox { height: 290px !important; @@ -575,25 +539,7 @@ class LoginDialog extends Component { 注册

- { - settings && settings.third_party_new && settings.third_party_new.length > 0 ? -

- ———————— 快速登录 ———————— -

- {settings.third_party_new.map((item,key)=>{ - return( - - - {`${item.name}登录`} - - - ) - }) - } -
-

- :"" - } + diff --git a/src/modules/login/OpenI.svg b/src/modules/login/OpenI.svg new file mode 100644 index 000000000..3648efb6e --- /dev/null +++ b/src/modules/login/OpenI.svg @@ -0,0 +1,34 @@ + + + + + + Created with Pixso. + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/modules/loginRegister/LoginRegisterPage.scss b/src/modules/loginRegister/LoginRegisterPage.scss index 7f7720807..cd028484a 100644 --- a/src/modules/loginRegister/LoginRegisterPage.scss +++ b/src/modules/loginRegister/LoginRegisterPage.scss @@ -226,7 +226,26 @@ border-bottom: 2px solid; } } - +.dfpanel{ + height: 50px; + display: flex; + align-items: center; + justify-content: center; +} +.thirdPanel{ + display: flex; + align-items: center; + justify-content: center; + flex-wrap: wrap; + min-width: 120px; + max-width:230px; + a{ + margin:5px 12px; + } +} +.moreIcon,.theTop{ + z-index: 11111; +} /*当页面宽度大于1000px*/ @media screen and (min-width:1000px) { .right_cont{width: 540px; } diff --git a/src/modules/loginRegister/component/otherLogin.jsx b/src/modules/loginRegister/component/otherLogin.jsx index 04ebf32e6..1aed763e5 100644 --- a/src/modules/loginRegister/component/otherLogin.jsx +++ b/src/modules/loginRegister/component/otherLogin.jsx @@ -1,10 +1,13 @@ import React,{useState ,useEffect} from 'react'; -import { Divider, Tooltip } from 'antd'; +import { Divider, Tooltip , Popover } from 'antd'; import educoderLogo from '../../login/educoder.png'; import qqlogo from '../../login/qq@2x.png'; import WeChatlogo from '../../login/WeChat@2x.png'; import giteelogo from '../../login/gitee.png'; import githublogo from '../../login/github.png'; +import CCFlogo from '../../login/CCF.png'; +import OpenI from '../../login/OpenI.svg'; +import "../LoginRegisterPage.scss" function OtherLogin(){ const [setting, setSetting] = useState(undefined); @@ -14,22 +17,61 @@ function OtherLogin(){ setSetting(JSON.parse(localStorage.getItem("chromesetting"))); },[]) + function renderLogo(name){ + if(!name) return; + switch(name.toLowerCase()){ + case 'educoder': + return educoderLogo; + case 'qq': + return qqlogo; + case 'wechat': + return WeChatlogo; + case 'gitee': + return giteelogo; + case 'github': + return githublogo; + case 'ccf': + return CCFlogo; + case 'openi': + return OpenI; + default: + return; + } + } return( setting && setting.third_party_new && setting.third_party_new.length > 0 ?
快速登录 - {setting.third_party_new.map((item,key)=>{ - return( - - - {`${item.name}登录`}/ - - - ) - }) - } +
+ {setting.third_party_new.map((item,key)=>{ + return( + key < 4 && + + {`${item.name}登录`}/ + + + ) + }) + } + { + setting.third_party_new.length > 4 && + + { + setting.third_party_new.map((i,k)=>{ + return k>=4 && + + + + + }) + } +
} trigger="hover" overlayClassName='theTop'> + + + } +
:"" )