Dev: Add BIT backend heroku url

add heroku specific branch on fork repo Refactor homepage url to fork repo for test remove extra backslash add CORS ORIGIN for remote BIT web on Login Add CORS ORIGIN headers on other existing features refactor to staging remote urls remove travis yml refactor config to include both upstream and fork BIT web url revert dotenv since gh action use different method for secret refactor config update config
anitab-org · Jul 6, 2021 · dcbc0c9 · dcbc0c9
1 parent 2c888bf
commit dcbc0c9
Show file tree

Hide file tree

Showing 14 changed files with 36 additions and 23 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -1,11 +1,11 @@
 # Basic workflow for Actions
 
 name: Build and Deploy to GitHub static pages
-# Controls when the action will run. 
+# Controls when the action will run.
 on:
   # Triggers the workflow on push or pull request events but only for the develop branch
   push:
-    branches: [ develop ]
+    branches: [ develop, bit-heroku-url ]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -30,7 +30,7 @@ jobs:
         run: |
           npm install
           npm run build
-          
+
       - name: Deploy to Github Pages
         uses: JamesIves/github-pages-deploy-action@3.7.1
         with:

diff --git a/.travis.yml b/.travis.yml
diff --git a/src/config.js b/src/config.js
@@ -1 +1,6 @@
-export const BASE_API = process.env.REACT_APP_BASE_API ?  process.env.REACT_APP_BASE_API : "http://localhost:5000"
+// export const BASE_API = process.env.REACT_APP_BASE_API ?  process.env.REACT_APP_BASE_API : "http://localhost:5000"
+export const BASE_API = process.env.REACT_APP_BASE_API ?  process.env.REACT_APP_BASE_API : "https://bridge-in-tech-backend.herokuapp.com/"
+// export const CORS_ORIGIN = process.env.REACT_APP_CORS_ORIGIN ? process.env.REACT_APP_CORS_ORIGIN : "https://anitab-org.github.io"
+export const CORS_ORIGIN = process.env.REACT_APP_CORS_ORIGIN ? process.env.REACT_APP_CORS_ORIGIN : "https://mtreacy002.github.io"
+// export const CORS_ORIGIN = process.env.REACT_APP_CORS_ORIGIN ? process.env.REACT_APP_CORS_ORIGIN : "http://localhost:3000"
+
diff --git a/src/login/Login.jsx b/src/login/Login.jsx
@@ -2,7 +2,7 @@ import React, { useState, useContext } from "react";
 import "./Login.css";
 import { Redirect, Link } from "react-router-dom";
 import { AuthContext } from "../AuthContext";
-import {BASE_API} from "../config";
+import {BASE_API, CORS_ORIGIN} from "../config";
 import { SERVICE_UNAVAILABLE_ERROR } from "../messages";
 
 export default function Login() {
@@ -23,6 +23,7 @@ export default function Login() {
             headers: {
                 "Accept": "application/json",
                 "Content-Type": "application/json",
+                "Access-Control-Allow-Origin": {CORS_ORIGIN}
             },
             body: JSON.stringify(payload)
         };
@@ -37,6 +38,7 @@ export default function Login() {
                              "Authorization": `Bearer ${access_token}`,
                              "Accept": "application/json",
                              "Content-Type": "application/json",
+                             "Access-Control-Allow-Origin": {CORS_ORIGIN}
                         }
                     }).then(async response => {
                         let userData = await response.json();

diff --git a/src/members/Members.jsx b/src/members/Members.jsx
@@ -2,7 +2,7 @@ import React, { useState, useContext, useEffect } from "react";
 import { Table } from "react-bootstrap";
 import { Link } from "react-router-dom";
 import { AuthContext } from "../AuthContext";
-import { BASE_API } from "../config";
+import { BASE_API, CORS_ORIGIN } from "../config";
 import { SERVICE_UNAVAILABLE_ERROR } from "../messages";
 import "./Member.css";
 
@@ -19,6 +19,7 @@ export default function Members() {
         "Authorization": `Bearer ${access_token}`,
         "Accept": "application/json",
         "Content-Type": "application/json",
+        "Access-Control-Allow-Origin": {CORS_ORIGIN}
       },
     };
 

diff --git a/src/myorganization/EditOrganization.jsx b/src/myorganization/EditOrganization.jsx
@@ -1,7 +1,7 @@
 import React, {useState, useEffect, useContext} from "react";
 import { Link } from "react-router-dom";
 import {AuthContext} from "../AuthContext";
-import {BASE_API} from "../config";
+import {BASE_API, CORS_ORIGIN} from "../config";
 import "./EditOrganization.css";
 import {SERVICE_UNAVAILABLE_ERROR} from "../messages";
 import { ORGANIZATION_STATUS} from "../enums";
@@ -22,6 +22,7 @@ export default function EditOrganization() {
         "Authorization": `Bearer ${access_token}`,
         "Accept": "application/json",
         "Content-Type": "application/json",
+        "Access-Control-Allow-Origin": {CORS_ORIGIN}
       },
     };
 
