Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 15 additions & 13 deletions frontend/src/components/app/App.tsx
Original file line number Diff line number Diff line change
@@ -1,26 +1,28 @@
import React from "react";

import { SocketContextProvider } from "@context/socket";
import { SocketContextProvider } from "@context";
import SideBar from "@components/sideBar";

import { BrowserRouter, Route, Routes, Outlet } from "react-router-dom";
import { CommandRoutes } from "@routes/CommandRoute";
import { ConfigRoutes } from "@routes/ConfigsRoute";
import { EventRoutes } from "@routes/EventsRoute";
import { MessageRoutes } from "@routes/MessageRoute";
import { OverlayRoutes } from "@routes/OverlayRoute";
import { RedemptionRoutes } from "@routes/RedemptionRoute";
import { StreamSessionRoutes } from "@routes/StreamSessionRoute";
import { TriggerRoutes } from "@routes/TriggerRoute";
import { UserRoutes } from "@routes/UserRoute";
import { MessageCategoriesRoute } from "@routes/MessageCategoriesRoute";
import { ReactNotifications } from "react-notifications-component";
import { TimersRoute } from "@routes/TimersRoute";
import { ModesRoutes } from "@routes/ModeRoute";
import { HelmetProvider } from "react-helmet-async";
import Home from "@components/home";
import OverlayList from "@components/overlay/overlaysList";
import ComponentWithTitle from "@components/componentWithTitle";
import {
OverlayRoutes,
UserRoutes,
MessageRoutes,
MessageCategoriesRoute,
CommandRoutes,
EventRoutes,
ModesRoutes,
RedemptionRoutes,
StreamSessionRoutes,
TimersRoute,
TriggerRoutes,
ConfigRoutes,
} from "@routes";

