From 7d986b1518c3ec7f99c776f3d81e0d5466ee73d2 Mon Sep 17 00:00:00 2001 From: ErickSkrauch Date: Sun, 2 Oct 2016 13:32:28 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=BE=D0=BC=D0=BF=D0=BE=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D1=82=D1=8B=20Userbar,=20Header=20=D0=B8=20Footer=20?= =?UTF-8?q?=D1=81=D0=B3=D1=80=D1=83=D0=BF=D0=BF=D0=B8=D1=80=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D0=BD=D1=8B=20=D0=B2=D0=BD=D1=83=D1=82=D1=80=D0=B8=20lay?= =?UTF-8?q?out?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/footer/index.js | 1 - src/components/header/index.js | 1 - src/components/index.js | 4 +--- src/components/{ => layout}/footer/Footer.jsx | 0 .../{ => layout}/footer/messages.intl.json | 0 src/components/{ => layout}/footer/styles.js | 0 src/components/{ => layout}/header/Header.jsx | 0 src/components/{ => layout}/header/background.jpg | Bin .../{ => layout}/header/messages.intl.json | 0 src/components/{ => layout}/header/styles.js | 0 src/components/layout/index.js | 9 +++++++++ src/components/{ => layout}/userbar/Userbar.jsx | 0 src/components/{ => layout}/userbar/logo.png | Bin src/components/{ => layout}/userbar/styles.js | 0 src/components/userbar/index.js | 1 - src/emails/register/Register.jsx | 4 +--- 16 files changed, 11 insertions(+), 9 deletions(-) delete mode 100644 src/components/footer/index.js delete mode 100644 src/components/header/index.js rename src/components/{ => layout}/footer/Footer.jsx (100%) rename src/components/{ => layout}/footer/messages.intl.json (100%) rename src/components/{ => layout}/footer/styles.js (100%) rename src/components/{ => layout}/header/Header.jsx (100%) rename src/components/{ => layout}/header/background.jpg (100%) rename src/components/{ => layout}/header/messages.intl.json (100%) rename src/components/{ => layout}/header/styles.js (100%) create mode 100644 src/components/layout/index.js rename src/components/{ => layout}/userbar/Userbar.jsx (100%) rename src/components/{ => layout}/userbar/logo.png (100%) rename src/components/{ => layout}/userbar/styles.js (100%) delete mode 100644 src/components/userbar/index.js diff --git a/src/components/footer/index.js b/src/components/footer/index.js deleted file mode 100644 index 97faaaf..0000000 --- a/src/components/footer/index.js +++ /dev/null @@ -1 +0,0 @@ -export Footer from './Footer'; diff --git a/src/components/header/index.js b/src/components/header/index.js deleted file mode 100644 index d8cde81..0000000 --- a/src/components/header/index.js +++ /dev/null @@ -1 +0,0 @@ -export Header from './Header'; diff --git a/src/components/index.js b/src/components/index.js index bdcccc3..34c5e1c 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -1,7 +1,5 @@ import Html from './Html'; -import Userbar from './userbar/Userbar'; export { - Html, - Userbar + Html }; diff --git a/src/components/footer/Footer.jsx b/src/components/layout/footer/Footer.jsx similarity index 100% rename from src/components/footer/Footer.jsx rename to src/components/layout/footer/Footer.jsx diff --git a/src/components/footer/messages.intl.json b/src/components/layout/footer/messages.intl.json similarity index 100% rename from src/components/footer/messages.intl.json rename to src/components/layout/footer/messages.intl.json diff --git a/src/components/footer/styles.js b/src/components/layout/footer/styles.js similarity index 100% rename from src/components/footer/styles.js rename to src/components/layout/footer/styles.js diff --git a/src/components/header/Header.jsx b/src/components/layout/header/Header.jsx similarity index 100% rename from src/components/header/Header.jsx rename to src/components/layout/header/Header.jsx diff --git a/src/components/header/background.jpg b/src/components/layout/header/background.jpg similarity index 100% rename from src/components/header/background.jpg rename to src/components/layout/header/background.jpg diff --git a/src/components/header/messages.intl.json b/src/components/layout/header/messages.intl.json similarity index 100% rename from src/components/header/messages.intl.json rename to src/components/layout/header/messages.intl.json diff --git a/src/components/header/styles.js b/src/components/layout/header/styles.js similarity index 100% rename from src/components/header/styles.js rename to src/components/layout/header/styles.js diff --git a/src/components/layout/index.js b/src/components/layout/index.js new file mode 100644 index 0000000..a74c02e --- /dev/null +++ b/src/components/layout/index.js @@ -0,0 +1,9 @@ +import Userbar from './userbar/Userbar'; +import Header from './header/Header'; +import Footer from './footer/Footer'; + +export { + Userbar, + Header, + Footer +}; diff --git a/src/components/userbar/Userbar.jsx b/src/components/layout/userbar/Userbar.jsx similarity index 100% rename from src/components/userbar/Userbar.jsx rename to src/components/layout/userbar/Userbar.jsx diff --git a/src/components/userbar/logo.png b/src/components/layout/userbar/logo.png similarity index 100% rename from src/components/userbar/logo.png rename to src/components/layout/userbar/logo.png diff --git a/src/components/userbar/styles.js b/src/components/layout/userbar/styles.js similarity index 100% rename from src/components/userbar/styles.js rename to src/components/layout/userbar/styles.js diff --git a/src/components/userbar/index.js b/src/components/userbar/index.js deleted file mode 100644 index ea34f2a..0000000 --- a/src/components/userbar/index.js +++ /dev/null @@ -1 +0,0 @@ -export Userbar from './Userbar'; diff --git a/src/emails/register/Register.jsx b/src/emails/register/Register.jsx index 863a178..9b8e21d 100644 --- a/src/emails/register/Register.jsx +++ b/src/emails/register/Register.jsx @@ -2,10 +2,8 @@ import { PropTypes } from 'react'; import { FormattedMessage as Message } from 'react-intl'; -import { Userbar } from 'components/userbar'; +import { Userbar, Header, Footer } from 'components/layout'; import { Table } from 'components/table'; -import { Header } from 'components/header'; -import { Footer } from 'components/footer'; import { Button } from 'components/button'; import { Input } from 'components/input'; import { BitmapText } from 'components/text';