From fef88f3517da082429f2109635c050c4b5a22e8d Mon Sep 17 00:00:00 2001 From: Luke Berndt Date: Wed, 18 Jan 2023 21:27:02 -0500 Subject: [PATCH] cleaned up the folders --- frontend/src/Call/CallPlayer.js | 12 ++++++------ frontend/src/Call/Calls.js | 6 +++--- frontend/src/Call/{ => components}/CalendarModal.css | 0 frontend/src/Call/{ => components}/CalendarModal.js | 2 +- frontend/src/Call/{ => components}/CallInfo.js | 2 +- frontend/src/Call/{ => components}/CallItem.js | 2 +- frontend/src/Call/{ => components}/CallLinks.js | 0 frontend/src/Call/{ => components}/FilterModal.css | 0 frontend/src/Call/{ => components}/FilterModal.js | 4 ++-- frontend/src/Call/{ => components}/GroupModal.js | 4 ++-- frontend/src/Call/{ => components}/ListCalls.js | 2 +- frontend/src/Call/{ => components}/MediaPlayer.js | 0 frontend/src/Call/{ => components}/SupportModal.js | 0 13 files changed, 17 insertions(+), 17 deletions(-) rename frontend/src/Call/{ => components}/CalendarModal.css (100%) rename frontend/src/Call/{ => components}/CalendarModal.js (95%) rename frontend/src/Call/{ => components}/CallInfo.js (97%) rename frontend/src/Call/{ => components}/CallItem.js (96%) rename frontend/src/Call/{ => components}/CallLinks.js (100%) rename frontend/src/Call/{ => components}/FilterModal.css (100%) rename frontend/src/Call/{ => components}/FilterModal.js (96%) rename frontend/src/Call/{ => components}/GroupModal.js (92%) rename frontend/src/Call/{ => components}/ListCalls.js (98%) rename frontend/src/Call/{ => components}/MediaPlayer.js (100%) rename frontend/src/Call/{ => components}/SupportModal.js (100%) diff --git a/frontend/src/Call/CallPlayer.js b/frontend/src/Call/CallPlayer.js index 621c570..09f962e 100644 --- a/frontend/src/Call/CallPlayer.js +++ b/frontend/src/Call/CallPlayer.js @@ -1,12 +1,12 @@ import React, { useEffect, useLayoutEffect, useState, useRef } from "react"; import { Link, useLocation, useParams, useNavigate } from 'react-router-dom'; -import MediaPlayer from "./MediaPlayer"; +import MediaPlayer from "./components/MediaPlayer"; -import SupportModal from "./SupportModal"; +import SupportModal from "./components/SupportModal"; -import CallInfo from "./CallInfo"; -import ListCalls from "./ListCalls"; +import CallInfo from "./components/CallInfo"; +import ListCalls from "./components/ListCalls"; import { useSelector, useDispatch } from 'react-redux' import { setLive, setFilter,setDateFilter } from "../features/callPlayer/callPlayerSlice"; import { getCalls, getOlderCalls, getNewerCalls, addCall } from "../features/calls/callsSlice"; @@ -24,8 +24,8 @@ import { import "./CallPlayer.css"; import queryString from '../query-string'; import io from 'socket.io-client'; -import { useCallLink } from "./CallLinks"; - +import { useCallLink } from "./components/CallLinks"; +import "./CallPlayer.css"; const socket = io(process.env.REACT_APP_BACKEND_SERVER); diff --git a/frontend/src/Call/Calls.js b/frontend/src/Call/Calls.js index b912aae..9ad7793 100644 --- a/frontend/src/Call/Calls.js +++ b/frontend/src/Call/Calls.js @@ -1,10 +1,10 @@ import React, { useEffect, useLayoutEffect, useState, useRef } from "react"; import { Link, useLocation, useParams, useNavigate } from 'react-router-dom'; -import FilterModal from "./FilterModal"; -import GroupModal from "./GroupModal"; +import FilterModal from "./components/FilterModal"; +import GroupModal from "./components/GroupModal"; -import CalendarModal from "./CalendarModal"; +import CalendarModal from "./components/CalendarModal"; import CallPlayer from "./CallPlayer"; import { useSelector, useDispatch } from 'react-redux' diff --git a/frontend/src/Call/CalendarModal.css b/frontend/src/Call/components/CalendarModal.css similarity index 100% rename from frontend/src/Call/CalendarModal.css rename to frontend/src/Call/components/CalendarModal.css diff --git a/frontend/src/Call/CalendarModal.js b/frontend/src/Call/components/CalendarModal.js similarity index 95% rename from frontend/src/Call/CalendarModal.js rename to frontend/src/Call/components/CalendarModal.js index 76322c2..7f51c23 100644 --- a/frontend/src/Call/CalendarModal.js +++ b/frontend/src/Call/components/CalendarModal.js @@ -5,7 +5,7 @@ import { Icon } from "semantic-ui-react"; import "./CalendarModal.css"; -import { setDateFilter } from "../features/callPlayer/callPlayerSlice"; +import { setDateFilter } from "../../features/callPlayer/callPlayerSlice"; import DatePicker from 'react-datepicker'; import { useDispatch } from 'react-redux' import { subDays } from 'date-fns' diff --git a/frontend/src/Call/CallInfo.js b/frontend/src/Call/components/CallInfo.js similarity index 97% rename from frontend/src/Call/CallInfo.js rename to frontend/src/Call/components/CallInfo.js index 0aa882c..b6440f7 100644 --- a/frontend/src/Call/CallInfo.js +++ b/frontend/src/Call/components/CallInfo.js @@ -1,6 +1,6 @@ import React from "react"; import { useCallLink } from "./CallLinks"; -import { useGetGroupsQuery, useGetTalkgroupsQuery } from '../features/api/apiSlice' +import { useGetGroupsQuery, useGetTalkgroupsQuery } from '../../features/api/apiSlice' import { Link, useLocation, useParams, useNavigate } from 'react-router-dom'; import { Header, diff --git a/frontend/src/Call/CallItem.js b/frontend/src/Call/components/CallItem.js similarity index 96% rename from frontend/src/Call/CallItem.js rename to frontend/src/Call/components/CallItem.js index 9e7dcce..a9d55ef 100644 --- a/frontend/src/Call/CallItem.js +++ b/frontend/src/Call/components/CallItem.js @@ -6,7 +6,7 @@ import { } from "semantic-ui-react"; -import { addStar, removeStar } from "../features/calls/callsSlice"; +import { addStar, removeStar } from "../../features/calls/callsSlice"; import { useDispatch } from 'react-redux' const CallItem = (props) => { diff --git a/frontend/src/Call/CallLinks.js b/frontend/src/Call/components/CallLinks.js similarity index 100% rename from frontend/src/Call/CallLinks.js rename to frontend/src/Call/components/CallLinks.js diff --git a/frontend/src/Call/FilterModal.css b/frontend/src/Call/components/FilterModal.css similarity index 100% rename from frontend/src/Call/FilterModal.css rename to frontend/src/Call/components/FilterModal.css diff --git a/frontend/src/Call/FilterModal.js b/frontend/src/Call/components/FilterModal.js similarity index 96% rename from frontend/src/Call/FilterModal.js rename to frontend/src/Call/components/FilterModal.js index 01b1b2a..8bbb7fa 100644 --- a/frontend/src/Call/FilterModal.js +++ b/frontend/src/Call/components/FilterModal.js @@ -1,6 +1,6 @@ import React, { useState } from "react"; -import { setGroupFilter, setTalkgroupFilter, setAllFilter, setStarredFilter } from "../features/callPlayer/callPlayerSlice"; -import { useGetGroupsQuery, useGetTalkgroupsQuery } from '../features/api/apiSlice' +import { setGroupFilter, setTalkgroupFilter, setAllFilter, setStarredFilter } from "../../features/callPlayer/callPlayerSlice"; +import { useGetGroupsQuery, useGetTalkgroupsQuery } from '../../features/api/apiSlice' import { useSelector, useDispatch } from 'react-redux' import { Modal, diff --git a/frontend/src/Call/GroupModal.js b/frontend/src/Call/components/GroupModal.js similarity index 92% rename from frontend/src/Call/GroupModal.js rename to frontend/src/Call/components/GroupModal.js index b079a6b..9b9b450 100644 --- a/frontend/src/Call/GroupModal.js +++ b/frontend/src/Call/components/GroupModal.js @@ -1,6 +1,6 @@ import React, { Component, useState } from "react"; -import { useGetGroupsQuery } from '../features/api/apiSlice' -import { setGroupFilter } from "../features/callPlayer/callPlayerSlice"; +import { useGetGroupsQuery } from '../../features/api/apiSlice' +import { setGroupFilter } from "../../features/callPlayer/callPlayerSlice"; import { useSelector, useDispatch } from 'react-redux' import { diff --git a/frontend/src/Call/ListCalls.js b/frontend/src/Call/components/ListCalls.js similarity index 98% rename from frontend/src/Call/ListCalls.js rename to frontend/src/Call/components/ListCalls.js index f2e0379..3a6059d 100644 --- a/frontend/src/Call/ListCalls.js +++ b/frontend/src/Call/components/ListCalls.js @@ -5,7 +5,7 @@ import { Table, Ref } from "semantic-ui-react"; -import "./CallPlayer.css"; +import "../CallPlayer.css"; // ---------------------------------------------------- const ListCalls = (props) => { diff --git a/frontend/src/Call/MediaPlayer.js b/frontend/src/Call/components/MediaPlayer.js similarity index 100% rename from frontend/src/Call/MediaPlayer.js rename to frontend/src/Call/components/MediaPlayer.js diff --git a/frontend/src/Call/SupportModal.js b/frontend/src/Call/components/SupportModal.js similarity index 100% rename from frontend/src/Call/SupportModal.js rename to frontend/src/Call/components/SupportModal.js