From 59974978a98995e6d9aa59cc6243f5eeab9a1e50 Mon Sep 17 00:00:00 2001 From: sanaya Date: Wed, 2 Feb 2022 18:24:37 +0530 Subject: [PATCH] made courier and vendors page --- .eslintrc.js | 25 ------------- .prettierrc.js | 7 ---- package.json | 13 +------ src/_nav.js | 12 +++++++ src/routes.js | 4 +++ src/views/Courier/Courier.js | 53 +++++++++++++++++++++++++++ src/views/Vendor/Vendor.js | 54 ++++++++++++++++++++++++++++ src/views/pages/register/Register.js | 10 +++--- 8 files changed, 130 insertions(+), 48 deletions(-) delete mode 100644 .eslintrc.js delete mode 100644 .prettierrc.js create mode 100644 src/views/Courier/Courier.js create mode 100644 src/views/Vendor/Vendor.js diff --git a/.eslintrc.js b/.eslintrc.js deleted file mode 100644 index 7920297..0000000 --- a/.eslintrc.js +++ /dev/null @@ -1,25 +0,0 @@ -module.exports = { - // parser: '@typescript-eslint/parser', // Specifies the ESLint parser - parserOptions: { - ecmaVersion: 2020, // Allows for the parsing of modern ECMAScript features - sourceType: 'module', // Allows for the use of imports - ecmaFeatures: { - jsx: true, // Allows for the parsing of JSX - }, - }, - settings: { - react: { - version: 'detect', // Tells eslint-plugin-react to automatically detect the version of React to use - }, - }, - extends: [ - 'react-app', - 'plugin:react/recommended', // Uses the recommended rules from @eslint-plugin-react - 'plugin:prettier/recommended', // Enables eslint-plugin-prettier and eslint-config-prettier. This will display prettier errors as ESLint errors. Make sure this is always the last configuration in the extends array. - ], - plugins: ['react', 'react-hooks'], - rules: { - // Place to specify ESLint rules. Can be used to overwrite rules specified from the extended configs - // e.g. "@typescript-eslint/explicit-function-return-type": "off", - }, -} diff --git a/.prettierrc.js b/.prettierrc.js deleted file mode 100644 index 415ca05..0000000 --- a/.prettierrc.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - semi: false, - trailingComma: "all", - singleQuote: true, - printWidth: 100, - tabWidth: 2 -}; \ No newline at end of file diff --git a/package.json b/package.json index c1b865d..7c01684 100644 --- a/package.json +++ b/package.json @@ -14,13 +14,6 @@ "author": "The CoreUI Team (https://github.com/orgs/coreui/people)", "scripts": { "dev": "react-scripts start", - "start": "serve -s build", - "build": "react-scripts build", - "test": "react-scripts test --env=jsdom", - "eject": "react-scripts eject", - "heroku-postbuild": "npm run build" - }, - "scripts": { "build": "react-scripts build", "build:n17": "react-scripts --openssl-legacy-provider build", "changelog": "auto-changelog --starting-version 4.1.0 --commit-limit false --hide-credit", @@ -61,10 +54,6 @@ }, "devDependencies": { "auto-changelog": "~2.3.0", - "eslint": "^7.32.0", - "eslint-config-prettier": "^8.3.0", - "eslint-plugin-prettier": "^4.0.0", - "prettier": "2.5.0", "react-scripts": "^4.0.3", "sass": "^1.43.5" }, @@ -72,4 +61,4 @@ "node": "16.x", "npm": "6.x" } -} \ No newline at end of file +} diff --git a/src/_nav.js b/src/_nav.js index 5880a9f..a749cf9 100644 --- a/src/_nav.js +++ b/src/_nav.js @@ -272,6 +272,18 @@ const _nav = [ // name: 'Login', // to: '/', // }, + { + component: CNavItem, + name: 'Vendors', + to: '/vendors', + icon: , + }, + { + component: CNavItem, + name: 'Courier', + to: '/courier', + icon: , + }, { component: CNavItem, diff --git a/src/routes.js b/src/routes.js index 5ad35da..2a75f54 100644 --- a/src/routes.js +++ b/src/routes.js @@ -1,5 +1,7 @@ import React from 'react' +import Courier from './views/Courier/Courier' import Register from './views/pages/register/Register' +import Vendor from './views/Vendor/Vendor' const Dashboard = React.lazy(() => import('./views/dashboard/Dashboard')) const Colors = React.lazy(() => import('./views/theme/colors/Colors')) @@ -54,6 +56,8 @@ const Widgets = React.lazy(() => import('./views/widgets/Widgets')) const routes = [ { path: '/', exact: true, name: 'Home' }, { path: '/register', name: 'Change Password', component: Register }, + { path: '/courier', name: 'Courier', component: Courier }, + { path: '/vendors', name: 'Vendors', component: Vendor }, { path: '/dashboard', name: 'Dashboard', component: Dashboard }, { path: '/theme', name: 'Theme', component: Colors, exact: true }, { path: '/theme/colors', name: 'Colors', component: Colors }, diff --git a/src/views/Courier/Courier.js b/src/views/Courier/Courier.js new file mode 100644 index 0000000..b0792df --- /dev/null +++ b/src/views/Courier/Courier.js @@ -0,0 +1,53 @@ +import React from 'react'; +import { + CAvatar, + CButton, + CButtonGroup, + CCard, + CCardBody, + CCardFooter, + CCardHeader, + CCol, + CContainer, + CProgress, + CRow, + CTable, + CTableBody, + CTableDataCell, + CTableHead, + CTableHeaderCell, + CTableRow, +} from '@coreui/react' + +const Courier = () => { + return
+ +Add New +
+ + + + Courier Name + Unique ID + Added On + Actions + + + + + Mark + 123 + Otto + + + Edit + + Delete + + + + + +
; +}; + +export default Courier; diff --git a/src/views/Vendor/Vendor.js b/src/views/Vendor/Vendor.js new file mode 100644 index 0000000..a57c47a --- /dev/null +++ b/src/views/Vendor/Vendor.js @@ -0,0 +1,54 @@ +import React from 'react'; +import { + CAvatar, + CButton, + CButtonGroup, + CCard, + CCardBody, + CCardFooter, + CCardHeader, + CCol, + CContainer, + CProgress, + CRow, + CTable, + CTableBody, + CTableDataCell, + CTableHead, + CTableHeaderCell, + CTableRow, +} from '@coreui/react' + +const Vendor = () => { + return
+ + +Add New Vendor +
+ + + + Vendor Name + Code + Area + Actions + + + + + Mark + 123 + Otto + + + Edit + View + Delete + + + + + +
; +}; + +export default Vendor; diff --git a/src/views/pages/register/Register.js b/src/views/pages/register/Register.js index 333938a..e6b3bfe 100644 --- a/src/views/pages/register/Register.js +++ b/src/views/pages/register/Register.js @@ -25,15 +25,17 @@ const Register = () => {

Change Password

{/*

Create your account

*/} - + {/* - + */} - @ - + + + +