Skip to content

Commit 2a54e5d

Browse files
modularcodermodularcoder
committed
Restructure modules
1 parent 1913f75 commit 2a54e5d

File tree

14 files changed

+94
-106
lines changed

14 files changed

+94
-106
lines changed

‎.storybook/config.js

+9-10
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,20 @@ addParameters({
1919
showRoots: true,
2020
theme: docsTheme,
2121
storySort: (a, b) => {
22-
console.log('a', a);
23-
// console.log('b', b);
24-
25-
// const aNestingLevel = a[1].parameters.fileName.split('/').length
26-
// const bNestingLevel = b[1].parameters.fileName.split('/').length
27-
28-
// return `${aNestingLevel}${a[1].id}`.localeCompare(`${bNestingLevel}${b[1].id}`)
29-
3022
const getPriority = (id) => {
23+
var priority = '';
24+
3125
if (id.indexOf('general-') > -1) {
32-
return '0'
26+
priority = '0'
3327
}
3428
else {
35-
return 'z';
29+
priority = 'z';
30+
}
31+
32+
if (id.includes('--page')) {
33+
priority = priority + '0';
3634
}
35+
return priority;
3736
}
3837

3938
const aPriority = getPriority(a[1].id);

‎src/Organization/Organization.stories.mdx renamed to ‎src/Account/Organization/Organization.stories.mdx

File renamed without changes.

‎src/Profile/Profile.stories.mdx renamed to ‎src/Account/Profile/Profile.stories.mdx

File renamed without changes.

‎src/Account/Profile/index.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
const ProfileModule = {
2+
init() {},
3+
}
4+
5+
export default ProfileModule

‎src/Account/index.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
const AccountModule = {
2+
init() {},
3+
}
4+
5+
export default AccountModule

‎src/Administration/index.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
const AdministrationModule = {
2+
init() {},
3+
}
4+
5+
export default AdministrationModule

‎src/Auth/index.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
const AuthModule = {
2+
init() {},
3+
}
4+
5+
export default AuthModule

‎src/Content/index.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
const ContentModule = {
2+
init() {},
3+
}
4+
5+
export default ContentModule

‎src/Demo/index.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
const DemoModule = {
2+
init() {},
3+
}
4+
5+
export default DemoModule

‎src/Sales/index.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
const SalesModule = {
2+
init() {},
3+
}
4+
5+
export default SalesModule

‎src/_common/AppSidebar/AppSidebar.js

+1-8
Original file line numberDiff line numberDiff line change
@@ -67,22 +67,15 @@ const useStyles = makeStyles(theme => ({
6767
textDecoration: 'none',
6868
color: 'inherit',
6969
display: 'flex',
70-
// '&:hover': {
71-
// '& $logo': {
72-
// color: '#fff',
73-
// },
74-
// },
7570
},
7671
logo: {
7772
color: theme.palette.primary.main,
7873
},
7974
title: props => ({
80-
// fontSize: '20px',
81-
// fontWeight: 400,
8275
position: 'relative',
8376
overflow: 'visible',
8477
marginLeft: '5px',
85-
display: props.isDesktop && props.isSidebarCollapsedDesktop ? 'none' : 'block',
78+
display: props.isCollapsed ? 'none' : 'block',
8679
}),
8780
name: {},
8881
tagline: {

‎src/_common/AppSidebar/AppSidebarNav.js

+42-78
Original file line numberDiff line numberDiff line change
@@ -96,37 +96,6 @@ const SidebarNav = props => {
9696
},
9797
]
9898

99-
const itemsProfile = [
100-
{
101-
name: 'My Profile',
102-
link: '/profile',
103-
Icon: IconInfo,
104-
},
105-
{
106-
name: 'Profile Settings',
107-
link: '/profile/settings',
108-
Icon: IconSettings,
109-
},
110-
]
111-
112-
const itemsOrganizations = [
113-
{
114-
name: 'My Organizations',
115-
link: '/organizations',
116-
Icon: IconInfo,
117-
},
118-
{
119-
name: 'Organization Settings',
120-
link: '/organizations/settings',
121-
Icon: IconSettings,
122-
},
123-
{
124-
name: 'Team',
125-
link: '/organizations/users',
126-
Icon: IconGroup,
127-
},
128-
]
129-
13099
const itemsAuth = [
131100
{
132101
name: 'Login',
@@ -146,6 +115,39 @@ const SidebarNav = props => {
146115
},
147116
]
148117

118+
const itemsAccount = [
119+
{
120+
name: 'Profile',
121+
items: [
122+
{
123+
name: 'My Profile',
124+
link: '/profile/me',
125+
},
126+
{
127+
name: 'User Profile',
128+
link: '/profile/user/2',
129+
},
130+
{
131+
name: 'Profile Settings',
132+
link: '/profile/settings',
133+
},
134+
],
135+
},
136+
{
137+
name: 'Organization',
138+
items: [
139+
{
140+
name: 'My Organizations',
141+
link: '/organizations',
142+
},
143+
{
144+
name: 'Organization Settings',
145+
link: '/organizations/1/settings',
146+
},
147+
],
148+
},
149+
]
150+
149151
const itemsAdmin = [
150152
{
151153
name: 'Admin Dashboard',
@@ -175,48 +177,17 @@ const SidebarNav = props => {
175177
},
176178
]
177179

178-
// eslint-disable-next-line
179-
const itemsAppModules = [
180-
{
181-
name: 'Sales Management',
182-
link: '/sales',
183-
Icon: IconSales,
184-
items: itemsSales,
185-
},
186-
// {
187-
// name: 'Customer Support',
188-
// link: '/support',
189-
// Icon: IconPhone,
190-
// },
191-
// {
192-
// name: 'Content Management',
193-
// link: '/content',
194-
// Icon: IconContent,
195-
// items: itemsContent,
196-
// },
197-
// {
198-
// name: 'Services',
199-
// link: '/services',
200-
// Icon: IconSync,
201-
// },
202-
]
203-
204180
const itemsCoreModules = [
205181
{
206182
name: 'Auth',
207183
items: itemsAuth,
208184
Icon: IconPreson,
209185
},
210186
{
211-
name: 'Profile',
212-
items: itemsProfile,
187+
name: 'Account',
188+
items: itemsAccount,
213189
Icon: IconProfile,
214190
},
215-
{
216-
name: 'Organizations',
217-
items: itemsOrganizations,
218-
Icon: IconAccount,
219-
},
220191
{
221192
name: 'Administration',
222193
items: itemsAdmin,
@@ -229,14 +200,6 @@ const SidebarNav = props => {
229200
},
230201
]
231202

232-
const itemsUI = [
233-
{
234-
name: 'UI Components',
235-
link: '/demo/components',
236-
Icon: IconPersonalVideo,
237-
},
238-
]
239-
240203
const itemsTheme = [
241204
{
242205
name: 'Why Modular?',
@@ -269,7 +232,7 @@ const SidebarNav = props => {
269232
<List className={classes.navList} disablePadding>
270233
{!isCollapsed && (
271234
<ListSubheader disableSticky={true} className={classes.navListHeader}>
272-
Applications
235+
Sales Management
273236
</ListSubheader>
274237
)}
275238
<SidebarNavItems isCollapsed={isCollapsed} items={itemsSales} />
@@ -278,20 +241,21 @@ const SidebarNav = props => {
278241
<List className={classes.navList} disablePadding>
279242
{!isCollapsed && (
280243
<ListSubheader disableSticky={true} className={classes.navListHeader}>
281-
Basic Functionality
244+
Content Management
282245
</ListSubheader>
283246
)}
284-
<SidebarNavItems isCollapsed={isCollapsed} items={itemsCoreModules} />
247+
<SidebarNavItems isCollapsed={isCollapsed} items={itemsContent} />
285248
</List>
286249

287250
<List className={classes.navList} disablePadding>
288251
{!isCollapsed && (
289-
<ListSubheader inset disableSticky={true}>
290-
UI & Utils
252+
<ListSubheader disableSticky={true} className={classes.navListHeader}>
253+
Core Modules
291254
</ListSubheader>
292255
)}
293-
<SidebarNavItems isCollapsed={isCollapsed} items={itemsUI} />
256+
<SidebarNavItems isCollapsed={isCollapsed} items={itemsCoreModules} />
294257
</List>
258+
295259
<List className={classes.navList} disablePadding>
296260
{!isCollapsed && (
297261
<ListSubheader disableSticky={true} className={classes.navListHeader}>

‎src/_common/AppSidebar/AppSidebarNavItem.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -207,10 +207,10 @@ const useStyles = makeStyles(theme =>
207207
width: theme.sidebar.widthCollapsed,
208208
'& $iconToggle': {
209209
position: 'absolute',
210-
bottom: -1,
210+
// bottom: -1,
211211
fontSize: 14,
212-
left: '50%',
213-
marginLeft: '-0.5em',
212+
top: '50%',
213+
margintop: '-0.5em',
214214
},
215215
'&.active': {
216216
background: 'rgba(0, 0, 0, 0.08)',

‎src/_layouts/DashboardLayout/DashboardLayout.js

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import React, { useState, useEffect, useRef } from 'react'
22
import PropTypes from 'prop-types'
33
import clsx from 'clsx'
4-
import useComponentSize from '@rehooks/component-size'
54
import { makeStyles, useTheme } from '@material-ui/core/styles'
65
import useMediaQuery from '@material-ui/core/useMediaQuery'
76
import Drawer from '@material-ui/core/Drawer'
@@ -35,10 +34,6 @@ const DashboardLayout = (
3534
setHeaderHeight(refHeaderContainer.current.offsetHeight)
3635
}, [])
3736

38-
// const headerSize = useComponentSize(refHeaderContainer)
39-
// const sidebarSize = useComponentSize(refSidebarContainer)
40-
// const footerSize = useComponentSize(refFooterContainer)
41-
4237
const contentOffset = (() => {
4338
if ((isDesktop && !isSidebarOpenDesktop) || isMobile) {
4439
return 0
@@ -91,6 +86,7 @@ const DashboardLayout = (
9186
isDesktop && isSidebarCollapsed && classes.sidebarContainerCollapsed,
9287
)}
9388
>
89+
{/* Mobile sidebar */}
9490
<Hidden mdUp implementation="css">
9591
<Drawer
9692
variant="temporary"
@@ -103,17 +99,18 @@ const DashboardLayout = (
10399
keepMounted: true, // Better open performance on mobile.
104100
}}
105101
>
106-
{SidebarComponent && <SidebarComponent isCollapsed={isSidebarCollapsed} />}
102+
{SidebarComponent && <SidebarComponent />}
107103
</Drawer>
108104
</Hidden>
105+
{/* Desktop sidebar */}
109106
<Hidden smDown implementation="css">
110107
<Drawer
111108
classes={{
112109
paper: clsx(classes.drawer),
113110
}}
114111
variant="permanent"
115112
>
116-
{SidebarComponent && <SidebarComponent />}
113+
{SidebarComponent && <SidebarComponent isCollapsed={isSidebarCollapsed} />}
117114
</Drawer>
118115
</Hidden>
119116
</div>

0 commit comments

Comments
 (0)