mirror of
https://github.com/naturalcrit/homebrewery.git
synced 2026-01-08 07:32:40 +00:00
Change fetch to use request-middleware instead
This commit is contained in:
@@ -13,7 +13,7 @@ const NewBrew = require('../../navbar/newbrew.navitem.jsx');
|
|||||||
const HelpNavItem = require('../../navbar/help.navitem.jsx');
|
const HelpNavItem = require('../../navbar/help.navitem.jsx');
|
||||||
const BrewItem = require('../basePages/listPage/brewItem/brewItem.jsx');
|
const BrewItem = require('../basePages/listPage/brewItem/brewItem.jsx');
|
||||||
|
|
||||||
const request = require('superagent');
|
const request = require('../../utils/request-middleware.js');
|
||||||
|
|
||||||
const ArchivePage = createClass({
|
const ArchivePage = createClass({
|
||||||
displayName : 'ArchivePage',
|
displayName : 'ArchivePage',
|
||||||
@@ -37,14 +37,15 @@ const ArchivePage = createClass({
|
|||||||
this.setState({ title: e.target.value });
|
this.setState({ title: e.target.value });
|
||||||
},
|
},
|
||||||
|
|
||||||
updateStateWithBrews : (brews, page, totalPages)=>{
|
updateStateWithBrews : function (brews, page, totalPages) {
|
||||||
this.setState({
|
this.setState({
|
||||||
brewCollection : brews,
|
brewCollection : brews || null,
|
||||||
page : page,
|
page : page || 1,
|
||||||
totalPages : totalPages,
|
totalPages : totalPages || 1,
|
||||||
searching : false
|
searching : false
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
loadPage : async function(page) {
|
loadPage : async function(page) {
|
||||||
if(this.state.title == '') {} else {
|
if(this.state.title == '') {} else {
|
||||||
|
|
||||||
@@ -52,19 +53,18 @@ const ArchivePage = createClass({
|
|||||||
//this.updateUrl();
|
//this.updateUrl();
|
||||||
this.setState({ searching: true, error: null });
|
this.setState({ searching: true, error: null });
|
||||||
const title = encodeURIComponent(this.state.title);
|
const title = encodeURIComponent(this.state.title);
|
||||||
const response = await fetch(`/archive?title=${title}&page=${page}`);
|
await request.get(`/api/archive?title=${title}&page=${page}`)
|
||||||
|
.then((response)=>{
|
||||||
|
if(response.ok) {
|
||||||
if(response.ok) {
|
this.updateStateWithBrews(response.body.brews, page, response.body.totalPages);
|
||||||
const res = await response.json();
|
}
|
||||||
this.updateStateWithBrews(res.brews, page, res.totalPages);
|
});
|
||||||
}
|
|
||||||
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.log(`LoadPage error: ${error}`);
|
console.log(`LoadPage error: ${error}`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
updateUrl : function() {
|
updateUrl : function() {
|
||||||
const url = new URL(window.location.href);
|
const url = new URL(window.location.href);
|
||||||
const urlParams = new URLSearchParams(url.search);
|
const urlParams = new URLSearchParams(url.search);
|
||||||
|
|||||||
Reference in New Issue
Block a user