mirror of
https://github.com/opensupports/opensupports.git
synced 2025-07-31 01:35:15 +02:00
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">
|
<div className="ticket-viewer__comments">
|
||||||
{ticket.events && ticket.events.map(this.renderTicketEvent.bind(this))}
|
{ticket.events && ticket.events.map(this.renderTicketEvent.bind(this))}
|
||||||
</div>
|
</div>
|
||||||
<div className="ticket-viewer__reopen-closeticket-buttons">
|
{showResponseField ? this.renderResponseField() : this.renderReopenCloseButtons()}
|
||||||
{!showResponseField ? this.renderReopenTicketButton() : null}
|
|
||||||
{
|
|
||||||
showResponseField ?
|
|
||||||
this.renderResponseField() :
|
|
||||||
(this.showDeleteButton()) ? this.renderDeleteTicketButton() : null
|
|
||||||
}
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
renderReopenCloseButtons() {
|
||||||
|
return(
|
||||||
|
<div className="ticket-viewer__reopen-close-buttons">
|
||||||
|
{this.renderReopenTicketButton()}
|
||||||
|
{this.showDeleteButton() ? this.renderDeleteTicketButton() : null}
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
renderTitleHeader() {
|
renderTitleHeader() {
|
||||||
const {ticket, userStaff, userId} = this.props;
|
const {ticket, userStaff, userId} = this.props;
|
||||||
const {ticketNumber, title, author, editedTitle, language} = ticket;
|
const {ticketNumber, title, author, editedTitle, language} = ticket;
|
||||||
@ -445,7 +447,6 @@ class TicketViewer extends React.Component {
|
|||||||
</div>
|
</div>
|
||||||
<div className="ticket-viewer__buttons-column">
|
<div className="ticket-viewer__buttons-column">
|
||||||
<div className="ticket-viewer__buttons-row">
|
<div className="ticket-viewer__buttons-row">
|
||||||
{(this.showDeleteButton()) ? this.renderDeleteTicketButton() : null}
|
|
||||||
{this.renderCloseTicketButton()}
|
{this.renderCloseTicketButton()}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -168,10 +168,11 @@
|
|||||||
position: relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
|
|
||||||
&__reopen-closeticket-buttons {
|
&__reopen-close-buttons {
|
||||||
|
width: 230px;
|
||||||
display: flex;
|
display: flex;
|
||||||
|
align-content: left;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
align-content: center;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
&__response {
|
&__response {
|
||||||
|
@ -164,8 +164,6 @@ class MainHomePageLoginWidget extends React.Component {
|
|||||||
|
|
||||||
onLoginFormSubmit(formState) {
|
onLoginFormSubmit(formState) {
|
||||||
this.setState({
|
this.setState({
|
||||||
loadingRecover: true,
|
|
||||||
recoverSent: false,
|
|
||||||
reSendEmailVerificationStep: UNVERIFIED_USER_STEP
|
reSendEmailVerificationStep: UNVERIFIED_USER_STEP
|
||||||
})
|
})
|
||||||
this.props.dispatch(SessionActions.login(formState));
|
this.props.dispatch(SessionActions.login(formState));
|
||||||
@ -230,7 +228,7 @@ class MainHomePageLoginWidget extends React.Component {
|
|||||||
})
|
})
|
||||||
|
|
||||||
API.call({
|
API.call({
|
||||||
path: '/user/resend-email-verification',
|
path: '/user/resend-email-token',
|
||||||
data: {
|
data: {
|
||||||
email: this.state.email
|
email: this.state.email
|
||||||
}
|
}
|
||||||
|
@ -31,7 +31,6 @@
|
|||||||
.main-home-page__link-buttons-container {
|
.main-home-page__link-buttons-container {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
width: 329px;
|
|
||||||
margin: auto;
|
margin: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user