mirror of
https://github.com/naturalcrit/homebrewery.git
synced 2026-01-14 06:22:40 +00:00
"Removed lodash import, simplified boolean assignments, refactored API request and error handling, and removed unused variables in ArchivePage component."
This commit is contained in:
@@ -2,7 +2,6 @@ require('./archivePage.less');
|
|||||||
|
|
||||||
const React = require('react');
|
const React = require('react');
|
||||||
const createClass = require('create-react-class');
|
const createClass = require('create-react-class');
|
||||||
const _ = require('lodash');
|
|
||||||
const cx = require('classnames');
|
const cx = require('classnames');
|
||||||
|
|
||||||
const Nav = require('naturalcrit/nav/nav.jsx');
|
const Nav = require('naturalcrit/nav/nav.jsx');
|
||||||
@@ -27,8 +26,8 @@ const ArchivePage = createClass({
|
|||||||
//# request
|
//# request
|
||||||
title: this.props.query.title || '',
|
title: this.props.query.title || '',
|
||||||
//tags: {},
|
//tags: {},
|
||||||
legacy: `${this.props.query.legacy === 'false' ? false : true}`,
|
legacy: this.props.query.legacy !== 'false',
|
||||||
v3: `${this.props.query.v3 === 'false' ? false : true}`,
|
v3: this.props.query.v3 !== 'false',
|
||||||
pageSize: this.props.query.size || 10,
|
pageSize: this.props.query.size || 10,
|
||||||
page: parseInt(this.props.query.page) || 1,
|
page: parseInt(this.props.query.page) || 1,
|
||||||
|
|
||||||
@@ -100,19 +99,10 @@ const ArchivePage = createClass({
|
|||||||
if (title !== '') {
|
if (title !== '') {
|
||||||
try {
|
try {
|
||||||
this.setState({ searching: true, error: null });
|
this.setState({ searching: true, error: null });
|
||||||
|
const response = await request.get(`/api/archive?title=${title}&page=${page}&size=${size}&v3=${v3}&legacy=${legacy}`);
|
||||||
await request
|
if (response.ok) {
|
||||||
.get(
|
this.updateStateWithBrews(response.body.brews, page);
|
||||||
`/api/archive?title=${title}&page=${page}&size=${size}&v3=${v3}&legacy=${legacy}`
|
}
|
||||||
)
|
|
||||||
.then((response) => {
|
|
||||||
if (response.ok) {
|
|
||||||
this.updateStateWithBrews(
|
|
||||||
response.body.brews,
|
|
||||||
page
|
|
||||||
);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.log('error at loadPage: ', error);
|
console.log('error at loadPage: ', error);
|
||||||
this.setState({ error: `${error.response.status}` });
|
this.setState({ error: `${error.response.status}` });
|
||||||
@@ -252,7 +242,6 @@ const ArchivePage = createClass({
|
|||||||
|
|
||||||
renderPaginationControls() {
|
renderPaginationControls() {
|
||||||
if (this.state.totalBrews) {
|
if (this.state.totalBrews) {
|
||||||
const title = encodeURIComponent(this.state.title);
|
|
||||||
const size = parseInt(this.state.pageSize);
|
const size = parseInt(this.state.pageSize);
|
||||||
const { page, totalBrews } = this.state;
|
const { page, totalBrews } = this.state;
|
||||||
|
|
||||||
@@ -317,7 +306,7 @@ const ArchivePage = createClass({
|
|||||||
},
|
},
|
||||||
|
|
||||||
renderFoundBrews() {
|
renderFoundBrews() {
|
||||||
const { title, brewCollection, page, totalPages, error, searching } =
|
const { title, brewCollection, error, searching } =
|
||||||
this.state;
|
this.state;
|
||||||
|
|
||||||
if (searching) {
|
if (searching) {
|
||||||
@@ -344,11 +333,11 @@ const ArchivePage = createClass({
|
|||||||
errorMessage = "404 - We didn't find any brew";
|
errorMessage = "404 - We didn't find any brew";
|
||||||
break;
|
break;
|
||||||
case '503':
|
case '503':
|
||||||
errorMessage =
|
errorMessage = "503 - Service Unavailable, try again later, sorry.";
|
||||||
' 503 - Service Unavailable, try again later, sorry.';
|
|
||||||
break;
|
break;
|
||||||
case '500':
|
case '500':
|
||||||
errorMessage = "500 - We don't know what happened, go ahead and contact the mods or report as a mistake.";
|
errorMessage = "500 - We don't know what happened, go ahead and contact the mods or report as a mistake.";
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
errorMessage = 'An unexpected error occurred';
|
errorMessage = 'An unexpected error occurred';
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user