admin/ota-admin-portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove default localhost settings (#8)

Browse Source 
* Remove default localhost settings
Replace with deployment settings

* Fix for upload data format

* Fix test data for last commit
This commit is contained in:
John Wu
2021-01-26 17:35:39 -08:00
committed by GitHub
parent fcde299197
commit eccae3f26d
5 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.template
View File

@@ -1,2 +1,2 @@
REACT_APP_AUTH_SERVICE_URL = https://dev-auth.fiskerdps.com REACT_APP_AUTH_SERVICE_URL = https://dev-auth.fiskerdps.com
REACT_APP_UPLOAD_SERVICE_URL = http://localhost:8080/api/upload REACT_APP_UPLOAD_SERVICE_URL = https://gw-dev.fiskerdps.com

1
Dockerfile
View File

@@ -3,7 +3,6 @@ FROM node:12-alpine as builder
COPY package*.json ./ COPY package*.json ./
RUN npm install RUN npm install
COPY . . COPY . .
COPY .env.template .env
RUN npm run build RUN npm run build
FROM nginx:alpine FROM nginx:alpine

2
src/components/Contexts/FileUploadContext.jsx
View File

@@ -39,7 +39,7 @@ export const FileUploadProvider = ({ children }) => {
const { data } = await uploadFile(file, accessToken, setProgress, cancelUpload); const { data } = await uploadFile(file, accessToken, setProgress, cancelUpload);
if (data.message) throw new Error(`${data.error}. ${data.message}`); if (data.message) throw new Error(`${data.error}. ${data.message}`);
const url = ((data && data.link) ? data.link : "No URL available"); const url = ((data && data.link && data.link.link) ? data.link.link : "No URL available");
setLinkURL(url); setLinkURL(url);
setStatus(`Uploaded ${filename}`); setStatus(`Uploaded ${filename}`);
setCancelUpload(null); setCancelUpload(null);

2
src/services/__mocks__/uploadFile.js
View File

@@ -1,6 +1,6 @@
import delay from "../../utils/delay"; import delay from "../../utils/delay";
let uploadFileResponse = { data: { link: "CLOUDFRONT_URL" } }; let uploadFileResponse = { data: { link: { link: "CLOUDFRONT_URL" } } };
let uploadFileDelay = false; let uploadFileDelay = false;
let issuedCancelToken = null; let issuedCancelToken = null;

2
src/services/uploadFile.js
View File

@@ -1,6 +1,6 @@
import axios from 'axios'; import axios from 'axios';
const UPLOAD_ENDPOINT = process.env.REACT_APP_UPLOAD_SERVICE_URL || "http://localhost:8080"; const UPLOAD_ENDPOINT = process.env.REACT_APP_UPLOAD_SERVICE_URL || "https://gw-dev.fiskerdps.com";
export const getCancelToken = () => { export const getCancelToken = () => {
const token = axios.CancelToken; const token = axios.CancelToken;