moves components to nicer folder structure

app/javascript/packs/src/settings/app.jsx

@@ -12,8 +12,8 @@ import messages from "../../locales/messages";
 import Navigation from "../../shared/navigation";
 import NotFound from "../../shared/404/NotFound";
 import MainNav from "./components/MainNav";
-import SettingsAccount from "./components/SettingsAccount";
-import SettingsTeams from "./components/SettingsTeams";
+import SettingsAccount from "./components/account/SettingsAccount";
+import SettingsTeams from "./components/team/SettingsTeams";
 
 addLocaleData([...enLocaleData]);
 const locale = "en-US";

app/javascript/packs/src/settings/components/account/InputEnabled.jsx

@@ -7,7 +7,7 @@ import {
   BORDER_LIGHT_COLOR,
   PRIMARY_GREEN_COLOR,
   PRIMARY_HOVER_COLOR
-} from "../../../app/constants/colors";
+} from "../../../../app/constants/colors";
 
 const StyledInputEnabled = styled.div`
   border: 1px solid ${BORDER_LIGHT_COLOR};

app/javascript/packs/src/settings/components/account/SettingsAccount.jsx

@@ -3,10 +3,10 @@ import { Route, Switch } from "react-router-dom";
 import styled from "styled-components";
 
 import SettingsLeftTab from "./SettingsLeftTab";
-import SettingsProfile from "./SettingsProfile";
-import SettingsPreferences from "./SettingsPreferences";
+import SettingsProfile from "./profile/SettingsProfile";
+import SettingsPreferences from "./preferences/SettingsPreferences";
 
-import { BORDER_LIGHT_COLOR } from "../../../app/constants/colors";
+import { BORDER_LIGHT_COLOR } from "../../../../app/constants/colors";
 
 const Wrapper = styled.div`
   background: white;

app/javascript/packs/src/settings/components/account/SettingsLeftTab.jsx

@@ -6,12 +6,12 @@ import styled from "styled-components";
 import {
   SETTINGS_ACCOUNT_PROFILE,
   SETTINGS_ACCOUNT_PREFERENCES
-} from "../../../app/routes";
+} from "../../../../app/routes";
 
 import {
   SIDEBAR_HOVER_GRAY_COLOR,
   LIGHT_BLUE_COLOR
-} from "../../../app/constants/colors";
+} from "../../../../app/constants/colors";
 
 const MyLinkContainer = styled(LinkContainer)`
   a {
@@ -43,7 +43,7 @@ const MyLinkContainer = styled(LinkContainer)`
   }
 `;
 
-const SettingsAccountLeftTab = () =>
+const SettingsLeftTab = () =>
   <Nav bsStyle="pills" stacked activeKey={1}>
     <MyLinkContainer to={SETTINGS_ACCOUNT_PROFILE}>
       <NavItem eventKey={1}>Profile</NavItem>
@@ -53,4 +53,4 @@ const SettingsAccountLeftTab = () =>
     </MyLinkContainer>
   </Nav>;
 
-export default SettingsAccountLeftTab;
+export default SettingsLeftTab;

app/javascript/packs/src/settings/components/account/preferences/InputTimezone.jsx

@@ -9,7 +9,7 @@ import {
   BORDER_LIGHT_COLOR,
   PRIMARY_GREEN_COLOR,
   PRIMARY_HOVER_COLOR
-} from "../../../app/constants/colors";
+} from "../../../../../app/constants/colors";
 
 const Wrapper = styled.div`
   border: 1px solid ${BORDER_LIGHT_COLOR};

app/javascript/packs/src/settings/components/account/preferences/NotificationsGroup.jsx

@@ -3,7 +3,7 @@ import PropTypes from "prop-types";
 import styled from "styled-components";
 
 import NotificationsSwitchGroup from "./NotificationsSwitchGroup";
-import { WHITE_COLOR } from "../../../app/constants/colors";
+import { WHITE_COLOR } from "../../../../../app/constants/colors";
 
 const Wrapper = styled.div`margin-bottom: 6px;`;
 

app/javascript/packs/src/settings/components/account/preferences/NotificationsSwitch.jsx

@@ -6,7 +6,7 @@ import {
   WHITE_COLOR,
   NOTIFICATION_YES,
   NOTIFICATION_YES_BORDER
-} from "../../../app/constants/colors";
+} from "../../../../../app/constants/colors";
 
 const Wrapper = styled.div`margin-top: 13px;`;
 

app/javascript/packs/src/settings/components/account/preferences/NotificationsSwitchGroup.jsx