@@ -53,6 +54,7 @@ export default function EditOrganization() {
         "Authorization": `Bearer ${access_token}`,
         "Accept": "application/json",
         "Content-Type": "application/json",
+        "Access-Control-Allow-Origin": {CORS_ORIGIN}
       },
       body: JSON.stringify(payload)
     };

diff --git a/src/myorganization/EditProgram.jsx b/src/myorganization/EditProgram.jsx
@@ -12,7 +12,7 @@ import {
     HIGHEST_EDUCATION,
     YEARS_OF_EXPERIENCE
 } from "../backgrounds";
-import { BASE_API } from "../config";
+import { BASE_API, CORS_ORIGIN } from "../config";
 import { SERVICE_UNAVAILABLE_ERROR } from "../messages";
 import { PROGRAM_STATUS, CONTACT_TYPE, ZONE } from "../enums";
 import { AuthContext } from "../AuthContext";
@@ -66,6 +66,7 @@ export default function EditProgram() {
                 "Authorization": `Bearer ${access_token}`,
                 "Accept": "application/json",
                 "Content-Type": "application/json",
+                "Access-Control-Allow-Origin": {CORS_ORIGIN}
             },
             body: JSON.stringify(payload)
         };

diff --git a/src/myorganization/EditPrograms.jsx b/src/myorganization/EditPrograms.jsx
@@ -2,7 +2,7 @@ import React, { useState, useEffect, useContext } from "react";
 import { Table } from "react-bootstrap";
 import { Link, useLocation } from "react-router-dom";
 import { AuthContext } from "../AuthContext";
-import { BASE_API } from "../config";
+import { BASE_API, CORS_ORIGIN } from "../config";
 import "./EditOrganization.css";
 import { SERVICE_UNAVAILABLE_ERROR } from "../messages";
 
@@ -22,6 +22,7 @@ export default function EditPrograms() {
         "Authorization": `Bearer ${access_token}`,
         "Accept": "application/json",
         "Content-Type": "application/json",
+        "Access-Control-Allow-Origin": {CORS_ORIGIN}
       },
     };
 

diff --git a/src/myspace/AdditionalInfo.jsx b/src/myspace/AdditionalInfo.jsx
@@ -1,5 +1,5 @@
 import React, { useState, useEffect, useContext } from "react";
-import { BASE_API } from "../config";
+import { BASE_API, CORS_ORIGIN } from "../config";
 import { AuthContext } from "../AuthContext";
 import "./MySpace.css";
 import { SERVICE_UNAVAILABLE_ERROR } from "../messages";
@@ -21,6 +21,7 @@ export default function AdditionalInfo() {
         "Authorization": `Bearer ${access_token}`,
         "Accept": "application/json",
         "Content-Type": "application/json",
+        "Access-Control-Allow-Origin": {CORS_ORIGIN}
       },
     };
 
@@ -59,6 +60,7 @@ export default function AdditionalInfo() {
         "Authorization": `Bearer ${access_token}`,
         "Accept": "application/json",
         "Content-Type": "application/json",
+        "Access-Control-Allow-Origin": {CORS_ORIGIN}
       },
       body: JSON.stringify(payload)
     };

diff --git a/src/myspace/PersonalBackground.jsx b/src/myspace/PersonalBackground.jsx
@@ -1,5 +1,5 @@
 import React, { useState, useEffect, useContext } from "react";
