Move Nav and Toolbar files into new Header folder

client/components/Nav.jsx → client/modules/IDE/components/Header/Nav.jsx

@@ -4,26 +4,23 @@ import React from 'react';
 import { withTranslation } from 'react-i18next';
 import { connect } from 'react-redux';
 import { Link } from 'react-router-dom';
-import { availableLanguages, languageKeyToLabel } from '../i18n';
-import * as IDEActions from '../modules/IDE/actions/ide';
-import * as toastActions from '../modules/IDE/actions/toast';
-import * as projectActions from '../modules/IDE/actions/project';
-import {
-  setAllAccessibleOutput,
-  setLanguage
-} from '../modules/IDE/actions/preferences';
-import { logoutUser } from '../modules/User/actions';
+import { availableLanguages, languageKeyToLabel } from '../../../../i18n';
+import * as IDEActions from '../../actions/ide';
+import * as toastActions from '../../actions/toast';
+import * as projectActions from '../../actions/project';
+import { setAllAccessibleOutput, setLanguage } from '../../actions/preferences';
+import { logoutUser } from '../../../User/actions';
 
-import getConfig from '../utils/getConfig';
-import { metaKeyName, metaKey } from '../utils/metaKey';
-import { getIsUserOwner } from '../modules/IDE/selectors/users';
-import { selectSketchPath } from '../modules/IDE/selectors/project';
+import getConfig from '../../../../utils/getConfig';
+import { metaKeyName, metaKey } from '../../../../utils/metaKey';
+import { getIsUserOwner } from '../../selectors/users';
+import { selectSketchPath } from '../../selectors/project';
 
