community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed routing

Browse Source
This commit is contained in:
Jayasanka 2019-04-28 17:22:16 +05:30
parent b3d87186eb
commit 9a580e513f
4 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/App.js vendored
View File

@ -3,22 +3,28 @@ import "antd/dist/antd.css";
import RouteWithSubRoutes from "./components/RouteWithSubRoutes"; import RouteWithSubRoutes from "./components/RouteWithSubRoutes";
import { import {
BrowserRouter as Router, BrowserRouter as Router,
Link, Link, Redirect, Switch,
} from 'react-router-dom'; } from 'react-router-dom';
class App extends React.Component { class App extends React.Component {
routes; routes;
constructor(props) { constructor(props) {
super(props); super(props);
this.routes = props.routes; this.routes = props.routes;
} }
render() { render() {
console.log(this.routes);
return ( return (
<Router> <Router>
<div> <div>
<Switch>
<Redirect exact from="/publisher" to="/publisher/dashboard/apps"/>
{this.routes.map((route) => ( {this.routes.map((route) => (
<RouteWithSubRoutes key={route.path} {...route} /> <RouteWithSubRoutes key={route.path} {...route} />
))} ))}
</Switch>
</div> </div>
</Router> </Router>

2
components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/RouteWithSubRoutes.js vendored
View File

@ -8,7 +8,7 @@ class RouteWithSubRoutes extends React.Component{
} }
render() { render() {
return( return(
<Route path={this.props.path} render={(props) => ( <Route path={this.props.path} exact={this.props.exact} render={(props) => (
<this.props.component {...props} routes={this.props.routes}/> <this.props.component {...props} routes={this.props.routes}/>
)}/> )}/>
); );

15
components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/index.js vendored
View File

@ -9,24 +9,29 @@ import AddNewApp from "./pages/dashboard/add-new-app/AddNewApp";
import './index.css'; import './index.css';
import store from "./js/store/index"; import store from "./js/store/index";
import {Provider} from "react-redux"; import {Provider} from "react-redux";
import {Switch} from "react-router";
const routes = [ const routes = [
{ {
path: '/publisher/login', path: '/publisher/login',
exact: true,
component: Login component: Login
}, },
{ {
path: '/publisher', path: '/publisher/dashboard',
exact: false,
component: Dashboard, component: Dashboard,
routes: [ routes: [
{ {
path: '/publisher/apps', path: '/publisher/dashboard/apps',
component: Apps component: Apps,
exact: false
}, },
{ {
path: '/publisher/new-app', path: '/publisher/dashboard/new-app',
component: AddNewApp component: AddNewApp,
exact: false
} }
] ]
} }

2
components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/pages/dashboard/Dashboard.js vendored
View File

@ -38,7 +38,7 @@ class Dashboard extends React.Component {
</Header> </Header>
<Content style={{padding: '0 0'}}> <Content style={{padding: '0 0'}}>
<Switch> <Switch>
<Redirect exact from="/publisher" to="/publisher/apps"/> <Redirect exact from="/publisher/dashboard" to="/publisher/dashboard/apps"/>
{this.state.routes.map((route) => ( {this.state.routes.map((route) => (
<RouteWithSubRoutes key={route.path} {...route} /> <RouteWithSubRoutes key={route.path} {...route} />
))} ))}