LogalDeveloper/owncast
0
Fork 0
Code Activity

Fix some components being rendered as pages

Browse Source
This commit is contained in:
Gabe Kangas
2023-01-09 15:00:53 -08:00
parent d169d9d023
commit c542dc10da
13 changed files with 53 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/pages/admin/config-social-items.tsx
View File

@@ -1,6 +1,6 @@
import React from 'react'; import React from 'react';
import { Typography } from 'antd'; import { Typography } from 'antd';
import EditSocialLinks from './config/general/EditSocialLinks'; import EditSocialLinks from './config/general/components/EditSocialLinks';
const { Title } = Typography; const { Title } = Typography;

12
web/pages/admin/config/general/AppearanceConfig.tsx → web/pages/admin/config/general/components/AppearanceConfig.tsx
View File

@@ -3,17 +3,17 @@ import React, { useContext, useEffect, useState } from 'react';
import { Button, Col, Collapse, Row, Slider, Space } from 'antd'; import { Button, Col, Collapse, Row, Slider, Space } from 'antd';
import Paragraph from 'antd/lib/typography/Paragraph'; import Paragraph from 'antd/lib/typography/Paragraph';
import Title from 'antd/lib/typography/Title'; import Title from 'antd/lib/typography/Title';
import { EditCustomStyles } from '../../../../components/config/EditCustomStyles'; import { EditCustomStyles } from '../../../../../components/config/EditCustomStyles';
import s from './appearance.module.scss'; import s from '../appearance.module.scss';
import { postConfigUpdateToAPI, RESET_TIMEOUT } from '../../../../utils/config-constants'; import { postConfigUpdateToAPI, RESET_TIMEOUT } from '../../../../../utils/config-constants';
import { import {
createInputStatus, createInputStatus,
StatusState, StatusState,
STATUS_ERROR, STATUS_ERROR,
STATUS_SUCCESS, STATUS_SUCCESS,
} from '../../../../utils/input-statuses'; } from '../../../../../utils/input-statuses';
import { ServerStatusContext } from '../../../../utils/server-status-context'; import { ServerStatusContext } from '../../../../../utils/server-status-context';
import { FormStatusIndicator } from '../../../../components/config/FormStatusIndicator'; import { FormStatusIndicator } from '../../../../../components/config/FormStatusIndicator';
const { Panel } = Collapse; const { Panel } = Collapse;

12
web/pages/admin/config/general/EditInstanceDetails.tsx → web/pages/admin/config/general/components/EditInstanceDetails.tsx
View File

