Merge branch 'master' of https://github.com/thecoder93/nyt-times-books

Author: thecoder93

.circleci/config.yml

@@ -62,7 +62,7 @@ jobs:
 
 workflows:
   version: 2
-  test-build-and-deploy:
+  build-test-and-deploy:
     jobs:
       - build
       - test:

package-lock.json

@@ -23,8 +23,9 @@
   },
   "scripts": {
     "api:serve": "netlify-lambda serve .netlify/functions",
-    "start": "react-scripts start",
+    "start:dev": "react-scripts start",
     "build": "react-scripts build",
+    "build:prod": "env-cmd -f ./.env.production react-scripts build",
     "test": "react-scripts test",
     "eject": "react-scripts eject",
     "netlify:deploy": "netlify deploy --dir=./build -p -m \"$git log -1 --pretty=%B)\""
@@ -52,6 +53,7 @@
     "@babel/preset-react": "^7.16.7",
     "@types/styled-components": "^5.1.22",
     "babel-jest": "^27.5.1",
+    "env-cmd": "^10.1.0",
     "jest": "^27.5.1",
     "react-test-renderer": "^17.0.2",
     "sass": "^1.49.7"

package.json

@@ -0,0 +1,5 @@
+const NYT_APP_API_KEY = process.env.REACT_APP_NYT_APP_API_KEY  
+const BASE_URL = process.env.REACT_APP_BASE_URL_API_NYT  
+
+export const API_URL_DEV = `${BASE_URL}/lists/overview.json?api-key=${NYT_APP_API_KEY}`
+export const API_URL_PROD = `/.netlify/functions/books`

src/Constants.tsx

@@ -1,13 +1,17 @@
 import axios from "axios";
- const NYT_APP_API_KEY = process.env.REACT_APP_NYT_APP_API_KEY  
- const BASE_URL = process.env.REACT_APP_BASE_URL_API_NYT  
+import { API_URL_DEV, API_URL_PROD } from "../Constants";
 
-export const API_URL = `${BASE_URL}/lists/overview.json?api-key=${NYT_APP_API_KEY}`
-//export const API_URL2 = `/.netlify/functions/books`
+export let API_ENDPOINT: string;
+
+if (process.env.NODE_ENV === "production") {
+  API_ENDPOINT = API_URL_PROD
+} else {
+  API_ENDPOINT = API_URL_DEV
+}
 
 export const getOverviewBooks = async () => {
   try {
-    return await axios.get(API_URL);
+    return await axios.get(API_ENDPOINT);
   } catch (e) {
     return [];
   }

src/services/OverviewBooksServices.tsx

@@ -1,4 +1,4 @@
-import { API_URL, getOverviewBooks } from '../OverviewBooksServices';
+import { API_ENDPOINT, getOverviewBooks } from '../OverviewBooksServices';
 import axios from '../__mocks__/axios';
 
 describe("fetchBooks", () => {
@@ -12,7 +12,7 @@ describe("fetchBooks", () => {
         const result = await getOverviewBooks();
 
         // then
-        expect(axios.get).toHaveBeenCalledWith(API_URL);
+        expect(axios.get).toHaveBeenCalledWith(API_ENDPOINT);
         expect(result).toEqual(books);
       });
     })
@@ -28,7 +28,7 @@ describe("fetchBooks", () => {
           const result = await getOverviewBooks();
 
           // then
-          expect(axios.get).toHaveBeenCalledWith(API_URL);
+          expect(axios.get).toHaveBeenCalledWith(API_ENDPOINT);
           expect(result).toEqual([]);
         });
       });