Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dilshod #215

Open
wants to merge 35 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
7d3854d
Login page
May 20, 2023
71ff9ad
remove pattern
May 20, 2023
966dd2c
birinchi ish
Dilshods May 20, 2023
e125d26
remove pattern
May 20, 2023
16e1193
Merge pull request #1 from Dostonhack/doston
Dostonhack May 20, 2023
dbad931
dilshod
Dilshods May 20, 2023
2f33181
Merge branch 'main' of https://github.com/Dostonhack/material-dashboa…
Dilshods May 20, 2023
217d16f
Login page done
May 22, 2023
fad5043
login page done
May 22, 2023
162b79a
Merge pull request #2 from Dostonhack/doston1
Dostonhack May 22, 2023
651bff2
...
Dilshods May 22, 2023
d9fef2d
Merge branch 'main' of https://github.com/Dostonhack/material-dashboa…
Dilshods May 22, 2023
2a2a696
dilshod1
Dilshods May 23, 2023
d3cc1c0
catergory add
May 24, 2023
a12a57f
Merge pull request #3 from Dostonhack/doston1
Dostonhack May 24, 2023
e9eeb77
Merge branch 'main' of https://github.com/Dostonhack/material-dashboa…
Dilshods May 24, 2023
98918ff
uzgarish edit delete
Dilshods May 25, 2023
cf64291
Merge pull request #4 from Dostonhack/dilshod
Dilshods May 25, 2023
561f501
Category modals
May 25, 2023
b36ea49
Merge pull request #5 from Dostonhack/doston1
Dostonhack May 25, 2023
7bfc69c
delete
Dilshods May 27, 2023
1aed45b
change delete
Dilshods May 27, 2023
9322388
Merge pull request #6 from Dostonhack/dilshod
Dilshods May 27, 2023
1461bf6
Category delete add done
May 27, 2023
e3856b8
Merge pull request #7 from Dostonhack/doston1
Dostonhack May 27, 2023
cf936c3
crud done
May 28, 2023
4297bbb
uzbek
Dilshods May 28, 2023
a7881c1
Merge pull request #8 from Dostonhack/doston1
Dostonhack May 28, 2023
abcc9d6
uzbektext
Dilshods May 28, 2023
34d014e
add feedback
Dilshods Jun 3, 2023
10b641d
Merge pull request #9 from Dostonhack/dilshod
Dilshods Jun 21, 2023
ca9e513
adminka
Dilshods Jun 30, 2023
193e0d3
Merge pull request #10 from Dostonhack/dilshod1
Dilshods Jul 1, 2023
6c1d71f
admin24
Dilshods Jul 1, 2023
f6fa3b3
Merge pull request #11 from Dostonhack/dilshod
Dilshods Jul 1, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,9 @@
},
"plugins": ["react", "prettier"],
"rules": {
"prettier/prettier": [
"error",
{
"endOfLine": "auto"
}
],
"prettier/prettier": 0,
"default-param-last": "off",
"react/prop-types": "off",
"react/react-in-jsx-scope": "off",
"react/jsx-filename-extension": [1, { "extensions": [".js", ".jsx"] }],
"react/jsx-props-no-spreading": [
Expand Down
2 changes: 1 addition & 1 deletion .prettierrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"printWidth": 100,
"trailingComma": "es5",
"tabWidth": 2,
"semi": true,
"semi": false,
"singleQuote": false,
"endOfLine": "auto"
}
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"editor.formatOnSave": true
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ This free MUI & React Dashboard is coming with prebuilt design blocks, so the de
switching from our pages to the real website is very easy to be done.

Special thanks go to:
- [Nepcha Analytics](https://nepcha.com?ref=readme) for the analytics tool. Nepcha is already integrated with Material Dashboard React. You can use it to gain insights into your sources of traffic.
- [Nepcha tics](https://nepcha.com?ref=readme) for the analytics tool. Nepcha is already integrated with Material Dashboard React. You can use it to gain insights into your sources of traffic.

**Documentation built by Developers**

Expand Down
3 changes: 3 additions & 0 deletions dcasn
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
doston
* doston1
main
1 change: 1 addition & 0 deletions est
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Token = "tokenType": "Bearer",
1 change: 1 addition & 0 deletions jsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"compilerOptions": {
"jsx": "react",
"baseUrl": "src",
"paths": {
"*": ["public/src/*"]
Expand Down
20 changes: 16 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,32 +17,44 @@
"npm": ">=6"
},
"dependencies": {
"@date-io/moment": "^1.3.13",
"@draft-js-plugins/image": "^4.1.3",
"@emotion/cache": "11.7.1",
"@emotion/react": "11.7.1",
"@emotion/styled": "11.6.0",
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"@material-ui/core": "^4.12.3",
"@material-ui/pickers": "^3.3.10",
"@mui/icons-material": "5.4.1",
"@mui/material": "5.4.1",
"@mui/material": "^5.13.5",
"@mui/styled-engine": "5.4.1",
"@testing-library/jest-dom": "5.16.2",
"@testing-library/react": "12.1.2",
"@testing-library/user-event": "13.5.0",
"@uiw/react-md-editor": "^3.23.3",
"axios": "^1.4.0",
"chart.js": "3.4.1",
"chroma-js": "2.4.2",
"draft-js": "^0.11.7",
"install": "^0.13.0",
"lotin-kirill": "^0.1.3",
"npm": "^9.6.7",
"prop-types": "15.8.1",
"react": "17.0.2",
"react-chartjs-2": "3.0.4",
"react-dom": "17.0.2",
"react-github-btn": "1.2.1",
"react-icons": "^4.9.0",
"react-router-dom": "6.2.1",
"react-scripts": "5.0.0",
"react-table": "7.7.0",
"react-toastify": "^9.1.3",
"stylis": "4.0.13",
"stylis-plugin-rtl": "2.1.1",
"web-vitals": "2.1.4",
"yup": "0.32.11"
},
"scripts": {
"start": "react-scripts start",
"start": "set PORT=3001 && react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject",
Expand Down
Binary file added public/back.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/back_sidebar.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<meta name="theme-color" content="#1A73E8" />
<link rel="apple-touch-icon" sizes="76x76" href="%PUBLIC_URL%/apple-icon.png" />
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<title>Material Dashboard 2 React</title>
<title>Tahlil24</title>
<link
rel="stylesheet"
href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap"
Expand Down
2 changes: 1 addition & 1 deletion public/manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"short_name": "Material Dashboard",
"name": "Material Dashboard 2 React",
"name": "Tahlil24",
"icons": [
{
"src": "favicon.png",
Expand Down
16 changes: 1 addition & 15 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,3 @@
/**
=========================================================
* Material Dashboard 2 React - v2.1.0
=========================================================

* Product Page: https://www.creative-tim.com/product/material-dashboard-react
* Copyright 2022 Creative Tim (https://www.creative-tim.com)

Coded by www.creative-tim.com

=========================================================

* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
*/

import { useState, useEffect, useMemo } from "react";

// react-router components
Expand Down Expand Up @@ -191,6 +176,7 @@ export default function App() {
{layout === "vr" && <Configurator />}
<Routes>
{getRoutes(routes)}
<Route path="*" element={<Navigate to="/authentication/sign-in" />} />
<Route path="*" element={<Navigate to="/dashboard" />} />
</Routes>
</ThemeProvider>
Expand Down
2 changes: 2 additions & 0 deletions src/components/MDTypography/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ MDTypography.propTypes = {
"dark",
"text",
"white",
"lime",
"blue",
]),
fontWeight: PropTypes.oneOf([false, "light", "regular", "medium", "bold"]),
textTransform: PropTypes.oneOf(["none", "capitalize", "uppercase", "lowercase"]),
Expand Down
15 changes: 0 additions & 15 deletions src/examples/Breadcrumbs/index.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,3 @@
/**
=========================================================
* Material Dashboard 2 React - v2.1.0
=========================================================

* Product Page: https://www.creative-tim.com/product/material-dashboard-react
* Copyright 2022 Creative Tim (https://www.creative-tim.com)

Coded by www.creative-tim.com

=========================================================

* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
*/

// react-router-dom components
import { Link } from "react-router-dom";

Expand Down
1 change: 1 addition & 0 deletions src/examples/Navbars/DefaultNavbar/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ function DefaultNavbar({ transparent, light, action }) {
name="sign in"
route="/authentication/sign-in"
light={light}
Dashboard="sign-in"
/>
</MDBox>
{action &&
Expand Down
24 changes: 4 additions & 20 deletions src/examples/Sidenav/index.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,3 @@
/**
=========================================================
* Material Dashboard 2 React - v2.1.0
=========================================================

* Product Page: https://www.creative-tim.com/product/material-dashboard-react
* Copyright 2022 Creative Tim (https://www.creative-tim.com)

Coded by www.creative-tim.com

=========================================================

* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
*/

import { useEffect } from "react";

// react-router-dom components
Expand All @@ -30,7 +15,7 @@ import Icon from "@mui/material/Icon";
// Material Dashboard 2 React components
import MDBox from "components/MDBox";
import MDTypography from "components/MDTypography";
import MDButton from "components/MDButton";
// import MDButton from "components/MDButton";

// Material Dashboard 2 React example components
import SidenavCollapse from "examples/Sidenav/SidenavCollapse";
Expand All @@ -49,7 +34,7 @@ import {

function Sidenav({ color, brand, brandName, routes, ...rest }) {
const [controller, dispatch] = useMaterialUIController();
const { miniSidenav, transparentSidenav, whiteSidenav, darkMode, sidenavColor } = controller;
const { miniSidenav, transparentSidenav, whiteSidenav, darkMode} = controller;
const location = useLocation();
const collapseName = location.pathname.replace("/", "");

Expand Down Expand Up @@ -78,7 +63,6 @@ function Sidenav({ color, brand, brandName, routes, ...rest }) {

// Call the handleMiniSidenav function to set the state with the initial value.
handleMiniSidenav();

// Remove event listener on cleanup
return () => window.removeEventListener("resize", handleMiniSidenav);
}, [dispatch, location]);
Expand Down Expand Up @@ -179,7 +163,7 @@ function Sidenav({ color, brand, brandName, routes, ...rest }) {
}
/>
<List>{renderRoutes}</List>
<MDBox p={2} mt="auto">
{/* <MDBox p={2} mt="auto">
<MDButton
component="a"
href="https://www.creative-tim.com/product/material-dashboard-pro-react"
Expand All @@ -191,7 +175,7 @@ function Sidenav({ color, brand, brandName, routes, ...rest }) {
>
upgrade to pro
</MDButton>
</MDBox>
</MDBox> */}
</SidenavRoot>
);
}
Expand Down
4 changes: 2 additions & 2 deletions src/examples/Tables/DataTable/DataTableHeadCell.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ function DataTableHeadCell({ width, children, sorted, align, ...rest }) {
{...rest}
position="relative"
textAlign={align}
color={darkMode ? "white" : "secondary"}
color={darkMode ? "red" : "dark"}
opacity={0.7}
sx={({ typography: { size, fontWeightBold } }) => ({
fontSize: size.xxs,
fontSize: size.xxa,
fontWeight: fontWeightBold,
textTransform: "uppercase",
cursor: sorted && "pointer",
Expand Down
55 changes: 55 additions & 0 deletions src/layouts/analysis24/FileUpload/FUStyles.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
import styled from "@emotion/styled"

const FUStyles = styled.div`
width: 100%;
form {
position: relative;

.loading {
position: absolute;
top: -10px;
left: -10px;
padding-left: 15px;
height: 100%;
width: 110%;
background: rgba(255, 255, 255, 0.25);
box-shadow: 0 8px 32px 0 rgba(31, 38, 135, 0.37);
backdrop-filter: blur(4px);
border: 1px solid rgba(255, 255, 255, 0.18);
/* loading */
.lds-ripple {
display: inline-block;
position: relative;
width: 80px;
height: 80px;
}
.lds-ripple div {
position: absolute;
border: 4px solid #3f51b5;
opacity: 1;
border-radius: 50%;
animation: lds-ripple 1s cubic-bezier(0, 0.2, 0.8, 1) infinite;
}
.lds-ripple div:nth-child(2) {
animation-delay: -0.5s;
}
@keyframes lds-ripple {
0% {
top: 36px;
left: 36px;
width: 0;
height: 0;
opacity: 1;
}
100% {
top: 0px;
left: 0px;
width: 72px;
height: 72px;
opacity: 0;
}
}
}
}
`
export default FUStyles
Loading