From 9fe69d21db855648920ce22887d9ac1f72fa4888 Mon Sep 17 00:00:00 2001 From: Rishi Ghan Date: Thu, 7 Sep 2023 13:54:02 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20Some=20refactoring?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/client/components/Dashboard/PullList.tsx | 4 ++-- .../{ => Settings}/AirDCPPSettings/AirDCPPHubsForm.tsx | 4 ++-- .../AirDCPPSettings/AirDCPPSettingsConfirmation.tsx | 0 .../{ => Settings}/AirDCPPSettings/AirDCPPSettingsForm.tsx | 4 ++-- .../QbittorrentSettings/QbittorrentConnectionForm.tsx | 2 +- src/client/components/{ => Settings}/Settings.tsx | 4 ++-- .../{ => Settings}/SystemSettings/SystemSettingsForm.tsx | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) rename src/client/components/{ => Settings}/AirDCPPSettings/AirDCPPHubsForm.tsx (95%) rename src/client/components/{ => Settings}/AirDCPPSettings/AirDCPPSettingsConfirmation.tsx (100%) rename src/client/components/{ => Settings}/AirDCPPSettings/AirDCPPSettingsForm.tsx (97%) rename src/client/components/{ => Settings}/QbittorrentSettings/QbittorrentConnectionForm.tsx (87%) rename src/client/components/{ => Settings}/Settings.tsx (96%) rename src/client/components/{ => Settings}/SystemSettings/SystemSettingsForm.tsx (97%) diff --git a/src/client/components/Dashboard/PullList.tsx b/src/client/components/Dashboard/PullList.tsx index 44fa41f..356e6a0 100644 --- a/src/client/components/Dashboard/PullList.tsx +++ b/src/client/components/Dashboard/PullList.tsx @@ -21,7 +21,7 @@ export const PullList = ({ issues }: PullListProps): ReactElement => { useEffect(() => { dispatch( getWeeklyPullList({ - startDate: "2023-8-9", + startDate: "2023-9-9", pageSize: "15", currentPage: "1", }), @@ -91,7 +91,7 @@ export const PullList = ({ issues }: PullListProps): ReactElement => {
+ iconClassNames="fa-solid fa-binoculars mr-2"/>
{/* select week */}
diff --git a/src/client/components/AirDCPPSettings/AirDCPPHubsForm.tsx b/src/client/components/Settings/AirDCPPSettings/AirDCPPHubsForm.tsx similarity index 95% rename from src/client/components/AirDCPPSettings/AirDCPPHubsForm.tsx rename to src/client/components/Settings/AirDCPPSettings/AirDCPPHubsForm.tsx index 11841fd..c2a88bf 100644 --- a/src/client/components/AirDCPPSettings/AirDCPPHubsForm.tsx +++ b/src/client/components/Settings/AirDCPPSettings/AirDCPPHubsForm.tsx @@ -3,8 +3,8 @@ import { Form, Field } from "react-final-form"; import { useDispatch } from "react-redux"; import { isEmpty, isNil, isUndefined } from "lodash"; import Select from "react-select"; -import { saveSettings } from "../../actions/settings.actions"; -import { AirDCPPSocketContext } from "../../context/AirDCPPSocket"; +import { saveSettings } from "../../../actions/settings.actions"; +import { AirDCPPSocketContext } from "../../../context/AirDCPPSocket"; export const AirDCPPHubsForm = (airDCPPClientUserSettings): ReactElement => { const dispatch = useDispatch(); diff --git a/src/client/components/AirDCPPSettings/AirDCPPSettingsConfirmation.tsx b/src/client/components/Settings/AirDCPPSettings/AirDCPPSettingsConfirmation.tsx similarity index 100% rename from src/client/components/AirDCPPSettings/AirDCPPSettingsConfirmation.tsx rename to src/client/components/Settings/AirDCPPSettings/AirDCPPSettingsConfirmation.tsx diff --git a/src/client/components/AirDCPPSettings/AirDCPPSettingsForm.tsx b/src/client/components/Settings/AirDCPPSettings/AirDCPPSettingsForm.tsx similarity index 97% rename from src/client/components/AirDCPPSettings/AirDCPPSettingsForm.tsx rename to src/client/components/Settings/AirDCPPSettings/AirDCPPSettingsForm.tsx index 5ba513f..8ab1eb6 100644 --- a/src/client/components/AirDCPPSettings/AirDCPPSettingsForm.tsx +++ b/src/client/components/Settings/AirDCPPSettings/AirDCPPSettingsForm.tsx @@ -1,9 +1,9 @@ import React, { ReactElement, useCallback, useContext } from "react"; import { Form, Field } from "react-final-form"; import { useDispatch } from "react-redux"; -import { saveSettings, deleteSettings } from "../../actions/settings.actions"; +import { saveSettings, deleteSettings } from "../../../actions/settings.actions"; import { AirDCPPSettingsConfirmation } from "./AirDCPPSettingsConfirmation"; -import { AirDCPPSocketContext } from "../../context/AirDCPPSocket"; +import { AirDCPPSocketContext } from "../../../context/AirDCPPSocket"; import { isUndefined, isEmpty, isNil } from "lodash"; export const AirDCPPSettingsForm = (): ReactElement => { diff --git a/src/client/components/QbittorrentSettings/QbittorrentConnectionForm.tsx b/src/client/components/Settings/QbittorrentSettings/QbittorrentConnectionForm.tsx similarity index 87% rename from src/client/components/QbittorrentSettings/QbittorrentConnectionForm.tsx rename to src/client/components/Settings/QbittorrentSettings/QbittorrentConnectionForm.tsx index 1b6d77f..6b46d0b 100644 --- a/src/client/components/QbittorrentSettings/QbittorrentConnectionForm.tsx +++ b/src/client/components/Settings/QbittorrentSettings/QbittorrentConnectionForm.tsx @@ -1,6 +1,6 @@ import React, { ReactElement, useCallback, useEffect } from "react"; import { useDispatch, useSelector } from "react-redux"; -import { getQBitTorrentClientInfo } from "../../actions/settings.actions"; +import { getQBitTorrentClientInfo } from "../../../actions/settings.actions"; export const QbittorrentConnectionForm = (): ReactElement => { const dispatch = useDispatch(); diff --git a/src/client/components/Settings.tsx b/src/client/components/Settings/Settings.tsx similarity index 96% rename from src/client/components/Settings.tsx rename to src/client/components/Settings/Settings.tsx index 1f9aa7c..6849494 100644 --- a/src/client/components/Settings.tsx +++ b/src/client/components/Settings/Settings.tsx @@ -3,8 +3,8 @@ import { AirDCPPSettingsForm } from "./AirDCPPSettings/AirDCPPSettingsForm"; import { AirDCPPHubsForm } from "./AirDCPPSettings/AirDCPPHubsForm"; import { QbittorrentConnectionForm } from "./QbittorrentSettings/QbittorrentConnectionForm"; import { SystemSettingsForm } from "./SystemSettings/SystemSettingsForm"; -import { ServiceStatuses } from "./ServiceStatuses/ServiceStatuses"; -import settingsObject from "../constants/settings/settingsMenu.json"; +import { ServiceStatuses } from "../ServiceStatuses/ServiceStatuses"; +import settingsObject from "../../constants/settings/settingsMenu.json"; import { isUndefined, map } from "lodash"; interface ISettingsProps { } diff --git a/src/client/components/SystemSettings/SystemSettingsForm.tsx b/src/client/components/Settings/SystemSettings/SystemSettingsForm.tsx similarity index 97% rename from src/client/components/SystemSettings/SystemSettingsForm.tsx rename to src/client/components/Settings/SystemSettings/SystemSettingsForm.tsx index 18a70f1..d19c9e5 100644 --- a/src/client/components/SystemSettings/SystemSettingsForm.tsx +++ b/src/client/components/Settings/SystemSettings/SystemSettingsForm.tsx @@ -1,5 +1,5 @@ import React, { ReactElement, useCallback } from "react"; -import { flushDb } from "../../actions/settings.actions"; +import { flushDb } from "../../../actions/settings.actions"; import { useDispatch, useSelector } from "react-redux"; export const SystemSettingsForm = (): ReactElement => {