Skip to content

Commit

Permalink
master: update core funtion
Browse files Browse the repository at this point in the history
  • Loading branch information
ChunhThanhDe committed Feb 22, 2024
1 parent 3315f0c commit 62f1c66
Show file tree
Hide file tree
Showing 50 changed files with 154 additions and 156 deletions.
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<h1><a href="https://ui-lib.com/downloads/matx-react-dashboard/">Matx React Material Design Admin Dashboard Template</a></h1>
<h1><a href="https://ui-lib.com/downloads/tms-react-dashboard/">Tms React Material Design Admin Dashboard Template</a></h1>

<a href="https://matx-react-free.netlify.app/"><img alt="Matx React Admin" src="https://ui-lib.com/blog/wp-content/uploads/2021/09/matx-github.png" /></a>
<a href="https://tms-react-free.netlify.app/"><img alt="Tms React Admin" src="https://ui-lib.com/blog/wp-content/uploads/2021/09/tms-github.png" /></a>

<p>MatX is a full-featured React Material UI Admin Dashboard template. MatX is built with React, Redux & Material UI We implemented all the features you might need to start a new Web application. The free version includes all Material UI components, Form elements, and validation, JWT authentication, Sign in, sign up pages, Vertical navigation, Lazy loading, Code splitting.</p>

Expand All @@ -12,12 +12,12 @@
</tr>
<tr>
<td>
<a href="https://matx-react-free.netlify.app/">Live Preview</a> <br>
<a href="https://ui-lib.com/downloads/matx-react-dashboard/">Download MatX</a>
<a href="https://tms-react-free.netlify.app/">Live Preview</a> <br>
<a href="https://ui-lib.com/downloads/tms-react-dashboard/">Download MatX</a>
</td>
<td>
<a href="http://matx-react.ui-lib.com/">Live Preview</a> <br>
<a href="https://ui-lib.com/downloads/matx-pro-react-admin/">Get MatX Pro</a>
<a href="http://tms-react.ui-lib.com/">Live Preview</a> <br>
<a href="https://ui-lib.com/downloads/tms-pro-react-admin/">Get MatX Pro</a>
</td>
</tr>
<tr>
Expand Down Expand Up @@ -75,7 +75,7 @@
</td>
<td valign="top">
<ul>
<li>All features of Matx free +</li>
<li>All features of Tms free +</li>
<li>Firebase authentication</li>
<li>Auth0 authentication</li>
<li>Horizontal navigation</li>
Expand Down Expand Up @@ -171,6 +171,6 @@ It correctly bundles React in production mode and optimizes the build for the be
Your app is ready to be deployed!</p>

<h3>Download</h3>
Download From <a href="https://ui-lib.com/downloads/matx-react-dashboard/">official website</a>
Download From <a href="https://ui-lib.com/downloads/tms-react-dashboard/">official website</a>

