Fix frontend issues (#1055)
* fix login widget bugs * fix ticket issues * fix path name
This commit is contained in:
parent
143776febe
commit
8c17d22ab3
|
@ -108,18 +108,20 @@ class TicketViewer extends React.Component {
|
|||
<div className="ticket-viewer__comments">
|
||||
{ticket.events && ticket.events.map(this.renderTicketEvent.bind(this))}
|
||||
</div>
|
||||
<div className="ticket-viewer__reopen-closeticket-buttons">
|
||||
{!showResponseField ? this.renderReopenTicketButton() : null}
|
||||
{
|
||||
showResponseField ?
|
||||
this.renderResponseField() :
|
||||
(this.showDeleteButton()) ? this.renderDeleteTicketButton() : null
|
||||
}
|
||||
</div>
|
||||
{showResponseField ? this.renderResponseField() : this.renderReopenCloseButtons()}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
renderReopenCloseButtons() {
|
||||
return(
|
||||
<div className="ticket-viewer__reopen-close-buttons">
|
||||
{this.renderReopenTicketButton()}
|
||||
{this.showDeleteButton() ? this.renderDeleteTicketButton() : null}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
renderTitleHeader() {
|
||||
const {ticket, userStaff, userId} = this.props;
|
||||
const {ticketNumber, title, author, editedTitle, language} = ticket;
|
||||
|
@ -445,7 +447,6 @@ class TicketViewer extends React.Component {
|
|||
</div>
|
||||
<div className="ticket-viewer__buttons-column">
|
||||
<div className="ticket-viewer__buttons-row">
|
||||
{(this.showDeleteButton()) ? this.renderDeleteTicketButton() : null}
|
||||
{this.renderCloseTicketButton()}
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -168,10 +168,11 @@
|
|||
position: relative;
|
||||
}
|
||||
|
||||
&__reopen-closeticket-buttons {
|
||||
&__reopen-close-buttons {
|
||||
width: 230px;
|
||||
display: flex;
|
||||
align-content: left;
|
||||
justify-content: space-between;
|
||||
align-content: center;
|
||||
}
|
||||
|
||||
&__response {
|
||||
|
|
|
@ -164,8 +164,6 @@ class MainHomePageLoginWidget extends React.Component {
|
|||
|
||||
onLoginFormSubmit(formState) {
|
||||
this.setState({
|
||||
loadingRecover: true,
|
||||
recoverSent: false,
|
||||
reSendEmailVerificationStep: UNVERIFIED_USER_STEP
|
||||
})
|
||||
this.props.dispatch(SessionActions.login(formState));
|
||||
|
@ -230,7 +228,7 @@ class MainHomePageLoginWidget extends React.Component {
|
|||
})
|
||||
|
||||
API.call({
|
||||
path: '/user/resend-email-verification',
|
||||
path: '/user/resend-email-token',
|
||||
data: {
|
||||
email: this.state.email
|
||||
}
|
||||
|
|
|
@ -31,7 +31,6 @@
|
|||
.main-home-page__link-buttons-container {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
width: 329px;
|
||||
margin: auto;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue