Skip to content

Commit 550f533

Browse files
Update folder structure (#81)
1 parent 44799b2 commit 550f533

35 files changed

+167
-189
lines changed
File renamed without changes.
File renamed without changes.

src/layouts/DashboardLayout/index.js renamed to src/components/DashboardLayout.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { useState } from 'react';
22
import { Outlet } from 'react-router-dom';
33
import { experimentalStyled } from '@material-ui/core';
4-
import NavBar from './NavBar';
5-
import TopBar from './TopBar';
4+
import DashboardNavbar from './DashboardNavbar';
5+
import DashboardSidebar from './DashboardSidebar';
66

77
const DashboardLayoutRoot = experimentalStyled('div')(
88
({ theme }) => ({
@@ -43,8 +43,8 @@ const DashboardLayout = () => {
4343

4444
return (
4545
<DashboardLayoutRoot>
46-
<TopBar onMobileNavOpen={() => setMobileNavOpen(true)} />
47-
<NavBar
46+
<DashboardNavbar onMobileNavOpen={() => setMobileNavOpen(true)} />
47+
<DashboardSidebar
4848
onMobileClose={() => setMobileNavOpen(false)}
4949
openMobile={isMobileNavOpen}
5050
/>

src/layouts/DashboardLayout/TopBar.js renamed to src/components/DashboardNavbar.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import {
1212
import MenuIcon from '@material-ui/icons/Menu';
1313
import NotificationsIcon from '@material-ui/icons/NotificationsOutlined';
1414
import InputIcon from '@material-ui/icons/Input';
15-
import Logo from 'src/components/Logo';
15+
import Logo from './Logo';
1616

17-
const TopBar = ({ onMobileNavOpen, ...rest }) => {
17+
const DashboardNavbar = ({ onMobileNavOpen, ...rest }) => {
1818
const [notifications] = useState([]);
1919

2020
return (
@@ -54,8 +54,8 @@ const TopBar = ({ onMobileNavOpen, ...rest }) => {
5454
);
5555
};
5656

57-
TopBar.propTypes = {
57+
DashboardNavbar.propTypes = {
5858
onMobileNavOpen: PropTypes.func
5959
};
6060

61-
export default TopBar;
61+
export default DashboardNavbar;

src/layouts/DashboardLayout/NavBar/index.js renamed to src/components/DashboardSidebar.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ const items = [
7272
}
7373
];
7474

75-
const NavBar = ({ onMobileClose, openMobile }) => {
75+
const DashboardSidebar = ({ onMobileClose, openMobile }) => {
7676
const location = useLocation();
7777

7878
useEffect(() => {
@@ -211,14 +211,14 @@ const NavBar = ({ onMobileClose, openMobile }) => {
211211
);
212212
};
213213

214-
NavBar.propTypes = {
214+
DashboardSidebar.propTypes = {
215215
onMobileClose: PropTypes.func,
216216
openMobile: PropTypes.bool
217217
};
218218

219-
NavBar.defaultProps = {
219+
DashboardSidebar.defaultProps = {
220220
onMobileClose: () => { },
221221
openMobile: false
222222
};
223223

224-
export default NavBar;
224+
export default DashboardSidebar;

src/layouts/MainLayout/index.js renamed to src/components/MainLayout.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Outlet } from 'react-router-dom';
22
import { experimentalStyled } from '@material-ui/core';
3-
import TopBar from './TopBar';
3+
import MainNavbar from './MainNavbar';
44

55
const MainLayoutRoot = experimentalStyled('div')(
66
({ theme }) => ({
@@ -33,7 +33,7 @@ const MainLayoutContent = experimentalStyled('div')({
3333

3434
const MainLayout = () => (
3535
<MainLayoutRoot>
36-
<TopBar />
36+
<MainNavbar />
3737
<MainLayoutWrapper>
3838
<MainLayoutContainer>
3939
<MainLayoutContent>

src/layouts/MainLayout/TopBar.js renamed to src/components/MainNavbar.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { Link as RouterLink } from 'react-router-dom';
22
import { AppBar, Toolbar } from '@material-ui/core';
3-
import Logo from 'src/components/Logo';
3+
import Logo from './Logo';
44

5-
const TopBar = (props) => (
5+
const MainNavbar = (props) => (
66
<AppBar
77
elevation={0}
88
{...props}
@@ -15,4 +15,4 @@ const TopBar = (props) => (
1515
</AppBar>
1616
);
1717

18-
export default TopBar;
18+
export default MainNavbar;
File renamed without changes.

src/views/account/AccountView/Profile.js renamed to src/components/account/AccountProfile.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const user = {
1919
timezone: 'GTM-7'
2020
};
2121

22-
const Profile = (props) => (
22+
const AccountProfile = (props) => (
2323
<Card {...props}>
2424
<CardContent>
2525
<Box
@@ -70,4 +70,4 @@ const Profile = (props) => (
7070
</Card>
7171
);
7272

73-
export default Profile;
73+
export default AccountProfile;

src/views/account/AccountView/ProfileDetails.js renamed to src/components/account/AccountProfileDetails.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const states = [
2525
}
2626
];
2727

28-
const ProfileDetails = (props) => {
28+
const AccountProfileDetails = (props) => {
2929
const [values, setValues] = useState({
3030
firstName: 'Katarina',
3131
lastName: 'Smith',
@@ -183,4 +183,4 @@ const ProfileDetails = (props) => {
183183
);
184184
};
185185

186-
export default ProfileDetails;
186+
export default AccountProfileDetails;

0 commit comments

Comments
 (0)