diff options
author | Amine Mouafik <amine@mouafik.fr> | 2019-07-01 13:39:55 +0700 |
---|---|---|
committer | Amine Mouafik <amine@mouafik.fr> | 2019-07-01 13:39:55 +0700 |
commit | b43b265e8d383eb9b6f0a31f096f52ad9f7171c2 (patch) | |
tree | 6b258426b849520ae29d92a44fe2aa7c608ad80b /src/app.js | |
parent | Add features list to README (diff) | |
parent | Revert: fix spellchecker (diff) | |
download | ferdium-app-b43b265e8d383eb9b6f0a31f096f52ad9f7171c2.tar.gz ferdium-app-b43b265e8d383eb9b6f0a31f096f52ad9f7171c2.tar.zst ferdium-app-b43b265e8d383eb9b6f0a31f096f52ad9f7171c2.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/app.js')
-rw-r--r-- | src/app.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/app.js b/src/app.js index f6092bf60..cb3e37c64 100644 --- a/src/app.js +++ b/src/app.js | |||
@@ -43,6 +43,8 @@ import SubscriptionPopupScreen from './containers/subscription/SubscriptionPopup | |||
43 | import WorkspacesScreen from './features/workspaces/containers/WorkspacesScreen'; | 43 | import WorkspacesScreen from './features/workspaces/containers/WorkspacesScreen'; |
44 | import EditWorkspaceScreen from './features/workspaces/containers/EditWorkspaceScreen'; | 44 | import EditWorkspaceScreen from './features/workspaces/containers/EditWorkspaceScreen'; |
45 | import { WORKSPACES_ROUTES } from './features/workspaces'; | 45 | import { WORKSPACES_ROUTES } from './features/workspaces'; |
46 | import AnnouncementScreen from './features/announcements/components/AnnouncementScreen'; | ||
47 | import { ANNOUNCEMENTS_ROUTES } from './features/announcements'; | ||
46 | 48 | ||
47 | // Add Polyfills | 49 | // Add Polyfills |
48 | smoothScroll.polyfill(); | 50 | smoothScroll.polyfill(); |
@@ -73,6 +75,7 @@ window.addEventListener('load', () => { | |||
73 | <I18N> | 75 | <I18N> |
74 | <Router history={history}> | 76 | <Router history={history}> |
75 | <Route path="/" component={AppLayoutContainer}> | 77 | <Route path="/" component={AppLayoutContainer}> |
78 | <Route path={ANNOUNCEMENTS_ROUTES.TARGET} component={AnnouncementScreen} /> | ||
76 | <Route path="/settings" component={SettingsWindow}> | 79 | <Route path="/settings" component={SettingsWindow}> |
77 | <IndexRedirect to="/settings/recipes" /> | 80 | <IndexRedirect to="/settings/recipes" /> |
78 | <Route path="/settings/recipes" component={RecipesScreen} /> | 81 | <Route path="/settings/recipes" component={RecipesScreen} /> |