From 6d89fdf6c35e1d2acbb508d285ac9a48145b5532 Mon Sep 17 00:00:00 2001 From: gingervitis Date: Thu, 4 Feb 2021 14:50:03 -0800 Subject: [PATCH] a fix for https://github.com/owncast/owncast/issues/691 (and some linting) --- web/pages/components/config/constants.tsx | 15 +++------------ web/utils/apis.ts | 14 +++++++------- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/web/pages/components/config/constants.tsx b/web/pages/components/config/constants.tsx index 143d9e821..083e7612a 100644 --- a/web/pages/components/config/constants.tsx +++ b/web/pages/components/config/constants.tsx @@ -177,19 +177,9 @@ export const DEFAULT_SOCIAL_HANDLE: SocialHandle = { export const OTHER_SOCIAL_HANDLE_OPTION = 'OTHER_SOCIAL_HANDLE_OPTION'; - export const TEXTFIELD_PROPS_S3_COMMON = { maxLength: 255, -} - - -// export const FIELD_PROPS_CUSTOM_CONTENT = { -// apiPath: API_CUSTOM_CONTENT, -// configPath: 'instanceDetails', -// placeholder: '', -// label: 'Extra page content', -// tip: 'Custom markup about yourself', -// }; +}; export const S3_TEXT_FIELDS_INFO = { accessKey: { @@ -239,6 +229,7 @@ export const S3_TEXT_FIELDS_INFO = { label: 'Serving Endpoint', maxLength: 255, placeholder: 'http://cdn.ss3.provider.endpoint.com', - tip: 'Optional URL that content should be accessed from instead of the default. Used with CDNs and specific storage providers. Generally not required.' + tip: + 'Optional URL that content should be accessed from instead of the default. Used with CDNs and specific storage providers. Generally not required.', }, }; diff --git a/web/utils/apis.ts b/web/utils/apis.ts index d25679bb1..26063bf94 100644 --- a/web/utils/apis.ts +++ b/web/utils/apis.ts @@ -65,8 +65,7 @@ export const SOCIAL_PLATFORMS_LIST = `${NEXT_PUBLIC_API_HOST}api/socialplatforms export const TEMP_UPDATER_API = LOGS_ALL; - -const GITHUB_RELEASE_URL = "https://api.github.com/repos/owncast/owncast/releases/latest"; +const GITHUB_RELEASE_URL = 'https://api.github.com/repos/owncast/owncast/releases/latest'; interface FetchOptions { data?: any; @@ -86,14 +85,14 @@ export async function fetchData(url: string, options?: FetchOptions) { }; if (data) { - requestOptions.body = JSON.stringify(data) + requestOptions.body = JSON.stringify(data); } if (auth && ADMIN_USERNAME && ADMIN_STREAMKEY) { const encoded = btoa(`${ADMIN_USERNAME}:${ADMIN_STREAMKEY}`); requestOptions.headers = { - 'Authorization': `Basic ${encoded}` - } + Authorization: `Basic ${encoded}`, + }; requestOptions.mode = 'cors'; requestOptions.credentials = 'include'; } @@ -107,8 +106,9 @@ export async function fetchData(url: string, options?: FetchOptions) { const json = await response.json(); return json; } catch (error) { - console.log(error) - throw new Error(error) + return error; + // console.log(error) + // throw new Error(error) } return {}; }