From ad6583d5dc43279400832b6f97d3b289f026ad3c Mon Sep 17 00:00:00 2001 From: Jeff Avallone Date: Mon, 12 Feb 2018 20:05:47 -0500 Subject: [PATCH] Reorganizing components into directories --- .../__snapshots__/test.js.snap} | 0 src/components/{Footer.js => Footer/index.js} | 0 src/components/{Footer.test.js => Footer/test.js} | 2 +- .../__snapshots__/test.js.snap} | 0 src/components/{Header.js => Header/index.js} | 0 src/components/{Header.test.js => Header/test.js} | 2 +- .../__snapshots__/test.js.snap} | 0 src/components/{Message.js => Message/index.js} | 0 src/components/{Message.test.js => Message/test.js} | 2 +- .../__snapshots__/test.js.snap} | 0 src/components/{PageTemplate.js => PageTemplate/index.js} | 2 +- .../{PageTemplate.test.js => PageTemplate/test.js} | 2 +- .../__snapshots__/test.js.snap} | 0 src/components/{RavenBoundary.js => RavenBoundary/index.js} | 2 +- .../{RavenBoundary.test.js => RavenBoundary/test.js} | 2 +- .../__snapshots__/test.js.snap} | 0 src/components/{RavenError.js => RavenError/index.js} | 4 ++-- src/components/{RavenError.test.js => RavenError/test.js} | 6 +++--- 18 files changed, 12 insertions(+), 12 deletions(-) rename src/components/{__snapshots__/Footer.test.js.snap => Footer/__snapshots__/test.js.snap} (100%) rename src/components/{Footer.js => Footer/index.js} (100%) rename src/components/{Footer.test.js => Footer/test.js} (86%) rename src/components/{__snapshots__/Header.test.js.snap => Header/__snapshots__/test.js.snap} (100%) rename src/components/{Header.js => Header/index.js} (100%) rename src/components/{Header.test.js => Header/test.js} (91%) rename src/components/{__snapshots__/Message.test.js.snap => Message/__snapshots__/test.js.snap} (100%) rename src/components/{Message.js => Message/index.js} (100%) rename src/components/{Message.test.js => Message/test.js} (94%) rename src/components/{__snapshots__/PageTemplate.test.js.snap => PageTemplate/__snapshots__/test.js.snap} (100%) rename src/components/{PageTemplate.js => PageTemplate/index.js} (95%) rename src/components/{PageTemplate.test.js => PageTemplate/test.js} (93%) rename src/components/{__snapshots__/RavenBoundary.test.js.snap => RavenBoundary/__snapshots__/test.js.snap} (100%) rename src/components/{RavenBoundary.js => RavenBoundary/index.js} (94%) rename src/components/{RavenBoundary.test.js => RavenBoundary/test.js} (94%) rename src/components/{__snapshots__/RavenError.test.js.snap => RavenError/__snapshots__/test.js.snap} (100%) rename src/components/{RavenError.js => RavenError/index.js} (93%) rename src/components/{RavenError.test.js => RavenError/test.js} (91%) diff --git a/src/components/__snapshots__/Footer.test.js.snap b/src/components/Footer/__snapshots__/test.js.snap similarity index 100% rename from src/components/__snapshots__/Footer.test.js.snap rename to src/components/Footer/__snapshots__/test.js.snap diff --git a/src/components/Footer.js b/src/components/Footer/index.js similarity index 100% rename from src/components/Footer.js rename to src/components/Footer/index.js diff --git a/src/components/Footer.test.js b/src/components/Footer/test.js similarity index 86% rename from src/components/Footer.test.js rename to src/components/Footer/test.js index 4478aaf..f77738a 100644 --- a/src/components/Footer.test.js +++ b/src/components/Footer/test.js @@ -1,7 +1,7 @@ import React from 'react'; import { shallow } from 'enzyme'; -import { Footer } from './Footer'; +import { Footer } from './index'; test('Footer rendering', () => { const component = shallow( diff --git a/src/components/__snapshots__/Header.test.js.snap b/src/components/Header/__snapshots__/test.js.snap similarity index 100% rename from src/components/__snapshots__/Header.test.js.snap rename to src/components/Header/__snapshots__/test.js.snap diff --git a/src/components/Header.js b/src/components/Header/index.js similarity index 100% rename from src/components/Header.js rename to src/components/Header/index.js diff --git a/src/components/Header.test.js b/src/components/Header/test.js similarity index 91% rename from src/components/Header.test.js rename to src/components/Header/test.js index 726e74c..89db516 100644 --- a/src/components/Header.test.js +++ b/src/components/Header/test.js @@ -1,7 +1,7 @@ import React from 'react'; import { shallow } from 'enzyme'; -import { Header } from './Header'; +import { Header } from './index'; const env = { ...process.env }; diff --git a/src/components/__snapshots__/Message.test.js.snap b/src/components/Message/__snapshots__/test.js.snap similarity index 100% rename from src/components/__snapshots__/Message.test.js.snap rename to src/components/Message/__snapshots__/test.js.snap diff --git a/src/components/Message.js b/src/components/Message/index.js similarity index 100% rename from src/components/Message.js rename to src/components/Message/index.js diff --git a/src/components/Message.test.js b/src/components/Message/test.js similarity index 94% rename from src/components/Message.test.js rename to src/components/Message/test.js index a738ea1..f20a97b 100644 --- a/src/components/Message.test.js +++ b/src/components/Message/test.js @@ -1,7 +1,7 @@ import React from 'react'; import { shallow, render } from 'enzyme'; -import Message from './Message'; +import Message from './index'; test('Message rendering', () => { const component = shallow( diff --git a/src/components/__snapshots__/PageTemplate.test.js.snap b/src/components/PageTemplate/__snapshots__/test.js.snap similarity index 100% rename from src/components/__snapshots__/PageTemplate.test.js.snap rename to src/components/PageTemplate/__snapshots__/test.js.snap diff --git a/src/components/PageTemplate.js b/src/components/PageTemplate/index.js similarity index 95% rename from src/components/PageTemplate.js rename to src/components/PageTemplate/index.js index 0dea74c..709f7d5 100644 --- a/src/components/PageTemplate.js +++ b/src/components/PageTemplate/index.js @@ -2,7 +2,7 @@ import React from 'react'; import ReactDOMServer from 'react-dom/server'; import PropTypes from 'prop-types'; -import pkg from '../../package.json'; +import pkg from '../../../package.json'; const PageTemplate = ({ title, children }) => ( diff --git a/src/components/PageTemplate.test.js b/src/components/PageTemplate/test.js similarity index 93% rename from src/components/PageTemplate.test.js rename to src/components/PageTemplate/test.js index fa2e104..7d8565e 100644 --- a/src/components/PageTemplate.test.js +++ b/src/components/PageTemplate/test.js @@ -1,7 +1,7 @@ import React from 'react'; import { shallow } from 'enzyme'; -import PageTemplate from './PageTemplate'; +import PageTemplate from './index'; const env = { ...process.env }; diff --git a/src/components/__snapshots__/RavenBoundary.test.js.snap b/src/components/RavenBoundary/__snapshots__/test.js.snap similarity index 100% rename from src/components/__snapshots__/RavenBoundary.test.js.snap rename to src/components/RavenBoundary/__snapshots__/test.js.snap diff --git a/src/components/RavenBoundary.js b/src/components/RavenBoundary/index.js similarity index 94% rename from src/components/RavenBoundary.js rename to src/components/RavenBoundary/index.js index b3c8a2b..886559e 100644 --- a/src/components/RavenBoundary.js +++ b/src/components/RavenBoundary/index.js @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; -import RavenError from './RavenError'; +import RavenError from '../RavenError'; class RavenBoundary extends React.Component { constructor() { diff --git a/src/components/RavenBoundary.test.js b/src/components/RavenBoundary/test.js similarity index 94% rename from src/components/RavenBoundary.test.js rename to src/components/RavenBoundary/test.js index 7761ce2..7b6f70a 100644 --- a/src/components/RavenBoundary.test.js +++ b/src/components/RavenBoundary/test.js @@ -1,7 +1,7 @@ import React from 'react'; import { shallow } from 'enzyme'; -import RavenBoundary from './RavenBoundary'; +import RavenBoundary from './index'; const testError = { error: 'test error' }; const testDetails = { details: 'test details' }; diff --git a/src/components/__snapshots__/RavenError.test.js.snap b/src/components/RavenError/__snapshots__/test.js.snap similarity index 100% rename from src/components/__snapshots__/RavenError.test.js.snap rename to src/components/RavenError/__snapshots__/test.js.snap diff --git a/src/components/RavenError.js b/src/components/RavenError/index.js similarity index 93% rename from src/components/RavenError.js rename to src/components/RavenError/index.js index d549540..c05e288 100644 --- a/src/components/RavenError.js +++ b/src/components/RavenError/index.js @@ -1,9 +1,9 @@ import React from 'react'; import PropTypes from 'prop-types'; import { translate, Trans } from 'react-i18next'; -import { Raven } from '../sentry'; +import { Raven } from '../../sentry'; -import Message from './Message'; +import Message from '../Message'; import AlertIcon from 'feather-icons/dist/icons/alert-octagon.svg'; class RavenError extends React.Component { diff --git a/src/components/RavenError.test.js b/src/components/RavenError/test.js similarity index 91% rename from src/components/RavenError.test.js rename to src/components/RavenError/test.js index 4efa3f3..fa29f50 100644 --- a/src/components/RavenError.test.js +++ b/src/components/RavenError/test.js @@ -1,10 +1,10 @@ import React from 'react'; import { shallow } from 'enzyme'; -jest.mock('../sentry'); +jest.mock('../../sentry'); -import { RavenError } from './RavenError'; -import { Raven } from '../sentry'; +import { RavenError } from './index'; +import { Raven } from '../../sentry'; const testError = { error: 'test error' }; const testDetails = { details: 'test details' };