Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BRITECHSRM-234 Restructure files by feature #41

Merged
merged 4 commits into from
Apr 15, 2016
Merged

BRITECHSRM-234 Restructure files by feature #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
323a725
Create AppHeader folder
lclark-scottlogic Apr 15, 2016
3086ed4
Add dashboard folder
lclark-scottlogic Apr 15, 2016
94577df
Add Session folder
lclark-scottlogic Apr 15, 2016
d5f2344
Merge remote-tracking branch 'origin/master' into restructure
lclark-scottlogic Apr 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 app/components/AppHeader.jsx → app/components/AppHeader/AppHeader.jsx
View file
Open in desktop
File renamed without changes.
0 app/components/NavLink.jsx → app/components/AppHeader/NavLink.jsx
View file
Open in desktop
File renamed without changes.
0 app/components/appHeader.scss → app/components/AppHeader/appHeader.scss
View file
Open in desktop
File renamed without changes.
0 app/components/navLink.scss → app/components/AppHeader/navLink.scss
View file
Open in desktop
File renamed without changes.
0 app/components/DashboardSidebar.jsx → ...ard/DashboardSidebar/DashboardSidebar.jsx
View file
Open in desktop
File renamed without changes.
0 app/components/SessionFilter.jsx → ...hboard/DashboardSidebar/SessionFilter.jsx
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion app/components/SessionFilterCheckbox.jsx → ...ashboardSidebar/SessionFilterCheckbox.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { Component, PropTypes } from 'react';
import Checkbox from 'material-ui/lib/checkbox';
import SessionStatusService from '../services/SessionStatusService';
import SessionStatusService from '../../../services/SessionStatusService';
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Going up three levels looks a bit fragile to me?


import styles from './sessionFilterCheckbox.scss';

Expand Down
0 app/components/dashboardSidebar.scss → ...rd/DashboardSidebar/dashboardSidebar.scss
View file
Open in desktop
File renamed without changes.
0 app/components/sessionFilterCheckbox.scss → ...shboardSidebar/sessionFilterCheckbox.scss
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion app/components/SessionCard.jsx → ...nts/Dashboard/SessionList/SessionCard.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { Component, PropTypes } from 'react';
import StarRating from 'react-star-rating';
import SessionStatusService from '../services/SessionStatusService';
import SessionStatusService from '../../../services/SessionStatusService';
import moment from 'moment';

import styles from './sessionCard.scss';
Expand Down
0 app/components/SessionList.jsx → ...nts/Dashboard/SessionList/SessionList.jsx
View file
Open in desktop
File renamed without changes.
0 app/components/sessionCard.scss → ...ts/Dashboard/SessionList/sessionCard.scss
View file
Open in desktop
File renamed without changes.
0 app/components/sessionList.scss → ...ts/Dashboard/SessionList/sessionList.scss
View file
Open in desktop
File renamed without changes.
0 app/components/CorrespondenceItem.jsx → ...components/Session/CorrespondenceItem.jsx
View file
Open in desktop
File renamed without changes.
0 app/components/SessionCorrespondence.jsx → ...ponents/Session/SessionCorrespondence.jsx
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion app/components/SessionSidebar.jsx → app/components/Session/SessionSidebar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { Component, PropTypes } from 'react';
import SessionStatusService from '../services/SessionStatusService';
import SessionStatusService from '../../services/SessionStatusService';
import StarRating from 'react-star-rating';

import styles from './sessionSidebar.scss';
Expand Down
0 app/components/correspondenceItem.scss → ...omponents/Session/correspondenceItem.scss
View file
Open in desktop
File renamed without changes.
0 app/components/sessionCorrespondence.scss → ...onents/Session/sessionCorrespondence.scss
View file
Open in desktop
File renamed without changes.
0 app/components/sessionSidebar.scss → app/components/Session/sessionSidebar.scss
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion app/containers/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { Component, PropTypes } from 'react';
import AppHeader from '../components/AppHeader.jsx';
import AppHeader from '../components/AppHeader/AppHeader.jsx';
import styles from './app.scss';

class App extends Component {
Expand Down
4 changes: 2 additions & 2 deletions app/containers/Dashboard.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { connect } from 'react-redux';
import { createSelector } from 'reselect';
import SessionsApi from '../services/SessionsApi';

import SessionList from '../components/SessionList.jsx';
import DashboardSidebar from '../components/DashboardSidebar.jsx';
import SessionList from '../components/Dashboard/SessionList/SessionList.jsx';
import DashboardSidebar from '../components/Dashboard/DashboardSidebar/DashboardSidebar.jsx';
import { getAllSessions, changeViewSettings } from '../actions';
import styles from './dashboard.scss';
import immutable from 'immutable';
Expand Down
4 changes: 2 additions & 2 deletions app/containers/Session.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { Component, PropTypes } from 'react';
import { connect } from 'react-redux';
import SessionSidebar from '../components/SessionSidebar.jsx';
import SessionCorrespondence from '../components/SessionCorrespondence.jsx';
import SessionSidebar from '../components/Session/SessionSidebar.jsx';
import SessionCorrespondence from '../components/Session/SessionCorrespondence.jsx';
import { getSession } from '../actions';
import styles from './session.scss';

Expand Down