Skip to content

Commit be8d719

Browse files
committed
refactor the base api path
1 parent 8bd5ac2 commit be8d719

3 files changed

Lines changed: 11 additions & 7 deletions

File tree

src/components/CarbonAd.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
import axios from 'axios'
22
import React, { useEffect, useState } from 'react'
33
import './CarbonAd.css'
4+
import { getBaseApi } from '../utils/DataUtils'
45

56
export default function CarbonAd() {
67
const [ad, setAd] = useState()
7-
const packageFile = require('../../package.json')
88

99
useEffect(() => {
1010
const setup = async () => {
1111
const userAgent = new URLSearchParams(navigator.userAgent).toString()
12-
var baseUrl = process.env.NODE_ENV === 'production' ? packageFile.proxy : ''
13-
const request = await axios.get(`${baseUrl}/monetization/?useragent=${userAgent}`)
12+
const request = await axios.get(`${getBaseApi('')}/monetization/?useragent=${userAgent}`)
1413
if (request.data) {
1514
setAd(request.data.ads[0])
1615
}

src/services/cachedRequest.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
import axios from 'axios';
22
import AppStorage from "./localStorage";
3-
4-
var packageFile = require("../../package.json");
3+
import { getBaseApi } from '../utils/DataUtils'
54

65
const axiosInstance = axios.create({
7-
baseURL: process.env.NODE_ENV === "production" ? packageFile.proxy : null,
8-
});
6+
baseURL: getBaseApi(null),
7+
})
98
const isWebVersion = !!+process.env.REACT_APP_WEB_BUILD
109

1110
const cachedRequest = async (url) => {

src/utils/DataUtils.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
const packageFile = require('../../package.json')
2+
13
export const mergeMultipleDataSources = async (promises, maxCount) => {
24
let promisesRequests = await Promise.allSettled(promises)
35
let promisesValues = promisesRequests
@@ -20,3 +22,7 @@ export const mergeMultipleDataSources = async (promises, maxCount) => {
2022
}
2123
return data
2224
}
25+
26+
export const getBaseApi = (fallback) => {
27+
return process.env.NODE_ENV === 'production' ? packageFile.proxy : fallback
28+
}

0 commit comments

Comments
 (0)