Skip to content

Commit 49ed354

Browse files
committed
move alertStack to ApplicationView
1 parent 06e0737 commit 49ed354

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

client/src/app/components/applicationView.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ export default context => {
1313
const NavBar = navBar(context);
1414
const Footer = footer(context);
1515
const AsyncView = asyncView(context);
16+
const AlertStack = context.alertStack.View;
1617

1718
const AppRoot = glamorous("div")({
1819
display: "flex",
@@ -45,6 +46,7 @@ export default context => {
4546
<NavBar authenticated={authStore.authenticated} />
4647
<MainView>{children}</MainView>
4748
<Footer version={version} />
49+
<AlertStack />
4850
</AppView>
4951
{themeStore.open && (
5052
<AsyncView getModule={() => import("parts/theme/ThemeView")} />

client/src/app/router.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,18 +49,17 @@ export default context => {
4949
};
5050

5151
async function onLocationChange(location) {
52-
console.log("onLocationChange ", location);
52+
//console.log("onLocationChange ", location);
5353
let component;
5454
let route;
5555
try {
5656
route = await router.resolve({
5757
pathname: location.pathname,
5858
query: parse(location.search)
5959
});
60-
console.log("onLocationChange match route ", route);
6160
component = route.component; // eslint-disable-line prefer-destructuring
6261
} catch (error) {
63-
console.log("Routing exception:", error.message);
62+
console.error("Routing exception:", error.message);
6463
if (error.code === 404) {
6564
component = h(asyncView(context), {
6665
getModule: () => import("./components/notFound")
@@ -77,7 +76,6 @@ export default context => {
7776
animationHide={`${animation.hideToRight} 0.3s`}
7877
animationShow={`${animation.showFromLeft} 0.5s`}
7978
/>
80-
<AlertStack />
8179
</Layout>
8280
);
8381
context.rootInstance = render(
@@ -89,7 +87,7 @@ export default context => {
8987
}
9088

9189
history.listen(onLocationChange);
92-
90+
9391
return {
9492
instance: router,
9593
start() {

0 commit comments

Comments
 (0)