From 61cc62306e1f612033a8276af861dc278641aedd Mon Sep 17 00:00:00 2001 From: Mcat12 Date: Sat, 18 Aug 2018 11:34:35 -0400 Subject: [PATCH] Organize components into folders based on where they are used For example, dashboard components go into the dashboard folder, settings components go into the settings folder, and components used in multiple places go into the common folder. Signed-off-by: Mcat12 --- src/components/{ => common}/Alert.js | 0 src/components/{ => common}/Alert.test.js | 0 src/components/{ => common}/BoxedLayoutButton.js | 0 .../{ => common}/BoxedLayoutButton.test.js | 0 src/components/{ => common}/Footer.js | 0 src/components/{ => common}/Footer.test.js | 0 src/components/{ => common}/Header.js | 0 src/components/{ => common}/Sidebar.js | 4 ++-- src/components/{ => common}/Sidebar.test.js | 2 +- src/components/{ => common}/StatusBadge.js | 2 +- src/components/{ => common}/StatusBadge.test.js | 0 src/components/{ => dashboard}/ChartTooltip.js | 0 src/components/{ => dashboard}/ClientsGraph.js | 2 +- .../{ => dashboard}/ClientsGraph.test.js | 0 .../{ => dashboard}/ForwardDestinationsChart.js | 2 +- .../{ => dashboard}/GenericDoughnutChart.js | 2 +- .../{ => dashboard}/GenericDoughnutChart.test.js | 0 src/components/{ => dashboard}/QueriesGraph.js | 2 +- .../{ => dashboard}/QueryTypesChart.js | 2 +- src/components/{ => dashboard}/SummaryStats.js | 2 +- .../{ => dashboard}/SummaryStats.test.js | 0 src/components/{ => dashboard}/TopBlocked.js | 2 +- .../{ => dashboard}/TopBlocked.test.js | 0 src/components/{ => dashboard}/TopClients.js | 2 +- .../{ => dashboard}/TopClients.test.js | 0 src/components/{ => dashboard}/TopDomains.js | 2 +- .../{ => dashboard}/TopDomains.test.js | 0 src/components/{ => dashboard}/TopTable.js | 2 +- src/components/{ => dashboard}/TopTable.test.js | 0 src/components/{ => list}/DomainInput.js | 2 +- src/components/{ => list}/DomainInput.test.js | 2 +- src/components/{ => list}/DomainList.js | 2 +- src/components/{ => list}/DomainList.test.js | 2 +- src/components/{ => list}/ListPage.js | 6 +++--- src/components/{ => list}/ListPage.test.js | 0 src/components/{ => log}/QueryLog.js | 2 +- src/components/{ => login}/ForgotPassword.js | 0 .../{ => login}/ForgotPassword.test.js | 0 src/components/{ => settings}/DHCPInfo.js | 2 +- src/components/{ => settings}/DNSInfo.js | 2 +- src/components/{ => settings}/FTLInfo.js | 2 +- src/components/{ => settings}/NetworkInfo.js | 2 +- src/components/{ => settings}/VersionCard.js | 0 src/components/{ => settings}/VersionInfo.js | 4 ++-- src/containers/Full.js | 8 ++++---- src/views/Blacklist.js | 2 +- src/views/Dashboard.js | 16 ++++++++-------- src/views/Login.js | 2 +- src/views/Networking.js | 8 ++++---- src/views/Regexlist.js | 2 +- src/views/Versions.js | 2 +- src/views/Whitelist.js | 2 +- 52 files changed, 49 insertions(+), 49 deletions(-) rename src/components/{ => common}/Alert.js (100%) rename src/components/{ => common}/Alert.test.js (100%) rename src/components/{ => common}/BoxedLayoutButton.js (100%) rename src/components/{ => common}/BoxedLayoutButton.test.js (100%) rename src/components/{ => common}/Footer.js (100%) rename src/components/{ => common}/Footer.test.js (100%) rename src/components/{ => common}/Header.js (100%) rename src/components/{ => common}/Sidebar.js (97%) rename src/components/{ => common}/Sidebar.test.js (98%) rename src/components/{ => common}/StatusBadge.js (93%) rename src/components/{ => common}/StatusBadge.test.js (100%) rename src/components/{ => dashboard}/ChartTooltip.js (100%) rename src/components/{ => dashboard}/ClientsGraph.js (99%) rename src/components/{ => dashboard}/ClientsGraph.test.js (100%) rename src/components/{ => dashboard}/ForwardDestinationsChart.js (95%) rename src/components/{ => dashboard}/GenericDoughnutChart.js (98%) rename src/components/{ => dashboard}/GenericDoughnutChart.test.js (100%) rename src/components/{ => dashboard}/QueriesGraph.js (99%) rename src/components/{ => dashboard}/QueryTypesChart.js (94%) rename src/components/{ => dashboard}/SummaryStats.js (98%) rename src/components/{ => dashboard}/SummaryStats.test.js (100%) rename src/components/{ => dashboard}/TopBlocked.js (98%) rename src/components/{ => dashboard}/TopBlocked.test.js (100%) rename src/components/{ => dashboard}/TopClients.js (98%) rename src/components/{ => dashboard}/TopClients.test.js (100%) rename src/components/{ => dashboard}/TopDomains.js (98%) rename src/components/{ => dashboard}/TopDomains.test.js (100%) rename src/components/{ => dashboard}/TopTable.js (97%) rename src/components/{ => dashboard}/TopTable.test.js (100%) rename src/components/{ => list}/DomainInput.js (98%) rename src/components/{ => list}/DomainInput.test.js (98%) rename src/components/{ => list}/DomainList.js (97%) rename src/components/{ => list}/DomainList.test.js (98%) rename src/components/{ => list}/ListPage.js (96%) rename src/components/{ => list}/ListPage.test.js (100%) rename src/components/{ => log}/QueryLog.js (99%) rename src/components/{ => login}/ForgotPassword.js (100%) rename src/components/{ => login}/ForgotPassword.test.js (100%) rename src/components/{ => settings}/DHCPInfo.js (97%) rename src/components/{ => settings}/DNSInfo.js (98%) rename src/components/{ => settings}/FTLInfo.js (96%) rename src/components/{ => settings}/NetworkInfo.js (97%) rename src/components/{ => settings}/VersionCard.js (100%) rename src/components/{ => settings}/VersionInfo.js (96%) diff --git a/src/components/Alert.js b/src/components/common/Alert.js similarity index 100% rename from src/components/Alert.js rename to src/components/common/Alert.js diff --git a/src/components/Alert.test.js b/src/components/common/Alert.test.js similarity index 100% rename from src/components/Alert.test.js rename to src/components/common/Alert.test.js diff --git a/src/components/BoxedLayoutButton.js b/src/components/common/BoxedLayoutButton.js similarity index 100% rename from src/components/BoxedLayoutButton.js rename to src/components/common/BoxedLayoutButton.js diff --git a/src/components/BoxedLayoutButton.test.js b/src/components/common/BoxedLayoutButton.test.js similarity index 100% rename from src/components/BoxedLayoutButton.test.js rename to src/components/common/BoxedLayoutButton.test.js diff --git a/src/components/Footer.js b/src/components/common/Footer.js similarity index 100% rename from src/components/Footer.js rename to src/components/common/Footer.js diff --git a/src/components/Footer.test.js b/src/components/common/Footer.test.js similarity index 100% rename from src/components/Footer.test.js rename to src/components/common/Footer.test.js diff --git a/src/components/Header.js b/src/components/common/Header.js similarity index 100% rename from src/components/Header.js rename to src/components/common/Header.js diff --git a/src/components/Sidebar.js b/src/components/common/Sidebar.js similarity index 97% rename from src/components/Sidebar.js rename to src/components/common/Sidebar.js index 19acdc5..f20fee7 100644 --- a/src/components/Sidebar.js +++ b/src/components/common/Sidebar.js @@ -12,9 +12,9 @@ import React from "react"; import { translate } from "react-i18next"; import { NavLink } from "react-router-dom"; import { Nav, NavItem } from "reactstrap"; -import logo from "../img/logo.svg"; +import logo from "../../img/logo.svg"; import { mobileSidebarHide } from "./Header"; -import { api } from "../utils"; +import { api } from "../../utils"; import StatusBadge from "./StatusBadge"; const handleClick = (e) => { diff --git a/src/components/Sidebar.test.js b/src/components/common/Sidebar.test.js similarity index 98% rename from src/components/Sidebar.test.js rename to src/components/common/Sidebar.test.js index c34602d..5b41fd7 100644 --- a/src/components/Sidebar.test.js +++ b/src/components/common/Sidebar.test.js @@ -11,7 +11,7 @@ import React from "react"; import { shallow } from "enzyme"; import { dropDownClassList, navDropdown, navItem, navList } from "./Sidebar"; -import { api } from "../utils"; +import { api } from "../../utils"; it("expands active drop down items", () => { const classList = dropDownClassList("/testRoute", { location: { pathname: "/testRoute/page" } }); diff --git a/src/components/StatusBadge.js b/src/components/common/StatusBadge.js similarity index 93% rename from src/components/StatusBadge.js rename to src/components/common/StatusBadge.js index b116007..2901222 100644 --- a/src/components/StatusBadge.js +++ b/src/components/common/StatusBadge.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import { translate } from 'react-i18next'; -import { api, makeCancelable, ignoreCancel } from '../utils'; +import { api, makeCancelable, ignoreCancel } from '../../utils'; class StatusBadge extends Component { state = { diff --git a/src/components/StatusBadge.test.js b/src/components/common/StatusBadge.test.js similarity index 100% rename from src/components/StatusBadge.test.js rename to src/components/common/StatusBadge.test.js diff --git a/src/components/ChartTooltip.js b/src/components/dashboard/ChartTooltip.js similarity index 100% rename from src/components/ChartTooltip.js rename to src/components/dashboard/ChartTooltip.js diff --git a/src/components/ClientsGraph.js b/src/components/dashboard/ClientsGraph.js similarity index 99% rename from src/components/ClientsGraph.js rename to src/components/dashboard/ClientsGraph.js index b617e5b..72c1797 100644 --- a/src/components/ClientsGraph.js +++ b/src/components/dashboard/ClientsGraph.js @@ -12,7 +12,7 @@ import React, { Component } from 'react'; import ReactDOM from 'react-dom'; import { Line } from 'react-chartjs-2'; import { translate } from 'react-i18next'; -import { padNumber, api, makeCancelable, ignoreCancel } from '../utils'; +import { padNumber, api, makeCancelable, ignoreCancel } from '../../utils'; import ChartTooltip from "./ChartTooltip"; class ClientsGraph extends Component { diff --git a/src/components/ClientsGraph.test.js b/src/components/dashboard/ClientsGraph.test.js similarity index 100% rename from src/components/ClientsGraph.test.js rename to src/components/dashboard/ClientsGraph.test.js diff --git a/src/components/ForwardDestinationsChart.js b/src/components/dashboard/ForwardDestinationsChart.js similarity index 95% rename from src/components/ForwardDestinationsChart.js rename to src/components/dashboard/ForwardDestinationsChart.js index f1f9198..cd4cb24 100644 --- a/src/components/ForwardDestinationsChart.js +++ b/src/components/dashboard/ForwardDestinationsChart.js @@ -10,7 +10,7 @@ import React from "react"; import { translate } from "react-i18next"; -import { api } from "../utils"; +import { api } from "../../utils"; import GenericDoughnutChart from "./GenericDoughnutChart"; const ForwardDestinationsChart = ({ t }) => ( diff --git a/src/components/GenericDoughnutChart.js b/src/components/dashboard/GenericDoughnutChart.js similarity index 98% rename from src/components/GenericDoughnutChart.js rename to src/components/dashboard/GenericDoughnutChart.js index e18b4de..2eafdb2 100644 --- a/src/components/GenericDoughnutChart.js +++ b/src/components/dashboard/GenericDoughnutChart.js @@ -11,7 +11,7 @@ import React, { Component } from "react"; import { Doughnut } from "react-chartjs-2"; import PropTypes from "prop-types"; -import { makeCancelable, ignoreCancel } from "../utils"; +import { makeCancelable, ignoreCancel } from "../../utils"; class GenericDoughnutChart extends Component { state = { diff --git a/src/components/GenericDoughnutChart.test.js b/src/components/dashboard/GenericDoughnutChart.test.js similarity index 100% rename from src/components/GenericDoughnutChart.test.js rename to src/components/dashboard/GenericDoughnutChart.test.js diff --git a/src/components/QueriesGraph.js b/src/components/dashboard/QueriesGraph.js similarity index 99% rename from src/components/QueriesGraph.js rename to src/components/dashboard/QueriesGraph.js index bcffa14..e8a18a7 100644 --- a/src/components/QueriesGraph.js +++ b/src/components/dashboard/QueriesGraph.js @@ -11,7 +11,7 @@ import React, { Component } from 'react'; import { Line } from 'react-chartjs-2'; import { translate } from 'react-i18next'; -import { padNumber, api, makeCancelable, ignoreCancel } from '../utils'; +import { padNumber, api, makeCancelable, ignoreCancel } from '../../utils'; class QueriesGraph extends Component { state = { diff --git a/src/components/QueryTypesChart.js b/src/components/dashboard/QueryTypesChart.js similarity index 94% rename from src/components/QueryTypesChart.js rename to src/components/dashboard/QueryTypesChart.js index 7a41536..04448c3 100644 --- a/src/components/QueryTypesChart.js +++ b/src/components/dashboard/QueryTypesChart.js @@ -10,7 +10,7 @@ import React from 'react'; import { translate } from 'react-i18next'; -import { api } from "../utils"; +import { api } from "../../utils"; import GenericDoughnutChart from "./GenericDoughnutChart"; const QueryTypesChart = ({ t }) => ( diff --git a/src/components/SummaryStats.js b/src/components/dashboard/SummaryStats.js similarity index 98% rename from src/components/SummaryStats.js rename to src/components/dashboard/SummaryStats.js index b97c233..c0cd9ff 100644 --- a/src/components/SummaryStats.js +++ b/src/components/dashboard/SummaryStats.js @@ -10,7 +10,7 @@ import React, { Component, Fragment } from 'react'; import { translate } from 'react-i18next'; -import { api, ignoreCancel, makeCancelable } from "../utils"; +import { api, ignoreCancel, makeCancelable } from "../../utils"; class SummaryStats extends Component { state = { diff --git a/src/components/SummaryStats.test.js b/src/components/dashboard/SummaryStats.test.js similarity index 100% rename from src/components/SummaryStats.test.js rename to src/components/dashboard/SummaryStats.test.js diff --git a/src/components/TopBlocked.js b/src/components/dashboard/TopBlocked.js similarity index 98% rename from src/components/TopBlocked.js rename to src/components/dashboard/TopBlocked.js index db611a4..ce92206 100644 --- a/src/components/TopBlocked.js +++ b/src/components/dashboard/TopBlocked.js @@ -10,7 +10,7 @@ import React from "react"; import { translate } from "react-i18next"; -import { api } from "../utils"; +import { api } from "../../utils"; import TopTable from "./TopTable"; const TopBlocked = ({ t, ...props }) => ( diff --git a/src/components/TopBlocked.test.js b/src/components/dashboard/TopBlocked.test.js similarity index 100% rename from src/components/TopBlocked.test.js rename to src/components/dashboard/TopBlocked.test.js diff --git a/src/components/TopClients.js b/src/components/dashboard/TopClients.js similarity index 98% rename from src/components/TopClients.js rename to src/components/dashboard/TopClients.js index a769d41..493c487 100644 --- a/src/components/TopClients.js +++ b/src/components/dashboard/TopClients.js @@ -10,7 +10,7 @@ import React from "react"; import { translate } from "react-i18next"; -import { api } from "../utils"; +import { api } from "../../utils"; import TopTable from "./TopTable"; const TopClients = ({ t, ...props }) => ( diff --git a/src/components/TopClients.test.js b/src/components/dashboard/TopClients.test.js similarity index 100% rename from src/components/TopClients.test.js rename to src/components/dashboard/TopClients.test.js diff --git a/src/components/TopDomains.js b/src/components/dashboard/TopDomains.js similarity index 98% rename from src/components/TopDomains.js rename to src/components/dashboard/TopDomains.js index 3273a10..db6dc06 100644 --- a/src/components/TopDomains.js +++ b/src/components/dashboard/TopDomains.js @@ -10,7 +10,7 @@ import React from "react"; import { translate } from "react-i18next"; -import { api } from "../utils"; +import { api } from "../../utils"; import TopTable from "./TopTable"; const TopDomains = ({ t, ...props }) => ( diff --git a/src/components/TopDomains.test.js b/src/components/dashboard/TopDomains.test.js similarity index 100% rename from src/components/TopDomains.test.js rename to src/components/dashboard/TopDomains.test.js diff --git a/src/components/TopTable.js b/src/components/dashboard/TopTable.js similarity index 97% rename from src/components/TopTable.js rename to src/components/dashboard/TopTable.js index e99c703..1bda899 100644 --- a/src/components/TopTable.js +++ b/src/components/dashboard/TopTable.js @@ -10,7 +10,7 @@ import React, { Component } from "react"; import PropTypes from "prop-types"; -import { ignoreCancel, makeCancelable } from "../utils"; +import { ignoreCancel, makeCancelable } from "../../utils"; class TopTable extends Component { state = { diff --git a/src/components/TopTable.test.js b/src/components/dashboard/TopTable.test.js similarity index 100% rename from src/components/TopTable.test.js rename to src/components/dashboard/TopTable.test.js diff --git a/src/components/DomainInput.js b/src/components/list/DomainInput.js similarity index 98% rename from src/components/DomainInput.js rename to src/components/list/DomainInput.js index 025539b..4b357fe 100644 --- a/src/components/DomainInput.js +++ b/src/components/list/DomainInput.js @@ -11,7 +11,7 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import { translate } from 'react-i18next'; -import { api } from "../utils"; +import { api } from "../../utils"; class DomainInput extends Component { state = { diff --git a/src/components/DomainInput.test.js b/src/components/list/DomainInput.test.js similarity index 98% rename from src/components/DomainInput.test.js rename to src/components/list/DomainInput.test.js index 78b4afe..38debeb 100644 --- a/src/components/DomainInput.test.js +++ b/src/components/list/DomainInput.test.js @@ -11,7 +11,7 @@ import React from 'react'; import { shallow } from 'enzyme'; import DomainInput from './DomainInput'; -import { api } from "../utils"; +import { api } from "../../utils"; it('has a placeholder', () => { const placeholder = 'placeholder'; diff --git a/src/components/DomainList.js b/src/components/list/DomainList.js similarity index 97% rename from src/components/DomainList.js rename to src/components/list/DomainList.js index cf01964..a6260ff 100644 --- a/src/components/DomainList.js +++ b/src/components/list/DomainList.js @@ -11,7 +11,7 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import { translate } from 'react-i18next'; -import { api, ignoreCancel, makeCancelable } from "../utils"; +import { api, ignoreCancel, makeCancelable } from "../../utils"; class DomainList extends Component { onRemove(domain) { diff --git a/src/components/DomainList.test.js b/src/components/list/DomainList.test.js similarity index 98% rename from src/components/DomainList.test.js rename to src/components/list/DomainList.test.js index 765f490..75e5b34 100644 --- a/src/components/DomainList.test.js +++ b/src/components/list/DomainList.test.js @@ -11,7 +11,7 @@ import React from 'react'; import { shallow } from 'enzyme'; import DomainList from './DomainList'; -import { api } from "../utils"; +import { api } from "../../utils"; const domains = [ 'domain1.com', diff --git a/src/components/ListPage.js b/src/components/list/ListPage.js similarity index 96% rename from src/components/ListPage.js rename to src/components/list/ListPage.js index 8699975..5049093 100644 --- a/src/components/ListPage.js +++ b/src/components/list/ListPage.js @@ -12,9 +12,9 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import { translate } from 'react-i18next'; import DomainInput from "./DomainInput"; -import Alert from "./Alert"; +import Alert from "../common/Alert"; import DomainList from "./DomainList"; -import { ignoreCancel, makeCancelable } from "../utils"; +import { ignoreCancel, makeCancelable } from "../../utils"; class ListPage extends Component { state = { @@ -150,7 +150,7 @@ class ListPage extends Component { ListPage.propTypes = { title: PropTypes.string.isRequired, - note: PropTypes.object, + note: PropTypes.oneOfType([PropTypes.object, PropTypes.string]), placeholder: PropTypes.string.isRequired, add: PropTypes.func.isRequired, refresh: PropTypes.func.isRequired, diff --git a/src/components/ListPage.test.js b/src/components/list/ListPage.test.js similarity index 100% rename from src/components/ListPage.test.js rename to src/components/list/ListPage.test.js diff --git a/src/components/QueryLog.js b/src/components/log/QueryLog.js similarity index 99% rename from src/components/QueryLog.js rename to src/components/log/QueryLog.js index 38a247f..723be74 100644 --- a/src/components/QueryLog.js +++ b/src/components/log/QueryLog.js @@ -11,7 +11,7 @@ import React, { Component } from 'react'; import ReactTable from 'react-table'; import { translate } from 'react-i18next'; -import { api, ignoreCancel, makeCancelable, padNumber } from '../utils'; +import { api, ignoreCancel, makeCancelable, padNumber } from '../../utils'; import 'react-table/react-table.css'; class QueryLog extends Component { diff --git a/src/components/ForgotPassword.js b/src/components/login/ForgotPassword.js similarity index 100% rename from src/components/ForgotPassword.js rename to src/components/login/ForgotPassword.js diff --git a/src/components/ForgotPassword.test.js b/src/components/login/ForgotPassword.test.js similarity index 100% rename from src/components/ForgotPassword.test.js rename to src/components/login/ForgotPassword.test.js diff --git a/src/components/DHCPInfo.js b/src/components/settings/DHCPInfo.js similarity index 97% rename from src/components/DHCPInfo.js rename to src/components/settings/DHCPInfo.js index bf43573..9d27238 100644 --- a/src/components/DHCPInfo.js +++ b/src/components/settings/DHCPInfo.js @@ -10,7 +10,7 @@ import React, { Component } from "react"; import { translate } from "react-i18next"; -import { api, ignoreCancel, makeCancelable } from "../utils"; +import { api, ignoreCancel, makeCancelable } from "../../utils"; class DHCPInfo extends Component { state = { diff --git a/src/components/DNSInfo.js b/src/components/settings/DNSInfo.js similarity index 98% rename from src/components/DNSInfo.js rename to src/components/settings/DNSInfo.js index 338ca98..5497d94 100644 --- a/src/components/DNSInfo.js +++ b/src/components/settings/DNSInfo.js @@ -10,7 +10,7 @@ import React, { Component } from "react"; import { translate } from "react-i18next"; -import { api, ignoreCancel, makeCancelable } from "../utils"; +import { api, ignoreCancel, makeCancelable } from "../../utils"; class DNSInfo extends Component { state = { diff --git a/src/components/FTLInfo.js b/src/components/settings/FTLInfo.js similarity index 96% rename from src/components/FTLInfo.js rename to src/components/settings/FTLInfo.js index 9013b4e..e5c630e 100644 --- a/src/components/FTLInfo.js +++ b/src/components/settings/FTLInfo.js @@ -10,7 +10,7 @@ import React, { Component } from "react"; import { translate } from "react-i18next"; -import { api, ignoreCancel, makeCancelable } from "../utils"; +import { api, ignoreCancel, makeCancelable } from "../../utils"; class FTLInfo extends Component { state = { diff --git a/src/components/NetworkInfo.js b/src/components/settings/NetworkInfo.js similarity index 97% rename from src/components/NetworkInfo.js rename to src/components/settings/NetworkInfo.js index 82b04d7..1fc7c90 100644 --- a/src/components/NetworkInfo.js +++ b/src/components/settings/NetworkInfo.js @@ -10,7 +10,7 @@ import React, { Component } from "react"; import { translate } from "react-i18next"; -import { api, ignoreCancel, makeCancelable } from "../utils"; +import { api, ignoreCancel, makeCancelable } from "../../utils"; class NetworkInfo extends Component { state = { diff --git a/src/components/VersionCard.js b/src/components/settings/VersionCard.js similarity index 100% rename from src/components/VersionCard.js rename to src/components/settings/VersionCard.js diff --git a/src/components/VersionInfo.js b/src/components/settings/VersionInfo.js similarity index 96% rename from src/components/VersionInfo.js rename to src/components/settings/VersionInfo.js index b30ec10..bd9f3d3 100644 --- a/src/components/VersionInfo.js +++ b/src/components/settings/VersionInfo.js @@ -10,8 +10,8 @@ import React, { Component } from "react"; import { translate } from "react-i18next"; -import { api, ignoreCancel, makeCancelable } from "../utils"; -import VersionCard from "../components/VersionCard"; +import { api, ignoreCancel, makeCancelable } from "../../utils"; +import VersionCard from "./VersionCard"; class VersionInfo extends Component { state = { diff --git a/src/containers/Full.js b/src/containers/Full.js index ac4506e..85bed73 100644 --- a/src/containers/Full.js +++ b/src/containers/Full.js @@ -10,11 +10,11 @@ import React from 'react'; import { Switch, Route, Redirect } from 'react-router-dom' -import Header, { mobileSidebarHide } from '../components/Header'; -import Sidebar from '../components/Sidebar'; -import Footer from '../components/Footer'; +import Header, { mobileSidebarHide } from '../components/common/Header'; +import Sidebar from '../components/common/Sidebar'; +import Footer from '../components/common/Footer'; import Dashboard from '../views/Dashboard'; -import QueryLog from '../components/QueryLog'; +import QueryLog from '../components/log/QueryLog'; import Whitelist from "../views/Whitelist"; import Blacklist from "../views/Blacklist"; import Regexlist from "../views/Regexlist"; diff --git a/src/views/Blacklist.js b/src/views/Blacklist.js index 3ebc757..8c07571 100644 --- a/src/views/Blacklist.js +++ b/src/views/Blacklist.js @@ -11,7 +11,7 @@ import React from 'react'; import { translate } from 'react-i18next'; import { api } from "../utils"; -import ListPage from "../components/ListPage"; +import ListPage from "../components/list/ListPage"; const Blacklist = props => { const { t } = props; diff --git a/src/views/Dashboard.js b/src/views/Dashboard.js index 4928138..5a625b7 100644 --- a/src/views/Dashboard.js +++ b/src/views/Dashboard.js @@ -9,14 +9,14 @@ * Please see LICENSE file for your rights under this license. */ import React, { Fragment } from 'react'; -import SummaryStats from '../components/SummaryStats'; -import QueriesGraph from '../components/QueriesGraph'; -import ClientsGraph from '../components/ClientsGraph'; -import QueryTypesChart from "../components/QueryTypesChart"; -import ForwardDestinationsChart from "../components/ForwardDestinationsChart"; -import TopDomains from '../components/TopDomains'; -import TopBlocked from '../components/TopBlocked'; -import TopClients from '../components/TopClients'; +import SummaryStats from '../components/dashboard/SummaryStats'; +import QueriesGraph from '../components/dashboard/QueriesGraph'; +import ClientsGraph from '../components/dashboard/ClientsGraph'; +import QueryTypesChart from "../components/dashboard/QueryTypesChart"; +import ForwardDestinationsChart from "../components/dashboard/ForwardDestinationsChart"; +import TopDomains from '../components/dashboard/TopDomains'; +import TopBlocked from '../components/dashboard/TopBlocked'; +import TopClients from '../components/dashboard/TopClients'; import { api } from "../utils"; export default () => ( diff --git a/src/views/Login.js b/src/views/Login.js index a676967..7430057 100644 --- a/src/views/Login.js +++ b/src/views/Login.js @@ -14,7 +14,7 @@ import sha from 'sha.js'; import { api } from "../utils"; import logo from '../img/logo.svg'; import { routes } from "../routes"; -import ForgotPassword from "../components/ForgotPassword"; +import ForgotPassword from "../components/login/ForgotPassword"; import { translate } from 'react-i18next'; class Login extends Component { diff --git a/src/views/Networking.js b/src/views/Networking.js index e528398..75ae64c 100644 --- a/src/views/Networking.js +++ b/src/views/Networking.js @@ -10,10 +10,10 @@ import React from 'react'; -import DHCPInfo from '../components/DHCPInfo'; -import DNSInfo from '../components/DNSInfo'; -import NetworkInfo from '../components/NetworkInfo'; -import FTLInfo from '../components/FTLInfo'; +import DHCPInfo from '../components/settings/DHCPInfo'; +import DNSInfo from '../components/settings/DNSInfo'; +import NetworkInfo from '../components/settings/NetworkInfo'; +import FTLInfo from '../components/settings/FTLInfo'; export default () => (
diff --git a/src/views/Regexlist.js b/src/views/Regexlist.js index 26c8f9c..d88a444 100644 --- a/src/views/Regexlist.js +++ b/src/views/Regexlist.js @@ -10,7 +10,7 @@ import React from 'react'; import { translate } from 'react-i18next'; -import ListPage from "../components/ListPage"; +import ListPage from "../components/list/ListPage"; import { api } from "../utils"; const Regexlist = props => { diff --git a/src/views/Versions.js b/src/views/Versions.js index 952b706..1f2e993 100644 --- a/src/views/Versions.js +++ b/src/views/Versions.js @@ -9,7 +9,7 @@ * Please see LICENSE file for your rights under this license. */ import React from 'react'; -import VersionInfo from '../components/VersionInfo'; +import VersionInfo from '../components/settings/VersionInfo'; export default () => (
diff --git a/src/views/Whitelist.js b/src/views/Whitelist.js index f445d16..f27f321 100644 --- a/src/views/Whitelist.js +++ b/src/views/Whitelist.js @@ -10,7 +10,7 @@ import React from 'react'; import { translate } from 'react-i18next'; -import ListPage from "../components/ListPage"; +import ListPage from "../components/list/ListPage"; import { api } from "../utils"; const Whitelist = props => {