Skip to content

Loader npm pakg removed #225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Loader npm pakg removed #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6acf6a6
lazy and suspense npm loader removed
Jun 7, 2021
7d54438
Merge branch 'dev' into tab
Jun 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"version": "1.0.42",
"private": true,
"dependencies": {
"@lazy-react/react-suspense": "^1.0.8",
"@material-ui/core": "^4.11.3",
"@material-ui/icons": "^4.11.2",
"@material-ui/lab": "^4.0.0-alpha.58",
Expand Down
6 changes: 3 additions & 3 deletions src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { Suspense } from "react";
import React from "react";
import { connect } from "react-redux";
import Paper from "@material-ui/core/Paper";
import {useStyles} from "./globalStyles"
Expand Down Expand Up @@ -28,9 +28,9 @@ const App = (props) => {
return (
<ThemeProvider theme={defaultTheme}>
<Paper style= {{height: "100vh"}} elevation= {0} >
<Suspense fallback={<Loader color={Harlequin} styles="h4"/>}>

<Route />
</Suspense>

</Paper>
</ThemeProvider>
);}
Expand Down
41 changes: 12 additions & 29 deletions src/Components/Path.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,15 @@
// import AboutUs from "./../Pages/AboutUs/AboutUs";
// import Services from "./../Pages/Services";
// import WebServices from "../Pages/WebServices";
// import Home from "../Pages/Home/index";
// // import Event from "../Pages/Event/Index";
// import Testimonials from "../Pages/Testimonials";
// import Career from "../Pages/Careers/Container";
// import AppSolutions from "../Pages/AppSolutionsPage/Container";
// import OurBlogs from "../Pages/OurBlogs";
// import Quote from "../Pages/ContactUs/index";
// import HireDeveloper from "../Pages/HireDeveloper";
// import DigitalMarketing from "../Pages/DigitalMarketing";
// import CaseStudies from "../Pages/CaseStudies";
import { lazy } from 'react'



const AboutUs = lazy(() =>import("./../Pages/AboutUs/AboutUs"));
const Services = lazy(() =>import("./../Pages/Services"));
const WebServices = lazy(() =>import("../Pages/WebServices"));
const Home = lazy(() =>import("../Pages/Home/index"));
const Testimonials = lazy(() =>import("../Pages/Testimonials"));
const Career = lazy(() =>import("../Pages/Careers/Container"));
const AppSolutions = lazy(() =>import("../Pages/AppSolutionsPage/Container"));
const OurBlogs = lazy(() =>import("../Pages/OurBlogs"));
const Quote = lazy(() =>import("../Pages/ContactUs/index"));
const HireDeveloper = lazy(() =>import("../Pages/HireDeveloper"));
const DigitalMarketing = lazy(() =>import("../Pages/DigitalMarketing"));
const CaseStudies = lazy(() =>import("../Pages/CaseStudies"));
import AboutUs from "./../Pages/AboutUs/AboutUs";
import Services from "./../Pages/Services";
import WebServices from "../Pages/WebServices";
import Home from "../Pages/Home/index";
import Testimonials from "../Pages/Testimonials";
import Career from "../Pages/Careers/Container";
import AppSolutions from "../Pages/AppSolutionsPage/Container";
import OurBlogs from "../Pages/OurBlogs";
import Quote from "../Pages/ContactUs/index";
import HireDeveloper from "../Pages/HireDeveloper";
import DigitalMarketing from "../Pages/DigitalMarketing";
import CaseStudies from "../Pages/CaseStudies";

const pathIds = {
home: "home",
Expand Down
12 changes: 5 additions & 7 deletions src/routes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
import React, { lazy, Suspense } from "react";
import React, { lazy } from "react";
// import { useSelector } from "react-redux";
import { BrowserRouter as Router, Switch } from "react-router-dom";
import Layout from "./Layout";
import RequireAuth from "./container/RequireAuth";
import { pageRoutes } from "./Components/Path";
import { Loader } from "./Components/loader";
import { Colors } from "./Theme/color.constants";
const Home = lazy(() => import("./Pages/Home"));
const Error = lazy(() => import("./Pages/Error/Index"));
import Home from "./Pages/Home";
import Error from "./Pages/Error/Index";

const Routes = () => {
const routeArray = Object.values(pageRoutes);
// const isLoggedIn = useSelector((state) => state.userReducer.isLoggedin);
const { Harlequin } = Colors;

return (
<Suspense fallback={<Loader color={Harlequin} styles="h4" />}>

<Router>
<Layout>
<Switch>
Expand All @@ -35,7 +34,6 @@ const Routes = () => {
</Switch>
</Layout>
</Router>
</Suspense>
);
};
export default Routes;