@@ -4,8 +4,8 @@ import {
TextFieldWithSubmit, TextFieldWithSubmit,
TEXTFIELD_TYPE_TEXTAREA, TEXTFIELD_TYPE_TEXTAREA,
TEXTFIELD_TYPE_URL, TEXTFIELD_TYPE_URL,
} from '../../../../components/config/TextFieldWithSubmit'; } from '../../../../../components/config/TextFieldWithSubmit';
import { ServerStatusContext } from '../../../../utils/server-status-context'; import { ServerStatusContext } from '../../../../../utils/server-status-context';
import { import {
postConfigUpdateToAPI, postConfigUpdateToAPI,
TEXTFIELD_PROPS_INSTANCE_URL, TEXTFIELD_PROPS_INSTANCE_URL,
@@ -16,10 +16,10 @@ import {
FIELD_PROPS_YP, FIELD_PROPS_YP,
FIELD_PROPS_NSFW, FIELD_PROPS_NSFW,
FIELD_PROPS_HIDE_VIEWER_COUNT, FIELD_PROPS_HIDE_VIEWER_COUNT,
} from '../../../../utils/config-constants'; } from '../../../../../utils/config-constants';
import { UpdateArgs } from '../../../../types/config-section'; import { UpdateArgs } from '../../../../../types/config-section';
import { ToggleSwitch } from '../../../../components/config/ToggleSwitch'; import { ToggleSwitch } from '../../../../../components/config/ToggleSwitch';
import { EditLogo } from '../../../../components/config/EditLogo'; import { EditLogo } from '../../../../../components/config/EditLogo';
const { Title } = Typography; const { Title } = Typography;

12
web/pages/admin/config/general/EditInstanceTags.tsx → web/pages/admin/config/general/components/EditInstanceTags.tsx
View File

@@ -1,14 +1,14 @@
/* eslint-disable react/no-array-index-key */ /* eslint-disable react/no-array-index-key */
import React, { useContext, useState, useEffect } from 'react'; import React, { useContext, useState, useEffect } from 'react';
import { Typography, Tag } from 'antd'; import { Typography, Tag } from 'antd';
import { ServerStatusContext } from '../../../../utils/server-status-context'; import { ServerStatusContext } from '../../../../../utils/server-status-context';
import { import {
FIELD_PROPS_TAGS, FIELD_PROPS_TAGS,
RESET_TIMEOUT, RESET_TIMEOUT,
postConfigUpdateToAPI, postConfigUpdateToAPI,
} from '../../../../utils/config-constants'; } from '../../../../../utils/config-constants';
import { TextField } from '../../../../components/config/TextField'; import { TextField } from '../../../../../components/config/TextField';
import { UpdateArgs } from '../../../../types/config-section'; import { UpdateArgs } from '../../../../../types/config-section';
import { import {
createInputStatus, createInputStatus,
StatusState, StatusState,
@@ -16,8 +16,8 @@ import {
STATUS_PROCESSING, STATUS_PROCESSING,
STATUS_SUCCESS, STATUS_SUCCESS,
STATUS_WARNING, STATUS_WARNING,
} from '../../../../utils/input-statuses'; } from '../../../../../utils/input-statuses';
import { TAG_COLOR } from '../../../../components/config/EditValueArray'; import { TAG_COLOR } from '../../../../../components/config/EditValueArray';
const { Title } = Typography; const { Title } = Typography;

8
web/pages/admin/config/general/EditPageContent.tsx → web/pages/admin/config/general/components/EditPageContent.tsx
View File

@@ -6,20 +6,20 @@ import { bbedit } from '@uiw/codemirror-theme-bbedit';
import { markdown, markdownLanguage } from '@codemirror/lang-markdown'; import { markdown, markdownLanguage } from '@codemirror/lang-markdown';
import { languages } from '@codemirror/language-data'; import { languages } from '@codemirror/language-data';
import { ServerStatusContext } from '../../../../utils/server-status-context'; import { ServerStatusContext } from '../../../../../utils/server-status-context';
import { import {
postConfigUpdateToAPI, postConfigUpdateToAPI,
RESET_TIMEOUT, RESET_TIMEOUT,
API_CUSTOM_CONTENT, API_CUSTOM_CONTENT,
} from '../../../../utils/config-constants'; } from '../../../../../utils/config-constants';
import { import {
createInputStatus, createInputStatus,
StatusState, StatusState,
STATUS_ERROR, STATUS_ERROR,
STATUS_PROCESSING, STATUS_PROCESSING,
STATUS_SUCCESS, STATUS_SUCCESS,
} from '../../../../utils/input-statuses'; } from '../../../../../utils/input-statuses';
import { FormStatusIndicator } from '../../../../components/config/FormStatusIndicator'; import { FormStatusIndicator } from '../../../../../components/config/FormStatusIndicator';
const { Title } = Typography; const { Title } = Typography;

22
web/pages/admin/config/general/EditSocialLinks.tsx → web/pages/admin/config/general/components/EditSocialLinks.tsx
View File

@@ -2,26 +2,30 @@ import React, { useState, useContext, useEffect } from 'react';
import { Typography, Table, Button, Modal, Input } from 'antd'; import { Typography, Table, Button, Modal, Input } from 'antd';
import { ColumnsType } from 'antd/lib/table'; import { ColumnsType } from 'antd/lib/table';
import { CaretDownOutlined, CaretUpOutlined, DeleteOutlined } from '@ant-design/icons'; import { CaretDownOutlined, CaretUpOutlined, DeleteOutlined } from '@ant-design/icons';
import { SocialDropdown } from '../../../../components/config/SocialDropdown'; import { SocialDropdown } from '../../../../../components/config/SocialDropdown';
import { fetchData, SOCIAL_PLATFORMS_LIST } from '../../../../utils/apis'; import { fetchData, SOCIAL_PLATFORMS_LIST } from '../../../../../utils/apis';
import { ServerStatusContext } from '../../../../utils/server-status-context'; import { ServerStatusContext } from '../../../../../utils/server-status-context';
import { import {
API_SOCIAL_HANDLES, API_SOCIAL_HANDLES,
postConfigUpdateToAPI, postConfigUpdateToAPI,
RESET_TIMEOUT, RESET_TIMEOUT,
DEFAULT_SOCIAL_HANDLE, DEFAULT_SOCIAL_HANDLE,
OTHER_SOCIAL_HANDLE_OPTION, OTHER_SOCIAL_HANDLE_OPTION,
} from '../../../../utils/config-constants'; } from '../../../../../utils/config-constants';
import { SocialHandle, UpdateArgs } from '../../../../types/config-section'; import { SocialHandle, UpdateArgs } from '../../../../../types/config-section';
import { import {
isValidMatrixAccount, isValidMatrixAccount,
isValidAccount, isValidAccount,
isValidUrl, isValidUrl,
DEFAULT_TEXTFIELD_URL_PATTERN, DEFAULT_TEXTFIELD_URL_PATTERN,
} from '../../../../utils/urls'; } from '../../../../../utils/urls';
import { TextField } from '../../../../components/config/TextField'; import { TextField } from '../../../../../components/config/TextField';
import { createInputStatus, STATUS_ERROR, STATUS_SUCCESS } from '../../../../utils/input-statuses'; import {
import { FormStatusIndicator } from '../../../../components/config/FormStatusIndicator'; createInputStatus,
STATUS_ERROR,
STATUS_SUCCESS,
} from '../../../../../utils/input-statuses';
import { FormStatusIndicator } from '../../../../../components/config/FormStatusIndicator';
const { Title } = Typography; const { Title } = Typography;

0
web/pages/admin/config/general/GeneralConfig.tsx → web/pages/admin/config/general/components/GeneralConfig.tsx
View File

4
web/pages/admin/config/general/index.tsx
View File

@@ -1,8 +1,8 @@
import React from 'react'; import React from 'react';
import { Tabs } from 'antd'; import { Tabs } from 'antd';
import GeneralConfig from './GeneralConfig'; import GeneralConfig from './components/GeneralConfig';
import AppearanceConfig from './AppearanceConfig'; import AppearanceConfig from './components/AppearanceConfig';
export default function PublicFacingDetails() { export default function PublicFacingDetails() {
return ( return (

18
web/pages/admin/config/server/EditStorage.tsx → web/pages/admin/config/server/components/EditStorage.tsx
View File

@@ -1,27 +1,27 @@
import { Button, Collapse } from 'antd'; import { Button, Collapse } from 'antd';
import classNames from 'classnames'; import classNames from 'classnames';
import React, { useContext, useState, useEffect } from 'react'; import React, { useContext, useState, useEffect } from 'react';
import { UpdateArgs } from '../../../../types/config-section'; import { UpdateArgs } from '../../../../../types/config-section';
import { ServerStatusContext } from '../../../../utils/server-status-context'; import { ServerStatusContext } from '../../../../../utils/server-status-context';
import { AlertMessageContext } from '../../../../utils/alert-message-context'; import { AlertMessageContext } from '../../../../../utils/alert-message-context';
import { import {
postConfigUpdateToAPI, postConfigUpdateToAPI,
API_S3_INFO, API_S3_INFO,
RESET_TIMEOUT, RESET_TIMEOUT,
S3_TEXT_FIELDS_INFO, S3_TEXT_FIELDS_INFO,
} from '../../../../utils/config-constants'; } from '../../../../../utils/config-constants';
import { import {
createInputStatus, createInputStatus,
StatusState, StatusState,
STATUS_ERROR, STATUS_ERROR,
STATUS_PROCESSING, STATUS_PROCESSING,
STATUS_SUCCESS, STATUS_SUCCESS,
} from '../../../../utils/input-statuses'; } from '../../../../../utils/input-statuses';
import { TextField } from '../../../../components/config/TextField'; import { TextField } from '../../../../../components/config/TextField';
import { FormStatusIndicator } from '../../../../components/config/FormStatusIndicator'; import { FormStatusIndicator } from '../../../../../components/config/FormStatusIndicator';
import { isValidUrl } from '../../../../utils/urls'; import { isValidUrl } from '../../../../../utils/urls';
import { ToggleSwitch } from '../../../../components/config/ToggleSwitch'; import { ToggleSwitch } from '../../../../../components/config/ToggleSwitch';
const { Panel } = Collapse; const { Panel } = Collapse;

2
web/pages/admin/config/server/ServerConfig.tsx → web/pages/admin/config/server/components/ServerConfig.tsx
View File

@@ -1,5 +1,5 @@
import React from 'react'; import React from 'react';
import { EditInstanceDetails } from '../../../../components/config/EditInstanceDetails2'; import { EditInstanceDetails } from '../../../../../components/config/EditInstanceDetails2';
export default function ConfigServerDetails() { export default function ConfigServerDetails() {
return ( return (

0
web/pages/admin/config/server/StorageConfig.tsx → web/pages/admin/config/server/components/StorageConfig.tsx
View File

4
web/pages/admin/config/server/StreamKeys.tsx → web/pages/admin/config/server/components/StreamKeys.tsx
View File

@@ -1,9 +1,9 @@
import React, { useContext, useState } from 'react'; import React, { useContext, useState } from 'react';
import { Table, Space, Button, Typography, Alert, Input, Form } from 'antd'; import { Table, Space, Button, Typography, Alert, Input, Form } from 'antd';
import { DeleteOutlined, EyeOutlined, PlusOutlined } from '@ant-design/icons'; import { DeleteOutlined, EyeOutlined, PlusOutlined } from '@ant-design/icons';
import { ServerStatusContext } from '../../../../utils/server-status-context'; import { ServerStatusContext } from '../../../../../utils/server-status-context';
import { fetchData, UPDATE_STREAM_KEYS } from '../../../../utils/apis'; import { fetchData, UPDATE_STREAM_KEYS } from '../../../../../utils/apis';
const { Paragraph } = Typography; const { Paragraph } = Typography;
const { Item } = Form; const { Item } = Form;

6
web/pages/admin/config/server/index.tsx
View File

@@ -1,9 +1,9 @@
import React from 'react'; import React from 'react';
import { Tabs } from 'antd'; import { Tabs } from 'antd';
import StreamKeys from './StreamKeys'; import StreamKeys from './components/StreamKeys';
import ServerConfig from './ServerConfig'; import ServerConfig from './components/ServerConfig';
import StorageConfig from './StorageConfig'; import StorageConfig from './components/StorageConfig';
export default function PublicFacingDetails() { export default function PublicFacingDetails() {
return ( return (