@@ -8,7 +8,7 @@ import {
   ASSIGNMENT_NOTIFICATION,
   RECENT_NOTIFICATION,
   SYSTEM_NOTIFICATION
-} from "./constants";
+} from "../constants";
 
 import {
   changeAssignmentsNotification,
@@ -16,7 +16,7 @@ import {
   changeRecentNotification,
   changeRecentNotificationEmail,
   changeSystemMessageNotificationEmail
-} from "../../../shared/actions/UsersActions";
+} from "../../../../../shared/actions/UsersActions";
 
 class NotificationsSwitchGroup extends Component {
   constructor(props) {

app/javascript/packs/src/settings/components/account/preferences/SettingsPreferences.jsx

@@ -3,22 +3,22 @@ import { connect } from "react-redux";
 import PropTypes from "prop-types";
 import styled from "styled-components";
 
-import InputDisabled from "./InputDisabled";
+import InputDisabled from "../InputDisabled";
 import InputTimezone from "./InputTimezone";
-import { changeTimezone } from "../../../shared/actions/UsersActions";
+import { changeTimezone } from "../../../../../shared/actions/UsersActions";
 import NotificationsGroup from "./NotificationsGroup";
 
 import {
   ASSIGNMENT_NOTIFICATION,
   RECENT_NOTIFICATION,
   SYSTEM_NOTIFICATION
-} from "./constants";
+} from "../constants";
 
 import {
   MAIN_COLOR_BLUE,
   ICON_GREEN_COLOR,
   BORDER_LIGHT_COLOR
-} from "../../../app/constants/colors";
+} from "../../../../../app/constants/colors";
 
 const WrapperInputDisabled = styled.div`
   margin: 20px 0;

app/javascript/packs/src/settings/components/account/profile/Avatar.jsx

@@ -2,7 +2,10 @@ import React from "react";
 import PropTypes, { string } from "prop-types";
 import styled from "styled-components";
 
-import { WHITE_COLOR, DARK_GRAY_COLOR } from "../../../app/constants/colors";
+import {
+  WHITE_COLOR,
+  DARK_GRAY_COLOR
+} from "../../../../../app/constants/colors";
 
 const AvatarWrapper = styled.div`
   width: 100px;

app/javascript/packs/src/settings/components/account/profile/MyProfile.jsx

@@ -4,8 +4,8 @@ import PropTypes from "prop-types";
 import styled from "styled-components";
 
 import Avatar from "./Avatar";
-import InputDisabled from "./InputDisabled";
-import InputEnabled from "./InputEnabled";
+import InputDisabled from "../InputDisabled";
+import InputEnabled from "../InputEnabled";
 
 import {
   changeFullName,
@@ -13,7 +13,7 @@ import {
   changeEmail,
   changePassword,
   changeAvatar
-} from "../../../shared/actions/UsersActions";
+} from "../../../../../shared/actions/UsersActions";
 
 const AvatarLabel = styled.h4`
   margin-top: 15px;

app/javascript/packs/src/settings/components/account/profile/MyStatisticsBox.jsx

@@ -2,7 +2,7 @@ import React from "react";
 import styled from "styled-components";
 import PropTypes from "prop-types";
 
-import { MAIN_COLOR_BLUE } from "../../../app/constants/colors";
+import { MAIN_COLOR_BLUE } from "../../../../../app/constants/colors";
 
 const Box = styled.div`
   width: 100px;

app/javascript/packs/src/settings/components/team/SettingsTeams.jsx

@@ -1,7 +1,7 @@
 import React from "react";
 import styled from "styled-components";
 
-import { BORDER_LIGHT_COLOR } from "../../../app/constants/colors";
+import { BORDER_LIGHT_COLOR } from "../../../../app/constants/colors";
 
 const Wrapper = styled.div`
   background: white;

yarn.lock

@@ -1281,7 +1281,7 @@ clap@^1.0.9:
   dependencies:
     chalk "^1.1.3"
 
-classnames@^2.2.5:
+classnames@^2.2.1, classnames@^2.2.5:
   version "2.2.5"
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.5.tgz#fb3801d453467649ef3603c7d61a02bd129bde6d"
 
@@ -4651,6 +4651,13 @@ rc@^1.1.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
+react-bootstrap-timezone-picker@^1.0.11:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/react-bootstrap-timezone-picker/-/react-bootstrap-timezone-picker-1.0.11.tgz#210a284ae35c0a3243547baea4657d78abf96a86"
+  dependencies:
+    classnames "^2.2.5"
+    prop-types "^15.5.10"
+
 react-bootstrap@^0.31.1:
   version "0.31.1"
   resolved "https://registry.yarnpkg.com/react-bootstrap/-/react-bootstrap-0.31.1.tgz#679c9f73ae77ff207867d536496207291f3a3ed7"
@@ -4747,6 +4754,12 @@ react-router@^4.1.1:
     prop-types "^15.5.4"
     warning "^3.0.0"
 
+react-timezone@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/react-timezone/-/react-timezone-0.2.0.tgz#031b6d700b15eb6dd977e326b05fe9080b8a2b6d"
+  dependencies:
+    classnames "^2.2.1"
+
 react@^15.6.1:
   version "15.6.1"
   resolved "https://registry.yarnpkg.com/react/-/react-15.6.1.tgz#baa8434ec6780bde997cdc380b79cd33b96393df"