From dfdc4b568078b0b388c549f1f3962f020ede12a0 Mon Sep 17 00:00:00 2001 From: FuryACE Date: Thu, 24 Nov 2022 13:34:09 +0530 Subject: [PATCH 1/4] ad --- pages/_app.tsx | 2 +- pages/dashboards/crypto/index.tsx | 12 +- pages/management/profile/index.tsx | 6 +- pages/status/500/index.tsx | 6 +- public/static/images/avatars/profile.jpg | Bin 0 -> 1790061 bytes src/components/Footer/index.tsx | 6 +- .../Messenger/BottomBarContent.tsx | 14 +- .../Applications/Messenger/ChatContent.tsx | 2 +- .../Applications/Messenger/SidebarContent.tsx | 2 +- .../Applications/Messenger/StepperForms.jsx | 223 ++++++++++++++++++ .../Dashboards/Crypto/AccountBalance.tsx | 55 +++-- src/content/Dashboards/Crypto/PageHeader.tsx | 4 +- .../Management/Transactions/PageHeader.tsx | 2 +- .../Management/Users/settings/PageHeader.tsx | 2 +- .../SidebarLayout/Header/Userbox/index.tsx | 6 +- .../Sidebar/SidebarMenu/index.tsx | 4 +- 16 files changed, 292 insertions(+), 54 deletions(-) create mode 100644 public/static/images/avatars/profile.jpg create mode 100644 src/content/Applications/Messenger/StepperForms.jsx diff --git a/pages/_app.tsx b/pages/_app.tsx index 12fb3be..1c9b08b 100644 --- a/pages/_app.tsx +++ b/pages/_app.tsx @@ -36,7 +36,7 @@ function TokyoApp(props: TokyoAppProps) { return ( - Tokyo Free White NextJS Typescript Admin Dashboard + Urja Dashboard - + {/* + */} + + {/* */} + + + - + diff --git a/pages/management/profile/index.tsx b/pages/management/profile/index.tsx index 036b1f1..e47e912 100644 --- a/pages/management/profile/index.tsx +++ b/pages/management/profile/index.tsx @@ -14,9 +14,9 @@ import Addresses from '@/content/Management/Users/details/Addresses'; function ManagementUserProfile() { const user = { savedCards: 7, - name: 'Catherine Pike', - coverImg: '/static/images/placeholders/covers/5.jpg', - avatar: '/static/images/avatars/4.jpg', + name: 'Sudhanshu', + coverImg: '/static/images/placeholders/covers.jpg', + avatar: '/static/images/avatars/profile.jpg', description: "There are many variations of passages of Lorem Ipsum available, but the majority have suffered alteration in some form, by injected humour, or randomised words which don't look even slightly believable. If you are going to use a passage", jobtitle: 'Web Developer', diff --git a/pages/status/500/index.tsx b/pages/status/500/index.tsx index 22a4c92..862a09b 100644 --- a/pages/status/500/index.tsx +++ b/pages/status/500/index.tsx @@ -117,16 +117,14 @@ function Status500() { - Tokyo Free White Next.js Typescript Admin Dashboard + Urja App - High performance React template built with lots of powerful - Material-UI components across multiple product niches for - fast & perfect apps development processes. + An energy conservation monitoring application + + + ) : ( + + {/* Insert Forms here */} + + Step {activeStep + 1} + + {/* + + + {/*
e.preventDefault()}> */} + + + + Scheme Name + + + + + + + + + ) + }} + /> + + + + + + + + ) + }} + /> + + + + + + + + ) + }} + /> + + + + + + + + + + + {activeStep !== steps.length && + (completed[activeStep] ? ( + + Step {activeStep + 1} already completed + + ) : ( + + ))} + + + )} + + + ); +} diff --git a/src/content/Dashboards/Crypto/AccountBalance.tsx b/src/content/Dashboards/Crypto/AccountBalance.tsx index 26ac2c3..112f584 100644 --- a/src/content/Dashboards/Crypto/AccountBalance.tsx +++ b/src/content/Dashboards/Crypto/AccountBalance.tsx @@ -73,7 +73,7 @@ function AccountBalance() { } } }, - colors: ['#ff9900', '#1c81c2', '#333', '#5c6ac0'], + colors: ['#ff9900', '#1c81c2', '#FFF6BF', '#5c6ac0'], dataLabels: { enabled: true, formatter: function (val) { @@ -110,7 +110,12 @@ function AccountBalance() { fill: { opacity: 1 }, - labels: ['Bitcoin', 'Ripple', 'Cardano', 'Ethereum'], + labels: [ + 'AJAY: Phase-II', + 'Offgrid and Decentralized Solar PV Applications Programme - Phase III', + 'PM KUSUM', + '7 million solar study lamp scheme for school going children' + ], legend: { labels: { colors: theme.colors.alpha.trueWhite[100] @@ -138,19 +143,19 @@ function AccountBalance() { }} variant="h4" > - Account Balance + Credit Balance - $54,584.23 + 500 C - 1.0045983485234 BTC - + */} - + $3,594.00 + + 50 C this month - + {/* - + */} - BTC + /> */} - XRP + /> */} - ADA + /> */} - ETH + /> */} (null); diff --git a/src/layouts/SidebarLayout/Sidebar/SidebarMenu/index.tsx b/src/layouts/SidebarLayout/Sidebar/SidebarMenu/index.tsx index 3dc5d3e..2f07d65 100644 --- a/src/layouts/SidebarLayout/Sidebar/SidebarMenu/index.tsx +++ b/src/layouts/SidebarLayout/Sidebar/SidebarMenu/index.tsx @@ -208,7 +208,7 @@ function SidebarMenu() { onClick={closeSidebar} startIcon={} > - Energy Usage + Home @@ -253,7 +253,7 @@ function SidebarMenu() { onClick={closeSidebar} startIcon={} > - Transactions List + Contributions From efab4fd4ea97c4fd05ed5ef2b600acd96cd063af Mon Sep 17 00:00:00 2001 From: FuryACE Date: Thu, 24 Nov 2022 14:43:02 +0530 Subject: [PATCH 2/4] added some form filed --- .husky/pre-commit | 2 +- package-lock.json | 145 ++++++++++-------- .../Messenger/BottomBarContent.tsx | 14 +- .../Applications/Messenger/StepperForms.jsx | 36 +++-- 4 files changed, 103 insertions(+), 94 deletions(-) diff --git a/.husky/pre-commit b/.husky/pre-commit index 4e04df9..4fb25cc 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -2,4 +2,4 @@ . "$(dirname -- "$0")/_/husky.sh" npm run lint-fix -npm run build + diff --git a/package-lock.json b/package-lock.json index ac0e605..3aff74a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -932,6 +932,53 @@ } } }, + "node_modules/@mui/lab/node_modules/@mui/x-date-pickers": { + "version": "5.0.0-alpha.1", + "resolved": "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-5.0.0-alpha.1.tgz", + "integrity": "sha512-dLPkRiIn2Gr0momblxiOnIwrxn4SijVix+8e08mwAGWhiWcmWep1O9XTRDpZsjB0kjHYCf+kZjlRX4dxnj2acg==", + "dependencies": { + "@date-io/date-fns": "^2.11.0", + "@date-io/dayjs": "^2.11.0", + "@date-io/luxon": "^2.11.1", + "@date-io/moment": "^2.11.0", + "@mui/utils": "^5.6.0", + "clsx": "^1.1.1", + "prop-types": "^15.7.2", + "react-transition-group": "^4.4.2", + "rifm": "^0.12.1" + }, + "engines": { + "node": ">=12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mui" + }, + "peerDependencies": { + "@mui/material": "^5.2.3", + "@mui/system": "^5.2.3", + "date-fns": "^2.25.0", + "dayjs": "^1.10.7", + "luxon": "^1.28.0 || ^2.0.0", + "moment": "^2.29.1", + "react": "^17.0.2 || ^18.0.0", + "react-dom": "^17.0.2 || ^18.0.0" + }, + "peerDependenciesMeta": { + "date-fns": { + "optional": true + }, + "dayjs": { + "optional": true + }, + "luxon": { + "optional": true + }, + "moment": { + "optional": true + } + } + }, "node_modules/@mui/material": { "version": "5.8.2", "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.8.2.tgz", @@ -1192,53 +1239,6 @@ "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==" }, - "node_modules/@mui/x-date-pickers": { - "version": "5.0.0-alpha.1", - "resolved": "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-5.0.0-alpha.1.tgz", - "integrity": "sha512-dLPkRiIn2Gr0momblxiOnIwrxn4SijVix+8e08mwAGWhiWcmWep1O9XTRDpZsjB0kjHYCf+kZjlRX4dxnj2acg==", - "dependencies": { - "@date-io/date-fns": "^2.11.0", - "@date-io/dayjs": "^2.11.0", - "@date-io/luxon": "^2.11.1", - "@date-io/moment": "^2.11.0", - "@mui/utils": "^5.6.0", - "clsx": "^1.1.1", - "prop-types": "^15.7.2", - "react-transition-group": "^4.4.2", - "rifm": "^0.12.1" - }, - "engines": { - "node": ">=12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/mui" - }, - "peerDependencies": { - "@mui/material": "^5.2.3", - "@mui/system": "^5.2.3", - "date-fns": "^2.25.0", - "dayjs": "^1.10.7", - "luxon": "^1.28.0 || ^2.0.0", - "moment": "^2.29.1", - "react": "^17.0.2 || ^18.0.0", - "react-dom": "^17.0.2 || ^18.0.0" - }, - "peerDependenciesMeta": { - "date-fns": { - "optional": true - }, - "dayjs": { - "optional": true - }, - "luxon": { - "optional": true - }, - "moment": { - "optional": true - } - } - }, "node_modules/@next/env": { "version": "12.1.6", "resolved": "https://registry.npmjs.org/@next/env/-/env-12.1.6.tgz", @@ -4638,6 +4638,16 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/moment": { + "version": "2.29.4", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", + "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==", + "optional": true, + "peer": true, + "engines": { + "node": "*" + } + }, "node_modules/ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -7096,6 +7106,24 @@ "react-is": "^17.0.2", "react-transition-group": "^4.4.2", "rifm": "^0.12.1" + }, + "dependencies": { + "@mui/x-date-pickers": { + "version": "5.0.0-alpha.1", + "resolved": "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-5.0.0-alpha.1.tgz", + "integrity": "sha512-dLPkRiIn2Gr0momblxiOnIwrxn4SijVix+8e08mwAGWhiWcmWep1O9XTRDpZsjB0kjHYCf+kZjlRX4dxnj2acg==", + "requires": { + "@date-io/date-fns": "^2.11.0", + "@date-io/dayjs": "^2.11.0", + "@date-io/luxon": "^2.11.1", + "@date-io/moment": "^2.11.0", + "@mui/utils": "^5.6.0", + "clsx": "^1.1.1", + "prop-types": "^15.7.2", + "react-transition-group": "^4.4.2", + "rifm": "^0.12.1" + } + } } }, "@mui/material": { @@ -7245,22 +7273,6 @@ } } }, - "@mui/x-date-pickers": { - "version": "5.0.0-alpha.1", - "resolved": "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-5.0.0-alpha.1.tgz", - "integrity": "sha512-dLPkRiIn2Gr0momblxiOnIwrxn4SijVix+8e08mwAGWhiWcmWep1O9XTRDpZsjB0kjHYCf+kZjlRX4dxnj2acg==", - "requires": { - "@date-io/date-fns": "^2.11.0", - "@date-io/dayjs": "^2.11.0", - "@date-io/luxon": "^2.11.1", - "@date-io/moment": "^2.11.0", - "@mui/utils": "^5.6.0", - "clsx": "^1.1.1", - "prop-types": "^15.7.2", - "react-transition-group": "^4.4.2", - "rifm": "^0.12.1" - } - }, "@next/env": { "version": "12.1.6", "resolved": "https://registry.npmjs.org/@next/env/-/env-12.1.6.tgz", @@ -9787,6 +9799,13 @@ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz", "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==" }, + "moment": { + "version": "2.29.4", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", + "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==", + "optional": true, + "peer": true + }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", diff --git a/src/content/Applications/Messenger/BottomBarContent.tsx b/src/content/Applications/Messenger/BottomBarContent.tsx index 3ec4f0b..5cac8b3 100644 --- a/src/content/Applications/Messenger/BottomBarContent.tsx +++ b/src/content/Applications/Messenger/BottomBarContent.tsx @@ -9,7 +9,6 @@ import { useTheme } from '@mui/material'; import AddPhotoAlternateIcon from '@mui/icons-material/AddPhotoAlternate'; -import AttachFileTwoToneIcon from '@mui/icons-material/AttachFileTwoTone'; import SendTwoToneIcon from '@mui/icons-material/SendTwoTone'; const MessageInputWrapper = styled(InputBase)( @@ -41,9 +40,6 @@ function BottomBarContent() { p: 2 }} > - - - - {/* - - 😀 - - */} - - - ) + id="date" + label="Date" + type="date" + defaultValue="2022-11-24" + InputLabelProps={{ + shrink: true }} /> + + + + + From 1da9c02cab1dde8f42ec09ed65a38754e20cd6ca Mon Sep 17 00:00:00 2001 From: FuryACE Date: Thu, 24 Nov 2022 15:28:48 +0530 Subject: [PATCH 3/4] added milestone forms --- pages/dashboards/crypto/index.tsx | 4 +- .../Applications/Messenger/StepperForms.jsx | 92 ++------------- src/content/Forms/MileOne.jsx | 110 ++++++++++++++++++ src/content/Forms/MileThree.jsx | 110 ++++++++++++++++++ src/content/Forms/MileTwo.jsx | 110 ++++++++++++++++++ 5 files changed, 344 insertions(+), 82 deletions(-) create mode 100644 src/content/Forms/MileOne.jsx create mode 100644 src/content/Forms/MileThree.jsx create mode 100644 src/content/Forms/MileTwo.jsx diff --git a/pages/dashboards/crypto/index.tsx b/pages/dashboards/crypto/index.tsx index 64cd482..0c49d3d 100644 --- a/pages/dashboards/crypto/index.tsx +++ b/pages/dashboards/crypto/index.tsx @@ -43,9 +43,9 @@ function DashboardCrypto() { {/* */} - + {/* - + */} diff --git a/src/content/Applications/Messenger/StepperForms.jsx b/src/content/Applications/Messenger/StepperForms.jsx index f20f063..6887e34 100644 --- a/src/content/Applications/Messenger/StepperForms.jsx +++ b/src/content/Applications/Messenger/StepperForms.jsx @@ -22,6 +22,9 @@ import { Select, TextField } from '@mui/material'; +import MileOne from '@/content/Forms/MileOne'; +import MileTwo from '@/content/Forms/MileTwo'; +import MileThree from '@/content/Forms/MileThree'; const steps = [ 'Installation of 100 solar street lights', @@ -29,6 +32,8 @@ const steps = [ 'Installation of one solar power plant of individual size up to 25 kWp ' ]; +const milestoneForms = [, , ]; + export default function StepperForms() { const [activeStep, setActiveStep] = React.useState(0); const [completed, setCompleted] = React.useState({}); @@ -81,6 +86,11 @@ export default function StepperForms() { return ( + Share your contributions ! + + {' '} + Did you complete these Milestones ?{' '} + {steps.map((label, index) => ( @@ -108,86 +118,8 @@ export default function StepperForms() { Step {activeStep + 1} {/* - - - {/* e.preventDefault()}> */} - - - - Scheme Name - - - - - - - - - ) - }} - /> - - - - - - - - - - - - - - - - - - - - - + {milestoneForms.at(activeStep)} + {/* Stepper Buttons */} + ); }; diff --git a/src/content/Forms/MileThree.jsx b/src/content/Forms/MileThree.jsx index ddaf78d..1e15e91 100644 --- a/src/content/Forms/MileThree.jsx +++ b/src/content/Forms/MileThree.jsx @@ -37,7 +37,7 @@ const MileThree = () => { }} > diff --git a/src/content/Forms/MileTwo.jsx b/src/content/Forms/MileTwo.jsx index 21cee38..8dc7752 100644 --- a/src/content/Forms/MileTwo.jsx +++ b/src/content/Forms/MileTwo.jsx @@ -37,7 +37,7 @@ const MileTwo = () => { }} >