function App() {
return (
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/commandsList/CommandModalData.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from "react";
import { AllModesReturn, generateSelectModes } from "@utils";
import { DispatchAction } from "./types";
import ModalDataWrapper from "@components/modalDataWrapper/ModalDataWrapper";
import { ChatCommandCreateData } from "@services/ChatCommandService";
import { ChatCommandCreateData } from "@services";

interface CommandModalDataProps {
state: ChatCommandCreateData;
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/commandsList/CommandsData.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
TableItemsListWrapper,
TableListWrapper,
} from "@components/tableWrapper";
import { ChatCommand } from "@services/ChatCommandService";
import { ChatCommand } from "@services";
import SortByParamsButton from "@components/SortByParamsButton";

interface CommandsDataProps {
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/commandsList/CommandsList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ import {
useDeleteCommand,
ChatCommand,
ChatCommandCreateData,
} from "@services/ChatCommandService";
} from "@services";
import { addNotification } from "@utils";
import { useGetAllModes } from "@utils";
import { DispatchAction } from "./types";
import CommandsData from "./CommandsData";
import CommandModalData from "./CommandModalData";
import { useSocketContext } from "@context/socket";
import { useSocketContext } from "@context";

export default function CommandsList() {
const [showModal, setShowModal] = useState(false);
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/commandsList/types.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ChatCommandCreateData } from "@services/ChatCommandService";
import { ChatCommandCreateData } from "@services";

export type DispatchAction =
| { type: "SET_NAME"; payload: string }
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/configsList/ConfigsContext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
ConfigsDispatchActionType,
} from "./types";
import { configsInitialState } from "./initialState";
import { ConfigUpdateData } from "@services/ConfigService";
import { ConfigUpdateData } from "@services";

export const ConfigsContext = React.createContext<ConfigsContextType | null>(
null
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/configsList/ConfigsList.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useEffect, useState } from "react";

import PreviousPage from "@components/previousPage";
import { useGetConfigs } from "@services/ConfigService";
import { useGetConfigs } from "@services";
import CommandsConfigsWrapper from "./CommandsConfigs";
import TimersConfigsWrapper from "./TimersConfigs";
import ChatGamesConfigsWrapper from "./ChatGamesConfigs";
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/configsList/EditConfigs.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { useResetConfigs, useEditConfig } from "@services/ConfigService";
import { useResetConfigs, useEditConfig } from "@services";
import { addNotification } from "@utils";
import { ConfigsWrapperSharedProps } from "./types";
import { useConfigsContext } from "./ConfigsContext";
import { useSocketContext } from "@context/socket";
import { useSocketContext } from "@context";

interface EditConfigsProps extends ConfigsWrapperSharedProps {
onClickShowEdit: () => void;
Expand Down
14 changes: 7 additions & 7 deletions frontend/src/components/configsList/initialState.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { ConfigUpdateData, TriggersConfigs } from "@services/ConfigService";
import { LoyaltyConfigs } from "@services/ConfigService";
import { CommandsConfigs } from "@services/ConfigService";
import { MusicConfigs } from "@services/ConfigService";
import { PointsConfigs } from "@services/ConfigService";
import { ChatGamesConfigs } from "@services/ConfigService";
import { HeadConfigs, TimersConfigs } from "@services/ConfigService";
import { ConfigUpdateData, TriggersConfigs } from "@services";
import { LoyaltyConfigs } from "@services";
import { CommandsConfigs } from "@services";
import { MusicConfigs } from "@services";
import { PointsConfigs } from "@services";
import { ChatGamesConfigs } from "@services";
import { HeadConfigs, TimersConfigs } from "@services";

export const headConfigsInitial: HeadConfigs = {
permissionLevels: {
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/configsList/types/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
PointsConfigs,
TimersConfigs,
TriggersConfigs,
} from "@services/ConfigService";
} from "@services";

export type ConfigsDispatchAction =
| { type: ConfigsDispatchActionType.SET_COMMANDS; payload: CommandsConfigs }
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/home/Home.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import ChangeTheme from "@components/changeTheme";
import { HelmetTitle } from "@components/componentWithTitle";
import Message, { MessageProps } from "@components/message";
import { routes } from "@routes/routesList";
import { routes } from "@routes";
import React, { useEffect, useState } from "react";
import { Link } from "react-router-dom";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
TableItemsListWrapper,
TableListWrapper,
} from "@components/tableWrapper";
import { MessageCategory } from "@services/MessageCategoriesService";
import { MessageCategory } from "@services";
import SortByParamsButton from "@components/SortByParamsButton";

interface CategoriesDataProps {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from "react";
import { AllModesReturn, generateSelectModes } from "@utils";
import { DispatchAction } from "./types";
import { MessageCategoryCreateData } from "@services/MessageCategoriesService";
import { MessageCategoryCreateData } from "@services";
import ModalDataWrapper from "@components/modalDataWrapper";

interface CategoriesModalDataProps {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
useGetMessageCategories,
MessageCategory,
MessageCategoryCreateData,
} from "@services/MessageCategoriesService";
} from "@services";
import Modal from "@components/modal";
import FilterBarCategories from "./filterBarCategories";
import { addNotification } from "@utils";
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/messageCategoriesList/types.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { MessageCategoryCreateData } from "@services/MessageCategoriesService";
import { MessageCategoryCreateData } from "@services";

export type DispatchAction =
| { type: "SET_NAME"; payload: string }
Expand Down
8 changes: 4 additions & 4 deletions frontend/src/components/messagesList/MessagesList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import Pagination from "@components/pagination";
import { Link, useParams } from "react-router-dom";
import PreviousPage from "@components/previousPage";
import FilterBarMessages from "./filterBarMessages";
import { PaginationData } from "@services/ApiService";
import { useGetMessages, Message } from "@services/MessageService";
import { useGetUserMessages } from "@services/UserService";
import { useGetSessionMessages } from "@services/StreamSessionService";
import { PaginationData } from "@services";
import { useGetMessages, Message } from "@services";
import { useGetUserMessages } from "@services";
import { useGetSessionMessages } from "@services";
import { DateTooltip } from "@components/dateTooltip";
import SortByParamsButton from "@components/SortByParamsButton";

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/modesList/affixes/Affixes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
useCreateAffix,
useDeleteAffix,
Affix,
} from "@services/AffixService";
} from "@services";
import { handleActionOnChangeState } from "@utils";
import { addNotification } from "@utils";
import FilterBarModes from "../filterBarModes";
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/modesList/moods/Moods.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
useCreateMood,
useDeleteMood,
Mood,
} from "@services/MoodService";
} from "@services";
import { handleActionOnChangeState } from "@utils";
import { addNotification } from "@utils";
import FilterBarModes from "../filterBarModes";
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/modesList/tags/Tags.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
useCreateTag,
useDeleteTag,
Tag,
} from "@services/TagService";
} from "@services";
import { handleActionOnChangeState } from "@utils";
import { addNotification } from "@utils";
import FilterBarModes from "../filterBarModes";
Expand Down
5 changes: 1 addition & 4 deletions frontend/src/components/overlay/Overlay.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@ import {
import { useParams } from "react-router-dom";
import { getInitialCurrentBreakpoint } from "@utils";
import ReactGrid from "@components/reactGrid";
import {
useEditOverlayById,
useGetOverlayById,
} from "@services/OverlayService";
import { useEditOverlayById, useGetOverlayById } from "@services";
import MusicPlayer from "./musicPlayer";
import YoutubePlayerVideo from "./youtubePlayerVideo";
import { HelmetTitle } from "@components/componentWithTitle";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
AudioStreamDataInfo,
AudioStreamData,
useSocketContext,
} from "@context/socket";
} from "@context";
import SongProgress from "../SongProgress";

export default function MusicPlayer() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
useCreateOverlay,
useGetOverlays,
useRemoveOverlayById,
} from "@services/OverlayService";
} from "@services";
import CardboxWrapper, {
CardboxInput,
CardboxItem,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useEffect, useRef, useState } from "react";

import { useSocketContext } from "@context/socket";
import { useSocketContext } from "@context";

