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

handle conflict of routes in infos.js by updating the upstream whilee keeping the blockchain related routes

This commit is contained in:
zhangxunhui 2022-05-09 16:45:59 +08:00
parent 11122e6d9f
commit 815f05b74b
1 changed files with 13 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
src/forge/users/Infos.js
View File

@ -538,75 +538,6 @@ class Infos extends Component {
}}
></Route>
<Route
<<<<<<< HEAD
path="/users/:username/watchers"
render={() => {
return <WatchsUser {...this.props} {...this.state} userType="watchers" />;
}}
></Route>
<Route
path="/users/:username/notice"
render={() => {
return <Notice {...this.props} {...this.state} fetchUser={this.fetchUser}/>;
}}
></Route>
<Route
path="/users/:username/fan_users"
render={() => {
return <FanUser {...this.props} {...this.state} userType="fan_users"/>;
}}
></Route>
<Route
path="/users/:username/devops/CDService"
render={() => {
return <InfosDevOpsCD {...this.props} {...this.state} />;
}}
></Route>
<Route
path="/users/:username/devops/CIService"
render={() => {
return <InfosDevOps {...this.props} {...this.state} />;
}}
></Route>
<Route
path="/users/:username/blockchain/TransferService"
render={() => {
return <InfosBlockchainTransfer {...this.props} {...this.state} />;
}}
></Route>
<Route
path="/users/:username/blockchain/ExchangeService"
render={() => {
return <InfosBlockchainExMenu {...this.props} {...this.state} />;
}}
></Route>
<Route
path="/users/:username/projects/:project_type"
render={() => {
return <InfosUser {...this.props} {...this.state} />;
}}
></Route>
<Route
path="/users/:username/organizes"
render={() => {
return <Organize {...this.props} {...this.state} />;
}}
></Route>
<Route
path="/users/:username"
render={(props) => {
return <InfosUser {...this.props} {...this.state} />;
}}
></Route>
<Route
path="/"
render={(props) => {
return <InfosUser {...this.props} {...this.state} />;
}}
></Route>
</Switch>
</div>
=======
path="/:username/notice"
render={() => {
return <Notice {...this.props} {...this.state} deleteUndoEvent={this.deleteUndoEvent}/>;
@ -679,8 +610,20 @@ class Infos extends Component {
return <GeneralView {...this.props} {...this.state} menuKey={menuKey}/>;
}}
></Route>
<Route
path="/:username/blockchain/TransferService"
render={() => {
return <InfosBlockchainTransfer {...this.props} {...this.state} />;
}}
></Route>
<Route
path="/:username/blockchain/ExchangeService"
render={() => {
return <InfosBlockchainExMenu {...this.props} {...this.state} />;
}}
></Route>
</Switch>
>>>>>>> upstream/gitlink_server
)}
</div>
</div>