Nigel
/
forgeplus-react
forked from Gitlink/forgeplus-react
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'newVersion_forge' into dev_chain

This commit is contained in:
Jasder 2020-07-02 18:31:06 +08:00
parent 9aa68eedd6 3f117cddfa
commit f1a6078184
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/forge/Main/Detail.js
View File

@ -196,11 +196,11 @@ class Detail extends Component {
})
}
canvasChannel = () => {
const name = window.location.hostname === "localhost" ? "http://testforgeplus.trustie.net":window.location.hostname;
console.log(`ws:${name}/cable`);
const name = window.location.hostname === "localhost" ? "testforgeplus.trustie.net":window.location.hostname;
console.log(`wss://${name}/cable`);
const actioncable = require("actioncable")
var project = this.state.project
var cable = actioncable.createConsumer(`ws:${name}/cable`);
var cable = actioncable.createConsumer(`wss://${name}/cable`);
this.canvasChannel1 = cable.subscriptions.create({
channel: `MirrorProjectChannel`,
id: project && project.identifier

6
src/modules/login/LoginDialog.js
View File

@ -387,7 +387,7 @@ class LoginDialog extends Component {
登录密码出错已达上限，账号已被锁定；
</p>
<p className="mt10">
请10分钟后重新登录或<a href={'/changepassword'} style={{
请10分钟后重新登录或<a href={'https://www.trustie.net/account/lost_password'} style={{
textDecoration: "underline",
color: "#4CACFF",
}}>找回密码</a>
@ -580,9 +580,9 @@ class LoginDialog extends Component {
<label htmlFor="p_autolog" style={{ top: '0px' }}>下次自动登录</label>
</span>
<span className="fr">
<a onClick={(url) => this.getloginurl("/changepassword")}
<a onClick={(url) => this.getloginurl("https://www.trustie.net/account/lost_password")}
className="mr3 color-grey-9">找回密码</a><em className="vertical-line"></em>
<a onClick={(url) => this.getloginurl("/register")} className="color-grey-9">注册</a>
<a onClick={(url) => this.getloginurl("https://www.trustie.net/login?login=false")} className="color-grey-9">注册</a>
</span>
</p>

2
src/modules/user/LoginRegisterComponent.js
View File

@ -383,7 +383,7 @@ class LoginRegisterComponent extends Component {
登录密码出错已达上限，账号已被锁定；
</p>
<p className="mt10">
请10分钟后重新登录或<a href={'/changepassword'} style={{
请10分钟后重新登录或<a href={'https://www.trustie.net/account/lost_password'} style={{
textDecoration: "underline",
color: "#4CACFF",
}}>找回密码</a>