aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/App.css38
-rw-r--r--src/App.js16
-rw-r--r--src/config.js3
-rw-r--r--src/core/app.routes.js15
-rw-r--r--src/core/custom.router.js27
-rw-r--r--src/core/routes.js35
-rw-r--r--src/core/store.js31
-rw-r--r--src/index.css5
-rw-r--r--src/index.js32
-rw-r--r--src/logo.svg7
-rw-r--r--src/middlewares/root.middleware.js7
-rw-r--r--src/modules/admin/admin.container.js12
-rw-r--r--src/modules/dashboard/dashboard.container.js12
-rw-r--r--src/modules/login/login.container.js12
-rw-r--r--src/modules/superadmin/superadmin.container.js12
-rw-r--r--src/reducers/root.reducer.js9
-rw-r--r--src/services/http.service.js0
-rw-r--r--src/services/storage.service.js16
-rw-r--r--src/shared/header.hoc.js0
19 files changed, 220 insertions, 69 deletions
diff --git a/src/App.css b/src/App.css
index 74b5e05..e69de29 100644
--- a/src/App.css
+++ b/src/App.css
@@ -1,38 +0,0 @@
-.App {
- text-align: center;
-}
-
-.App-logo {
- height: 40vmin;
- pointer-events: none;
-}
-
-@media (prefers-reduced-motion: no-preference) {
- .App-logo {
- animation: App-logo-spin infinite 20s linear;
- }
-}
-
-.App-header {
- background-color: #282c34;
- min-height: 100vh;
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: center;
- font-size: calc(10px + 2vmin);
- color: white;
-}
-
-.App-link {
- color: #61dafb;
-}
-
-@keyframes App-logo-spin {
- from {
- transform: rotate(0deg);
- }
- to {
- transform: rotate(360deg);
- }
-}
diff --git a/src/App.js b/src/App.js
index ce9cbd2..5c5ec79 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,24 +1,10 @@
import React from 'react';
-import logo from './logo.svg';
import './App.css';
function App() {
return (
<div className="App">
- <header className="App-header">
- <img src={logo} className="App-logo" alt="logo" />
- <p>
- Edit <code>src/App.js</code> and save to reload.
- </p>
- <a
- className="App-link"
- href="https://reactjs.org"
- target="_blank"
- rel="noopener noreferrer"
- >
- Learn React
- </a>
- </header>
+
</div>
);
}
diff --git a/src/config.js b/src/config.js
new file mode 100644
index 0000000..1281554
--- /dev/null
+++ b/src/config.js
@@ -0,0 +1,3 @@
+export const Config = {
+ baseUrl: "http://localhost:5555"
+} \ No newline at end of file
diff --git a/src/core/app.routes.js b/src/core/app.routes.js
new file mode 100644
index 0000000..5d06e63
--- /dev/null
+++ b/src/core/app.routes.js
@@ -0,0 +1,15 @@
+import AdminContainer from "../modules/admin/admin.container";
+import SuperAdminContainer from "../modules/superadmin/superadmin.container";
+
+export const AppRoutes = [
+ {
+ path: '/admin',
+ component: AdminContainer,
+ permission: ['admin','superadmin']
+ },
+ {
+ path: '/superadmin',
+ component: SuperAdminContainer,
+ permission: ['admin', 'superadmin', 'user']
+ }
+];
diff --git a/src/core/custom.router.js b/src/core/custom.router.js
new file mode 100644
index 0000000..b3f08ec
--- /dev/null
+++ b/src/core/custom.router.js
@@ -0,0 +1,27 @@
+import React from "react";
+import { Route, Redirect } from "react-router-dom";
+import Storage from "../services/storage.service";
+
+export const CustomRouter = ({ xComponent: Component, ...xProps }) => {
+ return (
+ <Route
+ {...xProps}
+ render={props => {
+ console.log(props.permissions)
+ let token = Storage.get("token");
+ let pathName = props.match.path;
+ if (!token && pathName !== "/login") {
+ return <Redirect to="/login" />;
+ } else if (pathName === "/login" && token) {
+
+ return <Redirect to="/dashboard" />;
+ }else if (pathName === "/" && token) {
+
+ return <Redirect to="/dashboard" />;
+ }
+ debugger
+ return <Component {...props} />;
+ }}
+ />
+ );
+ }; \ No newline at end of file
diff --git a/src/core/routes.js b/src/core/routes.js
new file mode 100644
index 0000000..764e793
--- /dev/null
+++ b/src/core/routes.js
@@ -0,0 +1,35 @@
+import React, { Suspense } from "react";
+import { Provider } from "react-redux";
+import { ConnectedRouter } from "connected-react-router";
+import { Switch, Redirect, Route } from "react-router-dom";
+import { CustomRouter } from "./custom.router";
+import LoginContainer from "../modules/login/login.container";
+import DashBoardContainer from "../modules/dashboard/dashboard.container";
+import { AppRoutes } from "./app.routes";
+
+const Routes = ({ store, history }) => {
+ return (
+ <Provider store={store}>
+ <ConnectedRouter history={history}>
+ <Suspense
+ fallback={<div style={{ display: "none" }}> Loading ...</div>}
+ >
+ <Switch>
+ <CustomRouter path="/login" xComponent={LoginContainer} />
+ <CustomRouter path="/dashboard" xComponent={DashBoardContainer} />
+ {AppRoutes.map(_routes =>
+ <CustomRouter
+ key={_routes.path}
+ path={_routes.path}
+ xComponent={_routes.component}
+ permissions={_routes.permission}
+ />)}
+ <Redirect from="*" to="/login" push />
+ </Switch>
+ </Suspense>
+ </ConnectedRouter>
+ </Provider>
+ );
+};
+
+export default Routes; \ No newline at end of file
diff --git a/src/core/store.js b/src/core/store.js
new file mode 100644
index 0000000..5e55424
--- /dev/null
+++ b/src/core/store.js
@@ -0,0 +1,31 @@
+import { createStore, applyMiddleware } from "redux";
+import { routerMiddleware } from "connected-react-router";
+import createSagaMiddleware from "redux-saga";
+import { createBrowserHistory } from "history";
+import { composeWithDevTools } from "redux-devtools-extension/developmentOnly";
+
+import createRootReducer from "../reducers/root.reducer";
+
+export const history = createBrowserHistory({
+ hashType: "slash"
+});
+
+const RouterMiddleware = routerMiddleware(history);
+const SagaMiddleware = createSagaMiddleware();
+
+const getMiddleware = () => {
+ // DEVELPOPMENT
+ return composeWithDevTools(applyMiddleware(SagaMiddleware, RouterMiddleware));
+ // PRODUCTION
+ // return compose(applyMiddleware(SagaMiddleware, RouterMiddleware));
+};
+
+export function configureStore(initialState) {
+ const store = createStore(
+ createRootReducer(history),
+ initialState,
+ getMiddleware()
+ );
+ store.runSaga = SagaMiddleware.run;
+ return store;
+}
diff --git a/src/index.css b/src/index.css
index ec2585e..1532074 100644
--- a/src/index.css
+++ b/src/index.css
@@ -6,8 +6,3 @@ body {
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
-
-code {
- font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
- monospace;
-}
diff --git a/src/index.js b/src/index.js
index 87d1be5..a3b342f 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,12 +1,36 @@
import React from 'react';
import ReactDOM from 'react-dom';
+import "bootstrap/dist/css/bootstrap.min.css";
import './index.css';
import App from './App';
import * as serviceWorker from './serviceWorker';
+import { history, configureStore } from './core/store';
+import rootMiddleware from './middlewares/root.middleware';
+import {
+ BrowserRouter as Router,
+ Route
+ } from "react-router-dom";
+import Routes from './core/routes';
+
+require("es6-promise").polyfill();
+
+
+
+const store = configureStore();
+store.runSaga(rootMiddleware);
+
+const XRouter = () => {
+ return (
+ <Router>
+ <Route>
+ <Routes store={store} history={history} />
+ </Route>
+ </Router>
+ );
+ };
+
+
+ ReactDOM.render(<XRouter />, document.getElementById('root'));
-ReactDOM.render(<App />, 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();
diff --git a/src/logo.svg b/src/logo.svg
deleted file mode 100644
index 6b60c10..0000000
--- a/src/logo.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3">
- <g fill="#61DAFB">
- <path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/>
- <circle cx="420.9" cy="296.5" r="45.7"/>
- <path d="M520.5 78.1z"/>
- </g>
-</svg>
diff --git a/src/middlewares/root.middleware.js b/src/middlewares/root.middleware.js
new file mode 100644
index 0000000..2e90582
--- /dev/null
+++ b/src/middlewares/root.middleware.js
@@ -0,0 +1,7 @@
+import { all } from "redux-saga/effects";
+
+export default function* rootMiddleware() {
+ yield all([
+ //...LoginSaga,
+ ]);
+} \ No newline at end of file
diff --git a/src/modules/admin/admin.container.js b/src/modules/admin/admin.container.js
new file mode 100644
index 0000000..e7e669a
--- /dev/null
+++ b/src/modules/admin/admin.container.js
@@ -0,0 +1,12 @@
+import React, {Component} from 'react';
+
+class AdminContainer extends Component{
+
+ render(){
+ return(
+ <div>Admin Container</div>
+ );
+ }
+}
+
+export default AdminContainer; \ No newline at end of file
diff --git a/src/modules/dashboard/dashboard.container.js b/src/modules/dashboard/dashboard.container.js
new file mode 100644
index 0000000..595aa9f
--- /dev/null
+++ b/src/modules/dashboard/dashboard.container.js
@@ -0,0 +1,12 @@
+import React, {Component} from 'react';
+
+class DashBoardContainer extends Component{
+
+ render(){
+ return(
+ <div>Dashboard</div>
+ );
+ }
+}
+
+export default DashBoardContainer; \ No newline at end of file
diff --git a/src/modules/login/login.container.js b/src/modules/login/login.container.js
new file mode 100644
index 0000000..705284e
--- /dev/null
+++ b/src/modules/login/login.container.js
@@ -0,0 +1,12 @@
+import React,{Component} from 'react';
+
+class LoginContainer extends Component{
+
+ render(){
+ return(
+ <div>Login</div>
+ );
+ }
+}
+
+export default LoginContainer; \ No newline at end of file
diff --git a/src/modules/superadmin/superadmin.container.js b/src/modules/superadmin/superadmin.container.js
new file mode 100644
index 0000000..a82608d
--- /dev/null
+++ b/src/modules/superadmin/superadmin.container.js
@@ -0,0 +1,12 @@
+import React, {Component} from 'react';
+
+class SuperAdminContainer extends Component{
+
+ render(){
+ return(
+ <div>SuperAdminContainer</div>
+ );
+ }
+}
+
+export default SuperAdminContainer; \ No newline at end of file
diff --git a/src/reducers/root.reducer.js b/src/reducers/root.reducer.js
new file mode 100644
index 0000000..de1a3b8
--- /dev/null
+++ b/src/reducers/root.reducer.js
@@ -0,0 +1,9 @@
+import { combineReducers } from "redux";
+import { connectRouter } from "connected-react-router";
+
+const createRootReducer = history =>
+ combineReducers({
+ router: connectRouter(history),
+ });
+
+export default createRootReducer;
diff --git a/src/services/http.service.js b/src/services/http.service.js
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/services/http.service.js
diff --git a/src/services/storage.service.js b/src/services/storage.service.js
new file mode 100644
index 0000000..c41d552
--- /dev/null
+++ b/src/services/storage.service.js
@@ -0,0 +1,16 @@
+class Storage{
+ static get = (key)=>{
+ if(!key)throw("Storage.get expects a 'key' - 'key' can't be null");
+ if(!localStorage.getItem(key)) return null;
+ return localStorage.getItem(key);
+ }
+
+ static set = (key, value)=>{
+ if(!key||!value){
+ throw("Storag.set expects a 'key' and a 'value' - 'value' & 'key' can't be null");
+ }
+ localStorage.setItem(key, JSON.stringify(value));
+ }
+}
+
+export default Storage; \ No newline at end of file
diff --git a/src/shared/header.hoc.js b/src/shared/header.hoc.js
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/shared/header.hoc.js