From 58773f4e0f5f748629f24a8071f5c786010ebe61 Mon Sep 17 00:00:00 2001 From: Piotr Rogowski Date: Wed, 23 Feb 2022 22:59:53 +0100 Subject: [PATCH] Switch CDN, update dependencies --- package.json | 4 ++-- src/hooks/useServerStorage.ts | 2 +- src/utils/api.ts | 13 ++++--------- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index eb6b0fa..9736eec 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "@sentry/tracing": "^6.17.9", "@speedy-tuner/ini": "^0.3.0", "@speedy-tuner/types": "^0.3.0", - "antd": "^4.18.7", + "antd": "^4.18.8", "craco-less": "^2.0.0", "firebase": "^9.6.7", "kbar": "^0.1.0-beta.27", @@ -57,7 +57,7 @@ "devDependencies": { "@craco/craco": "^7.0.0-7.0.0-alpha.2.0", "@speedy-tuner/eslint-config": "^0.1.3", - "@types/node": "^17.0.18", + "@types/node": "^17.0.19", "@types/pako": "^1.0.3", "@types/react": "^17.0.39", "@types/react-dom": "^17.0.11", diff --git a/src/hooks/useServerStorage.ts b/src/hooks/useServerStorage.ts index 0dc2aeb..870ec76 100644 --- a/src/hooks/useServerStorage.ts +++ b/src/hooks/useServerStorage.ts @@ -12,7 +12,7 @@ import { const PUBLIC_PATH = 'public'; const USERS_PATH = `${PUBLIC_PATH}/users`; const INI_PATH = `${PUBLIC_PATH}/ini`; -const CDN_URL = process.env.REACT_APP_CDN_URL; +export const CDN_URL = process.env.REACT_APP_CDN_URL; const storage = getStorage(); diff --git a/src/utils/api.ts b/src/utils/api.ts index 6da80d8..5a8a7d7 100644 --- a/src/utils/api.ts +++ b/src/utils/api.ts @@ -10,7 +10,7 @@ import { } from './http'; import TuneParser from './tune/TuneParser'; import { TuneDbData } from '../types/dbData'; -import useServerStorage from '../hooks/useServerStorage'; +import useServerStorage, { CDN_URL } from '../hooks/useServerStorage'; export const loadTune = async (tuneData: TuneDbData) => { // eslint-disable-next-line react-hooks/rules-of-hooks @@ -51,26 +51,21 @@ export const loadTune = async (tuneData: TuneDbData) => { export const loadLogs = (onProgress?: onProgressType, signal?: AbortSignal) => fetchWithProgress( - // 'https://speedytuner-cloud.s3.eu-west-2.amazonaws.com/logs/longest.mlg.gz', - // 'https://d29mjpbgm6k6md.cloudfront.net/logs/longest.mlg.gz', - 'https://d29mjpbgm6k6md.cloudfront.net/logs/middle.mlg.gz', - // 'https://d29mjpbgm6k6md.cloudfront.net/logs/markers.mlg.gz', + `${CDN_URL}/public/temp/long.mlg.gz`, onProgress, signal, ).then((response) => response); export const loadCompositeLogs = (onProgress?: onProgressType, signal?: AbortSignal) => fetchWithProgress( - 'https://d29mjpbgm6k6md.cloudfront.net/trigger-logs/composite_1_2.csv.gz', - // 'https://d29mjpbgm6k6md.cloudfront.net/trigger-logs/composite_miata.csv.gz', - // 'https://d29mjpbgm6k6md.cloudfront.net/trigger-logs/2.csv.gz', + `${CDN_URL}/public/temp/composite_1.csv.gz`, onProgress, signal, ).then((response) => response); export const loadToothLogs = (onProgress?: onProgressType, signal?: AbortSignal) => fetchWithProgress( - 'https://d29mjpbgm6k6md.cloudfront.net/trigger-logs/tooth_3.csv.gz', + `${CDN_URL}/public/temp/tooth_3.csv.gz`, onProgress, signal, ).then((response) => response);