From 9bc7b93defdb4609a5aa473b426b75d849a59654 Mon Sep 17 00:00:00 2001 From: pepper Date: Thu, 3 Dec 2020 17:40:06 -0500 Subject: [PATCH] separated common funcs/classes from the pages dir --- src/components/root/Home.js | 2 +- src/components/root/Navigation.js | 2 +- src/components/root/Pages/Book.js | 2 +- src/components/root/Pages/Historical.js | 2 +- src/components/root/Pages/IDSingle.js | 2 +- src/components/root/Pages/Migrations.js | 4 ++-- src/components/root/Pages/Upcoming.js | 2 +- src/components/root/{Pages => common}/Forms/CPanelBooking.js | 0 src/components/root/{Pages => common}/Forms/EmailBooking.js | 0 src/components/root/{Pages => common}/Forms/FormPage.js | 0 .../root/{Pages => common}/Forms/ReportSingleMigration.js | 0 .../root/{Pages => common}/Functionality/IdSearchForm.js | 0 .../root/{Pages => common}/Functionality/InlineSearchBar.js | 0 .../root/{Pages => common}/Migrations/SideMigrations.js | 0 .../root/{Pages => common}/Tables/HistoricalSingle.js | 0 src/components/root/{Pages => common}/Tables/SingleSide.js | 0 .../root/{Pages => common}/Tables/UpcomingSingle.js | 0 17 files changed, 8 insertions(+), 8 deletions(-) rename src/components/root/{Pages => common}/Forms/CPanelBooking.js (100%) rename src/components/root/{Pages => common}/Forms/EmailBooking.js (100%) rename src/components/root/{Pages => common}/Forms/FormPage.js (100%) rename src/components/root/{Pages => common}/Forms/ReportSingleMigration.js (100%) rename src/components/root/{Pages => common}/Functionality/IdSearchForm.js (100%) rename src/components/root/{Pages => common}/Functionality/InlineSearchBar.js (100%) rename src/components/root/{Pages => common}/Migrations/SideMigrations.js (100%) rename src/components/root/{Pages => common}/Tables/HistoricalSingle.js (100%) rename src/components/root/{Pages => common}/Tables/SingleSide.js (100%) rename src/components/root/{Pages => common}/Tables/UpcomingSingle.js (100%) diff --git a/src/components/root/Home.js b/src/components/root/Home.js index 0d53399..c1ff26a 100644 --- a/src/components/root/Home.js +++ b/src/components/root/Home.js @@ -2,7 +2,7 @@ import React, { Component } from "react"; import { callAPI } from "../actions/API"; import Cards from "./Pages/Cards"; -import SideMigrations from "./Pages/Migrations/SideMigrations"; +import SideMigrations from "./common/Migrations/SideMigrations"; // Homepage/Cards, first API call here to pass down to cards // and the pending migration list, if there's no data, nothing will show diff --git a/src/components/root/Navigation.js b/src/components/root/Navigation.js index 7f19395..c3f7c5f 100644 --- a/src/components/root/Navigation.js +++ b/src/components/root/Navigation.js @@ -1,6 +1,6 @@ import React, { Component } from "react"; import { Link } from "react-router-dom"; -import InLineSearch from "./Pages/Functionality/InlineSearchBar"; +import InLineSearch from "./common/Functionality/InlineSearchBar"; // Navbar class component, Just simple href's to retain styling diff --git a/src/components/root/Pages/Book.js b/src/components/root/Pages/Book.js index eab4f4b..45ee8ee 100644 --- a/src/components/root/Pages/Book.js +++ b/src/components/root/Pages/Book.js @@ -1,6 +1,6 @@ import React, { Component } from "react"; -import FormPage from "./Forms/FormPage"; +import FormPage from "../common/Forms/FormPage"; // Parent page for the Book component, // links directly to FormPage which contains the POST request diff --git a/src/components/root/Pages/Historical.js b/src/components/root/Pages/Historical.js index 9e5e4ea..982e4ee 100644 --- a/src/components/root/Pages/Historical.js +++ b/src/components/root/Pages/Historical.js @@ -1,7 +1,7 @@ import React, { Component } from "react"; import { callAPI } from "../../actions/API"; -import HistoricalSingle from "./Tables/HistoricalSingle"; +import HistoricalSingle from "../common/Tables/HistoricalSingle"; import Error from "../../actions/Error"; // Parent page for the /historical-migrations page, diff --git a/src/components/root/Pages/IDSingle.js b/src/components/root/Pages/IDSingle.js index 4e57c6d..9959bfa 100644 --- a/src/components/root/Pages/IDSingle.js +++ b/src/components/root/Pages/IDSingle.js @@ -1,6 +1,6 @@ import React, { Component } from "react"; -import ReportSingleMigration from "./Forms/ReportSingleMigration"; +import ReportSingleMigration from "../common/Forms/ReportSingleMigration"; import { callAPI } from "../../actions/API"; // This class will populate a form from a UUID in the address bar, diff --git a/src/components/root/Pages/Migrations.js b/src/components/root/Pages/Migrations.js index d4c0184..d2ae029 100644 --- a/src/components/root/Pages/Migrations.js +++ b/src/components/root/Pages/Migrations.js @@ -1,7 +1,7 @@ import React, { Component } from "react"; -import IdSearchForm from "./Functionality/IdSearchForm"; -import ReportSingleMigration from "./Forms/ReportSingleMigration"; +import IdSearchForm from "../common/Functionality/IdSearchForm"; +import ReportSingleMigration from "../common/Forms/ReportSingleMigration"; import { callAPI } from "../../actions/API"; // /migrations in the address bar, diff --git a/src/components/root/Pages/Upcoming.js b/src/components/root/Pages/Upcoming.js index b0dbe68..a60254f 100644 --- a/src/components/root/Pages/Upcoming.js +++ b/src/components/root/Pages/Upcoming.js @@ -1,5 +1,5 @@ import React, { Component } from "react"; -import UpcomingSingle from "./Tables/UpcomingSingle"; +import UpcomingSingle from "../common/Tables/UpcomingSingle"; // Upcoming parent page, // Most of the good stuff is happening in UpcomingSingle, which does the diff --git a/src/components/root/Pages/Forms/CPanelBooking.js b/src/components/root/common/Forms/CPanelBooking.js similarity index 100% rename from src/components/root/Pages/Forms/CPanelBooking.js rename to src/components/root/common/Forms/CPanelBooking.js diff --git a/src/components/root/Pages/Forms/EmailBooking.js b/src/components/root/common/Forms/EmailBooking.js similarity index 100% rename from src/components/root/Pages/Forms/EmailBooking.js rename to src/components/root/common/Forms/EmailBooking.js diff --git a/src/components/root/Pages/Forms/FormPage.js b/src/components/root/common/Forms/FormPage.js similarity index 100% rename from src/components/root/Pages/Forms/FormPage.js rename to src/components/root/common/Forms/FormPage.js diff --git a/src/components/root/Pages/Forms/ReportSingleMigration.js b/src/components/root/common/Forms/ReportSingleMigration.js similarity index 100% rename from src/components/root/Pages/Forms/ReportSingleMigration.js rename to src/components/root/common/Forms/ReportSingleMigration.js diff --git a/src/components/root/Pages/Functionality/IdSearchForm.js b/src/components/root/common/Functionality/IdSearchForm.js similarity index 100% rename from src/components/root/Pages/Functionality/IdSearchForm.js rename to src/components/root/common/Functionality/IdSearchForm.js diff --git a/src/components/root/Pages/Functionality/InlineSearchBar.js b/src/components/root/common/Functionality/InlineSearchBar.js similarity index 100% rename from src/components/root/Pages/Functionality/InlineSearchBar.js rename to src/components/root/common/Functionality/InlineSearchBar.js diff --git a/src/components/root/Pages/Migrations/SideMigrations.js b/src/components/root/common/Migrations/SideMigrations.js similarity index 100% rename from src/components/root/Pages/Migrations/SideMigrations.js rename to src/components/root/common/Migrations/SideMigrations.js diff --git a/src/components/root/Pages/Tables/HistoricalSingle.js b/src/components/root/common/Tables/HistoricalSingle.js similarity index 100% rename from src/components/root/Pages/Tables/HistoricalSingle.js rename to src/components/root/common/Tables/HistoricalSingle.js diff --git a/src/components/root/Pages/Tables/SingleSide.js b/src/components/root/common/Tables/SingleSide.js similarity index 100% rename from src/components/root/Pages/Tables/SingleSide.js rename to src/components/root/common/Tables/SingleSide.js diff --git a/src/components/root/Pages/Tables/UpcomingSingle.js b/src/components/root/common/Tables/UpcomingSingle.js similarity index 100% rename from src/components/root/Pages/Tables/UpcomingSingle.js rename to src/components/root/common/Tables/UpcomingSingle.js