From 7b37e4e9b69915753e08fe86f0486bfb2e49ba6c Mon Sep 17 00:00:00 2001 From: Christoph Wolfes Date: Wed, 25 Jul 2018 14:29:43 +0200 Subject: [PATCH] updates root components structure --- scm-ui/src/components/{ => buttons}/AddButton.js | 0 scm-ui/src/components/{ => buttons}/Button.js | 0 scm-ui/src/components/{ => buttons}/DeleteButton.js | 0 scm-ui/src/components/{ => buttons}/EditButton.js | 0 scm-ui/src/components/{ => buttons}/SubmitButton.js | 0 scm-ui/src/components/buttons/index.js | 5 +++++ scm-ui/src/components/{ => forms}/Checkbox.js | 0 scm-ui/src/components/{ => forms}/InputField.js | 0 scm-ui/src/components/forms/index.js | 2 ++ scm-ui/src/components/{ => layout}/Footer.js | 2 +- scm-ui/src/components/{ => layout}/Header.js | 2 +- scm-ui/src/components/{ => layout}/Page.js | 4 ++-- scm-ui/src/components/layout/index.js | 3 +++ scm-ui/src/components/{ => modals}/ConfirmAlert.css | 0 scm-ui/src/components/{ => modals}/ConfirmAlert.js | 0 scm-ui/src/components/modals/index.js | 1 + .../{SecondaryNavigation => navigation}/NavAction.js | 0 .../{SecondaryNavigation => navigation}/NavLink.js | 0 .../{SecondaryNavigation => navigation}/Navigation.js | 0 .../src/components/{ => navigation}/PrimaryNavigation.js | 0 .../components/{ => navigation}/PrimaryNavigationLink.js | 0 .../{SecondaryNavigation => navigation}/Section.js | 0 .../{SecondaryNavigation => navigation}/index.js | 4 ++++ scm-ui/src/containers/App.js | 7 +++---- scm-ui/src/containers/Login.js | 4 ++-- scm-ui/src/repositories/containers/Repositories.js | 2 +- scm-ui/src/users/containers/AddUser.js | 2 +- scm-ui/src/users/containers/DeleteUserButton.js | 4 ++-- scm-ui/src/users/containers/DeleteUserButton.test.js | 4 ++-- scm-ui/src/users/containers/Details.js | 2 +- scm-ui/src/users/containers/EditUserButton.js | 2 +- scm-ui/src/users/containers/SingleUser.js | 8 ++------ scm-ui/src/users/containers/UserForm.js | 5 ++--- scm-ui/src/users/containers/Users.js | 4 ++-- 34 files changed, 38 insertions(+), 29 deletions(-) rename scm-ui/src/components/{ => buttons}/AddButton.js (100%) rename scm-ui/src/components/{ => buttons}/Button.js (100%) rename scm-ui/src/components/{ => buttons}/DeleteButton.js (100%) rename scm-ui/src/components/{ => buttons}/EditButton.js (100%) rename scm-ui/src/components/{ => buttons}/SubmitButton.js (100%) create mode 100644 scm-ui/src/components/buttons/index.js rename scm-ui/src/components/{ => forms}/Checkbox.js (100%) rename scm-ui/src/components/{ => forms}/InputField.js (100%) create mode 100644 scm-ui/src/components/forms/index.js rename scm-ui/src/components/{ => layout}/Footer.js (90%) rename scm-ui/src/components/{ => layout}/Header.js (95%) rename scm-ui/src/components/{ => layout}/Page.js (90%) create mode 100644 scm-ui/src/components/layout/index.js rename scm-ui/src/components/{ => modals}/ConfirmAlert.css (100%) rename scm-ui/src/components/{ => modals}/ConfirmAlert.js (100%) create mode 100644 scm-ui/src/components/modals/index.js rename scm-ui/src/components/{SecondaryNavigation => navigation}/NavAction.js (100%) rename scm-ui/src/components/{SecondaryNavigation => navigation}/NavLink.js (100%) rename scm-ui/src/components/{SecondaryNavigation => navigation}/Navigation.js (100%) rename scm-ui/src/components/{ => navigation}/PrimaryNavigation.js (100%) rename scm-ui/src/components/{ => navigation}/PrimaryNavigationLink.js (100%) rename scm-ui/src/components/{SecondaryNavigation => navigation}/Section.js (100%) rename scm-ui/src/components/{SecondaryNavigation => navigation}/index.js (51%) diff --git a/scm-ui/src/components/AddButton.js b/scm-ui/src/components/buttons/AddButton.js similarity index 100% rename from scm-ui/src/components/AddButton.js rename to scm-ui/src/components/buttons/AddButton.js diff --git a/scm-ui/src/components/Button.js b/scm-ui/src/components/buttons/Button.js similarity index 100% rename from scm-ui/src/components/Button.js rename to scm-ui/src/components/buttons/Button.js diff --git a/scm-ui/src/components/DeleteButton.js b/scm-ui/src/components/buttons/DeleteButton.js similarity index 100% rename from scm-ui/src/components/DeleteButton.js rename to scm-ui/src/components/buttons/DeleteButton.js diff --git a/scm-ui/src/components/EditButton.js b/scm-ui/src/components/buttons/EditButton.js similarity index 100% rename from scm-ui/src/components/EditButton.js rename to scm-ui/src/components/buttons/EditButton.js diff --git a/scm-ui/src/components/SubmitButton.js b/scm-ui/src/components/buttons/SubmitButton.js similarity index 100% rename from scm-ui/src/components/SubmitButton.js rename to scm-ui/src/components/buttons/SubmitButton.js diff --git a/scm-ui/src/components/buttons/index.js b/scm-ui/src/components/buttons/index.js new file mode 100644 index 0000000000..47f0d34ad2 --- /dev/null +++ b/scm-ui/src/components/buttons/index.js @@ -0,0 +1,5 @@ +export { default as AddButton } from "./AddButton"; +export { default as Button } from "./Button"; +export { default as DeleteButton } from "./DeleteButton"; +export { default as EditButton } from "./EditButton"; +export { default as SubmitButton } from "./SubmitButton"; diff --git a/scm-ui/src/components/Checkbox.js b/scm-ui/src/components/forms/Checkbox.js similarity index 100% rename from scm-ui/src/components/Checkbox.js rename to scm-ui/src/components/forms/Checkbox.js diff --git a/scm-ui/src/components/InputField.js b/scm-ui/src/components/forms/InputField.js similarity index 100% rename from scm-ui/src/components/InputField.js rename to scm-ui/src/components/forms/InputField.js diff --git a/scm-ui/src/components/forms/index.js b/scm-ui/src/components/forms/index.js new file mode 100644 index 0000000000..fd2744cf23 --- /dev/null +++ b/scm-ui/src/components/forms/index.js @@ -0,0 +1,2 @@ +export { default as Checkbox } from "./Checkbox"; +export { default as InputField } from "./InputField"; diff --git a/scm-ui/src/components/Footer.js b/scm-ui/src/components/layout/Footer.js similarity index 90% rename from scm-ui/src/components/Footer.js rename to scm-ui/src/components/layout/Footer.js index d13635d973..90d1b892b0 100644 --- a/scm-ui/src/components/Footer.js +++ b/scm-ui/src/components/layout/Footer.js @@ -1,6 +1,6 @@ //@flow import React from "react"; -import type { Me } from "../types/Me"; +import type { Me } from "../../types/Me"; type Props = { me?: Me diff --git a/scm-ui/src/components/Header.js b/scm-ui/src/components/layout/Header.js similarity index 95% rename from scm-ui/src/components/Header.js rename to scm-ui/src/components/layout/Header.js index 6b93546827..0bb3f378a6 100644 --- a/scm-ui/src/components/Header.js +++ b/scm-ui/src/components/layout/Header.js @@ -1,6 +1,6 @@ //@flow import * as React from "react"; -import Logo from "./Logo"; +import Logo from "./../Logo"; type Props = { children?: React.Node diff --git a/scm-ui/src/components/Page.js b/scm-ui/src/components/layout/Page.js similarity index 90% rename from scm-ui/src/components/Page.js rename to scm-ui/src/components/layout/Page.js index b9ee7b0e35..55e53f8d48 100644 --- a/scm-ui/src/components/Page.js +++ b/scm-ui/src/components/layout/Page.js @@ -1,7 +1,7 @@ //@flow import * as React from "react"; -import Loading from "./Loading"; -import ErrorNotification from "./ErrorNotification"; +import Loading from "./../Loading"; +import ErrorNotification from "./../ErrorNotification"; type Props = { title: string, diff --git a/scm-ui/src/components/layout/index.js b/scm-ui/src/components/layout/index.js new file mode 100644 index 0000000000..081e0e14bd --- /dev/null +++ b/scm-ui/src/components/layout/index.js @@ -0,0 +1,3 @@ +export { default as Footer } from "./Footer"; +export { default as Header } from "./Header"; +export { default as Page } from "./Page"; diff --git a/scm-ui/src/components/ConfirmAlert.css b/scm-ui/src/components/modals/ConfirmAlert.css similarity index 100% rename from scm-ui/src/components/ConfirmAlert.css rename to scm-ui/src/components/modals/ConfirmAlert.css diff --git a/scm-ui/src/components/ConfirmAlert.js b/scm-ui/src/components/modals/ConfirmAlert.js similarity index 100% rename from scm-ui/src/components/ConfirmAlert.js rename to scm-ui/src/components/modals/ConfirmAlert.js diff --git a/scm-ui/src/components/modals/index.js b/scm-ui/src/components/modals/index.js new file mode 100644 index 0000000000..be161dbe0f --- /dev/null +++ b/scm-ui/src/components/modals/index.js @@ -0,0 +1 @@ +export { default as ConfirmAlert } from "./ConfirmAlert"; diff --git a/scm-ui/src/components/SecondaryNavigation/NavAction.js b/scm-ui/src/components/navigation/NavAction.js similarity index 100% rename from scm-ui/src/components/SecondaryNavigation/NavAction.js rename to scm-ui/src/components/navigation/NavAction.js diff --git a/scm-ui/src/components/SecondaryNavigation/NavLink.js b/scm-ui/src/components/navigation/NavLink.js similarity index 100% rename from scm-ui/src/components/SecondaryNavigation/NavLink.js rename to scm-ui/src/components/navigation/NavLink.js diff --git a/scm-ui/src/components/SecondaryNavigation/Navigation.js b/scm-ui/src/components/navigation/Navigation.js similarity index 100% rename from scm-ui/src/components/SecondaryNavigation/Navigation.js rename to scm-ui/src/components/navigation/Navigation.js diff --git a/scm-ui/src/components/PrimaryNavigation.js b/scm-ui/src/components/navigation/PrimaryNavigation.js similarity index 100% rename from scm-ui/src/components/PrimaryNavigation.js rename to scm-ui/src/components/navigation/PrimaryNavigation.js diff --git a/scm-ui/src/components/PrimaryNavigationLink.js b/scm-ui/src/components/navigation/PrimaryNavigationLink.js similarity index 100% rename from scm-ui/src/components/PrimaryNavigationLink.js rename to scm-ui/src/components/navigation/PrimaryNavigationLink.js diff --git a/scm-ui/src/components/SecondaryNavigation/Section.js b/scm-ui/src/components/navigation/Section.js similarity index 100% rename from scm-ui/src/components/SecondaryNavigation/Section.js rename to scm-ui/src/components/navigation/Section.js diff --git a/scm-ui/src/components/SecondaryNavigation/index.js b/scm-ui/src/components/navigation/index.js similarity index 51% rename from scm-ui/src/components/SecondaryNavigation/index.js rename to scm-ui/src/components/navigation/index.js index af86075056..822f0f8a1e 100644 --- a/scm-ui/src/components/SecondaryNavigation/index.js +++ b/scm-ui/src/components/navigation/index.js @@ -1,3 +1,7 @@ +//primary Navigation +export { default as PrimaryNavigation } from "./PrimaryNavigation"; +export { default as PrimaryNavigationLink } from "./PrimaryNavigationLink"; +//secondary Navigation export { default as Navigation } from "./Navigation"; export { default as Section } from "./Section"; export { default as NavLink } from "./NavLink"; diff --git a/scm-ui/src/containers/App.js b/scm-ui/src/containers/App.js index 7e581a56ff..d44771fd7f 100644 --- a/scm-ui/src/containers/App.js +++ b/scm-ui/src/containers/App.js @@ -6,12 +6,11 @@ import { withRouter } from "react-router-dom"; import { fetchMe } from "../modules/auth"; import "./App.css"; -import "../components/ConfirmAlert.css"; -import Header from "../components/Header"; -import PrimaryNavigation from "../components/PrimaryNavigation"; +import "../components/modals/ConfirmAlert.css"; +import { PrimaryNavigation } from "../components/navigation"; import Loading from "../components/Loading"; import ErrorPage from "../components/ErrorPage"; -import Footer from "../components/Footer"; +import { Footer, Header } from "../components/layout"; type Props = { me: Me, diff --git a/scm-ui/src/containers/Login.js b/scm-ui/src/containers/Login.js index d661ef2b19..7f0b129e7e 100644 --- a/scm-ui/src/containers/Login.js +++ b/scm-ui/src/containers/Login.js @@ -6,8 +6,8 @@ import { translate } from "react-i18next"; import { login } from "../modules/auth"; import { connect } from "react-redux"; -import InputField from "../components/InputField"; -import SubmitButton from "../components/SubmitButton"; +import { InputField } from "../components/forms"; +import { SubmitButton } from "../components/buttons"; import classNames from "classnames"; import Avatar from "../images/blib.jpg"; diff --git a/scm-ui/src/repositories/containers/Repositories.js b/scm-ui/src/repositories/containers/Repositories.js index 8d0a52a421..162c6cfc4d 100644 --- a/scm-ui/src/repositories/containers/Repositories.js +++ b/scm-ui/src/repositories/containers/Repositories.js @@ -1,6 +1,6 @@ // @flow import React from "react"; -import Page from "../../components/Page"; +import { Page } from "../../components/layout"; import { translate } from "react-i18next"; type Props = { diff --git a/scm-ui/src/users/containers/AddUser.js b/scm-ui/src/users/containers/AddUser.js index 71d9bf58be..822395bd27 100644 --- a/scm-ui/src/users/containers/AddUser.js +++ b/scm-ui/src/users/containers/AddUser.js @@ -5,7 +5,7 @@ import UserForm from "./UserForm"; import type { User } from "../types/User"; import type { History } from "history"; import { createUser } from "../modules/users"; -import Page from "../../components/Page"; +import { Page } from "../../components/layout"; type Props = { addUser: (user: User, callback?: () => void) => void, diff --git a/scm-ui/src/users/containers/DeleteUserButton.js b/scm-ui/src/users/containers/DeleteUserButton.js index 9c4c18fed1..c6c9f43cf3 100644 --- a/scm-ui/src/users/containers/DeleteUserButton.js +++ b/scm-ui/src/users/containers/DeleteUserButton.js @@ -2,8 +2,8 @@ import React from "react"; import { translate } from "react-i18next"; import type { User } from "../types/User"; -import { confirmAlert } from "../../components/ConfirmAlert"; -import { NavAction } from "../../components/SecondaryNavigation"; +import { confirmAlert } from "../../components/modals/ConfirmAlert"; +import { NavAction } from "../../components/navigation"; type Props = { user: User, diff --git a/scm-ui/src/users/containers/DeleteUserButton.test.js b/scm-ui/src/users/containers/DeleteUserButton.test.js index a16eba053e..9c406cd6d0 100644 --- a/scm-ui/src/users/containers/DeleteUserButton.test.js +++ b/scm-ui/src/users/containers/DeleteUserButton.test.js @@ -4,8 +4,8 @@ import "../../tests/enzyme"; import "../../tests/i18n"; import DeleteUserButton from "./DeleteUserButton"; -import { confirmAlert } from "../../components/ConfirmAlert"; -jest.mock("../../components/ConfirmAlert"); +import { confirmAlert } from "../../components/modals/ConfirmAlert"; +jest.mock("../../components/modals/ConfirmAlert"); describe("DeleteUserButton", () => { it("should render nothing, if the delete link is missing", () => { diff --git a/scm-ui/src/users/containers/Details.js b/scm-ui/src/users/containers/Details.js index 233af5759b..74bdae4cd9 100644 --- a/scm-ui/src/users/containers/Details.js +++ b/scm-ui/src/users/containers/Details.js @@ -2,7 +2,7 @@ import React from "react"; import type { User } from "../types/User"; import { translate } from "react-i18next"; -import Checkbox from "../../components/Checkbox"; +import { Checkbox } from "../../components/forms"; type Props = { user: User, diff --git a/scm-ui/src/users/containers/EditUserButton.js b/scm-ui/src/users/containers/EditUserButton.js index 6bafa73468..5f4224e498 100644 --- a/scm-ui/src/users/containers/EditUserButton.js +++ b/scm-ui/src/users/containers/EditUserButton.js @@ -1,7 +1,7 @@ //@flow import React from "react"; import { translate } from "react-i18next"; -import EditButton from "../../components/EditButton"; +import { EditButton } from "../../components/buttons"; import type { UserEntry } from "../types/UserEntry"; type Props = { diff --git a/scm-ui/src/users/containers/SingleUser.js b/scm-ui/src/users/containers/SingleUser.js index d00af2a4c2..56db13c7e2 100644 --- a/scm-ui/src/users/containers/SingleUser.js +++ b/scm-ui/src/users/containers/SingleUser.js @@ -1,7 +1,7 @@ //@flow import React from "react"; import { connect } from "react-redux"; -import Page from "../../components/Page"; +import { Page } from "../../components/layout"; import { Route } from "react-router"; import Details from "./Details"; import EditUser from "./EditUser"; @@ -10,11 +10,7 @@ import type { UserEntry } from "../types/UserEntry"; import { fetchUser, deleteUser } from "../modules/users"; import Loading from "../../components/Loading"; -import { - Navigation, - Section, - NavLink -} from "../../components/SecondaryNavigation"; +import { Navigation, Section, NavLink } from "../../components/navigation"; import DeleteUserButton from "./DeleteUserButton"; import ErrorPage from "../../components/ErrorPage"; diff --git a/scm-ui/src/users/containers/UserForm.js b/scm-ui/src/users/containers/UserForm.js index 3b15ff54c8..b93877e0e3 100644 --- a/scm-ui/src/users/containers/UserForm.js +++ b/scm-ui/src/users/containers/UserForm.js @@ -2,9 +2,8 @@ import React from "react"; import { translate } from "react-i18next"; import type { User } from "../types/User"; -import InputField from "../../components/InputField"; -import Checkbox from "../../components/Checkbox"; -import SubmitButton from "../../components/SubmitButton"; +import { InputField, Checkbox } from "../../components/forms"; +import { SubmitButton } from "../../components/buttons"; import Loading from "../../components/Loading"; type Props = { diff --git a/scm-ui/src/users/containers/Users.js b/scm-ui/src/users/containers/Users.js index 8382852cb0..2fe99560ba 100644 --- a/scm-ui/src/users/containers/Users.js +++ b/scm-ui/src/users/containers/Users.js @@ -4,10 +4,10 @@ import { connect } from "react-redux"; import { translate } from "react-i18next"; import { fetchUsers, getUsersFromState } from "../modules/users"; -import Page from "../../components/Page"; +import { Page } from "../../components/layout"; import UserTable from "./UserTable"; import type { User } from "../types/User"; -import AddButton from "../../components/AddButton"; +import { AddButton } from "../../components/buttons"; import type { UserEntry } from "../types/UserEntry"; type Props = {