Refact/project (#189)

* refactor: cleanup project entry point
* refactor: remove unused
* refactor: folder restructure
This commit is contained in:
Carlos Valente
2022-08-03 23:20:23 +02:00
committed by GitHub
parent 05be0c1e95
commit 9b5d536378
116 changed files with 352 additions and 942 deletions
@@ -1,4 +1,4 @@
@use '../styles/main' as *;
@use '../theme/main' as *;
.wrapper {
background: $bg-black;
@@ -1,6 +1,6 @@
import React from 'react';
import { render, screen } from '@testing-library/react';
import SocketProvider from 'app/context/socketContext';
import SocketProvider from 'common/context/socketContext';
import MessageControl from '../message/MessageControl';
@@ -1,6 +1,6 @@
import React from 'react';
import { render, screen } from '@testing-library/react';
import SocketProvider from 'app/context/socketContext';
import SocketProvider from 'common/context/socketContext';
import PlaybackControl from '../playback/PlaybackControl';
@@ -3,7 +3,7 @@ import { IconButton } from '@chakra-ui/button';
import { Tooltip } from '@chakra-ui/tooltip';
import { IoMicOffOutline } from '@react-icons/all-files/io5/IoMicOffOutline';
import { IoMicSharp } from '@react-icons/all-files/io5/IoMicSharp';
import { useSocket } from 'app/context/socketContext';
import { useSocket } from 'common/context/socketContext';
import InputRow from './InputRow';
@@ -1,5 +1,5 @@
@use '../../../styles/main' as *;
@use '../../../styles/mixins' as *;
@use '../../../theme/main' as *;
@use '../../../theme/mixins' as *;
.messageContainer,
.onAirToggle {
@@ -1,5 +1,5 @@
import React, { useCallback, useEffect, useState } from 'react';
import { useSocket } from 'app/context/socketContext';
import { useSocket } from 'common/context/socketContext';
import PlaybackButtons from './PlaybackButtons';
import PlaybackTimer from './PlaybackTimer';
@@ -1,5 +1,5 @@
@use '../../../styles/main' as *;
@use '../../../styles/mixins' as *;
@use '../../../theme/main' as *;
@use '../../../theme/mixins' as *;
.mainContainer {
width: 100%;
@@ -1,4 +1,4 @@
@use '../../../styles/main' as *;
@use '../../../theme/main' as *;
/* ============= COMMON ============= */
.block {
@@ -4,7 +4,7 @@ import { HStack } from '@chakra-ui/react';
import { FiCheck } from '@react-icons/all-files/fi/FiCheck';
import { FiMoreVertical } from '@react-icons/all-files/fi/FiMoreVertical';
import { IoRemove } from '@react-icons/all-files/io5/IoRemove';
import DelayInput from 'common/input/DelayInput';
import DelayInput from 'common/components/input/DelayInput';
import { millisToMinutes } from 'common/utils/dateConfig';
import PropTypes from 'prop-types';
@@ -1,4 +1,4 @@
@use '../../../styles/main' as *;
@use '../../../theme/main' as *;
/* ============= COMMON ============= */
+2 -2
View File
@@ -4,8 +4,8 @@ import { Box } from '@chakra-ui/layout';
import ErrorBoundary from 'common/components/errorBoundary/ErrorBoundary';
import ModalManager from 'features/modals/ModalManager';
import { LocalEventSettingsProvider } from '../../app/context/LocalEventSettingsContext';
import { LoggingProvider } from '../../app/context/LoggingContext';
import { LocalEventSettingsProvider } from '../../common/context/LocalEventSettingsContext';
import { LoggingProvider } from '../../common/context/LoggingContext';
import MenuBar from '../menu/MenuBar';
import styles from './Editor.module.scss';
@@ -1,4 +1,4 @@
@use '../../styles/main' as *;
@use '../../theme/main' as *;
.corner {
display: none;
@@ -3,7 +3,7 @@ import { Checkbox } from '@chakra-ui/react';
import { Tooltip } from '@chakra-ui/tooltip';
import PropTypes from 'prop-types';
import { LocalEventSettingsContext } from '../../../app/context/LocalEventSettingsContext';
import { LocalEventSettingsContext } from '../../../common/context/LocalEventSettingsContext';
import style from './EntryBlock.module.scss';
@@ -1,4 +1,4 @@
@use '../../../styles/main' as *;
@use '../../../theme/main' as *;
@mixin when-visible() {
opacity: 1;
@@ -6,7 +6,7 @@ import PropTypes from 'prop-types';
import ActionButtons from '../../../common/components/buttons/ActionButtons';
import PublicIconBtn from '../../../common/components/buttons/PublicIconBtn';
import EventTimes from '../../../common/components/eventTimes/EventTimes';
import EditableText from '../../../common/input/EditableText';
import EditableText from '../../../common/components/input/EditableText';
import style from './EventBlock.module.scss';
@@ -5,7 +5,7 @@ import { FiChevronUp } from '@react-icons/all-files/fi/FiChevronUp';
import { millisToMinutes } from 'common/utils/dateConfig';
import PropTypes from 'prop-types';
import { CollapseContext } from '../../../app/context/CollapseContext';
import { CollapseContext } from '../../../common/context/CollapseContext';
import CollapsedBlock from './CollapsedBlock';
import ExpandedBlock from './ExpandedBlock';
@@ -1,4 +1,4 @@
@use '../../../styles/main' as *;
@use '../../../theme/main' as *;
/* ============= COMMON ============= */
.event {
@@ -8,7 +8,7 @@ import ActionButtons from '../../../common/components/buttons/ActionButtons';
import PublicIconBtn from '../../../common/components/buttons/PublicIconBtn';
import TooltipLoadingActionBtn from '../../../common/components/buttons/TooltipLoadingActionBtn';
import EventTimesVertical from '../../../common/components/eventTimes/EventTimesVertical';
import EditableText from '../../../common/input/EditableText';
import EditableText from '../../../common/components/input/EditableText';
import style from './EventBlock.module.scss';
@@ -1,10 +1,10 @@
import React, { createRef, useCallback, useContext, useEffect, useState } from 'react';
import { DragDropContext, Droppable } from 'react-beautiful-dnd';
import { useSocket } from 'app/context/socketContext';
import Empty from 'common/state/Empty';
import Empty from 'common/components/state/Empty';
import { useSocket } from 'common/context/socketContext';
import { CursorContext } from '../../../app/context/CursorContext';
import { LocalEventSettingsContext } from '../../../app/context/LocalEventSettingsContext';
import { CursorContext } from '../../../common/context/CursorContext';
import { LocalEventSettingsContext } from '../../../common/context/LocalEventSettingsContext';
import EntryBlock from '../EntryBlock/EntryBlock';
import EventListItem from './EventListItem';
@@ -2,9 +2,9 @@ import React from 'react';
import { Box } from '@chakra-ui/layout';
import { FiArrowUpRight } from '@react-icons/all-files/fi/FiArrowUpRight';
import { CollapseProvider } from '../../../app/context/CollapseContext';
import { CursorProvider } from '../../../app/context/CursorContext';
import ErrorBoundary from '../../../common/components/errorBoundary/ErrorBoundary';
import { CollapseProvider } from '../../../common/context/CollapseContext';
import { CursorProvider } from '../../../common/context/CursorContext';
import { handleLinks } from '../../../common/utils/linkUtils';
import EventListWrapper from './EventListWrapper';
@@ -1,8 +1,8 @@
import React, { memo, useCallback, useContext } from 'react';
import PropTypes from 'prop-types';
import { LocalEventSettingsContext } from '../../../app/context/LocalEventSettingsContext';
import { LoggingContext } from '../../../app/context/LoggingContext';
import { LocalEventSettingsContext } from '../../../common/context/LocalEventSettingsContext';
import { LoggingContext } from '../../../common/context/LoggingContext';
import BlockBlock from '../BlockBlock/BlockBlock';
import DelayBlock from '../DelayBlock/DelayBlock';
import EventBlock from '../EventBlock/EventBlock';
@@ -1,6 +1,6 @@
import React, { useCallback, useContext, useEffect, useState } from 'react';
import { useMutation, useQueryClient } from 'react-query';
import { EVENTS_TABLE } from 'app/api/apiConstants';
import { EVENTS_TABLE } from 'common/api/apiConstants';
import {
fetchAllEvents,
requestApplyDelay,
@@ -10,13 +10,13 @@ import {
requestPost,
requestPut,
requestReorder,
} from 'app/api/eventsApi.js';
import { useFetch } from 'app/hooks/useFetch.js';
import Empty from 'common/state/Empty';
} from 'common/api/eventsApi.js';
import Empty from 'common/components/state/Empty';
import { useFetch } from 'common/hooks/useFetch.js';
import EventListMenu from 'features/menu/EventListMenu.jsx';
import { CollapseContext } from '../../../app/context/CollapseContext';
import { LoggingContext } from '../../../app/context/LoggingContext';
import { CollapseContext } from '../../../common/context/CollapseContext';
import { LoggingContext } from '../../../common/context/LoggingContext';
import EventList from './EventList';
@@ -1,5 +1,5 @@
@use '../../../styles/main' as *;
@use '../../../styles/mixins' as *;
@use '../../../theme/main' as *;
@use '../../../theme/mixins' as *;
.eventContainer {
@include second-container;
+1 -1
View File
@@ -1,5 +1,5 @@
import React, { useEffect,useState } from 'react';
import { useSocket } from 'app/context/socketContext';
import { useSocket } from 'common/context/socketContext';
import InfoLogger from './InfoLogger';
import InfoNif from './InfoNif';
+2 -2
View File
@@ -1,5 +1,5 @@
@use '../../styles/main' as *;
@use '../../styles/mixins' as *;
@use '../../theme/main' as *;
@use '../../theme/mixins' as *;
@mixin container {
margin-top: 1em;
+1 -1
View File
@@ -1,7 +1,7 @@
import React, { useCallback, useContext, useEffect, useState } from 'react';
import { LoggingContext } from '../../app/context/LoggingContext';
import CollapseBar from '../../common/components/collapseBar/CollapseBar';
import { LoggingContext } from '../../common/context/LoggingContext';
import style from './InfoLogger.module.scss';
@@ -1,6 +1,6 @@
@use 'Info.module' as *;
@use '../../styles/main' as *;
@use '../../styles/mixins' as *;
@use '../../theme/main' as *;
@use '../../theme/mixins' as *;
.container,
.container__expanded{
+3 -3
View File
@@ -1,7 +1,7 @@
import React, { useState } from 'react';
import { APP_TABLE } from 'app/api/apiConstants';
import { getInfo, ontimePlaceholderInfo } from 'app/api/ontimeApi';
import { useFetch } from 'app/hooks/useFetch';
import { APP_TABLE } from 'common/api/apiConstants';
import { getInfo, ontimePlaceholderInfo } from 'common/api/ontimeApi';
import { useFetch } from 'common/hooks/useFetch';
import CollapseBar from '../../common/components/collapseBar/CollapseBar';
import { openLink } from '../../common/utils/linkUtils';
@@ -1,7 +1,7 @@
import React from 'react';
import { QueryClient, QueryClientProvider } from 'react-query';
import { render, screen } from '@testing-library/react';
import SocketProvider from 'app/context/socketContext';
import SocketProvider from 'common/context/socketContext';
import Info from '../Info';
+1 -1
View File
@@ -7,8 +7,8 @@ import { IoCaretDown } from '@react-icons/all-files/io5/IoCaretDown';
import { IoCaretUp } from '@react-icons/all-files/io5/IoCaretUp';
import PropTypes from 'prop-types';
import { CursorContext } from '../../app/context/CursorContext';
import TooltipActionBtn from '../../common/components/buttons/TooltipActionBtn';
import { CursorContext } from '../../common/context/CursorContext';
import MenuActionButtons from './MenuActionButtons';
+3 -3
View File
@@ -7,13 +7,13 @@ import { FiMaximize } from '@react-icons/all-files/fi/FiMaximize';
import { FiMinimize } from '@react-icons/all-files/fi/FiMinimize';
import { FiSettings } from '@react-icons/all-files/fi/FiSettings';
import { FiUpload } from '@react-icons/all-files/fi/FiUpload';
import { EVENTS_TABLE } from 'app/api/apiConstants';
import { downloadEvents, uploadEvents } from 'app/api/ontimeApi';
import { EVENTS_TABLE } from 'common/api/apiConstants';
import { downloadEvents, uploadEvents } from 'common/api/ontimeApi';
import PropTypes from 'prop-types';
import { LoggingContext } from '../../app/context/LoggingContext';
import QuitIconBtn from '../../common/components/buttons/QuitIconBtn';
import TooltipActionBtn from '../../common/components/buttons/TooltipActionBtn';
import { LoggingContext } from '../../common/context/LoggingContext';
import style from './MenuBar.module.scss';
+1 -1
View File
@@ -1,4 +1,4 @@
@use '../../styles/main' as *;
@use '../../theme/main' as *;
.gap {
height: 1em;
+6 -6
View File
@@ -7,13 +7,13 @@ import { Tooltip } from '@chakra-ui/tooltip';
import { IoInformationCircleOutline } from '@react-icons/all-files/io5/IoInformationCircleOutline';
import { IoRemove } from '@react-icons/all-files/io5/IoRemove';
import { IoSunny } from '@react-icons/all-files/io5/IoSunny';
import { ALIASES } from 'app/api/apiConstants';
import { useFetch } from 'app/hooks/useFetch';
import { ALIASES } from 'common/api/apiConstants';
import { useFetch } from 'common/hooks/useFetch';
import { getAliases, postAliases } from '../../app/api/ontimeApi';
import { viewerLocations } from '../../app/appConstants';
import { LoggingContext } from '../../app/context/LoggingContext';
import { validateAlias } from '../../app/utils/aliases';
import { viewerLocations } from '../../appConstants';
import { getAliases, postAliases } from '../../common/api/ontimeApi';
import { LoggingContext } from '../../common/context/LoggingContext';
import { validateAlias } from '../../common/utils/aliases';
import { handleLinks, host } from '../../common/utils/linkUtils';
import SubmitContainer from './SubmitContainer';
@@ -4,13 +4,13 @@ import { ModalBody } from '@chakra-ui/modal';
import { Checkbox, FormControl, FormLabel, Input, PinInput, PinInputField } from '@chakra-ui/react';
import { FiEye } from '@react-icons/all-files/fi/FiEye';
import { FiX } from '@react-icons/all-files/fi/FiX';
import { APP_SETTINGS } from 'app/api/apiConstants';
import { getSettings, ontimePlaceholderSettings, postSettings } from 'app/api/ontimeApi';
import { useFetch } from 'app/hooks/useFetch';
import { APP_SETTINGS } from 'common/api/apiConstants';
import { getSettings, ontimePlaceholderSettings, postSettings } from 'common/api/ontimeApi';
import { useFetch } from 'common/hooks/useFetch';
import { LocalEventSettingsContext } from '../../app/context/LocalEventSettingsContext';
import { LoggingContext } from '../../app/context/LoggingContext';
import TooltipActionBtn from '../../common/components/buttons/TooltipActionBtn';
import { LocalEventSettingsContext } from '../../common/context/LocalEventSettingsContext';
import { LoggingContext } from '../../common/context/LoggingContext';
import { inputProps } from './modalHelper';
import SubmitContainer from './SubmitContainer';
@@ -1,11 +1,11 @@
import React, { useCallback, useEffect, useState } from 'react';
import { ModalBody } from '@chakra-ui/modal';
import { FormLabel, Input, Textarea } from '@chakra-ui/react';
import { EVENT_TABLE } from 'app/api/apiConstants';
import { fetchEvent, postEvent } from 'app/api/eventApi';
import { useFetch } from 'app/hooks/useFetch';
import { EVENT_TABLE } from 'common/api/apiConstants';
import { fetchEvent, postEvent } from 'common/api/eventApi';
import { useFetch } from 'common/hooks/useFetch';
import { eventPlaceholderSettings } from '../../app/api/ontimeApi';
import { eventPlaceholderSettings } from '../../common/api/ontimeApi';
import { inputProps } from './modalHelper';
import SubmitContainer from './SubmitContainer';
@@ -2,11 +2,11 @@ import React, { useCallback, useContext, useEffect, useState } from 'react';
import { ModalBody } from '@chakra-ui/modal';
import { FormControl, FormLabel, Input, Switch } from '@chakra-ui/react';
import { FiInfo } from '@react-icons/all-files/fi/FiInfo';
import { APP_TABLE } from 'app/api/apiConstants';
import { getInfo, httpPlaceholder, ontimeVars, postInfo } from 'app/api/ontimeApi';
import { useFetch } from 'app/hooks/useFetch';
import { APP_TABLE } from 'common/api/apiConstants';
import { getInfo, httpPlaceholder, ontimeVars, postInfo } from 'common/api/ontimeApi';
import { useFetch } from 'common/hooks/useFetch';
import { LoggingContext } from '../../app/context/LoggingContext';
import { LoggingContext } from '../../common/context/LoggingContext';
import { inputProps } from './modalHelper';
import SubmitContainer from './SubmitContainer';
@@ -1,4 +1,4 @@
@use '../../styles/main' as *;
@use '../../theme/main' as *;
//////////////////////////////////// main
@@ -2,12 +2,12 @@ import React, { useCallback, useContext, useEffect, useState } from 'react';
import { ModalBody } from '@chakra-ui/modal';
import { FormControl, FormLabel, Input } from '@chakra-ui/react';
import { IoInformationCircleOutline } from '@react-icons/all-files/io5/IoInformationCircleOutline';
import { OSC_SETTINGS } from 'app/api/apiConstants';
import { getOSC, oscPlaceholderSettings, postOSC } from 'app/api/ontimeApi';
import { useFetch } from 'app/hooks/useFetch';
import { OSC_SETTINGS } from 'common/api/apiConstants';
import { getOSC, oscPlaceholderSettings, postOSC } from 'common/api/ontimeApi';
import { useFetch } from 'common/hooks/useFetch';
import { LoggingContext } from '../../app/context/LoggingContext';
import EnableBtn from '../../common/components/buttons/EnableBtn';
import { LoggingContext } from '../../common/context/LoggingContext';
import { inputProps, portInputProps } from './modalHelper';
import SubmitContainer from './SubmitContainer';
@@ -2,10 +2,10 @@ import React, { useCallback, useEffect, useState } from 'react';
import { ModalBody } from '@chakra-ui/modal';
import { Input } from '@chakra-ui/react';
import { IoInformationCircleOutline } from '@react-icons/all-files/io5/IoInformationCircleOutline';
import { USERFIELDS } from 'app/api/apiConstants';
import { useFetch } from 'app/hooks/useFetch';
import { USERFIELDS } from 'common/api/apiConstants';
import { useFetch } from 'common/hooks/useFetch';
import { getUserFields, postUserFields, userFieldsPlaceholder } from '../../app/api/ontimeApi';
import { getUserFields, postUserFields, userFieldsPlaceholder } from '../../common/api/ontimeApi';
import { handleLinks, host } from '../../common/utils/linkUtils';
import SubmitContainer from './SubmitContainer';
+2 -2
View File
@@ -17,8 +17,8 @@ import {
} from '@dnd-kit/sortable';
import PropTypes from 'prop-types';
import { TableSettingsContext } from '../../app/context/TableSettingsContext';
import { useLocalStorage } from '../../app/hooks/useLocalStorage';
import { TableSettingsContext } from '../../common/context/TableSettingsContext';
import { useLocalStorage } from '../../common/hooks/useLocalStorage';
import SortableCell from './tableElements/SortableCell';
import TableSettings from './tableElements/TableSettings';
+1 -1
View File
@@ -1,7 +1,7 @@
import React from 'react';
import { TableSettingsProvider } from '../../app/context/TableSettingsContext';
import ProtectRoute from '../../common/components/protectRoute/ProtectRoute';
import { TableSettingsProvider } from '../../common/context/TableSettingsContext';
import TableWrapper from './TableWrapper';
+1 -1
View File
@@ -1,4 +1,4 @@
@use '../../styles/main' as *;
@use '../../theme/main' as *;
.tableWrapper,
.tableWrapper__dark {
+5 -5
View File
@@ -4,11 +4,11 @@ import { FiSettings } from '@react-icons/all-files/fi/FiSettings';
import { FiTarget } from '@react-icons/all-files/fi/FiTarget';
import { IoMoon } from '@react-icons/all-files/io5/IoMoon';
import { EVENT_TABLE } from '../../app/api/apiConstants';
import { fetchEvent } from '../../app/api/eventApi';
import { useSocket } from '../../app/context/socketContext';
import { TableSettingsContext } from '../../app/context/TableSettingsContext';
import { useFetch } from '../../app/hooks/useFetch';
import { EVENT_TABLE } from '../../common/api/apiConstants';
import { fetchEvent } from '../../common/api/eventApi';
import { useSocket } from '../../common/context/socketContext';
import { TableSettingsContext } from '../../common/context/TableSettingsContext';
import { useFetch } from '../../common/hooks/useFetch';
import { formatDisplay } from '../../common/utils/dateConfig';
import { stringFromMillis } from '../../common/utils/time';
+7 -7
View File
@@ -1,12 +1,12 @@
import React, { useCallback, useContext, useEffect, useState } from 'react';
import { EVENTS_TABLE, USERFIELDS } from '../../app/api/apiConstants';
import { fetchAllEvents, requestPatch } from '../../app/api/eventsApi';
import { getUserFields } from '../../app/api/ontimeApi';
import { useSocket } from '../../app/context/socketContext';
import { TableSettingsContext } from '../../app/context/TableSettingsContext';
import { useFetch } from '../../app/hooks/useFetch';
import useMutateEvents from '../../app/hooks/useMutateEvents';
import { EVENTS_TABLE, USERFIELDS } from '../../common/api/apiConstants';
import { fetchAllEvents, requestPatch } from '../../common/api/eventsApi';
import { getUserFields } from '../../common/api/ontimeApi';
import { useSocket } from '../../common/context/socketContext';
import { TableSettingsContext } from '../../common/context/TableSettingsContext';
import { useFetch } from '../../common/hooks/useFetch';
import useMutateEvents from '../../common/hooks/useMutateEvents';
import OntimeTable from './OntimeTable';
import TableHeader from './TableHeader';
@@ -1,7 +1,7 @@
import React, { useCallback, useEffect, useState } from 'react';
import PropTypes from 'prop-types';
import { AutoTextArea } from '../../../common/input/AutoTextArea';
import { AutoTextArea } from '../../../common/components/input/AutoTextArea';
/**
* Shamelessly copied from react-table docs
+5 -5
View File
@@ -1,10 +1,10 @@
/* eslint-disable react/display-name */
import React, { useEffect, useState } from 'react';
import { EVENT_TABLE, EVENTS_TABLE } from 'app/api/apiConstants';
import { fetchEvent } from 'app/api/eventApi';
import { fetchAllEvents } from 'app/api/eventsApi';
import { useSocket } from 'app/context/socketContext';
import { useFetch } from 'app/hooks/useFetch';
import { EVENT_TABLE, EVENTS_TABLE } from 'common/api/apiConstants';
import { fetchEvent } from 'common/api/eventApi';
import { fetchAllEvents } from 'common/api/eventsApi';
import { useSocket } from 'common/context/socketContext';
import { useFetch } from 'common/hooks/useFetch';
import { stringFromMillis } from '../../common/utils/time';
@@ -1,5 +1,5 @@
@use '../../../styles/main' as *;
@use '../../../styles/viewers' as *;
@use '../../../theme/main' as *;
@use '../../../theme/viewers' as *;
.container__gray,
.container__grayFinished {
@@ -3,7 +3,7 @@ import { Link, useSearchParams } from 'react-router-dom';
import PropTypes from 'prop-types';
import NavLogo from '../../../common/components/nav/NavLogo';
import Empty from '../../../common/state/Empty';
import Empty from '../../../common/components/state/Empty';
import { formatDisplay, millisToSeconds } from '../../../common/utils/dateConfig';
import getDelayTo from '../../../common/utils/getDelayTo';
import { stringFromMillis } from '../../../common/utils/time';
@@ -1,4 +1,4 @@
@use '../../../styles/main' as *;
@use '../../../theme/main' as *;
.container {
margin: 0;
@@ -1,5 +1,5 @@
@use '../../../styles/main' as *;
@use '../../../styles/viewers' as *;
@use '../../../theme/main' as *;
@use '../../../theme/viewers' as *;
.container__gray,
.container__grayFinished {
@@ -1,5 +1,5 @@
@use '../../../styles/main' as *;
@use '../../../styles/viewers' as *;
@use '../../../theme/main' as *;
@use '../../../theme/viewers' as *;
.container__gray,
.container__grayFinished {
@@ -1,4 +1,4 @@
@use '../../../styles/main' as *;
@use '../../../theme/main' as *;
.container,
.containerFinished {
@@ -1,4 +1,4 @@
@use '../../../styles/main' as *;
@use '../../../theme/main' as *;
.container__gray,
.container__grayFinished {