From 15f38ba101f4eea135bc8cf9df3fc0884f561fd8 Mon Sep 17 00:00:00 2001 From: Jayasanka Date: Thu, 21 Mar 2019 20:00:41 +0530 Subject: [PATCH] Added login to router --- .../react-app/src/App.js | 26 +++- .../react-app/src/index.js | 130 ++++++++++++++---- 2 files changed, 125 insertions(+), 31 deletions(-) diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/App.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/App.js index 5cf9be115e..f09d174c33 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/App.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/App.js @@ -1,19 +1,31 @@ import React from "react"; import "antd/dist/antd.css"; -import { renderRoutes } from "react-router-config"; +import RouteWithSubRoutes from "./components/RouteWithSubRoutes"; +import { + BrowserRouter as Router, + Link, +} from 'react-router-dom'; class App extends React.Component { + routes; constructor(props) { super(props); - this.state = { - route : props.route - } + this.routes = props.routes; } render() { return ( -
- {renderRoutes(this.state.route.routes)} -
+ +
+
    +
  • Tacos
  • +
  • Sandwiches
  • +
+ + {this.routes.map((route) => ( + + ))} +
+
); } diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/index.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/index.js index 96931fc788..2478ce8287 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/index.js +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/index.js @@ -1,41 +1,123 @@ -import React from 'react'; +// import React from 'react'; import ReactDOM from 'react-dom'; -import './index.css'; -import App from './App'; +// import './index.css'; import * as serviceWorker from './serviceWorker'; -import { renderRoutes } from "react-router-config"; -import Dashboard from "./pages/dashboard/Dashboard" -import Login from "./pages/Login"; -import {BrowserRouter} from "react-router-dom"; +// import { renderRoutes } from "react-router-config"; +// import Dashboard from "./pages/dashboard/Dashboard" +// import Login from "./pages/Login"; +// import {BrowserRouter} from "react-router-dom"; +// +// +// const routes = [ +// { +// component: App, +// routes: [ +// { +// path: "/publisher", +// exact: true, +// component: Dashboard, +// routes: [ +// { +// path: "/publisher/a", +// component: Login +// } +// ] +// }, +// { +// path: "/publisher/login", +// component: Login +// } +// ] +// } +// ]; +// +// ReactDOM.render( +// {/* kick it all off with the root route */} +// {renderRoutes(routes)} +// , document.getElementById('root')); +// +// // If you want your app to work offline and load faster, you can change +// // unregister() to register() below. Note this comes with some pitfalls. +// // Learn more about service workers: https://bit.ly/CRA-PWA +// serviceWorker.unregister(); + + +import React from 'react'; +import { + BrowserRouter as Router, + Route, + Link, +} from 'react-router-dom'; +import RouteWithSubRoutes from "./components/RouteWithSubRoutes" +import App from "./App" +import Login from "./pages/Login" + +const Sandwiches = () =>

Sandwiches

+ +const Tacos = ({ routes }) => ( +
+

Tacos

+ + {routes.map((route) => ( + + ))} +
+) + +const Bus = () =>

Bus

+const Cart = () =>

Cart

const routes = [ { - component: App, + path: '/publisher/Login', + component: Login + }, + { + path: '/publisher/tacos', + component: Tacos, routes: [ { - path: "/publisher", - exact: true, - component: Dashboard, - routes: [ - { - path: "/publisher/a", - component: Login - } - ] + path: '/publisher/tacos/bus', + component: Login }, { - path: "/publisher/login", - component: Login + path: '/publisher/tacos/cart', + component: Cart } ] } -]; +] + +// const RouteWithSubRoutes = (route) => ( +// ( +// +// )}/> +// ) + +// class App extends React.Component { +// render() { +// return ( +// +//
+//
    +//
  • Tacos
  • +//
  • Sandwiches
  • +//
+// +// {routes.map((route) => ( +// +// ))} +//
+//
+// ) +// } +// } -ReactDOM.render( - {/* kick it all off with the root route */} - {renderRoutes(routes)} -, document.getElementById('root')); +ReactDOM.render( , document.getElementById('root')); // If you want your app to work offline and load faster, you can change // unregister() to register() below. Note this comes with some pitfalls.