Skip to content

Commit 61dfd1e

Browse files
authored
Merge pull request #81 from Chat-Your-Way/CHAT-214-Loader
it works
2 parents 6a70a4b + dd3de80 commit 61dfd1e

File tree

6 files changed

+217
-7
lines changed

6 files changed

+217
-7
lines changed

package-lock.json

Lines changed: 185 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"react": "^18.2.0",
2525
"react-dom": "^18.2.0",
2626
"react-hook-form": "^7.45.4",
27+
"react-loader-spinner": "^6.1.6",
2728
"react-redux": "^8.1.1",
2829
"react-responsive": "^9.0.2",
2930
"react-router-dom": "^6.16.0",

src/components/Loader/Loader.jsx

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import { Oval } from 'react-loader-spinner';
2+
import { LoaderWrap } from './Loader.styled';
3+
4+
const Loader = () => {
5+
return (
6+
<LoaderWrap>
7+
<Oval
8+
color="#ACADFF"
9+
secondaryColor="#ACADFF"
10+
strokeWidth="2"
11+
animationDuration="1"
12+
width="96"
13+
visible={true}
14+
/>
15+
</LoaderWrap>
16+
);
17+
};
18+
19+
export default Loader;
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import styled from '@emotion/styled';
2+
import { Box } from '@mui/material';
3+
4+
export const LoaderWrap = styled(Box)`
5+
position: fixed;
6+
top: calc(50% - 48px);
7+
left: calc(50% - 48px);
8+
z-index: 1100;
9+
`;

src/components/Loader/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export { default } from './Loader.jsx';

src/components/Routes/Route.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { PrivateRoute } from './PrivateRoute';
44
import { PublicRoute } from './PublicRoute';
55
import { PATH } from '../../constans/routes';
66
import SharedLayout from '../../ui-kit/components/SharedLayout/SharedLayout';
7+
import Loader from '../Loader';
78
import AuthorizationPage from '../../pages/AuthorizationPage';
89
import LoginPage from '../../pages/LoginPage/LoginPage';
910
import RegistrationPage from '../../pages/RegistrationPage';
@@ -20,7 +21,7 @@ import Chat from '../Chat';
2021

2122
const Router = () => {
2223
return (
23-
<Suspense fallback="Loading...">
24+
<Suspense fallback={<Loader />}>
2425
<Routes>
2526
{/*Public Route*/}
2627
<Route path={PATH.MAIN} element={<PublicRoute />}>

0 commit comments

Comments
 (0)