fix: proxy now correctly works

Author: CloudPower97

client/package.json

@@ -139,7 +139,7 @@
     "stylelint-order": "^2.0.0",
     "stylelint-selector-no-empty": "^1.0.7"
   },
-  "proxy": "http://localhost:5000/api",
+  "proxy": "http://localhost:5000",
   "browserslist": [
     ">0.2%",
     "not dead",

client/src/containers/GenericPage/Authors/AuthorPage.js

@@ -28,7 +28,7 @@ class AuthorPage extends Component {
     const { match } = this.props
 
     axios
-      .get(`${match.url}`)
+      .get(`/api${match.url}`)
       .then(({ data }) => {
         this.setState({
           data,

client/src/containers/GenericPage/Conferences/ConferencePage.js

@@ -31,7 +31,7 @@ class ConferencesPage extends Component {
     const { match } = this.props
 
     axios
-      .get(`${match.url}`)
+      .get(`/api${match.url}`)
       .then(({ data }) => {
         this.setState({
           data,
@@ -45,7 +45,7 @@ class ConferencesPage extends Component {
       })
 
     axios
-      .get(`${match.url}/documents`)
+      .get(`/api${match.url}/documents`)
       .then(({ data: documents }) => {
         this.setState({
           documents,
@@ -59,7 +59,7 @@ class ConferencesPage extends Component {
       })
 
     axios
-      .get(`${match.url}/sponsors`)
+      .get(`/api${match.url}/sponsors`)
       .then(({ data: sponsors }) => {
         this.setState({
           sponsors,
@@ -73,7 +73,7 @@ class ConferencesPage extends Component {
       })
 
     axios
-      .get(`${match.url}/organizations`)
+      .get(`/api${match.url}/organizations`)
       .then(({ data: organizations }) => {
         this.setState({
           organizations,

client/src/containers/GenericPage/Documents/DocumentPage.js

@@ -27,7 +27,7 @@ class AuthorPage extends Component {
     const { match } = this.props
 
     axios
-      .get(`${match.url}`)
+      .get(`/api${match.url}`)
       .then(({ data }) => {
         this.setState({
           data,

client/src/containers/GenericPage/Organizations/OrganizationPage.js

@@ -24,7 +24,7 @@ class AuthorPage extends Component {
     const { match } = this.props
 
     axios
-      .get(`${match.url}`)
+      .get(`/api${match.url}`)
       .then(({ data }) => {
         this.setState({
           data,
@@ -38,7 +38,7 @@ class AuthorPage extends Component {
       })
 
     axios
-      .get(`${match.url}/authors`)
+      .get(`/api${match.url}/authors`)
       .then(({ data: authors }) => {
         this.setState({
           authors,
@@ -49,7 +49,7 @@ class AuthorPage extends Component {
       })
 
     axios
-      .get(`${match.url}/conferences`)
+      .get(`/api${match.url}/conferences`)
       .then(({ data: conferences }) => {
         this.setState({
           conferences,

client/src/containers/GenericPage/Periodicals/PeriodicalPage.js

@@ -22,7 +22,7 @@ class PeriodicalPage extends Component {
     const { match } = this.props
 
     axios
-      .get(`${match.url}`)
+      .get(`/api${match.url}`)
       .then(({ data }) => {
         this.setState({
           data,
@@ -36,7 +36,7 @@ class PeriodicalPage extends Component {
       })
 
     axios
-      .get(`${match.url}/numbers`)
+      .get(`/api${match.url}/numbers`)
       .then(({ data: numbers }) => {
         this.setState({
           numbers,

client/src/containers/GenericPage/PublishingCompanies/PublishingCompanyPage.js

@@ -22,7 +22,7 @@ class AuthorPage extends Component {
     const { match } = this.props
 
     axios
-      .get(`${match.url}`)
+      .get(`/api${match.url}`)
       .then(({ data }) => {
         this.setState({
           data,
@@ -36,7 +36,7 @@ class AuthorPage extends Component {
       })
 
     axios
-      .get(`${match.url}/periodicals`)
+      .get(`/api${match.url}/periodicals`)
       .then(({ data: periodicals }) => {
         this.setState({
           periodicals,

client/src/containers/ResultsPage/ResultsPage.js

@@ -2,7 +2,7 @@ import React, { Component, lazy, Suspense } from 'react'
 import axios from 'axios'
 import Spinner from 'components/Spinner'
 import Banner from 'components/Banner'
-import { withRouter } from 'react-router-dom'
+import { withRouter, Redirect } from 'react-router-dom'
 
 const AuthorsTable = lazy(() => import('components/AuthorsTable'))
 const ConferencesTable = lazy(() => import('components/ConferencesTable'))
@@ -14,25 +14,29 @@ const OrganizationsTable = lazy(() => import('components/OrganizationsTable'))
 class Results extends Component {
   state = {
     data: null,
+    error: false,
   }
 
   componentDidMount() {
     const { match } = this.props
 
     axios
-      .get(`${match.path}`)
+      .get(`/api${match.url}`)
       .then(({ data }) => {
         this.setState({
           data,
+          error: typeof data === 'string',
         })
       })
-      .catch(err => {
-        console.log(err)
+      .catch(() => {
+        this.setState({
+          error: true,
+        })
       })
   }
 
   render() {
-    const { data } = this.state
+    const { data, error } = this.state
     const {
       location: { pathname, search },
     } = this.props
@@ -53,6 +57,10 @@ class Results extends Component {
       text = (data && `${data.length} ${collection} found`) || `Searching ${collection}...`
     }
 
+    if (error) {
+      return <Redirect to={`/${collection}/error`} />
+    }
+
     return (
       <>
         <Banner text={text} />