<h3>For questions and support mail us at <a href="mailto:[email protected]">[email protected]</a></h3>
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "matx-react",
"name": "tms-react",
"version": "3.0.0",
"private": true,
"dependencies": {
Expand Down
22 changes: 11 additions & 11 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

<!-- style -->
<style>
.matx-loader {
.tms-loader {
display: inline-block;
position: absolute;
width: 40px;
Expand All @@ -43,7 +43,7 @@
top: calc(50% - 20px);
margin: auto;
}
.matx-loader img {
.tms-loader img {
position: absolute;
height: 25px;
width: auto;
Expand All @@ -53,7 +53,7 @@
right: 0;
margin: auto;
}
.matx-loader div {
.tms-loader div {
box-sizing: border-box;
display: block;
position: absolute;
Expand All @@ -62,19 +62,19 @@
margin: 0;
border: 3.4px solid #1976d2;
border-radius: 50%;
animation: matx-loader 1.2s cubic-bezier(0.5, 0, 0.5, 1) infinite;
animation: tms-loader 1.2s cubic-bezier(0.5, 0, 0.5, 1) infinite;
border-color: #1976d2 transparent transparent transparent;
}
.matx-loader div:nth-child(1) {
.tms-loader div:nth-child(1) {
animation-delay: -0.45s;
}
.matx-loader div:nth-child(2) {
.tms-loader div:nth-child(2) {
animation-delay: -0.3s;
}
.matx-loader div:nth-child(3) {
.tms-loader div:nth-child(3) {
animation-delay: -0.15s;
}
@keyframes matx-loader {
@keyframes tms-loader {
0% {
transform: rotate(0deg);
}
Expand All @@ -84,7 +84,7 @@
}
</style>

<!-- Hotjar Tracking Code for http://matx-react.ui-lib.com/ -->
<!-- Hotjar Tracking Code for http://tms-react.ui-lib.com/ -->
<script>
(function (h, o, t, j, a, r) {
h.hj =
Expand All @@ -101,7 +101,7 @@
})(window, document, 'https://static.hotjar.com/c/hotjar-', '.js?sv=');
</script>

<!-- Global site tag (gtag.js) - Google Analytics for http://matx-react.ui-lib.com/ -->
<!-- Global site tag (gtag.js) - Google Analytics for http://tms-react.ui-lib.com/ -->
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-54187421-11"></script>
<script>
window.dataLayer = window.dataLayer || [];
Expand All @@ -117,7 +117,7 @@
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root">
<div class="matx-loader">
<div class="tms-loader">
<div></div>
<div></div>
<div></div>
Expand Down
6 changes: 3 additions & 3 deletions src/app/App.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Provider } from 'react-redux';
import { useRoutes } from 'react-router-dom';
import { MatxTheme } from './components';
import { TmsTheme } from './components';
import { AuthProvider } from './contexts/JWTAuthContext';
import { SettingsProvider } from './contexts/SettingsContext';
import { Store } from './redux/Store';
Expand All @@ -14,7 +14,7 @@ const App = () => {
return (
<Provider store={Store}>
<SettingsProvider>
<MatxTheme>
<TmsTheme>
<AuthProvider>{content}</AuthProvider>
<ToastContainer
position="top-right"
Expand All @@ -27,7 +27,7 @@ const App = () => {
draggable
pauseOnHover
/>
</MatxTheme>
</TmsTheme>
</SettingsProvider>
</Provider>
);
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/Loadable.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Suspense } from 'react';
import Loading from './MatxLoading';
import Loading from './TmsLoading';

const Loadable = (Component) => (props) => {
return (
Expand Down
16 changes: 0 additions & 16 deletions src/app/components/MatxLayout/MatxLayout.jsx

This file was deleted.

3 changes: 0 additions & 3 deletions src/app/components/MatxLayout/index.js

This file was deleted.

8 changes: 0 additions & 8 deletions src/app/components/MatxSuspense.jsx

This file was deleted.

2 changes: 1 addition & 1 deletion src/app/components/NotificationBar/NotificationBar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { sideNavWidth, topBarHeight } from 'app/utils/constant';
import { getTimeDifference } from 'app/utils/utils.js';
import React, { Fragment } from 'react';
import { Link } from 'react-router-dom';
import { themeShadows } from '../MatxTheme/themeColors';
import { themeShadows } from '../TmsTheme/themeColors';
import { Paragraph, Small } from '../Typography';

const Notification = styled('div')(() => ({
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/SecondarySidebar/SecondarySidebar.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import useSettings from 'app/hooks/useSettings';
import SecondarySidenavTheme from '../MatxTheme/SecondarySidenavTheme/SecondarySidenavTheme';
import SecondarySidenavTheme from '../TmsTheme/SecondarySidenavTheme/SecondarySidenavTheme';
import SecondarySidebarContent from './SecondarySidebarContent';
import SecondarySidebarToggle from './SecondarySidebarToggle';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Icon, IconButton } from '@mui/material';
import { styled, useTheme } from '@mui/system';
import MatxCustomizer from '../MatxCustomizer/MatxCustomizer';
import TmsCustomizer from '../TmsCustomizer/TmsCustomizer';
import { Span } from '../Typography';

const SidebarRoot = styled('div')(({ theme, width }) => ({
Expand All @@ -23,7 +23,7 @@ const SidebarRoot = styled('div')(({ theme, width }) => ({
'.content-wrap, .layout2.layout-contained, .layout2.layout-full': {
marginRight: (props) => props.width,
},
'.matx-customizer': {
'.tms-customizer': {
right: (props) => props.width,
},
},
Expand All @@ -41,7 +41,7 @@ const SecondarySidebarContent = () => {
return (
<SidebarRoot width={'50px'} className="secondary-sidebar">
<Span sx={{ m: 'auto' }}></Span>
<MatxCustomizer />
<TmsCustomizer />
<Span sx={{ m: 'auto' }}></Span>
</SidebarRoot>
);
Expand Down
4 changes: 2 additions & 2 deletions src/app/components/Sidenav.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { styled } from '@mui/system';
import { MatxVerticalNav } from 'app/components';
import { TmsVerticalNav } from 'app/components';
import useSettings from 'app/hooks/useSettings';
import { navigations, navigationsUser } from 'app/navigations';
import { Fragment, useEffect, useState } from 'react';
Expand Down Expand Up @@ -55,7 +55,7 @@ const Sidenav = ({ children }) => {
<Fragment>
<StyledScrollBar options={{ suppressScrollX: true }}>
{children}
<MatxVerticalNav items={navigation} />
<TmsVerticalNav items={navigation} />
</StyledScrollBar>

<SideNavMobile onClick={() => updateSidebarMode({ mode: 'close' })} />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
} from '@mui/material';
import { get } from 'lodash';
import { Fragment } from 'react';
import { themeColors, themeShadows } from '../MatxTheme/themeColors';
import { themeColors, themeShadows } from '../TmsTheme/themeColors';
import BadgeSelected from './BadgeSelected';
import { mainSidebarThemes, topbarThemes } from './customizerOptions';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
import useSettings from 'app/hooks/useSettings';
import { Fragment, useState } from 'react';
import Scrollbar from 'react-perfect-scrollbar';
import { themeShadows } from '../MatxTheme/themeColors';
import { themeShadows } from '../TmsTheme/themeColors';
import { H5, Span } from '../Typography';
import BadgeSelected from './BadgeSelected';

Expand Down Expand Up @@ -85,7 +85,7 @@ const StyledScrollBar = styled(Scrollbar)(() => ({
paddingRight: '16px',
}));

const MatxCustomizer = () => {
const TmsCustomizer = () => {
const theme = useTheme();
const [open, setOpen] = useState(false);
const [tabIndex, setTabIndex] = useState(0);
Expand Down Expand Up @@ -228,4 +228,4 @@ const demoLayouts = [
},
];

export default MatxCustomizer;
export default TmsCustomizer;
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { ThemeProvider, useMediaQuery } from '@mui/material';
import { Box, styled, useTheme } from '@mui/system';
import { MatxSuspense } from 'app/components';
import { TmsSuspense } from 'app/components';
import useSettings from 'app/hooks/useSettings';
import { sidenavCompactWidth, sideNavWidth } from 'app/utils/constant';
import React, { useEffect, useRef } from 'react';
import Scrollbar from 'react-perfect-scrollbar';
import { Outlet } from 'react-router-dom';
import Footer from '../../Footer';
import SidenavTheme from '../../MatxTheme/SidenavTheme/SidenavTheme';
import SidenavTheme from '../../TmsTheme/SidenavTheme/SidenavTheme';
import Layout1Sidenav from './Layout1Sidenav';
import Layout1Topbar from './Layout1Topbar';

Expand Down Expand Up @@ -106,9 +106,9 @@ const Layout1 = () => {
</ThemeProvider>
)}
<Box flexGrow={1} position="relative">
<MatxSuspense>
<TmsSuspense>
<Outlet />
</MatxSuspense>
</TmsSuspense>
</Box>

{settings.footer.show && !settings.footer.fixed && <Footer />}
Expand All @@ -124,9 +124,9 @@ const Layout1 = () => {
)}

<Box flexGrow={1} position="relative">
<MatxSuspense>
<TmsSuspense>
<Outlet />
</MatxSuspense>
</TmsSuspense>
</Box>

{settings.footer.show && !settings.footer.fixed && <Footer />}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ const Layout1Settings = {
leftSidebar: {
show: true,
mode: 'full', // full, close, compact, mobile,
theme: 'slateDark1', // View all valid theme colors inside MatxTheme/themeColors.js
theme: 'slateDark1', // View all valid theme colors inside TmsTheme/themeColors.js
bgImgURL: '/assets/images/sidebar/sidebar-bg-dark.jpg',
},
topbar: {
show: true,
fixed: true,
theme: 'whiteBlue', // View all valid theme colors inside MatxTheme/themeColors.js
theme: 'whiteBlue', // View all valid theme colors inside TmsTheme/themeColors.js
},
};

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Hidden, Switch } from '@mui/material';
import { Box, styled, useTheme } from '@mui/system';
import { themeShadows } from 'app/components/MatxTheme/themeColors';
import { themeShadows } from 'app/components/TmsTheme/themeColors';
import useSettings from 'app/hooks/useSettings';
import { sidenavCompactWidth, sideNavWidth } from 'app/utils/constant';
import { convertHexToRGB } from 'app/utils/utils';
Expand Down
Loading

0 comments on commit 62f1c66

Please sign in to comment.