mirror of
https://github.com/idanoo/GoScrobble.git
synced 2024-12-25 16:19:00 +00:00
Fix errors
This commit is contained in:
parent
50154a009c
commit
fc1d6fc567
@ -145,7 +145,7 @@ func limitMiddleware(next http.HandlerFunc, limiter *IPRateLimiter) http.Handler
|
||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
limiter := limiter.GetLimiter(r.RemoteAddr)
|
||||
if !limiter.Allow() {
|
||||
msg := generateJsonError("Too many requests")
|
||||
msg := generateJsonMessage("Too many requests")
|
||||
w.WriteHeader(http.StatusTooManyRequests)
|
||||
w.Write(msg)
|
||||
return
|
||||
|
@ -13,6 +13,11 @@
|
||||
}
|
||||
}
|
||||
|
||||
.toastNotifs {
|
||||
margin-top: 100px;
|
||||
z-index: 99999!important;
|
||||
}
|
||||
|
||||
.App-header {
|
||||
background-color: #282c34;
|
||||
min-height: 100vh;
|
||||
|
@ -29,18 +29,16 @@ const App = () => {
|
||||
let exact = true
|
||||
return (
|
||||
<HashRouter>
|
||||
<ToastProvider autoDismiss="true" autoDismissTimeout="5000">
|
||||
<div className="wrapper">
|
||||
<Navigation />
|
||||
<Switch>
|
||||
<Route exact={exact} path="/" component={Home} />
|
||||
<Route path="/about" component={About} />
|
||||
<Route path="/login" component={Login} />
|
||||
<Route path="/register" component={Register} />
|
||||
</Switch>
|
||||
</div>
|
||||
</ToastProvider>
|
||||
</HashRouter>
|
||||
<ToastProvider autoDismiss="true" autoDismissTimeout="5000" placement="bottom-right">
|
||||
<Navigation />
|
||||
<Switch>
|
||||
<Route exact={exact} path="/" component={Home} />
|
||||
<Route path="/about" component={About} />
|
||||
<Route path="/login" component={Login} />
|
||||
<Route path="/register" component={Register} />
|
||||
</Switch>
|
||||
</ToastProvider>
|
||||
</HashRouter>
|
||||
);
|
||||
}
|
||||
|
||||
|
@ -5,23 +5,6 @@ import { Button } from 'reactstrap';
|
||||
|
||||
import { useToasts } from 'react-toast-notifications';
|
||||
|
||||
// const FormWithToasts = () => {
|
||||
// const { addToast } = useToasts();
|
||||
|
||||
// const onSubmit = async value => {
|
||||
// // const { error } = await dataPersistenceLayer(value);
|
||||
|
||||
// if (error) {
|
||||
// addToast(error.message, { appearance: 'error' });
|
||||
// } else {
|
||||
// addToast('Saved Successfully', { appearance: 'success' });
|
||||
// }
|
||||
// };
|
||||
|
||||
// return <form onSubmit={this.handleSubmit}>...</form>;
|
||||
// };
|
||||
// const { addToast } = useToasts();
|
||||
|
||||
function withToast(Component) {
|
||||
return function WrappedComponent(props) {
|
||||
const toastFuncs = useToasts()
|
||||
@ -52,6 +35,7 @@ class Login extends React.Component {
|
||||
const requestOptions = {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
timeout: 5000,
|
||||
body: JSON.stringify({
|
||||
username: this.state.username,
|
||||
password: this.state.password,
|
||||
@ -67,7 +51,11 @@ class Login extends React.Component {
|
||||
this.props.addToast(data.token, { appearance: 'success' });
|
||||
}
|
||||
this.setState({loading: false});
|
||||
}).bind(this))
|
||||
}).bind(this))
|
||||
.catch(() => {
|
||||
this.props.addToast('Error submitting form. Please try again', { appearance: 'error' });
|
||||
this.setState({loading: false});
|
||||
});
|
||||
}
|
||||
|
||||
render() {
|
||||
|
@ -47,10 +47,10 @@ class Register extends React.Component {
|
||||
return
|
||||
}
|
||||
|
||||
if (this.state.password.len < 8) {
|
||||
this.props.addToast('Passwords do not match', { appearance: 'error' });
|
||||
return
|
||||
}
|
||||
// if (this.state.password.len < 8) {
|
||||
// this.props.addToast('Password must be at least 8 characters', { appearance: 'error' });
|
||||
// return
|
||||
// }
|
||||
|
||||
this.setState({loading: true});
|
||||
const requestOptions = {
|
||||
@ -67,6 +67,7 @@ class Register extends React.Component {
|
||||
fetch(apiUrl, requestOptions)
|
||||
.then((response) => response.json())
|
||||
.then((function(data) {
|
||||
console.log(data);
|
||||
if (data.error) {
|
||||
this.props.addToast(data.error, { appearance: 'error' });
|
||||
} else {
|
||||
|
Loading…
Reference in New Issue
Block a user