-import CaretLeftIcon from '../images/left-arrow.svg';
-import LogoIcon from '../images/p5js-logo-small.svg';
-import NavDropdownMenu from './Nav/NavDropdownMenu';
-import NavMenuItem from './Nav/NavMenuItem';
-import NavBar from './Nav/NavBar';
+import CaretLeftIcon from '../../../../images/left-arrow.svg';
+import LogoIcon from '../../../../images/p5js-logo-small.svg';
+import NavDropdownMenu from '../../../../components/Nav/NavDropdownMenu';
+import NavMenuItem from '../../../../components/Nav/NavMenuItem';
+import NavBar from '../../../../components/Nav/NavBar';
 
 class Nav extends React.PureComponent {
   constructor(props) {

client/components/Nav.unit.test.jsx → client/modules/IDE/components/Header/Nav.unit.test.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { render, reduxRender } from '../test-utils';
+import { render, reduxRender } from '../../../../test-utils';
 
 import Nav, { NavComponent } from './Nav';
 

client/modules/IDE/components/Toolbar.jsx → client/modules/IDE/components/Header/Toolbar.jsx

@@ -4,14 +4,14 @@ import { connect } from 'react-redux';
 import { Link } from 'react-router-dom';
 import classNames from 'classnames';
 import { withTranslation } from 'react-i18next';
-import * as IDEActions from '../actions/ide';
-import * as preferenceActions from '../actions/preferences';
-import * as projectActions from '../actions/project';
-
-import PlayIcon from '../../../images/play.svg';
-import StopIcon from '../../../images/stop.svg';
-import PreferencesIcon from '../../../images/preferences.svg';
-import EditProjectNameIcon from '../../../images/pencil.svg';
+import * as IDEActions from '../../actions/ide';
+import * as preferenceActions from '../../actions/preferences';
+import * as projectActions from '../../actions/project';
+
+import PlayIcon from '../../../../images/play.svg';
+import StopIcon from '../../../../images/stop.svg';
+import PreferencesIcon from '../../../../images/preferences.svg';
+import EditProjectNameIcon from '../../../../images/pencil.svg';
 
 class Toolbar extends React.Component {
   constructor(props) {

client/modules/IDE/components/Toolbar.unit.test.jsx → client/modules/IDE/components/Header/Toolbar.unit.test.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import lodash from 'lodash';
 
-import { fireEvent, render, screen, waitFor } from '../../../test-utils';
+import { fireEvent, render, screen, waitFor } from '../../../../test-utils';
 import { ToolbarComponent } from './Toolbar';
 
 const renderComponent = (extraProps = {}) => {

client/modules/IDE/pages/IDEView.jsx

@@ -9,15 +9,15 @@ import SplitPane from 'react-split-pane';
 import Editor from '../components/Editor';
 import Sidebar from '../components/Sidebar';
 import PreviewFrame from '../components/PreviewFrame';
-import Toolbar from '../components/Toolbar';
+import Toolbar from '../components/Header/Toolbar';
 import Preferences from '../components/Preferences/index';
 import NewFileModal from '../components/NewFileModal';
 import NewFolderModal from '../components/NewFolderModal';
 import UploadFileModal from '../components/UploadFileModal';
 import ShareModal from '../components/ShareModal';
 import KeyboardShortcutModal from '../components/KeyboardShortcutModal';
 import ErrorModal from '../components/ErrorModal';
-import Nav from '../../../components/Nav';
+import Nav from '../components/Header/Nav';
 import Console from '../components/Console';
 import Toast from '../components/Toast';
 import * as FileActions from '../actions/files';

client/modules/IDE/pages/Legal.jsx

@@ -7,7 +7,7 @@ import PrivacyPolicy from './PrivacyPolicy';
 import TermsOfUse from './TermsOfUse';
 import CodeOfConduct from './CodeOfConduct';
 import RootPage from '../../../components/RootPage';
-import Nav from '../../../components/Nav';
+import Nav from '../components/Header/Nav';
 import { remSize, prop } from '../../../theme';
 
 const StyledTabList = styled(TabList)`

client/modules/User/pages/AccountView.jsx

@@ -9,7 +9,7 @@ import { createApiKey, removeApiKey } from '../actions';
 import AccountForm from '../components/AccountForm';
 import SocialAuthButton from '../components/SocialAuthButton';
 import APIKeyForm from '../components/APIKeyForm';
-import Nav from '../../../components/Nav';
+import Nav from '../../IDE/components/Header/Nav';
 import ErrorModal from '../../IDE/components/ErrorModal';
 import Overlay from '../../App/components/Overlay';
 import Toast from '../../IDE/components/Toast';

client/modules/User/pages/CollectionView.jsx

@@ -3,7 +3,7 @@ import React from 'react';
 import { connect } from 'react-redux';
 import { withTranslation } from 'react-i18next';
 
-import Nav from '../../../components/Nav';
+import Nav from '../../IDE/components/Header/Nav';
 import RootPage from '../../../components/RootPage';
 
 import CollectionCreate from '../components/CollectionCreate';

client/modules/User/pages/DashboardView.jsx

@@ -5,7 +5,7 @@ import { withTranslation } from 'react-i18next';
 
 import browserHistory from '../../../browserHistory';
 import Button from '../../../common/Button';
-import Nav from '../../../components/Nav';
+import Nav from '../../IDE/components/Header/Nav';
 import Overlay from '../../App/components/Overlay';
 import AssetList from '../../IDE/components/AssetList';
 import AssetSize from '../../IDE/components/AssetSize';

client/modules/User/pages/EmailVerificationView.jsx

@@ -6,7 +6,7 @@ import { withTranslation } from 'react-i18next';
 import { Helmet } from 'react-helmet';
 import browserHistory from '../../../browserHistory';
 import { verifyEmailConfirmation } from '../actions';
-import Nav from '../../../components/Nav';
+import Nav from '../../IDE/components/Header/Nav';
 import RootPage from '../../../components/RootPage';
 
 class EmailVerificationView extends React.Component {

client/modules/User/pages/LoginView.jsx

@@ -4,7 +4,7 @@ import { Helmet } from 'react-helmet';
 import { useTranslation } from 'react-i18next';
 import LoginForm from '../components/LoginForm';
 import SocialAuthButton from '../components/SocialAuthButton';
-import Nav from '../../../components/Nav';
+import Nav from '../../IDE/components/Header/Nav';
 import RootPage from '../../../components/RootPage';
 
 function LoginView() {

client/modules/User/pages/NewPasswordView.jsx

@@ -6,7 +6,7 @@ import { useTranslation } from 'react-i18next';
 import { useParams } from 'react-router-dom';
 import NewPasswordForm from '../components/NewPasswordForm';
 import { validateResetPasswordToken } from '../actions';
-import Nav from '../../../components/Nav';
+import Nav from '../../IDE/components/Header/Nav';
 import RootPage from '../../../components/RootPage';
 
 function NewPasswordView() {

client/modules/User/pages/ResetPasswordView.jsx

@@ -5,7 +5,7 @@ import { useSelector } from 'react-redux';
 import { Helmet } from 'react-helmet';
 import { useTranslation } from 'react-i18next';
 import ResetPasswordForm from '../components/ResetPasswordForm';
-import Nav from '../../../components/Nav';
+import Nav from '../../IDE/components/Header/Nav';
 import RootPage from '../../../components/RootPage';
 
 function ResetPasswordView() {

client/modules/User/pages/SignupView.jsx

@@ -4,7 +4,7 @@ import { Helmet } from 'react-helmet';
 import { useTranslation } from 'react-i18next';
 import SignupForm from '../components/SignupForm';
 import SocialAuthButton from '../components/SocialAuthButton';
-import Nav from '../../../components/Nav';
+import Nav from '../../IDE/components/Header/Nav';
 import RootPage from '../../../components/RootPage';
 
 function SignupView() {

contributor_docs/development.md

@@ -30,7 +30,7 @@ See the [release guide](./release.md) for information about creating a release.
 ## Tests
 To run the test suite simply run `npm test` (after installing dependencies with `npm install`)
 
-A sample unit test could be found here: [Nav.unit.test.jsx](../client/components/Nav.unit.test.jsx).
+A sample unit test could be found here: [Nav.unit.test.jsx](../client/modules/IDE/components/Header/Nav.unit.test.jsx).
 
 ## Committing Code
 Inspired by [Git/GitHub commit standards & conventions](https://gist.github.com/digitaljhelms/3761873).