Added web and email notifications. Tests. Fire page
This commit is contained in:
parent
df05b33e82
commit
3bf21c8caf
32 changed files with 696 additions and 88 deletions
|
|
@ -4,7 +4,6 @@
|
|||
import React from 'react';
|
||||
import PropTypes from 'prop-types';
|
||||
import { Router, Switch, Route } from 'react-router-dom';
|
||||
import createHistory from 'history/createBrowserHistory';
|
||||
import { Grid } from 'react-bootstrap';
|
||||
import { I18nextProvider } from 'react-i18next';
|
||||
import { Meteor } from 'meteor/meteor';
|
||||
|
|
@ -41,17 +40,13 @@ import Privacy from '../../pages/Privacy/Privacy';
|
|||
import License from '../../pages/License/License';
|
||||
import Credits from '../../pages/Credits/Credits';
|
||||
import ReSendEmail from '../../components/ReSendEmail/ReSendEmail';
|
||||
import history from '../../components/History/History';
|
||||
import '../../components/NotificationsObserver/NotificationsObserver';
|
||||
import FiresMap from '../../pages/FiresMap/FiresMap';
|
||||
import Fires from '../../pages/Fires/Fires';
|
||||
import Sandbox from '../../pages/Sandbox/Sandbox';
|
||||
import './App.scss';
|
||||
|
||||
const history = createHistory();
|
||||
history.listen((location) => { // , action ) => {
|
||||
// console.log(location.pathname);
|
||||
// console.log(action); // PUSH, etc
|
||||
Meteor.Piwik.trackPage(location.pathname);
|
||||
});
|
||||
|
||||
const App = props => (
|
||||
/* https://react.i18next.com/components/i18nextprovider.html */
|
||||
<I18nextProvider i18n={i18n}>
|
||||
|
|
@ -72,9 +67,9 @@ const App = props => (
|
|||
<Authenticated exact path="/subscriptions/new" component={NewSubscription} {...props} />
|
||||
<Authenticated exact path="/subscriptions/:_id" component={ViewSubscription} {...props} />
|
||||
<Authenticated exact path="/subscriptions/:_id/edit" component={EditSubscription} {...props} />
|
||||
|
||||
<Authenticated exact path="/profile" component={Profile} {...props} />
|
||||
<Route path="/fires" component={FiresMap} {...props} />
|
||||
<Route path="/fire/:id" component={Fires} {...props} />
|
||||
<Public path="/signup" component={Signup} {...props} />
|
||||
<Public path="/login" component={Login} {...props} />
|
||||
<Route path="/logout" component={Logout} {...props} />
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue