Merge pull request #558 from hackmcgill/refactor/features-folder

Move features to a specific folder

src/App.tsx

@@ -1,15 +1,23 @@
 import * as React from 'react';
 import { BrowserRouter, Route, Switch } from 'react-router-dom';
-import CreateAccount from './Account/AccountCreation';
-import resetPassword from './Login/PasswordReset';
 
-import NotFoundContainer from './404/404';
-import EditAccountContainer from './Account/AccountEdition';
-import ConfirmAccountContainer from './Account/EmailConfirmed';
-import CreateApplicationContainer from './Application/ApplicationCreation';
-import Dashboard from './Dashboard/Main';
-import LoginContainer from './Login/Login';
-import TeamContainer from './Team/Main';
+import NotFoundContainer from './features/404/404';
+import CreateAccount from './features/Account/AccountCreation';
+import EditAccountContainer from './features/Account/AccountEdition';
+import ConfirmAccountContainer from './features/Account/EmailConfirmed';
+import CreateApplicationContainer from './features/Application/ApplicationCreation';
+import EditApplicationContainer from './features/Application/ApplicationEdition';
+import CheckinContainer from './features/Checkin/Main';
+import Dashboard from './features/Dashboard/Main';
+import HackPassContainer from './features/HackPass/Main';
+import LoginContainer from './features/Login/Login';
+import ForgotPasswordContainer from './features/Login/PasswordForgot';
+import resetPassword from './features/Login/PasswordReset';
+import SearchContainer from './features/Search/Search';
+import SingleHackerContainer from './features/SingleHacker/Main';
+import CreateSponsorContainer from './features/Sponsor/SponsorCreation';
+import EditSponsorContainer from './features/Sponsor/SponsorEdition';
+import TeamContainer from './features/Team/Main';
 
 import {
   FrontendRoute,
@@ -18,22 +26,14 @@ import {
   // IHacker,
   UserType,
 } from './config';
-import ForgotPasswordContainer from './Login/PasswordForgot';
-import withAuthRedirect from './shared/HOC/withAuthRedirect';
-import withTokenRedirect from './shared/HOC/withTokenRedirect';
 
-import EditApplicationContainer from './Application/ApplicationEdition';
-import CheckinContainer from './Checkin/Main';
-// import ConfirmAttendanceContainer from './ConfirmAttendance/ConfirmAttendance';
-import HackPassContainer from './HackPass/Main';
-import SearchContainer from './Search/Search';
+import withAuthRedirect from './shared/HOC/withAuthRedirect';
 import withHackerRedirect from './shared/HOC/withHackerRedirect';
 import withNavbar from './shared/HOC/withNavbar';
 import withSponsorRedirect from './shared/HOC/withSponsorRedirect';
 import withThemeProvider from './shared/HOC/withThemeProvider';
-import SingleHackerContainer from './SingleHacker/Main';
-import CreateSponsorContainer from './Sponsor/SponsorCreation';
-import EditSponsorContainer from './Sponsor/SponsorEdition';
+import withTokenRedirect from './shared/HOC/withTokenRedirect';
+
 import {
   canAccessApplication,
   canAccessHackerPass,

src/config/constants.ts

@@ -80,6 +80,6 @@ export const TEAM_MEMBERS = 'Team members:';
 export const TEAM_MAX_SIZE = 'Max 4 Hackers';
 
 // Sponsor creation
-export const SPONSOR_COMPANY_LABEL = "Company name";
-export const SPONSOR_CONTRACT_URL_LABEL = "Contract URL";
-export const SPONSOR_NOMINEE_LABEL = "Nominees";
+export const SPONSOR_COMPANY_LABEL = 'Company name';
+export const SPONSOR_CONTRACT_URL_LABEL = 'Contract URL';
+export const SPONSOR_NOMINEE_LABEL = 'Nominees';

src/404/404.tsx → src/features/404/404.tsx

@@ -3,12 +3,14 @@ import * as React from 'react';
 import Helmet from 'react-helmet';
 import { RouteComponentProps, withRouter } from 'react-router';
 import { Link } from 'react-router-dom';
-import Construction from '../assets/images/construction-notfound.svg';
-import Button from '../shared/Elements/Button';
-import H1 from '../shared/Elements/H1';
-import Image from '../shared/Elements/Image';
-import MaxWidthBox from '../shared/Elements/MaxWidthBox';
-import Paragraph from '../shared/Elements/Paragraph';
+
+import Construction from '../../assets/images/construction-notfound.svg';
+
+import Button from '../../shared/Elements/Button';
+import H1 from '../../shared/Elements/H1';
+import Image from '../../shared/Elements/Image';
+import MaxWidthBox from '../../shared/Elements/MaxWidthBox';
+import Paragraph from '../../shared/Elements/Paragraph';
 
 /**
  * Container that renders 404 not found page.

src/Account/AccountManagement.tsx → src/features/Account/AccountManagement.tsx

@@ -10,30 +10,30 @@ import {
   FormikProps,
   FormikValues,
 } from 'formik';
-import { Account, Auth } from '../api';
+import { Account, Auth } from '../../api';
 import {
   DietaryRestriction,
   FrontendRoute,
   IAccount,
   Pronouns,
   ShirtSize,
   UserType,
-} from '../config';
-import * as CONSTANTS from '../config/constants';
-import { FormDescription, H1, MaxWidthBox } from '../shared/Elements';
-import { Form, SubmitBtn } from '../shared/Form';
-import * as FormikElements from '../shared/Form/FormikElements';
+} from '../../config';
+import * as CONSTANTS from '../../config/constants';
+import { FormDescription, H1, MaxWidthBox } from '../../shared/Elements';
+import { Form, SubmitBtn } from '../../shared/Form';
+import * as FormikElements from '../../shared/Form/FormikElements';
 
-import ValidationErrorGenerator from '../shared/Form/validationErrorGenerator';
-import WithToasterContainer from '../shared/HOC/withToaster';
+import ValidationErrorGenerator from '../../shared/Form/validationErrorGenerator';
+import WithToasterContainer from '../../shared/HOC/withToaster';
 import {
   date2input,
   getNestedAttr,
   getOptionsFromEnum,
   getValueFromQuery,
   input2date,
   isSponsor,
-} from '../util';
+} from '../../util';
 import ConfirmationEmailSentComponent from './EmailConfirmationSent';
 import getValidationSchema from './validationSchema';
 

src/Account/EmailConfirmationSent.tsx → src/features/Account/EmailConfirmationSent.tsx

@@ -3,12 +3,18 @@ import { AxiosResponse } from 'axios';
 import * as React from 'react';
 import Helmet from 'react-helmet';
 
-import { APIResponse, Auth } from '../api';
-import constructionSVG from '../assets/images/construction.svg';
-import { EMAIL_SENT, RESEND_CONF_EMAIL } from '../config';
-import { Button, H1, Image, MaxWidthBox, Paragraph } from '../shared/Elements';
-import ValidationErrorGenerator from '../shared/Form/validationErrorGenerator';
-import WithToasterContainer from '../shared/HOC/withToaster';
+import { APIResponse, Auth } from '../../api';
+import constructionSVG from '../../assets/images/construction.svg';
+import { EMAIL_SENT, RESEND_CONF_EMAIL } from '../../config';
+import {
+  Button,
+  H1,
+  Image,
+  MaxWidthBox,
+  Paragraph,
+} from '../../shared/Elements';
+import ValidationErrorGenerator from '../../shared/Form/validationErrorGenerator';
+import WithToasterContainer from '../../shared/HOC/withToaster';
 
 interface IConfirmationEmailSentState {
   buttonDisabled: boolean;

src/Account/EmailConfirmed.tsx → src/features/Account/EmailConfirmed.tsx

@@ -3,10 +3,16 @@ import * as React from 'react';
 import Helmet from 'react-helmet';
 import { Link } from 'react-router-dom';
 
-import { Auth } from '../api';
-import constructionCone from '../assets/images/construction-cone.svg';
-import { getTokenFromQuery } from '../config';
-import { Button, H1, Image, MaxWidthBox, Paragraph } from '../shared/Elements';
+import { Auth } from '../../api';
+import constructionCone from '../../assets/images/construction-cone.svg';
+import { getTokenFromQuery } from '../../config';
+import {
+  Button,
+  H1,
+  Image,
+  MaxWidthBox,
+  Paragraph,
+} from '../../shared/Elements';
 
 interface IConfirmAccountState {
   attempting: boolean;

src/Application/ApplicationManagement.tsx → src/features/Application/ApplicationManagement.tsx

@@ -12,8 +12,8 @@ import Helmet from 'react-helmet';
 import { Redirect } from 'react-router';
 import { toast } from 'react-toastify';
 
-import * as CONSTANTS from '../config/constants';
-import { getOptionsFromEnum } from '../util';
+import * as CONSTANTS from '../../config/constants';
+import { getOptionsFromEnum } from '../../util';
 import getValidationSchema from './validationSchema';
 
 import {
@@ -26,21 +26,21 @@ import {
   JobInterest,
   Majors,
   Skills,
-} from '../config';
+} from '../../config';
 
-import { FormDescription, H1, MaxWidthBox } from '../shared/Elements';
+import { FormDescription, H1, MaxWidthBox } from '../../shared/Elements';
 
-import { Form, SubmitBtn } from '../shared/Form/';
-import * as FormikElements from '../shared/Form/FormikElements';
+import { Form, SubmitBtn } from '../../shared/Form';
+import * as FormikElements from '../../shared/Form/FormikElements';
 
-import { Account, APIResponse, Hacker } from '../api';
+import { Account, APIResponse, Hacker } from '../../api';
 
-import ValidationErrorGenerator from '../shared/Form/validationErrorGenerator';
+import ValidationErrorGenerator from '../../shared/Form/validationErrorGenerator';
 
 import ResumeComponent from './Resume';
 import SchoolComponent from './SchoolSelect';
 
-import WithToasterContainer from '../shared/HOC/withToaster';
+import WithToasterContainer from '../../shared/HOC/withToaster';
 
 export enum ManageApplicationModes {
   CREATE,

src/Application/Resume.tsx → src/features/Application/Resume.tsx

@@ -1,8 +1,8 @@
 import { Box, Flex } from '@rebass/grid';
 import { FieldProps } from 'formik';
 import * as React from 'react';
-import ViewPDFComponent from '../shared/Elements/ViewPDF';
-import { FileUpload, Label, LabelText } from '../shared/Form';
+import ViewPDFComponent from '../../shared/Elements/ViewPDF';
+import { FileUpload, Label, LabelText } from '../../shared/Form';
 import { ManageApplicationModes } from './ApplicationManagement';
 
 export interface IResumeProps {

src/Application/SchoolSelect.tsx → src/features/Application/SchoolSelect.tsx

@@ -1,12 +1,12 @@
 import { FieldProps } from 'formik';
 import * as React from 'react';
-import { Schools } from '../config';
+import { Schools } from '../../config';
 import {
   AutosuggestItem,
   Label,
   LabelText,
   StyledAutosuggest,
-} from '../shared/Form';
+} from '../../shared/Form';
 
 /**
  * SchoolComponent props

src/Checkin/Email.tsx → src/features/Checkin/Email.tsx

@@ -8,9 +8,12 @@ import {
 import * as React from 'react';
 import { object, string } from 'yup';
 
-import { EMAIL_LABEL } from '../config';
-import { Form, SubmitBtn } from '../shared/Form';
-import { Error as ErrorComponent, Input } from '../shared/Form/FormikElements';
+import { EMAIL_LABEL } from '../../config';
+import { Form, SubmitBtn } from '../../shared/Form';
+import {
+  Error as ErrorComponent,
+  Input,
+} from '../../shared/Form/FormikElements';
 
 interface IEmailProps {
   onSubmit: (email: string) => void;

src/Checkin/Main.tsx → src/features/Checkin/Main.tsx

@@ -1,13 +1,13 @@
 import { Box, Flex } from '@rebass/grid';
 import * as React from 'react';
 import { toast } from 'react-toastify';
-import { Account, Hacker } from '../api';
-import { FrontendRoute } from '../config';
-import { H1, MaxWidthBox } from '../shared/Elements';
-import ValidationErrorGenerator from '../shared/Form/validationErrorGenerator';
-import WithToasterContainer from '../shared/HOC/withToaster';
-import theme from '../shared/Styles/theme';
-import { generateHackPass } from '../util';
+import { Account, Hacker } from '../../api';
+import { FrontendRoute } from '../../config';
+import { H1, MaxWidthBox } from '../../shared/Elements';
+import ValidationErrorGenerator from '../../shared/Form/validationErrorGenerator';
+import WithToasterContainer from '../../shared/HOC/withToaster';
+import theme from '../../shared/Styles/theme';
+import { generateHackPass } from '../../util';
 import { Email } from './Email';
 import { Reader } from './Reader';
 

src/ConfirmAttendance/ConfirmAttendance.tsx → src/features/ConfirmAttendance/ConfirmAttendance.tsx

@@ -5,14 +5,14 @@ import Helmet from 'react-helmet';
 import { Redirect } from 'react-router';
 import { boolean, object } from 'yup';
 
-import { Hacker } from '../api';
-import { FrontendRoute } from '../config';
-import { Button, H1, H2, MaxWidthBox, Paragraph } from '../shared/Elements';
-import { Form } from '../shared/Form';
-import * as FormikElements from '../shared/Form/FormikElements';
-import ValidationErrorGenerator from '../shared/Form/validationErrorGenerator';
-import WithToasterContainer from '../shared/HOC/withToaster';
-import theme from '../shared/Styles/theme';
+import { Hacker } from '../../api';
+import { FrontendRoute } from '../../config';
+import { Button, H1, H2, MaxWidthBox, Paragraph } from '../../shared/Elements';
+import { Form } from '../../shared/Form';
+import * as FormikElements from '../../shared/Form/FormikElements';
+import ValidationErrorGenerator from '../../shared/Form/validationErrorGenerator';
+import WithToasterContainer from '../../shared/HOC/withToaster';
+import theme from '../../shared/Styles/theme';
 
 interface IConfirmAttendanceState {
   submitted: boolean;

src/Dashboard/HackerDashboard.tsx → src/features/Dashboard/HackerDashboard.tsx

@@ -11,11 +11,11 @@ import {
   FrontendRoute as routes,
   HackerStatus,
   RESEND_CONF_EMAIL,
-} from '../config';
+} from '../../config';
 
-import { APIResponse, Auth, Hacker } from '../api';
-import ValidationErrorGenerator from '../shared/Form/validationErrorGenerator';
-import WithToasterContainer from '../shared/HOC/withToaster';
+import { APIResponse, Auth, Hacker } from '../../api';
+import ValidationErrorGenerator from '../../shared/Form/validationErrorGenerator';
+import WithToasterContainer from '../../shared/HOC/withToaster';
 import {
   canAccessApplication,
   canAccessBus,
@@ -24,15 +24,15 @@ import {
   isAppOpen,
   isConfirmationOpen,
   isConfirmed,
-} from '../util/UserInfoHelperFunctions';
+} from '../../util/UserInfoHelperFunctions';
 import DashboardView, { IDashboardCard } from './View';
 
-import AccountIcon from '../assets/images/dashboard-account.svg';
-import ApplicationIcon from '../assets/images/dashboard-application.svg';
-import BusIcon from '../assets/images/dashboard-bus.svg';
-import ConfirmIcon from '../assets/images/dashboard-confirm.svg';
-import HackPassIcon from '../assets/images/dashboard-hackpass.svg';
-import TeamIcon from '../assets/images/dashboard-team.svg';
+import AccountIcon from '../../assets/images/dashboard-account.svg';
+import ApplicationIcon from '../../assets/images/dashboard-application.svg';
+import BusIcon from '../../assets/images/dashboard-bus.svg';
+import ConfirmIcon from '../../assets/images/dashboard-confirm.svg';
+import HackPassIcon from '../../assets/images/dashboard-hackpass.svg';
+import TeamIcon from '../../assets/images/dashboard-team.svg';
 
 export interface IDashboardState {
   status: HackerStatus;

src/Dashboard/Main.tsx → src/features/Dashboard/Main.tsx

@@ -1,8 +1,8 @@
 import * as React from 'react';
 import { Redirect } from 'react-router';
-import { UserType } from '../config';
-import { H1 } from '../shared/Elements';
-import { getUserInfo } from '../util';
+import { UserType } from '../../config';
+import { H1 } from '../../shared/Elements';
+import { getUserInfo } from '../../util';
 import HackerDashboardContainer from './HackerDashboard';
 import SponsorDashboard from './SponsorDashboard';
 import StaffDashboardContainer from './StaffDashboard';

src/Dashboard/SponsorDashboard.tsx → src/features/Dashboard/SponsorDashboard.tsx

@@ -1,14 +1,15 @@
 import * as React from 'react';
 
-import { FrontendRoute as routes, UserType } from '../config';
+import { FrontendRoute as routes, UserType } from '../../config';
 
-import WithToasterContainer from '../shared/HOC/withToaster';
+import WithToasterContainer from '../../shared/HOC/withToaster';
 import DashboardView, { IDashboardCard } from './View';
 
-import AccountIcon from '../assets/images/dashboard-account.svg';
-import SponsorIcon from '../assets/images/dashboard-sponsor.svg';
-import { getSponsorInfo } from '../util/UserInfoHelperFunctions';
-import SearchIcon from '../assets/images/dashboard-search.svg';
+import AccountIcon from '../../assets/images/dashboard-account.svg';
+import SearchIcon from '../../assets/images/dashboard-search.svg';
+import SponsorIcon from '../../assets/images/dashboard-sponsor.svg';
+
+import { getSponsorInfo } from '../../util/UserInfoHelperFunctions';
 
 interface ISponsorDashboardProps {
   userType: UserType;