core-dashboard-worona
Advanced tools
Comparing version 1.3.15 to 1.3.16
{ | ||
"name": "core-dashboard-worona", | ||
"version": "1.3.15", | ||
"version": "1.3.16", | ||
"description": "Core Package of Worona Dashboard", | ||
@@ -5,0 +5,0 @@ "scripts": { |
/* eslint-disable react/prefer-stateless-function, react/no-multi-comp, react/prop-types */ | ||
/* eslint-disable prefer-template, react/prefer-es6-class, react/jsx-filename-extension */ | ||
import React from 'react'; | ||
import Helmet from 'react-helmet'; | ||
import { dep } from 'worona-deps'; | ||
@@ -21,2 +22,5 @@ import { connect } from 'react-redux'; | ||
<Theme {...this.props} /> | ||
{this.props.children.props.route.title && ( | ||
<Helmet title={`Worona Dashboard - ${this.props.children.props.route.title}`} /> | ||
)} | ||
</div> | ||
@@ -41,3 +45,3 @@ ); | ||
const requireAuth = (store) => (nextState, replace) => { | ||
const requireAuth = store => (nextState, replace) => { | ||
const accounts = store.getState().accounts; | ||
@@ -52,3 +56,3 @@ if (!accounts || !accounts.isLoggedIn) { | ||
const dontRequireAuth = (store) => (nextState, replace) => { | ||
const dontRequireAuth = store => (nextState, replace) => { | ||
const accounts = store.getState().accounts; | ||
@@ -58,15 +62,47 @@ if (accounts && accounts.isLoggedIn) replace({ pathname: '/sites' }); | ||
export const routes = (store) => ( | ||
<Route path="/" component={ThemeLoader} > | ||
export const routes = store => ( | ||
<Route path="/" component={ThemeLoader}> | ||
<IndexRedirect to="/register" /> | ||
<Route path="login" component={Entry} wrapped="Login" onEnter={dontRequireAuth(store)} /> | ||
<Route path="register" component={Entry} wrapped="Register" onEnter={dontRequireAuth(store)} /> | ||
<Route path="add-site" component={Entry} wrapped="AddSite" onEnter={requireAuth(store)} /> | ||
<Route | ||
path="check-site/:siteId" component={Entry} wrapped="CheckSite" onEnter={requireAuth(store)} | ||
path="login" | ||
component={Entry} | ||
wrapped="Login" | ||
title="Login" | ||
onEnter={dontRequireAuth(store)} | ||
/> | ||
<Route | ||
path="edit-site/:siteId" component={Entry} wrapped="EditSite" onEnter={requireAuth(store)} | ||
path="register" | ||
component={Entry} | ||
wrapped="Register" | ||
title="Register" | ||
onEnter={dontRequireAuth(store)} | ||
/> | ||
<Route path="sites" component={Entry} wrapped="Sites" onEnter={requireAuth(store)} /> | ||
<Route | ||
path="add-site" | ||
component={Entry} | ||
wrapped="AddSite" | ||
title="Add Site" | ||
onEnter={requireAuth(store)} | ||
/> | ||
<Route | ||
path="check-site/:siteId" | ||
component={Entry} | ||
wrapped="CheckSite" | ||
title="Checking Site" | ||
onEnter={requireAuth(store)} | ||
/> | ||
<Route | ||
path="edit-site/:siteId" | ||
component={Entry} | ||
wrapped="EditSite" | ||
title="Edit Site" | ||
onEnter={requireAuth(store)} | ||
/> | ||
<Route | ||
path="sites" | ||
component={Entry} | ||
wrapped="Sites" | ||
title="Sites" | ||
onEnter={requireAuth(store)} | ||
/> | ||
<Redirect from="/site/:siteId" to="/site/:siteId/app" /> | ||
@@ -77,3 +113,5 @@ <Redirect from="/site/:siteId/app" to="/site/:siteId/app/general-app-extension-worona" /> | ||
<Route | ||
path="/site/:siteId/:service/:packageName" component={Entry} wrapped="SiteHome" | ||
path="/site/:siteId/:service/:packageName" | ||
component={Entry} | ||
wrapped="SiteHome" | ||
onEnter={requireAuth(store)} | ||
@@ -80,0 +118,0 @@ /> |
55627
1148