export default function Redemptions() {
const {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useCallback, useEffect, useState } from "react";

import { useSocketContext } from "@context/socket";
import { useSocketContext } from "@context";
import YouTube, { YouTubeEvent, YouTubeProps } from "react-youtube";
import SongProgress from "../SongProgress";

Expand Down
3 changes: 1 addition & 2 deletions frontend/src/components/pagination/Pagination.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import React, { useEffect, useState } from "react";

import usePagination, { DOTS } from "@hooks/usePaginationHook";
import { usePagination, DOTS, useLocalStorage } from "@hooks";
import classnames from "classnames";
import { useSearchParams } from "react-router-dom";
import useLocalStorage from "@hooks/useLocalStorageHook";

interface PaginationProps {
totalCount: number;
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/components/redemptionsList/RedemptionsList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import { Link, useParams } from "react-router-dom";
import PreviousPage from "@components/previousPage";
import FilterBarRedemptions from "./filterBarRedemptions";
import { useGetRedemptions, Redemption } from "src/services/RedemptionService";
import { PaginationData } from "@services/ApiService";
import { useGetSessionRedemptions } from "@services/StreamSessionService";
import { useGetUserRedemptions } from "@services/UserService";
import { PaginationData } from "@services";
import { useGetSessionRedemptions } from "@services";
import { useGetUserRedemptions } from "@services";
import { DateTooltip } from "@components/dateTooltip";
import SortByParamsButton from "@components/SortByParamsButton";

Expand Down
6 changes: 3 additions & 3 deletions frontend/src/components/sideBar/SideBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ import React, { useEffect, useState } from "react";

import { Link, LinkProps } from "react-router-dom";
import { resetWindowScroll } from "@utils";
import { useGetAuthorizeUrl } from "@services/AuthService";
import { useGetAuthorizeUrl } from "@services";
import DrawerBar from "@components/drawer";
import { routes } from "@routes/routesList";
import { routes } from "@routes";
import ChangeTheme from "@components/changeTheme";
import { useSocketContext } from "@context/socket";
import { useSocketContext } from "@context";

interface NavLinkProps extends LinkProps {
label: string;
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/streamEvents/StreamEvents.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
widgetsKeys,
} from "src/layout/initialLayoutWidgets";
import { useParams } from "react-router-dom";
import { useEditWidgetById, useGetWidgetById } from "@services/WidgetsService";
import { useEditWidgetById, useGetWidgetById } from "@services";
import StreamModes from "./streamModes";
import { getInitialCurrentBreakpoint } from "@utils";
import ReactGrid from "@components/reactGrid";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import "react-notifications-component/dist/theme.css";
import {
useGetMessageCategories,
useIncrementUsesCategoryById,
} from "@services/MessageCategoriesService";
} from "@services";
import Modal from "@components/modal";
import { useSocketContext } from "@context/socket";
import { useSocketContext } from "@context";
import { addNotification } from "@utils";

export default function MessagesWindow() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
useCreateAudioFolder,
useDeleteAudioFolder,
useGetFoldersList,
} from "@services/FilesService";
} from "@services";
import { addNotification } from "@utils";
import { handleActionOnChangeState } from "@utils";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import React, { useCallback, useEffect, useState } from "react";
import { useSocketContext } from "@context/socket";
import { useSocketContext } from "@context";
import {
useDeleteMp3File,
useGetFolderMp3Files,
useGetFoldersList,
} from "@services/FilesService";
} from "@services";
import { addNotification } from "@utils";
import { handleActionOnChangeState } from "@utils";
export default function AudioFoldersList() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
AudioStreamDataInfo,
AudioYTDataInfo,
useSocketContext,
} from "@context/socket";
} from "@context";
import { convertSecondsToMS } from "@utils";

interface AudioInformationProps<
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { useCallback, useMemo } from "react";
import UploadMp3Form from "./UploadMp3Form";
import AudioFoldersList from "./AudioFoldersList";
import AudioFolderCreate from "./AudioFolderCreate";
import { AudioStreamDataInfo, useSocketContext } from "@context/socket";
import { AudioStreamDataInfo, useSocketContext } from "@context";
import { useState } from "react";
import SterringButtons from "./SterringButtonsPlayer";
import TabButton from "./TabButton";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React, { useEffect, useState } from "react";
import useFileUpload from "@hooks/useFileUpload";
import { useFileUpload } from "@hooks";
import { addNotification } from "@utils";
import ProgressBar from "@ramonak/react-progress-bar";
import { useGetFoldersList } from "@services/FilesService";
import { useGetFoldersList } from "@services";
export default function UploadMp3Form() {
const [fileList, setFileList] = useState<FileList | null>(null);
const [folderName, setFolderName] = useState("");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useCallback, useEffect, useMemo } from "react";
import { AudioYTDataInfo, useSocketContext } from "@context/socket";
import { AudioYTDataInfo, useSocketContext } from "@context";
import { useState } from "react";
import SterringButtons from "./SterringButtonsPlayer";
import TabButton from "./TabButton";
Expand Down
Loading