Skip to content

2
2022-196
Commit 23afdd38 authored by Dilip Wijethunga's avatar Dilip Wijethunga
Browse files
Options

App Update

parent 0adf1a44
Hide whitespace changes
Inline Side-by-side
Showing with 108 additions and 143 deletions
frontend/package.json
View file @ 23afdd38
......@@ -9,12 +9,13 @@
"animate.css": "^3.7.2",
"axios": "^0.27.2",
"bootstrap": "4.6.0",
"chart.js": "^3.9.1",
"google-maps-react": "^2.0.2",
"js-file-download": "^0.4.12",
"prop-types": "^15.7.2",
"react": "^17.0.2",
"react-app-polyfill": "^1.0.5",
"react-bootstrap": "^1.0.0-beta.16",
"react-confirm-alert": "^2.7.0",
"react-countup": "^4.3.3",
"react-dom": "^17.0.2",
"react-gauge-chart": "^0.4.0",
......@@ -55,6 +56,7 @@
]
},
"devDependencies": {
"react-chartjs-2": "^4.3.1",
"sass": "^1.35.1"
}
}
frontend/src/App.js
View file @ 23afdd38
import React from "react";
import { BrowserRouter as Router, Switch, Route } from "react-router-dom";
import {BrowserRouter as Router, Switch, Route} from "react-router-dom";
import ScrollToTop from "./helpers/ScrollToTop";
import HomeOne from "./pages/HomeOne";
import HomeTwo from "./pages/HomeTwo";
import HomeThree from "./pages/HomeThree";
import HomeFour from "./pages/HomeFour";
import About from "./pages/About";
import Blog from "./pages/Blog";
import BlogRightSidebar from "./pages/BlogRightSidebar";
import BlogPost from "./pages/BlogPost";
import Contact from "./pages/Contact";
import Service from "./pages/Service";
import ServiceDetails from "./pages/ServiceDetails";
import Merchants from "./pages/Merchants";
import Team from "./pages/Team";
import Wallet from "./pages/Wallet";
import LoginRegister from "./pages/LoginRegister";
import NotFound from "./pages/NotFound";
import AboutBitcoin from "./pages/AboutBitcoin";
......@@ -26,132 +16,98 @@ import AddCoin from "./components/coins/AddCoin";
import CoinsList from "./components/coins/CoinsList";
import EditCoin from "./components/coins/EditCoin";
import Foreteller from "./pages/Foreteller";
import CustomerDashboardHome from "./pages/CustomerDashboardHome";
import UsersList from "./components/dashboard/admin/UsersList";
import CustomerProfile from "./components/customer/CustomerProfile";
import BlogPost from "./pages/BlogPost";
function App() {
return (
<Router>
<ScrollToTop>
<Switch>
<Route
exact
path={`${process.env.PUBLIC_URL + "/"}`}
component={HomeTwo}
/>
{/*<Route*/}
{/* path={`${process.env.PUBLIC_URL + "/home-one"}`}*/}
{/* component={HomeOne}*/}
{/*/>*/}
{/*<Route*/}
{/* path={`${process.env.PUBLIC_URL + "/home-two"}`}*/}
{/* component={HomeTwo}*/}
{/*/>*/}
{/*<Route*/}
{/* path={`${process.env.PUBLIC_URL + "/home-three"}`}*/}
{/* component={HomeThree}*/}
{/*/>*/}
{/*<Route*/}
{/* path={`${process.env.PUBLIC_URL + "/home-four"}`}*/}
{/* component={HomeFour}*/}
{/*/>*/}
<Route
path={`${process.env.PUBLIC_URL + "/about"}`}
component={About}
/>
<Route
path={`${process.env.PUBLIC_URL + "/coins"}`}
component={AboutBitcoin}
/>
<Route
path={`${process.env.PUBLIC_URL + "/foreteller"}`}
component={Foreteller}
/>
{/*<Route*/}
{/* path={`${process.env.PUBLIC_URL + "/blog"}`}*/}
{/* component={Blog}*/}
{/*/>*/}
<Route
path={`${process.env.PUBLIC_URL + "/news"}`}
component={BlogRightSidebar}
/>
{/*<Route*/}
{/* path={`${process.env.PUBLIC_URL + "/blog-post"}`}*/}
{/* component={BlogPost}*/}
{/*/>*/}
<Route
path={`${process.env.PUBLIC_URL + "/contact"}`}
component={Contact}
/>
{/*<Route*/}
{/* path={`${process.env.PUBLIC_URL + "/service"}`}*/}
{/* component={Service}*/}
{/*/>*/}
{/*<Route*/}
{/* path={`${process.env.PUBLIC_URL + "/service-details"}`}*/}
{/* component={ServiceDetails}*/}
{/*/>*/}
{/*<Route*/}
{/* path={`${process.env.PUBLIC_URL + "/merchants"}`}*/}
{/* component={Merchants}*/}
{/*/>*/}
{/*<Route*/}
{/* path={`${process.env.PUBLIC_URL + "/team"}`}*/}
{/* component={Team}*/}
{/*/>*/}
{/*<Route*/}
{/* path={`${process.env.PUBLIC_URL + "/wallet"}`}*/}
{/* component={Wallet}*/}
{/*/>*/}
<Route
path={`${process.env.PUBLIC_URL + "/login"}`}
component={LoginRegister}
/>
<Route
path={`${process.env.PUBLIC_URL + "/not-found"}`}
component={NotFound}
/>
<Route
path={`${process.env.PUBLIC_URL + "/add-news"}`}
component={AddNews}
/>
<Route
path={`${process.env.PUBLIC_URL + "/news-list"}`}
component={NewsList}
/>
<Route
path={`${process.env.PUBLIC_URL + "/edit-news"}`}
component={EditNews}
/>
<Route
path={`${process.env.PUBLIC_URL + "/add-coin"}`}
component={AddCoin}
/>
<Route
path={`${process.env.PUBLIC_URL + "/coins-list"}`}
component={CoinsList}
/>
<Route
path={`${process.env.PUBLIC_URL + "/coin-edit"}`}
component={EditCoin}
/>
<Route
path={`${process.env.PUBLIC_URL + "/admin-dashboard"}`}
component={AdminDashboardHome}
/>
<Route exact component={NotFound} />
</Switch>
</ScrollToTop>
</Router>
);
return (
<Router>
<ScrollToTop>
<Switch>
<Route
exact
path={`${process.env.PUBLIC_URL + "/"}`}
component={HomeTwo}
/>
<Route
path={`${process.env.PUBLIC_URL + "/about"}`}
component={About}
/>
<Route
path={`${process.env.PUBLIC_URL + "/coins"}`}
component={AboutBitcoin}
/>
<Route
path={`${process.env.PUBLIC_URL + "/foreteller"}`}
component={Foreteller}
/>
<Route
path={`${process.env.PUBLIC_URL + "/news"}`}
component={BlogRightSidebar}
/>
<Route
path={`${process.env.PUBLIC_URL + "/contact"}`}
component={Contact}
/>
<Route
path={`${process.env.PUBLIC_URL + "/login"}`}
component={LoginRegister}
/>
<Route
path={`${process.env.PUBLIC_URL + "/not-found"}`}
component={NotFound}
/>
<Route
path={`${process.env.PUBLIC_URL + "/add-news"}`}
component={AddNews}
/>
<Route
path={`${process.env.PUBLIC_URL + "/news-list"}`}
component={NewsList}
/>
<Route
path={`${process.env.PUBLIC_URL + "/edit-news"}`}
component={EditNews}
/>
<Route
path={`${process.env.PUBLIC_URL + "/add-coin"}`}
component={AddCoin}
/>
<Route
path={`${process.env.PUBLIC_URL + "/coins-list"}`}
component={CoinsList}
/>
<Route
path={`${process.env.PUBLIC_URL + "/coin-edit"}`}
component={EditCoin}
/>
<Route
path={`${process.env.PUBLIC_URL + "/admin-dashboard"}`}
component={AdminDashboardHome}
/>
<Route
path={`${process.env.PUBLIC_URL + "/customer-dashboard"}`}
component={CustomerDashboardHome}
/>
<Route
path={`${process.env.PUBLIC_URL + "/users-list"}`}
component={UsersList}
/>
<Route
path={`${process.env.PUBLIC_URL + "/customer-profile"}`}
component={CustomerProfile}
/>
<Route
path={`${process.env.PUBLIC_URL + "/news-details/:id"}`}
component={BlogPost}
/>
<Route exact component={NotFound}/>
</Switch>
</ScrollToTop>
</Router>
);
}
export default App;
frontend/src/index.js
View file @ 23afdd38
......@@ -8,7 +8,4 @@ import * as serviceWorker from "./serviceWorker";
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();
frontend/yarn.lock
View file @ 23afdd38
......@@ -3070,6 +3070,11 @@ chardet@^0.7.0:
resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
chart.js@^3.9.1:
version "3.9.1"
resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-3.9.1.tgz#3abf2c775169c4c71217a107163ac708515924b8"
integrity sha512-Ro2JbLmvg83gXF5F4sniaQ+lTbSv18E+TIf2cOeiH1Iqd2PGFOtem+DUufMZsCJwFE7ywPOpfXFBwRTGq7dh6w==
"chokidar@>=3.0.0 <4.0.0", chokidar@^3.4.1:
version "3.5.3"
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
......@@ -6835,6 +6840,11 @@ jest@24.9.0:
import-local "^2.0.0"
jest-cli "^24.9.0"
js-file-download@^0.4.12:
version "0.4.12"
resolved "https://registry.yarnpkg.com/js-file-download/-/js-file-download-0.4.12.tgz#10c70ef362559a5b23cdbdc3bd6f399c3d91d821"
integrity sha512-rML+NkoD08p5Dllpjo0ffy4jRHeY6Zsapvr/W86N7E0yuzAO6qa5X9+xog6zQNlH102J7IXljNY2FtS6Lj3ucg==
"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
......@@ -9260,10 +9270,10 @@ react-bootstrap@^1.0.0-beta.16:
uncontrollable "^7.2.1"
warning "^4.0.3"
react-confirm-alert@^2.7.0:
version "2.8.0"
resolved "https://registry.yarnpkg.com/react-confirm-alert/-/react-confirm-alert-2.8.0.tgz#b3538c412432226e817478d3a2614538196ab204"
integrity sha512-qvNjJWuWUpTh+q4NecUjCMIWLNDl8IwW6JRIky5pzoiFBXsLWSA2Z1VsaDsQedwgyxEpKnMEJFETkDogBpv/kA==
react-chartjs-2@^4.3.1:
version "4.3.1"
resolved "https://registry.yarnpkg.com/react-chartjs-2/-/react-chartjs-2-4.3.1.tgz#9941e7397fb963f28bb557addb401e9ff96c6681"
integrity sha512-5i3mjP6tU7QSn0jvb8I4hudTzHJqS8l00ORJnVwI2sYu0ihpj83Lv2YzfxunfxTZkscKvZu2F2w9LkwNBhj6xA==
react-countup@^4.3.3:
version "4.4.0"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment