From c542dc10da98fad2e6c0f09237d43410c37cb2fc Mon Sep 17 00:00:00 2001 From: Gabe Kangas Date: Mon, 9 Jan 2023 15:00:53 -0800 Subject: [PATCH] Fix some components being rendered as pages --- web/pages/admin/config-social-items.tsx | 2 +- .../{ => components}/AppearanceConfig.tsx | 12 +++++----- .../{ => components}/EditInstanceDetails.tsx | 12 +++++----- .../{ => components}/EditInstanceTags.tsx | 12 +++++----- .../{ => components}/EditPageContent.tsx | 8 +++---- .../{ => components}/EditSocialLinks.tsx | 22 +++++++++++-------- .../{ => components}/GeneralConfig.tsx | 0 web/pages/admin/config/general/index.tsx | 4 ++-- .../server/{ => components}/EditStorage.tsx | 18 +++++++-------- .../server/{ => components}/ServerConfig.tsx | 2 +- .../server/{ => components}/StorageConfig.tsx | 0 .../server/{ => components}/StreamKeys.tsx | 4 ++-- web/pages/admin/config/server/index.tsx | 6 ++--- 13 files changed, 53 insertions(+), 49 deletions(-) rename web/pages/admin/config/general/{ => components}/AppearanceConfig.tsx (96%) rename web/pages/admin/config/general/{ => components}/EditInstanceDetails.tsx (91%) rename web/pages/admin/config/general/{ => components}/EditInstanceTags.tsx (90%) rename web/pages/admin/config/general/{ => components}/EditPageContent.tsx (92%) rename web/pages/admin/config/general/{ => components}/EditSocialLinks.tsx (93%) rename web/pages/admin/config/general/{ => components}/GeneralConfig.tsx (100%) rename web/pages/admin/config/server/{ => components}/EditStorage.tsx (92%) rename web/pages/admin/config/server/{ => components}/ServerConfig.tsx (83%) rename web/pages/admin/config/server/{ => components}/StorageConfig.tsx (100%) rename web/pages/admin/config/server/{ => components}/StreamKeys.tsx (96%) diff --git a/web/pages/admin/config-social-items.tsx b/web/pages/admin/config-social-items.tsx index 299027d67..8aa865b9b 100644 --- a/web/pages/admin/config-social-items.tsx +++ b/web/pages/admin/config-social-items.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { Typography } from 'antd'; -import EditSocialLinks from './config/general/EditSocialLinks'; +import EditSocialLinks from './config/general/components/EditSocialLinks'; const { Title } = Typography; diff --git a/web/pages/admin/config/general/AppearanceConfig.tsx b/web/pages/admin/config/general/components/AppearanceConfig.tsx similarity index 96% rename from web/pages/admin/config/general/AppearanceConfig.tsx rename to web/pages/admin/config/general/components/AppearanceConfig.tsx index da642bc09..19b167d87 100644 --- a/web/pages/admin/config/general/AppearanceConfig.tsx +++ b/web/pages/admin/config/general/components/AppearanceConfig.tsx @@ -3,17 +3,17 @@ import React, { useContext, useEffect, useState } from 'react'; import { Button, Col, Collapse, Row, Slider, Space } from 'antd'; import Paragraph from 'antd/lib/typography/Paragraph'; import Title from 'antd/lib/typography/Title'; -import { EditCustomStyles } from '../../../../components/config/EditCustomStyles'; -import s from './appearance.module.scss'; -import { postConfigUpdateToAPI, RESET_TIMEOUT } from '../../../../utils/config-constants'; +import { EditCustomStyles } from '../../../../../components/config/EditCustomStyles'; +import s from '../appearance.module.scss'; +import { postConfigUpdateToAPI, RESET_TIMEOUT } from '../../../../../utils/config-constants'; import { createInputStatus, StatusState, STATUS_ERROR, STATUS_SUCCESS, -} from '../../../../utils/input-statuses'; -import { ServerStatusContext } from '../../../../utils/server-status-context'; -import { FormStatusIndicator } from '../../../../components/config/FormStatusIndicator'; +} from '../../../../../utils/input-statuses'; +import { ServerStatusContext } from '../../../../../utils/server-status-context'; +import { FormStatusIndicator } from '../../../../../components/config/FormStatusIndicator'; const { Panel } = Collapse; diff --git a/web/pages/admin/config/general/EditInstanceDetails.tsx b/web/pages/admin/config/general/components/EditInstanceDetails.tsx similarity index 91% rename from web/pages/admin/config/general/EditInstanceDetails.tsx rename to web/pages/admin/config/general/components/EditInstanceDetails.tsx index 4d3390641..40701e2fb 100644 --- a/web/pages/admin/config/general/EditInstanceDetails.tsx +++ b/web/pages/admin/config/general/components/EditInstanceDetails.tsx @@ -4,8 +4,8 @@ import { TextFieldWithSubmit, TEXTFIELD_TYPE_TEXTAREA, TEXTFIELD_TYPE_URL, -} from '../../../../components/config/TextFieldWithSubmit'; -import { ServerStatusContext } from '../../../../utils/server-status-context'; +} from '../../../../../components/config/TextFieldWithSubmit'; +import { ServerStatusContext } from '../../../../../utils/server-status-context'; import { postConfigUpdateToAPI, TEXTFIELD_PROPS_INSTANCE_URL, @@ -16,10 +16,10 @@ import { FIELD_PROPS_YP, FIELD_PROPS_NSFW, FIELD_PROPS_HIDE_VIEWER_COUNT, -} from '../../../../utils/config-constants'; -import { UpdateArgs } from '../../../../types/config-section'; -import { ToggleSwitch } from '../../../../components/config/ToggleSwitch'; -import { EditLogo } from '../../../../components/config/EditLogo'; +} from '../../../../../utils/config-constants'; +import { UpdateArgs } from '../../../../../types/config-section'; +import { ToggleSwitch } from '../../../../../components/config/ToggleSwitch'; +import { EditLogo } from '../../../../../components/config/EditLogo'; const { Title } = Typography; diff --git a/web/pages/admin/config/general/EditInstanceTags.tsx b/web/pages/admin/config/general/components/EditInstanceTags.tsx similarity index 90% rename from web/pages/admin/config/general/EditInstanceTags.tsx rename to web/pages/admin/config/general/components/EditInstanceTags.tsx index 76031d4b5..b3e88c06a 100644 --- a/web/pages/admin/config/general/EditInstanceTags.tsx +++ b/web/pages/admin/config/general/components/EditInstanceTags.tsx @@ -1,14 +1,14 @@ /* eslint-disable react/no-array-index-key */ import React, { useContext, useState, useEffect } from 'react'; import { Typography, Tag } from 'antd'; -import { ServerStatusContext } from '../../../../utils/server-status-context'; +import { ServerStatusContext } from '../../../../../utils/server-status-context'; import { FIELD_PROPS_TAGS, RESET_TIMEOUT, postConfigUpdateToAPI, -} from '../../../../utils/config-constants'; -import { TextField } from '../../../../components/config/TextField'; -import { UpdateArgs } from '../../../../types/config-section'; +} from '../../../../../utils/config-constants'; +import { TextField } from '../../../../../components/config/TextField'; +import { UpdateArgs } from '../../../../../types/config-section'; import { createInputStatus, StatusState, @@ -16,8 +16,8 @@ import { STATUS_PROCESSING, STATUS_SUCCESS, STATUS_WARNING, -} from '../../../../utils/input-statuses'; -import { TAG_COLOR } from '../../../../components/config/EditValueArray'; +} from '../../../../../utils/input-statuses'; +import { TAG_COLOR } from '../../../../../components/config/EditValueArray'; const { Title } = Typography; diff --git a/web/pages/admin/config/general/EditPageContent.tsx b/web/pages/admin/config/general/components/EditPageContent.tsx similarity index 92% rename from web/pages/admin/config/general/EditPageContent.tsx rename to web/pages/admin/config/general/components/EditPageContent.tsx index 6347e0998..b83e0d75f 100644 --- a/web/pages/admin/config/general/EditPageContent.tsx +++ b/web/pages/admin/config/general/components/EditPageContent.tsx @@ -6,20 +6,20 @@ import { bbedit } from '@uiw/codemirror-theme-bbedit'; import { markdown, markdownLanguage } from '@codemirror/lang-markdown'; import { languages } from '@codemirror/language-data'; -import { ServerStatusContext } from '../../../../utils/server-status-context'; +import { ServerStatusContext } from '../../../../../utils/server-status-context'; import { postConfigUpdateToAPI, RESET_TIMEOUT, API_CUSTOM_CONTENT, -} from '../../../../utils/config-constants'; +} from '../../../../../utils/config-constants'; import { createInputStatus, StatusState, STATUS_ERROR, STATUS_PROCESSING, STATUS_SUCCESS, -} from '../../../../utils/input-statuses'; -import { FormStatusIndicator } from '../../../../components/config/FormStatusIndicator'; +} from '../../../../../utils/input-statuses'; +import { FormStatusIndicator } from '../../../../../components/config/FormStatusIndicator'; const { Title } = Typography; diff --git a/web/pages/admin/config/general/EditSocialLinks.tsx b/web/pages/admin/config/general/components/EditSocialLinks.tsx similarity index 93% rename from web/pages/admin/config/general/EditSocialLinks.tsx rename to web/pages/admin/config/general/components/EditSocialLinks.tsx index 9fb9662f9..e9bee22bb 100644 --- a/web/pages/admin/config/general/EditSocialLinks.tsx +++ b/web/pages/admin/config/general/components/EditSocialLinks.tsx @@ -2,26 +2,30 @@ import React, { useState, useContext, useEffect } from 'react'; import { Typography, Table, Button, Modal, Input } from 'antd'; import { ColumnsType } from 'antd/lib/table'; import { CaretDownOutlined, CaretUpOutlined, DeleteOutlined } from '@ant-design/icons'; -import { SocialDropdown } from '../../../../components/config/SocialDropdown'; -import { fetchData, SOCIAL_PLATFORMS_LIST } from '../../../../utils/apis'; -import { ServerStatusContext } from '../../../../utils/server-status-context'; +import { SocialDropdown } from '../../../../../components/config/SocialDropdown'; +import { fetchData, SOCIAL_PLATFORMS_LIST } from '../../../../../utils/apis'; +import { ServerStatusContext } from '../../../../../utils/server-status-context'; import { API_SOCIAL_HANDLES, postConfigUpdateToAPI, RESET_TIMEOUT, DEFAULT_SOCIAL_HANDLE, OTHER_SOCIAL_HANDLE_OPTION, -} from '../../../../utils/config-constants'; -import { SocialHandle, UpdateArgs } from '../../../../types/config-section'; +} from '../../../../../utils/config-constants'; +import { SocialHandle, UpdateArgs } from '../../../../../types/config-section'; import { isValidMatrixAccount, isValidAccount, isValidUrl, DEFAULT_TEXTFIELD_URL_PATTERN, -} from '../../../../utils/urls'; -import { TextField } from '../../../../components/config/TextField'; -import { createInputStatus, STATUS_ERROR, STATUS_SUCCESS } from '../../../../utils/input-statuses'; -import { FormStatusIndicator } from '../../../../components/config/FormStatusIndicator'; +} from '../../../../../utils/urls'; +import { TextField } from '../../../../../components/config/TextField'; +import { + createInputStatus, + STATUS_ERROR, + STATUS_SUCCESS, +} from '../../../../../utils/input-statuses'; +import { FormStatusIndicator } from '../../../../../components/config/FormStatusIndicator'; const { Title } = Typography; diff --git a/web/pages/admin/config/general/GeneralConfig.tsx b/web/pages/admin/config/general/components/GeneralConfig.tsx similarity index 100% rename from web/pages/admin/config/general/GeneralConfig.tsx rename to web/pages/admin/config/general/components/GeneralConfig.tsx diff --git a/web/pages/admin/config/general/index.tsx b/web/pages/admin/config/general/index.tsx index e171d4a24..1f00884e5 100644 --- a/web/pages/admin/config/general/index.tsx +++ b/web/pages/admin/config/general/index.tsx @@ -1,8 +1,8 @@ import React from 'react'; import { Tabs } from 'antd'; -import GeneralConfig from './GeneralConfig'; -import AppearanceConfig from './AppearanceConfig'; +import GeneralConfig from './components/GeneralConfig'; +import AppearanceConfig from './components/AppearanceConfig'; export default function PublicFacingDetails() { return ( diff --git a/web/pages/admin/config/server/EditStorage.tsx b/web/pages/admin/config/server/components/EditStorage.tsx similarity index 92% rename from web/pages/admin/config/server/EditStorage.tsx rename to web/pages/admin/config/server/components/EditStorage.tsx index f8de7a7ae..cbea40dc8 100644 --- a/web/pages/admin/config/server/EditStorage.tsx +++ b/web/pages/admin/config/server/components/EditStorage.tsx @@ -1,27 +1,27 @@ import { Button, Collapse } from 'antd'; import classNames from 'classnames'; import React, { useContext, useState, useEffect } from 'react'; -import { UpdateArgs } from '../../../../types/config-section'; -import { ServerStatusContext } from '../../../../utils/server-status-context'; -import { AlertMessageContext } from '../../../../utils/alert-message-context'; +import { UpdateArgs } from '../../../../../types/config-section'; +import { ServerStatusContext } from '../../../../../utils/server-status-context'; +import { AlertMessageContext } from '../../../../../utils/alert-message-context'; import { postConfigUpdateToAPI, API_S3_INFO, RESET_TIMEOUT, S3_TEXT_FIELDS_INFO, -} from '../../../../utils/config-constants'; +} from '../../../../../utils/config-constants'; import { createInputStatus, StatusState, STATUS_ERROR, STATUS_PROCESSING, STATUS_SUCCESS, -} from '../../../../utils/input-statuses'; -import { TextField } from '../../../../components/config/TextField'; -import { FormStatusIndicator } from '../../../../components/config/FormStatusIndicator'; -import { isValidUrl } from '../../../../utils/urls'; -import { ToggleSwitch } from '../../../../components/config/ToggleSwitch'; +} from '../../../../../utils/input-statuses'; +import { TextField } from '../../../../../components/config/TextField'; +import { FormStatusIndicator } from '../../../../../components/config/FormStatusIndicator'; +import { isValidUrl } from '../../../../../utils/urls'; +import { ToggleSwitch } from '../../../../../components/config/ToggleSwitch'; const { Panel } = Collapse; diff --git a/web/pages/admin/config/server/ServerConfig.tsx b/web/pages/admin/config/server/components/ServerConfig.tsx similarity index 83% rename from web/pages/admin/config/server/ServerConfig.tsx rename to web/pages/admin/config/server/components/ServerConfig.tsx index 23e9d6c39..18380af40 100644 --- a/web/pages/admin/config/server/ServerConfig.tsx +++ b/web/pages/admin/config/server/components/ServerConfig.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { EditInstanceDetails } from '../../../../components/config/EditInstanceDetails2'; +import { EditInstanceDetails } from '../../../../../components/config/EditInstanceDetails2'; export default function ConfigServerDetails() { return ( diff --git a/web/pages/admin/config/server/StorageConfig.tsx b/web/pages/admin/config/server/components/StorageConfig.tsx similarity index 100% rename from web/pages/admin/config/server/StorageConfig.tsx rename to web/pages/admin/config/server/components/StorageConfig.tsx diff --git a/web/pages/admin/config/server/StreamKeys.tsx b/web/pages/admin/config/server/components/StreamKeys.tsx similarity index 96% rename from web/pages/admin/config/server/StreamKeys.tsx rename to web/pages/admin/config/server/components/StreamKeys.tsx index aac9b5b3e..8ba0cea08 100644 --- a/web/pages/admin/config/server/StreamKeys.tsx +++ b/web/pages/admin/config/server/components/StreamKeys.tsx @@ -1,9 +1,9 @@ import React, { useContext, useState } from 'react'; import { Table, Space, Button, Typography, Alert, Input, Form } from 'antd'; 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 { Item } = Form; diff --git a/web/pages/admin/config/server/index.tsx b/web/pages/admin/config/server/index.tsx index 2f380dae1..cb7293dfb 100644 --- a/web/pages/admin/config/server/index.tsx +++ b/web/pages/admin/config/server/index.tsx @@ -1,9 +1,9 @@ import React from 'react'; import { Tabs } from 'antd'; -import StreamKeys from './StreamKeys'; -import ServerConfig from './ServerConfig'; -import StorageConfig from './StorageConfig'; +import StreamKeys from './components/StreamKeys'; +import ServerConfig from './components/ServerConfig'; +import StorageConfig from './components/StorageConfig'; export default function PublicFacingDetails() { return (