Skip to content

Commit

Permalink
Settings route issue resolved issue #87
Browse files Browse the repository at this point in the history
  • Loading branch information
Syed Asher Ahmed committed Apr 11, 2017
1 parent 932b785 commit 11468d8
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 104 deletions.
4 changes: 1 addition & 3 deletions imports/startup/client/routes.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import AccountsPage from '../../ui/components/accounts/Accounts.jsx';
import CategoriesPage from '../../ui/components/categories/Categories.jsx';

import SettingsPage from '../../ui/components/settings/Settings.jsx';
import SettingsSideBar from '../../ui/components/settings/SettingsSideBar.jsx';

import ProjectPage from '../../ui/components/projects/Project.jsx';
import TransactionPage from '../../ui/components/transactions/Transactions.jsx';
Expand Down Expand Up @@ -56,8 +55,7 @@ Meteor.startup( () => {
<Route path="dashboard" components={{ content: DashboardPage}} />
<Route path="accounts" components={{ content: AccountsPage }} />
<Route path="categories" components={{ content: CategoriesPage }} />
<Route path="settings" components={{ content: SettingsPage, sidebar: SettingsSideBar }}>
<Route path="new" />
<Route path="settings" components={{ content: SettingsPage }}>
<Route path=":id" />
</Route>
<Route path="projects" components={{ content: ProjectPage}}>
Expand Down
4 changes: 2 additions & 2 deletions imports/ui/components/leftMenu/LeftMenu.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ export default class LeftMenu extends Component {
<Link to={`/app/categories`} onClick={this.toggleDrawerActive.bind(this)}>
<ListItem className={this.isActive('categories')} caption='Categories' leftIcon='view_module' theme={listItemTheme}/>
</Link>
<Link to={`/app/settings/new`} onClick={this.toggleDrawerActive.bind(this)}>
<ListItem className={this.isActive('settings/new')} caption='Settings' leftIcon='settings' theme={listItemTheme}/>
<Link to={`/app/settings`} onClick={this.toggleDrawerActive.bind(this)}>
<ListItem className={this.isActive('settings')} caption='Settings' leftIcon='settings' theme={listItemTheme}/>
</Link>
<ListItem caption='Logout' leftIcon='power_settings_new' onClick={this.logout.bind(this)} theme={listItemTheme}/>
</List>
Expand Down
99 changes: 0 additions & 99 deletions imports/ui/components/settings/SettingsSideBar.jsx

This file was deleted.

0 comments on commit 11468d8

Please sign in to comment.