diff --git a/components/app.js b/components/app.js index 93a7428..39318f3 100644 --- a/components/app.js +++ b/components/app.js @@ -7,6 +7,7 @@ import Calendar from './calendar' import CycleDay from './cycle-day/cycle-day-overview' import symptomViews from './cycle-day/symptoms' import Chart from './chart/chart' +import SettingsMenu from './settings/settings-menu' import settingsViews from './settings' import Stats from './stats' import {headerTitles, menuTitles} from '../i18n/en/labels' @@ -24,6 +25,7 @@ const menuTitlesLowerCase = Object.keys(menuTitles).reduce((acc, curr) => { }, {}) const isSymptomView = name => Object.keys(symptomViews).includes(name) +const isSettingsView = name => Object.keys(settingsViews).includes(name) const isMenuItem = name => Object.keys(menuTitles).includes(name) export default class App extends Component { @@ -58,6 +60,8 @@ export default class App extends Component { this.navigate( this.originForSymptomView, { date: this.state.currentProps.date } ) + } else if (isSettingsView(this.state.currentPage)) { + this.navigate('SettingsMenu') } else if(this.state.currentPage === 'CycleDay') { this.navigate(this.menuOrigin) } else { @@ -68,7 +72,7 @@ export default class App extends Component { render() { const page = { - Home, Calendar, CycleDay, Chart, ...settingsViews, Stats, ...symptomViews + Home, Calendar, CycleDay, Chart, SettingsMenu, ...settingsViews, Stats, ...symptomViews }[this.state.currentPage] return ( diff --git a/components/settings/index.js b/components/settings/index.js index 3bc35c0..a1eaa03 100644 --- a/components/settings/index.js +++ b/components/settings/index.js @@ -1,4 +1,3 @@ -import SettingsMenu from './settings-menu' import Reminders from './reminders' import NfpSettings from './nfp-settings' import ImportExport from './import-export' @@ -6,5 +5,5 @@ import Password from './password' import About from './about' export default { - SettingsMenu, Reminders, NfpSettings, ImportExport, Password, About + Reminders, NfpSettings, ImportExport, Password, About }