Skip to content

Commit a17b2e8

Browse files
committed
Add UI pages block
1 parent 8161676 commit a17b2e8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+17526
-9
lines changed

.gitignore

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,2 @@
11
/node_modules/
2-
/.idea/.gitignore
3-
/.idea/misc.xml
4-
/.idea/modules.xml
5-
/.idea/inspectionProfiles/Project_Default.xml
6-
/.idea/React-Material-Admin-Full_frontend.iml
7-
/.idea/vcs.xml
2+
/.idea/

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
"eslint": "^6.8.0",
2929
"eslint-config-react-app": "^5.2.1",
3030
"file-loader": "3.0.1",
31+
"font-awesome": "^4.7.0",
3132
"formik": "2.2.9",
3233
"history": "4.10.1",
3334
"jsonwebtoken": "^8.5.1",
@@ -41,6 +42,7 @@
4142
"react-router-dom": "^5.2.0",
4243
"react-scripts": "3.4.3",
4344
"react-swipeable-views": "^0.14.0",
45+
"react-swipeable-views-utils": "^0.14.0",
4446
"react-syntax-highlighter": "^11.0.2",
4547
"recharts": "^2.1.10",
4648
"redux": "^4.0.5",

src/components/Layout/Layout.js

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,17 @@ import GridPage from '../../pages/grid'
3333
import StaticTablesPage from '../../pages/tables'
3434
import DynamicTablesPage from '../../pages/tables/dynamic'
3535

36+
import IconsPage from '../../pages/icons'
37+
import BadgesPage from '../../pages/badge'
38+
import CarouselsPage from '../../pages/carousel'
39+
import CardsPage from '../../pages/cards'
40+
import ModalsPage from '../../pages/modal'
41+
// import NotificationsPage from '../../pages/notifications'
42+
import NavbarsPage from '../../pages/nav'
43+
import TooltipsPage from '../../pages/tooltips'
44+
import TabsPage from '../../pages/tabs'
45+
import ProgressPage from '../../pages/progress'
46+
import WidgetsPage from '../../pages/widget'
3647

3748
import BreadCrumbs from '../../components/BreadCrumbs';
3849

@@ -84,8 +95,19 @@ function Layout(props) {
8495
<Route path="/app/core/grid" component={GridPage} />
8596

8697
<Route path="/app/tables/static" component={StaticTablesPage} />
87-
<Route path="/app/tables/dynamic" component={DynamicTablesPage}
88-
/>
98+
<Route path="/app/tables/dynamic" component={DynamicTablesPage} />
99+
100+
<Route path="/app/ui/icons" component={IconsPage} />
101+
<Route path="/app/ui/badge" component={BadgesPage} />
102+
<Route path="/app/ui/carousel" component={CarouselsPage} />
103+
<Route path="/app/ui/modal" component={ModalsPage} />
104+
<Route path="/app/ui/navbar" component={NavbarsPage} />
105+
<Route path="/app/ui/tooltips" component={TooltipsPage} />
106+
<Route path="/app/ui/tabs" component={TabsPage} />
107+
<Route path="/app/ui/cards" component={CardsPage} />
108+
<Route path="/app/ui/widget" component={WidgetsPage} />
109+
<Route path="/app/ui/progress" component={ProgressPage} />
110+
{/*<Route path="/app/ui/notifications" component={NotificationsPage} />*/}
89111
/>
90112

91113
<Route path={'/app/api-docs'} exact
@@ -100,7 +122,11 @@ function Layout(props) {
100122
/>
101123
)}
102124
/>
103-
125+
<Route
126+
exact
127+
path="/app/ui"
128+
render={() => <Redirect to="/app/ui/icons" />}
129+
/>
104130
<Route path={'/app/users'} exact component={UsersTablePage} />
105131
<Route path={'/app/user/new'} exact component={AddUser} />
106132
<Route

src/components/Sidebar/SidebarStructure.js

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,39 @@ const structure = [
114114
},
115115
],
116116
},
117+
{
118+
id: 8,
119+
label: 'UI Elements',
120+
link: '/app/ui',
121+
icon: <UIElementsIcon />,
122+
children: [
123+
{ label: 'Icons', link: '/app/ui/icons' },
124+
{ label: 'Badge', link: '/app/ui/badge' },
125+
{ label: 'Carousel', link: '/app/ui/carousel' },
126+
{ label: 'Cards', link: '/app/ui/cards' },
127+
{ label: 'Modal', link: '/app/ui/modal' },
128+
{
129+
label: 'Notifications',
130+
link: '/app/ui/notifications',
131+
},
132+
{ label: 'Navbar', link: '/app/ui/navbar' },
133+
{ label: 'Tooltips', link: '/app/ui/tooltips' },
134+
{ label: 'Tabs', link: '/app/ui/tabs' },
135+
{ label: 'Pagination', link: '/app/tables/dynamic' },
136+
{ label: 'Progress', link: '/app/ui/progress' },
137+
{ label: 'Widget', link: '/app/ui/widget' },
138+
],
139+
},
140+
{
141+
id: 9,
142+
label: 'Forms',
143+
link: '/app/forms',
144+
icon: <DescriptionIcon />,
145+
children: [
146+
{ label: 'Form Elements', link: '/app/forms/elements' },
147+
{ label: 'Form Validation', link: '/app/forms/validation' },
148+
],
149+
},
117150
];
118151

119152
export default structure;

src/images/cards/isometric.jpg

42.7 KB
Loading

src/images/cards/lifestyle.jpg

321 KB
Loading

src/images/cards/mountains.jpeg

34.3 KB
Loading

src/images/cards/rns.png

200 KB
Loading

src/images/carousel/1.jpg

166 KB
Loading

src/images/carousel/2.jpg

219 KB
Loading

0 commit comments

Comments
 (0)