From 905bfd2bf0b21660aeab99db2b65a9a14124cfd7 Mon Sep 17 00:00:00 2001 From: Sukchan Lee Date: Fri, 9 Jun 2017 14:22:26 +0900 Subject: [PATCH] update it --- webui/.babelrc | 5 +++- webui/src/components/{ => Base}/Header.js | 2 +- webui/src/components/{ => Base}/Layout.js | 14 +++++------ webui/src/components/{ => Base}/Login.js | 4 +-- webui/src/components/{ => Base}/Logout.js | 2 +- webui/src/components/{ => Base}/Sidebar.js | 2 +- webui/src/components/{ => Shared}/Dimmed.js | 0 webui/src/components/{ => Shared}/Modal.js | 2 +- .../{Thumbnail.js => Shared/ThumbnailIcon.js} | 0 webui/src/components/User/index.js | 5 ++++ webui/src/components/index.js | 25 +++++++++++++++++++ webui/src/containers/App.js | 6 ++--- webui/src/containers/Auth.js | 8 +++--- webui/src/containers/HeaderContainer.js | 8 +++--- webui/src/containers/PdnContainer.js | 2 +- webui/src/containers/SidebarContainer.js | 6 ++--- webui/src/containers/UserContainer.js | 4 +-- webui/src/reducers/auth.js | 2 +- webui/src/reducers/ui.js | 2 +- webui/src/sagas/auth.js | 4 +-- 20 files changed, 66 insertions(+), 37 deletions(-) rename webui/src/components/{ => Base}/Header.js (96%) rename webui/src/components/{ => Base}/Layout.js (83%) rename webui/src/components/{ => Base}/Login.js (97%) rename webui/src/components/{ => Base}/Logout.js (97%) rename webui/src/components/{ => Base}/Sidebar.js (98%) rename webui/src/components/{ => Shared}/Dimmed.js (100%) rename webui/src/components/{ => Shared}/Modal.js (97%) rename webui/src/components/{Thumbnail.js => Shared/ThumbnailIcon.js} (100%) create mode 100644 webui/src/components/User/index.js create mode 100644 webui/src/components/index.js diff --git a/webui/.babelrc b/webui/.babelrc index 55a4d7dce..370b81841 100644 --- a/webui/.babelrc +++ b/webui/.babelrc @@ -8,6 +8,9 @@ "displayName": false, "preprocess": false }], - ["polished"] + ["polished"], + ["module-resolver", { + "root": ["./src"] + }] ] } diff --git a/webui/src/components/Header.js b/webui/src/components/Base/Header.js similarity index 96% rename from webui/src/components/Header.js rename to webui/src/components/Base/Header.js index 34a5bb903..4ce3dc7ce 100644 --- a/webui/src/components/Header.js +++ b/webui/src/components/Base/Header.js @@ -4,7 +4,7 @@ import styled from 'styled-components'; import oc from 'open-color'; import MenuIcon from 'react-icons/lib/md/menu'; -import ThumbnailIcon from './Thumbnail'; +import {ThumbnailIcon} from 'components'; const Wrapper = styled.div` display: flex; diff --git a/webui/src/components/Layout.js b/webui/src/components/Base/Layout.js similarity index 83% rename from webui/src/components/Layout.js rename to webui/src/components/Base/Layout.js index ded16fd01..3289af3c3 100644 --- a/webui/src/components/Layout.js +++ b/webui/src/components/Base/Layout.js @@ -1,15 +1,13 @@ import PropTypes from 'prop-types'; - -import styled from 'styled-components'; -import { media, transitions} from '../lib/style-utils'; -import oc from 'open-color'; - import Head from 'next/head'; -import HeaderContainer from '../containers/HeaderContainer'; -import SidebarContainer from '../containers/SidebarContainer'; +import styled from 'styled-components'; +import oc from 'open-color'; -import Package from '../../package'; +import HeaderContainer from 'containers/HeaderContainer'; +import SidebarContainer from 'containers/SidebarContainer'; + +import Package from '../../../package'; const Body = styled.div` display: flex; diff --git a/webui/src/components/Login.js b/webui/src/components/Base/Login.js similarity index 97% rename from webui/src/components/Login.js rename to webui/src/components/Base/Login.js index 176692b03..97ee3961b 100644 --- a/webui/src/components/Login.js +++ b/webui/src/components/Base/Login.js @@ -4,9 +4,9 @@ import PropTypes from 'prop-types'; import styled from 'styled-components'; import oc from 'open-color'; -import { media } from '../lib/style-utils'; +import { media } from '../../lib/style-utils'; -import ThumbnailIcon from './Thumbnail'; +import {ThumbnailIcon} from 'components'; import CloseIcon from 'react-icons/lib/md/close'; const Wrapper = styled.div` diff --git a/webui/src/components/Logout.js b/webui/src/components/Base/Logout.js similarity index 97% rename from webui/src/components/Logout.js rename to webui/src/components/Base/Logout.js index e6a14133f..85439b400 100644 --- a/webui/src/components/Logout.js +++ b/webui/src/components/Base/Logout.js @@ -4,7 +4,7 @@ import PropTypes from 'prop-types'; import styled from 'styled-components'; import oc from 'open-color'; -import Modal from './Modal'; +import { Modal } from '../../components'; const TitleWrapper = styled.div` padding-left: 1rem; diff --git a/webui/src/components/Sidebar.js b/webui/src/components/Base/Sidebar.js similarity index 98% rename from webui/src/components/Sidebar.js rename to webui/src/components/Base/Sidebar.js index b5a852767..b5dde156b 100644 --- a/webui/src/components/Sidebar.js +++ b/webui/src/components/Base/Sidebar.js @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; import styled from 'styled-components'; -import { media, transitions} from '../lib/style-utils'; +import { media, transitions } from 'lib/style-utils'; import oc from 'open-color'; import PdnIcon from 'react-icons/lib/md/cast'; diff --git a/webui/src/components/Dimmed.js b/webui/src/components/Shared/Dimmed.js similarity index 100% rename from webui/src/components/Dimmed.js rename to webui/src/components/Shared/Dimmed.js diff --git a/webui/src/components/Modal.js b/webui/src/components/Shared/Modal.js similarity index 97% rename from webui/src/components/Modal.js rename to webui/src/components/Shared/Modal.js index 5d1f32ddc..51e8f31b4 100644 --- a/webui/src/components/Modal.js +++ b/webui/src/components/Shared/Modal.js @@ -3,8 +3,8 @@ import PropTypes from 'prop-types'; import styled from 'styled-components'; import onClickOutside from 'react-onclickoutside'; -import {media, transitions} from '../lib/style-utils'; import CSSTransitionGroup from 'react-transition-group/CSSTransitionGroup'; +import {media, transitions} from 'lib/style-utils'; const Wrapper = styled.div` position: fixed; diff --git a/webui/src/components/Thumbnail.js b/webui/src/components/Shared/ThumbnailIcon.js similarity index 100% rename from webui/src/components/Thumbnail.js rename to webui/src/components/Shared/ThumbnailIcon.js diff --git a/webui/src/components/User/index.js b/webui/src/components/User/index.js new file mode 100644 index 000000000..40a8318f9 --- /dev/null +++ b/webui/src/components/User/index.js @@ -0,0 +1,5 @@ +import ViewSelector from './ViewSelector'; + +export { + ViewSelector +}; \ No newline at end of file diff --git a/webui/src/components/index.js b/webui/src/components/index.js new file mode 100644 index 000000000..7b2d07af9 --- /dev/null +++ b/webui/src/components/index.js @@ -0,0 +1,25 @@ +import Layout from './Base/Layout'; +import Header from './Base/Header'; +import Sidebar from './Base/Sidebar'; +import Login from './Base/Login'; +import Logout from './Base/Logout'; + +import Modal from './Shared/Modal'; +import ThumbnailIcon from './Shared/ThumbnailIcon'; +import Dimmed from './Shared/Dimmed'; + +import * as User from './User'; + +export { + Layout, + Header, + Sidebar, + Login, + Logout, + + Modal, + ThumbnailIcon, + Dimmed, + + User +} \ No newline at end of file diff --git a/webui/src/containers/App.js b/webui/src/containers/App.js index 0d0a8c78f..b915d3874 100644 --- a/webui/src/containers/App.js +++ b/webui/src/containers/App.js @@ -6,9 +6,9 @@ import { bindActionCreators, compose } from 'redux'; import * as uiActions from '../actions/ui'; import withWidth, { SMALL } from '../lib/with-width'; -import Layout from '../components/Layout'; -import PdnContainer from '../containers/PdnContainer'; -import UserContainer from '../containers/UserContainer'; +import { Layout } from 'components'; +import PdnContainer from 'containers/PdnContainer'; +import UserContainer from 'containers/UserContainer'; class App extends Component { static propTypes = { diff --git a/webui/src/containers/Auth.js b/webui/src/containers/Auth.js index 019f41886..3a550fbd4 100644 --- a/webui/src/containers/Auth.js +++ b/webui/src/containers/Auth.js @@ -5,12 +5,12 @@ import { bindActionCreators } from 'redux'; import Router from 'next/router'; import NProgress from 'nprogress'; -import Session from '../lib/session'; +import Session from 'lib/session'; -import * as authActions from '../actions/auth'; -import * as uiActions from '../actions/ui'; +import * as authActions from 'actions/auth'; +import * as uiActions from 'actions/ui'; -import Login from '../components/Login'; +import { Login } from 'components'; class Auth extends Component { state = { diff --git a/webui/src/containers/HeaderContainer.js b/webui/src/containers/HeaderContainer.js index 7aa50ce69..8807641eb 100644 --- a/webui/src/containers/HeaderContainer.js +++ b/webui/src/containers/HeaderContainer.js @@ -4,13 +4,11 @@ import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; -import * as uiActions from '../actions/ui'; +import * as uiActions from 'actions/ui'; -import Session from '../lib/session'; +import Session from 'lib/session'; -import Header from '../components/Header'; -import Logout from '../components//Logout'; -import Dimmed from '../components//Dimmed'; +import { Header, Logout, Dimmed } from 'components'; class HeaderContainer extends Component { state = { diff --git a/webui/src/containers/PdnContainer.js b/webui/src/containers/PdnContainer.js index 80be8a7cb..ca7ee9656 100644 --- a/webui/src/containers/PdnContainer.js +++ b/webui/src/containers/PdnContainer.js @@ -1,7 +1,7 @@ import styled from 'styled-components'; import oc from 'open-color'; -import Layout from '../components/Layout'; +import { Layout } from 'components'; const PdnContainer = () => ( diff --git a/webui/src/containers/SidebarContainer.js b/webui/src/containers/SidebarContainer.js index 8c77c83cd..f51681e39 100644 --- a/webui/src/containers/SidebarContainer.js +++ b/webui/src/containers/SidebarContainer.js @@ -3,10 +3,10 @@ import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { bindActionCreators, compose } from 'redux'; -import withWidth, { SMALL } from '../lib/with-width'; -import * as uiActions from '../actions/ui'; +import withWidth, { SMALL } from 'lib/with-width'; +import * as uiActions from 'actions/ui'; -import Sidebar from '../components/Sidebar'; +import { Sidebar } from 'components'; class SidebarContainer extends Component { static propTypes = { diff --git a/webui/src/containers/UserContainer.js b/webui/src/containers/UserContainer.js index 834ade90c..26f17f1f0 100644 --- a/webui/src/containers/UserContainer.js +++ b/webui/src/containers/UserContainer.js @@ -4,7 +4,7 @@ import PropTypes from 'prop-types'; import styled from 'styled-components'; import oc from 'open-color'; -import ViewSelector from '../components/User/ViewSelector'; +import { User } from 'components'; const Wrapper = styled.div` `; @@ -25,7 +25,7 @@ class UserContainer extends Component { return ( - + ) } diff --git a/webui/src/reducers/auth.js b/webui/src/reducers/auth.js index 60b76f5a0..369878ba2 100644 --- a/webui/src/reducers/auth.js +++ b/webui/src/reducers/auth.js @@ -1,5 +1,5 @@ import { handleActions } from 'redux-actions'; -import { AUTH } from '../actions/auth'; +import { AUTH } from 'actions/auth'; const initialState = { isLoggedIn: false, diff --git a/webui/src/reducers/ui.js b/webui/src/reducers/ui.js index 6ff4d68b0..e4501e610 100644 --- a/webui/src/reducers/ui.js +++ b/webui/src/reducers/ui.js @@ -1,5 +1,5 @@ import { handleActions } from 'redux-actions'; -import { UI } from '../actions/ui'; +import { UI } from 'actions/ui'; const initialState = { sidebar: { diff --git a/webui/src/sagas/auth.js b/webui/src/sagas/auth.js index f2d4efeee..9b1149306 100644 --- a/webui/src/sagas/auth.js +++ b/webui/src/sagas/auth.js @@ -1,7 +1,7 @@ import { takeEvery, put, call, take } from 'redux-saga/effects'; -import { AUTH } from '../actions/auth'; -import { UI, toggleSidebar } from '../actions/ui'; +import { AUTH } from 'actions/auth'; +import { UI, toggleSidebar } from 'actions/ui'; function* testCode() { yield put(toggleSidebar());