-import { BASE_API } from "../config";
+import { BASE_API, CORS_ORIGIN } from "../config";
 import { AuthContext } from "../AuthContext";
 import "./MySpace.css";
 import { SERVICE_UNAVAILABLE_ERROR } from "../messages";
@@ -28,6 +28,7 @@ export default function PersonalBackground() {
         "Authorization": `Bearer ${access_token}`,
         "Accept": "application/json",
         "Content-Type": "application/json",
+        "Access-Control-Allow-Origin": {CORS_ORIGIN}
       },
     };
 
@@ -64,6 +65,7 @@ export default function PersonalBackground() {
         "Authorization": `Bearer ${access_token}`,
         "Accept": "application/json",
         "Content-Type": "application/json",
+        "Access-Control-Allow-Origin": {CORS_ORIGIN}
       },
       body: JSON.stringify(payload)
     };

diff --git a/src/myspace/PersonalDetails.jsx b/src/myspace/PersonalDetails.jsx
@@ -1,6 +1,6 @@
 import React, { useState, useEffect, useContext } from "react";
 import { AuthContext } from "../AuthContext";
-import { BASE_API } from "../config";
+import { BASE_API, CORS_ORIGIN } from "../config";
 import "./MySpace.css";
 import { SERVICE_UNAVAILABLE_ERROR } from "../messages";
 
@@ -22,6 +22,7 @@ export default function PersonalDetails() {
         "Authorization": `Bearer ${access_token}`,
         "Accept": "application/json",
         "Content-Type": "application/json",
+        "Access-Control-Allow-Origin": {CORS_ORIGIN}
       },
     };
 
@@ -57,6 +58,7 @@ export default function PersonalDetails() {
         "Authorization": `Bearer ${access_token}`,
         "Accept": "application/json",
         "Content-Type": "application/json",
+        "Access-Control-Allow-Origin": {CORS_ORIGIN}
       },
       body: JSON.stringify(payload)
     };

diff --git a/src/organizations/Organizations.jsx b/src/organizations/Organizations.jsx
@@ -2,7 +2,7 @@ import React, { useState, useContext, useEffect } from "react";
 import { Table } from "react-bootstrap";
 import { Link } from "react-router-dom";
 import { AuthContext } from "../AuthContext";
-import { BASE_API } from "../config";
+import { BASE_API, CORS_ORIGIN } from "../config";
 import { SERVICE_UNAVAILABLE_ERROR } from "../messages";
 import "./Organization.css";
 
@@ -19,6 +19,7 @@ export default function Organizations() {
         "Authorization": `Bearer ${access_token}`,
         "Accept": "application/json",
         "Content-Type": "application/json",
+        "Access-Control-Allow-Origin": {CORS_ORIGIN}
       },
     };
 

diff --git a/src/organizations/Programs.jsx b/src/organizations/Programs.jsx
@@ -2,7 +2,7 @@ import React, { useEffect, useState, useContext} from "react";
 import { Table } from "react-bootstrap";
 import { Link, useLocation } from "react-router-dom";
 import { AuthContext } from "../AuthContext";
-import { BASE_API } from "../config";
+import { BASE_API, CORS_ORIGIN } from "../config";
 import { SERVICE_UNAVAILABLE_ERROR } from "../messages";
 
 
@@ -21,6 +21,7 @@ export default function Programs() {
               "Authorization": `Bearer ${access_token}`,
               "Accept": "application/json",
               "Content-Type": "application/json",
+              "Access-Control-Allow-Origin": {CORS_ORIGIN}
             },
         };
 

diff --git a/src/register/Register.jsx b/src/register/Register.jsx
@@ -2,7 +2,7 @@ import React, { useState, useContext } from "react";
 import "./Register.css";
 import { Redirect, Link } from "react-router-dom";
 import { AuthContext } from "../AuthContext";
-import {BASE_API} from "../config";
+import {BASE_API, CORS_ORIGIN} from "../config";
 import {SERVICE_UNAVAILABLE_ERROR} from "../messages";
 import TermsAndPrivacyPolicyModal from "./TermsAndPrivacyPolicyModal";
 
@@ -36,6 +36,7 @@ export default function Register() {
                 headers: {
                     "Accept": "application/json",
                     "Content-Type": "application/json",
+                    "Access-Control-Allow-Origin": {CORS_ORIGIN}
                 },
                 body: JSON.stringify(payload)
             };