diff --git a/client/nginx/nginx.conf b/client/nginx/nginx.conf index 621b249..71fcda4 100644 --- a/client/nginx/nginx.conf +++ b/client/nginx/nginx.conf @@ -52,15 +52,6 @@ } - # server { - #listen 8000; - - # location /graphql { - # proxy_pass http://server:8000/graphql; - - #} - - - #} + \ No newline at end of file diff --git a/client/package-lock.json b/client/package-lock.json index cede89b..dd2480a 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -6416,6 +6416,14 @@ "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" }, + "ejs": { + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.6.tgz", + "integrity": "sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw==", + "requires": { + "jake": "^10.6.1" + } + }, "electron-to-chromium": { "version": "1.3.682", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.682.tgz", @@ -7787,6 +7795,14 @@ "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", "optional": true }, + "filelist": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.2.tgz", + "integrity": "sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ==", + "requires": { + "minimatch": "^3.0.4" + } + }, "filename-regex": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", @@ -10027,6 +10043,50 @@ "html-escaper": "^2.0.0" } }, + "jake": { + "version": "10.8.2", + "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.2.tgz", + "integrity": "sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A==", + "requires": { + "async": "0.9.x", + "chalk": "^2.4.2", + "filelist": "^1.0.1", + "minimatch": "^3.0.4" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "requires": { + "color-convert": "^1.9.0" + } + }, + "async": { + "version": "0.9.2", + "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz", + "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=" + }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + } + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "jest": { "version": "24.9.0", "resolved": "https://registry.npmjs.org/jest/-/jest-24.9.0.tgz", @@ -15269,6 +15329,14 @@ "scheduler": "^0.20.1" } }, + "react-error-boundary": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/react-error-boundary/-/react-error-boundary-3.1.1.tgz", + "integrity": "sha512-W3xCd9zXnanqrTUeViceufD3mIW8Ut29BUD+S2f0eO2XCOU8b6UrJfY46RDGe5lxCJzfe4j0yvIfh0RbTZhKJw==", + "requires": { + "@babel/runtime": "^7.12.5" + } + }, "react-error-overlay": { "version": "6.0.9", "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.9.tgz", @@ -15289,6 +15357,14 @@ "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz", "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" }, + "react-loadable": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/react-loadable/-/react-loadable-5.5.0.tgz", + "integrity": "sha512-C8Aui0ZpMd4KokxRdVAm2bQtI03k2RMRNzOB+IipV3yxFTSVICv7WoUr5L9ALB5BmKO1iHgZtWM8EvYG83otdg==", + "requires": { + "prop-types": "^15.5.0" + } + }, "react-modal": { "version": "3.12.1", "resolved": "https://registry.npmjs.org/react-modal/-/react-modal-3.12.1.tgz", @@ -17068,6 +17144,140 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" }, + "source-map-explorer": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/source-map-explorer/-/source-map-explorer-2.5.2.tgz", + "integrity": "sha512-gBwOyCcHPHcdLbgw6Y6kgoH1uLKL6hN3zz0xJcNI2lpnElZliIlmSYAjUVwAWnc7+HscoTyh1ScR7ITtFuEnxg==", + "requires": { + "btoa": "^1.2.1", + "chalk": "^4.1.0", + "convert-source-map": "^1.7.0", + "ejs": "^3.1.5", + "escape-html": "^1.0.3", + "glob": "^7.1.6", + "gzip-size": "^6.0.0", + "lodash": "^4.17.20", + "open": "^7.3.1", + "source-map": "^0.7.3", + "temp": "^0.9.4", + "yargs": "^16.2.0" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" + }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", + "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==", + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "requires": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "gzip-size": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz", + "integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==", + "requires": { + "duplexer": "^0.1.2" + } + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "source-map": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", + "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==" + }, + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "requires": { + "ansi-regex": "^5.0.0" + } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "requires": { + "has-flag": "^4.0.0" + } + }, + "wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + } + }, + "y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==" + }, + "yargs": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "requires": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + } + }, + "yargs-parser": { + "version": "20.2.7", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz", + "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==" + } + } + }, "source-map-resolve": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz", @@ -17699,6 +17909,15 @@ "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz", "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==" }, + "temp": { + "version": "0.9.4", + "resolved": "https://registry.npmjs.org/temp/-/temp-0.9.4.tgz", + "integrity": "sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA==", + "requires": { + "mkdirp": "^0.5.1", + "rimraf": "~2.6.2" + } + }, "terser": { "version": "4.8.0", "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz", diff --git a/client/package.json b/client/package.json index 198fb74..259056d 100644 --- a/client/package.json +++ b/client/package.json @@ -22,7 +22,9 @@ "react-currency-input": "^1.3.6", "react-datepicker": "^3.6.0", "react-dom": "^17.0.1", + "react-error-boundary": "^3.1.1", "react-icons": "^4.2.0", + "react-loadable": "^5.5.0", "react-modal": "^3.12.1", "react-number-format": "^4.4.4", "react-router": "^5.2.0", @@ -30,6 +32,7 @@ "react-scripts": "3.4.1", "react-tabs": "^3.2.0", "recoil": "^0.1.3", + "source-map-explorer": "^2.5.2", "store": "^2.0.12", "styled-components": "^5.2.1", "underscore": "^1.12.0", @@ -40,7 +43,8 @@ "start": "react-scripts start", "build": "react-scripts build", "test": "react-scripts test", - "eject": "react-scripts eject" + "eject": "react-scripts eject", + "analyze": "source-map-explorer build/static/js/main.*" }, "eslintConfig": { "extends": "react-app" diff --git a/client/src/App.js b/client/src/App.js index d28feda..0903705 100644 --- a/client/src/App.js +++ b/client/src/App.js @@ -1,4 +1,4 @@ -import React, { useState, useEffect } from "react"; +import React, { useEffect } from "react"; import "./App.css"; import { ApolloProvider } from "@apollo/client"; import client from "./apolloClient"; @@ -12,64 +12,290 @@ import { import styled from "styled-components"; import Navigation from "./components/navbar"; import Layout from "./components/layout"; +import LoginComponentRoute from "./components/loginComponentRoute"; +import { ErrorBoundary } from "react-error-boundary"; +import ErrorFallback from "./components/common/errorFallback"; import { useRecoilState } from "recoil"; -import { createGlobalStyle } from "styled-components"; /** imports of page components starts here */ -import HomePage from "./components/home"; -import StudentAccountCreation from "./components/studentAccountCreation"; -import Login from "./components/login"; -import DashBoard from "./components/dashboard"; -import ConfirmTransaction from "./components/confirmRemitaTransaction"; -import PrintAllocation from "./components/printAllocation"; - -import AdminDashboard from "./components/adminDashboard"; -import ConfirmPhoneCode from "./components/confirmPhoneCode"; -import PrintStudentHostelAllocationBySession from "./components/printAllocationBySession"; -//import CreateNewRoom from "./components/addNewRoom"; -//import ConfirmHostelAllocation from "./components/confirmHostelAccomodation"; -import ConfirmHostelAccomodation from "./components/confirmHostelAccomodation"; -import Authorized from "./components/authorized"; -import GenerateRemitaRRR from "./components/generateRRR"; -import CreateNewSession from "./components/createNewSession"; -import UpdateSessionData from "./components/updateSessionNew"; -import ActiateDeactivateSession from "./components/activateSession"; -import CreateNewHostel from "./components/addHostel"; -import SelectHostelComponent from "./components/selectHostelComponet"; -import CreateRoomInHostel from "./components/createRoomInHostel"; -import RoomBedSpaceOperation from "./components/roomOperation"; -import BedSpaceSettings from "./components/bedSpaceSettings"; -import BedSpaceStatsTotal from "./components/bedstatsTotal"; -import AssignSpaceToStudent from "./components/assignSpaceToStudent"; -import MakeRemitaPaymentUsingRRR from "./components/makeRemitaPaymentUsingRRR"; -import PrintPaymentReceipt from "./components/viewPaymentReceipt"; -import StudentTransaction from "./components/viewTransactions"; -import ViewStudentsInRooms from "./components/viewStudentsInRoom"; -import AdminAllocateFreeBed from "./components/adminAllocationEachSession"; -import AuthorizedComponent from "./components/authorized"; import Footer from "./components/footer"; import state from "./applicationState"; -import EditHostelDetails from "./components/editHostelDetails"; -import SendMessageToStudent from "./components/sendMessageToStudents"; -import CustomNavbar from "./components/common/customNavbar"; -import AdminViewTransaction from "./components/adminViewTransaction"; +import AuthorizedComponent from "./components/authorized"; import GlobalStyle from "./globalStyles"; -import CreateStaffUserAccountByAdmin from "./components/adminCreateUserAccount"; -import SearchUserAccount from "./components/searchStudentAccount"; -/** - imports of page components ends here - */ -import { useHistory } from "react-router-dom"; -const store = require("store"); +import Loadable from "react-loadable"; +import Loader from "./components/common/loader"; + +//loadable content start here start of code splitting by route + +const LoadableBedSpaceStatsTotal = Loadable({ + loader: () => + import("./components/bedstatsTotal" /*webpackChunkName: "bedspaceStats"*/), + loading: Loader, + delay: 300, +}); + +const LoadableAssignSpaceToStudent = Loadable({ + loader: () => + import( + "./components/assignSpaceToStudent" /*webpackChunkName: "assignSpaceToStudent"*/ + ), + loading: Loader, + delay: 300, +}); + +const LoadableMakeRemitaPaymentUsingRRR = Loadable({ + loader: () => + import( + "./components/makeRemitaPaymentUsingRRR" /*webpackChunkName: "makeRemitaPaymentUsingRRR"*/ + ), + loading: Loader, + delay: 300, +}); + +const LoadablePrintPaymentReceipt = Loadable({ + loader: () => + import( + "./components/viewPaymentReceipt" /*webpackChunkName: "viewPaymentReceipt"*/ + ), + loading: Loader, + delay: 300, +}); + +const LoadableStudentTransaction = Loadable({ + loader: () => + import( + "./components/viewTransactions" /*webpackChunkName: "viewTransactions"*/ + ), + loading: Loader, + delay: 300, +}); + +const LoadableViewStudentsInRooms = Loadable({ + loader: () => + import( + "./components/viewStudentsInRoom" /*webpackChunkName: "viewStudentsInRoom"*/ + ), + loading: Loader, + delay: 300, +}); + +const LoadableAdminAllocateFreeBed = Loadable({ + loader: () => + import( + "./components/adminAllocationEachSession" /*webpackChunkName: "adminAllocationEachSession"*/ + ), + loading: Loader, + delay: 300, +}); + +const LoadableEditHostelDetails = Loadable({ + loader: () => + import( + "./components/editHostelDetails" /*webpackChunkName: "editHostelDetails"*/ + ), + loading: Loader, + delay: 300, +}); + +const LoadableSendMessageToStudent = Loadable({ + loader: () => + import( + "./components/sendMessageToStudents" /*webpackChunkName: "sendMessageToStudents"*/ + ), + loading: Loader, + delay: 300, +}); + +const LoadableAdminViewTransaction = Loadable({ + loader: () => + import( + "./components/adminViewTransaction" /*webpackChunkName: "adminViewTransaction"*/ + ), + loading: Loader, + delay: 300, +}); + +const LoadableCreateStaffUserAccountByAdmin = Loadable({ + loader: () => + import( + "./components/adminCreateUserAccount" /*webpackChunkName: "adminCreateUserAccount"*/ + ), + loading: Loader, + delay: 300, +}); + +const LoadableSearchUserAccount = Loadable({ + loader: () => + import( + "./components/searchStudentAccount" /*webpackChunkName: "searchStudentAccount"*/ + ), + loading: Loader, + delay: 300, +}); + +const LoadableHomePage = Loadable({ + loader: () => import("./components/home" /*webpackChunkName: "homepage"*/), + loading: Loader, + delay: 300, +}); + +const LoadableStudentAccountCreation = Loadable({ + loader: () => + import( + "./components/studentAccountCreation" /*webpackChunkName: "studentAccountCreation"*/ + ), + loading: Loader, + delay: 300, +}); + +const LoadableLogin = Loadable({ + loader: () => import("./components/login" /*webpackChunkName: "login"*/), + loading: Loader, + delay: 300, +}); + +const LoadableDashBoard = Loadable({ + loader: () => + import("./components/dashboard" /*webpackChunkName: "dashboard"*/), + loading: Loader, + delay: 300, +}); + +const LoadableConfirmTransaction = Loadable({ + loader: () => + import( + "./components/confirmRemitaTransaction" /*webpackChunkName: "confirmTransaction"*/ + ), + loading: Loader, + delay: 300, +}); + +const LoadablePrintAllocation = Loadable({ + loader: () => + import( + "./components/printAllocation" /*webpackChunkName: "printAllocation"*/ + ), + loading: Loader, + delay: 300, +}); + +const LoadableAdminDashboard = Loadable({ + loader: () => + import( + "./components/adminDashboard" /*webpackChunkName: "adminDashboard"*/ + ), + loading: Loader, + delay: 300, +}); + +const LoadableConfirmPhoneCode = Loadable({ + loader: () => + import( + "./components/confirmPhoneCode" /*webpackChunkName: "confirmPhoneCode"*/ + ), + loading: Loader, + delay: 300, +}); + +const LoadablePrintStudentHostelAllocationBySession = Loadable({ + loader: () => + import( + "./components/printAllocationBySession" /*webpackChunkName: "printAllocation"*/ + ), + loading: Loader, + delay: 300, +}); + +const LoadableConfirmHostelAccomodation = Loadable({ + loader: () => + import( + "./components/confirmHostelAccomodation" /*webpackChunkName: "confirmHostelAccomodation"*/ + ), + loading: Loader, + delay: 300, +}); + +const LoadableGenerateRemitaRRR = Loadable({ + loader: () => + import("./components/generateRRR" /*webpackChunkName: "generateRRR"*/), + loading: Loader, + delay: 300, +}); -// const GlobalStyle = createGlobalStyle` -// /* Your css reset here */ -// -// background-color: red; -// `; +const LoadableCreateNewSession = Loadable({ + loader: () => + import( + "./components/createNewSession" /*webpackChunkName: "createNewSession"*/ + ), + loading: Loader, + delay: 300, +}); + +const LoadableUpdateSessionData = Loadable({ + loader: () => + import( + "./components/updateSessionNew" /*webpackChunkName: "updateSessionNew"*/ + ), + loading: Loader, + delay: 300, +}); + +const LoadableActiateDeactivateSession = Loadable({ + loader: () => + import( + "./components/activateSession" /*webpackChunkName: "activateDeactivateSession"*/ + ), + loading: Loader, + delay: 300, +}); + +const LoadableCreateNewHostel = Loadable({ + loader: () => + import("./components/addHostel" /*webpackChunkName: "addHostel"*/), + loading: Loader, + delay: 300, +}); + +const LoadableSelectHostelComponent = Loadable({ + loader: () => + import( + "./components/selectHostelComponet" /*webpackChunkName: "selectHostelComponent"*/ + ), + loading: Loader, + delay: 300, +}); + +const LoadableCreateRoomInHostel = Loadable({ + loader: () => + import( + "./components/createRoomInHostel" /*webpackChunkName: "createRoomInHostel"*/ + ), + loading: Loader, + delay: 300, +}); + +const LoadableRoomBedSpaceOperation = Loadable({ + loader: () => + import("./components/roomOperation" /*webpackChunkName: "roomOperation"*/), + loading: Loader, + delay: 300, +}); + +const LoadableBedSpaceSettings = Loadable({ + loader: () => + import( + "./components/bedSpaceSettings" /*webpackChunkName: "bedSpaceSettings"*/ + ), + loading: Loader, + delay: 300, +}); + +/*import of component ends here */ + +const store = require("store"); const AppStyles = styled.div` .mainComponent { @@ -95,8 +321,6 @@ const App = (props) => { } }, []); - //let didMount = false; - return ( @@ -111,192 +335,197 @@ const App = (props) => { /> {/* */} - - -
-
-
-
+
+
+
+
+ + - ( - - )} - /> - - {/* student route starts here*/} - - - - - - - - - - {/* students route ends here*/} - {/* + ( + + )} + /> + + {/* student route starts here*/} + + + + + + + + + + {/* students route ends here*/} + {/* */} - !authenticated ? ( - + ) : ( ) } - /> - {/* */} + + + + {/* */} - - {/* Admin routes from here */} + + {/* Admin routes from here */} - + - + - - - - {/* + + + {/* { currentUser={currentUser} {...props} /> */} - - - - - - - - - - - - - - - {/* Admin routes ends here */} + + + + + + + + + + + + + + + {/* Admin routes ends here */} + -
-
+ +
- - +
+
+