Skip to content

C
cms
Commit 1f58b375 authored by PDuarte's avatar PDuarte
Browse files
Options

cleaning code

parent 38aa7fd8
Hide whitespace changes
Inline Side-by-side
Showing with 105 additions and 273 deletions
src/redux/reducers/rootReducer.js
View file @ 1f58b375
...@@ -14,7 +14,7 @@ import calendar from '@src/views/apps/calendar/store/reducer' ...@@ -14,7 +14,7 @@ import calendar from '@src/views/apps/calendar/store/reducer'
import ecommerce from '@src/views/apps/ecommerce/store/reducer' import ecommerce from '@src/views/apps/ecommerce/store/reducer'
import dataTables from '@src/views/tables/data-tables/store/reducer' import dataTables from '@src/views/tables/data-tables/store/reducer'
import settings from '@src/views/settings/store/reducer' import projectsettings from '@src/views/settings/store/reducer'
const rootReducer = combineReducers({ const rootReducer = combineReducers({
auth, auth,
...@@ -28,7 +28,7 @@ const rootReducer = combineReducers({ ...@@ -28,7 +28,7 @@ const rootReducer = combineReducers({
calendar, calendar,
ecommerce, ecommerce,
dataTables, dataTables,
settings projectsettings
}) })
export default rootReducer export default rootReducer
src/views/settings/projects/TableServerSide.js
View file @ 1f58b375
...@@ -17,7 +17,7 @@ import { Card, CardHeader, CardTitle, Input, Label, Row, Col } from 'reactstrap' ...@@ -17,7 +17,7 @@ import { Card, CardHeader, CardTitle, Input, Label, Row, Col } from 'reactstrap'
const DataTableServerSide = () => { const DataTableServerSide = () => {
// ** Store Vars // ** Store Vars
const dispatch = useDispatch() const dispatch = useDispatch()
const store = useSelector(state => state.settings) const store = useSelector(state => state.projectsettings)
// ** States // ** States
const [currentPage, setCurrentPage] = useState(1) const [currentPage, setCurrentPage] = useState(1)
......
src/views/settings/projects/edit/index.js
View file @ 1f58b375
import { useState, useEffect, Fragment } from 'react' // ** React Imports
import { useParams, Link } from 'react-router-dom' import { Fragment } from 'react'
// ** Store & Actions // ** Custom Components
import { getProject, updateProject } from '../../store/actions' import Breadcrumbs from '@components/breadcrumbs'
import { useSelector, useDispatch } from 'react-redux'
// ** Third Party Components
// ** Utils import { Row, Col } from 'reactstrap'
import { isObjEmpty } from '@utils'
// ** Tables
// ** Third Party Components import ProjectsEdit from './main'
import { Lock, Edit, Trash2 } from 'react-feather' // ** Styles
import '@styles/react/libs/tables/react-dataTable-component.scss'
import {Media, Button, Label, Form, FormGroup, Input, Table, CustomInput, Card, CardBody, Row, Col, Nav, NavItem, NavLink, TabContent, TabPane, Alert } from 'reactstrap'
const Tables = () => {
import ProjectCard from './projectCard' return (
import ProjectPlatform from './plataform' <Fragment>
<Breadcrumbs breadCrumbTitle='Settings' breadCrumbParent='Settings' breadCrumbActive='Projects' />
import { useForm } from 'react-hook-form' <Row>
import classnames from 'classnames' <Col sm='12'>
<ProjectsEdit />
</Col>
const ProjectsEdit = () => { </Row>
// ** States & Vars </Fragment>
const store = useSelector(state => state.settings),
[dataProject, setProjectData] = useState(null),
{ register, errors, handleSubmit } = useForm(),
dispatch = useDispatch(),
{ id } = useParams()
// ** Function to get user on mount
useEffect(() => {
// console.log('eff')
// console.log(store.selectedProject)
dispatch(getProject(id))
}, [dispatch])
// ** Update user image on mount or change
useEffect(() => {
if (store.selectedProject !== null || (store.selectedProject !== null && dataProject !== null && store.selectedProject.id !== dataProject.id)) {
return setProjectData(store.selectedProject)
}
}, [store.selectedProject])
return store.selectedProject !== null && store.selectedProject !== undefined ? (
<Row>
<Col sm='12'>
<Form
// onSubmit={handleSubmit(onSubmit)}
>
<Row>
<Col md='4' sm='12'>
<FormGroup>
<Label for='email'>ID</Label>
<Input
readOnly={true}
type='text'
name='id'
id='id'
innerRef={register({ required: true })}
placeholder='id'
defaultValue={id}
/>
</FormGroup>
</Col>
<Col md='4' sm='12'>
<FormGroup>
<Label for='app_name'>Project Name</Label>
<Input
type='text'
name='app_name'
id='app_name'
innerRef={register({ required: true })}
placeholder='Project Name'
defaultValue={dataProject && dataProject.app_name}
className={classnames({ 'is-invalid': errors['app_name'] })}
/>
</FormGroup>
</Col>
<Col md='4' sm='12'>
<FormGroup>
<Label for='customer_name'>Client Name</Label>
<Input
type='text'
name='customer_name'
id='customer_name'
innerRef={register({ required: true })}
placeholder='Client Name'
defaultValue={dataProject && dataProject.customer_name}
className={classnames({ 'is-invalid': errors['customer_name'] })}
/>
</FormGroup>
</Col>
{/* <Col md='4' sm='12'>
<FormGroup>
<Label for='email'>Email</Label>
<Input disabled='disabled' type='text' id='email' placeholder='Email' defaultValue={ProjectData && ProjectData.email} />
</FormGroup>
</Col> */}
{/* <Col md='4' sm='12'>
<FormGroup>
<Label for='status'>Status</Label>
<Input type='select' name='status' id='status' defaultValue={ProjectData && ProjectData.status}>
<option value='pending'>Pending</option>
<option value='active'>Active</option>
<option value='inactive'>Inactive</option>
</Input>
</FormGroup>
</Col> */}
<Col sm='6'>
<div className='permissions border mt-1'>
<h6 className='py-1 mx-1 mb-0 font-medium-2'>
<Lock size={18} className='mr-25' />
<span className='align-middle'>Platforms</span>
</h6>
<Table borderless striped responsive>
<thead className='thead-light'>
<tr>
<th>Platforms</th>
<th>Active</th>
</tr>
</thead>
<tbody>
<tr>
<td>IOS</td>
<td>
<CustomInput type='checkbox' id='admin-1' label='' defaultChecked />
</td>
</tr>
<tr>
<td>Android</td>
<td>
<CustomInput type='checkbox' id='staff-1' label='' />
</td>
</tr>
<tr>
<td>Android Tv</td>
<td>
<CustomInput type='checkbox' id='author-1' label='' defaultChecked />
</td>
</tr>
<tr>
<td>Roku</td>
<td>
<CustomInput type='checkbox' id='contributor-1' label='' />
</td>
</tr>
<tr>
<td>STV</td>
<td>
<CustomInput type='checkbox' id='user-1' label='' />
</td>
</tr>
</tbody>
</Table>
</div>
{/* <ProjectPlatform /> */}
</Col>
<Col className='d-flex flex-sm-row flex-column mt-2' sm='12'>
<Button.Ripple className='mb-1 mb-sm-0 mr-0 mr-sm-1' type='submit' color='primary'>
Save Changes
</Button.Ripple>
<Button.Ripple color='secondary' outline>
Reset
</Button.Ripple>
</Col>
</Row>
</Form>
{/* <ProjectCard selectedProject={dataProject} /> */}
{/* {saveSucces ? 'sim' : 'nao'}
{errorMsg} */}
</Col>
</Row>
) : (
<Alert color='danger'>
<h4 className='alert-heading'>Project not found</h4>
<div className='alert-body'>
User with id: {id} doesn't exist. Check list of all Projects: <Link to='/settings/projects'>Projects List</Link>
</div>
</Alert>
) )
} }
export default ProjectsEdit
export default Tables
src/views/settings/projects/edit/main.js 0 → 100644
View file @ 1f58b375
import { useState, useEffect, Fragment } from 'react'
import { useParams, Link } from 'react-router-dom'
// ** Store & Actions
import { getProject, updateProject } from '../../store/actions'
import { useSelector, useDispatch } from 'react-redux'
import { Alert } from 'reactstrap'
import ProjectCard from './projectCard'
const ProjectsEdit = () => {
// ** States & Vars
const store = useSelector(state => state.projectsettings),
[dataProject, setProjectData] = useState(null),
dispatch = useDispatch(),
{ id } = useParams()
// ** Function to get user on mount
useEffect(() => {
dispatch(getProject(id))
}, [dispatch])
// ** Update user image on mount or change
useEffect(() => {
if (store.selectedProject !== null || (store.selectedProject !== null && dataProject !== null && store.selectedProject.id !== dataProject.id)) {
return setProjectData(store.selectedProject)
}
}, [store.selectedProject])
return store.selectedProject !== null && store.selectedProject !== undefined ? (
<ProjectCard selectedProject={store.selectedProject} />
) : (
<Alert color='danger'>
<h4 className='alert-heading'>Project not found</h4>
<div className='alert-body'>
User with id: {id} doesn't exist. Check list of all Projects: <Link to='/settings/projects'>Projects List</Link>
</div>
</Alert>
)
}
export default ProjectsEdit
src/views/settings/projects/edit/plataform.js
View file @ 1f58b375
import {Media, Button, Label, Form, FormGroup, Input, Table, CustomInput, Card, CardBody, Row, Col, Nav, NavItem, NavLink, TabContent, TabPane, Alert } from 'reactstrap' import {Media, Button, Label, Form, FormGroup, Input, Table, CustomInput, Card, CardBody, Row, Col, Nav, NavItem, NavLink, TabContent, TabPane, Alert } from 'reactstrap'
// ** Styles import { Lock, Edit, Trash2 } from 'react-feather'
import '@styles/react/apps/app-users.scss'
const ProjectPlatform = () => { const ProjectPlatform = () => {
......
src/views/settings/projects/edit/projectCard.js
View file @ 1f58b375
// ** React Imports // ** React Imports
import { useState, useEffect, Fragment } from 'react' import { useState, useEffect, Fragment } from 'react'
import { useDispatch } from 'react-redux'
import {Media, Button, Label, Form, FormGroup, Input, Table, CustomInput, Card, CardBody, Row, Col, Nav, NavItem, NavLink, TabContent, TabPane, Alert } from 'reactstrap' import {Media, Button, Label, Form, FormGroup, Input, Table, CustomInput, Card, CardBody, Row, Col, Nav, NavItem, NavLink, TabContent, TabPane, Alert } from 'reactstrap'
import { isEmptyObject } from 'jquery' import { isObjEmpty } from '@utils'
import { Lock, Edit, Trash2 } from 'react-feather'
// ** Store & Actions // ** Store & Actions
import { updateProject } from '../../store/actions' import { updateProject } from '../../store/actions'
...@@ -10,32 +14,23 @@ import { updateProject } from '../../store/actions' ...@@ -10,32 +14,23 @@ import { updateProject } from '../../store/actions'
import { useForm } from 'react-hook-form' import { useForm } from 'react-hook-form'
import classnames from 'classnames' import classnames from 'classnames'
import ProjectPlatform from './plataform'
// ** Function to handle form submit
const onSubmit = values => {
// if (isObjEmpty(errors)) {
// dispatch(
// updateProject({
// id: values.id,
// app_name: values.app_name,
// customer_name: values.customer_name
// })
// )
// }
}
const ProjectCard = ({ selectedProject }) => { const ProjectCard = ({ selectedProject }) => {
const [dataProject, setProjectData] = useState(null) const [dataProject, setProjectData] = useState(null),
// const { register, errors, handleSubmit } = useForm() { register, errors, handleSubmit } = useForm(),
dispatch = useDispatch(),
// const [dataProject, setProjectData] = useState(null) onSubmit = values => {
// // ** Update user image on mount or change if (isObjEmpty(errors)) {
// useEffect(() => { dispatch(
// if (selectedProject !== null || (selectedProject !== null && dataProject !== null && selectedProject.id !== dataProject.id)) { updateProject({
// return setProjectData(selectedProject) id: values.id,
// } app_name: values.app_name,
// }, [selectedProject]) customer_name: values.customer_name
})
)
}
}
useEffect(() => { useEffect(() => {
if (selectedProject !== null || (selectedProject !== null && dataProject !== null && selectedProject.id !== dataProject.id)) { if (selectedProject !== null || (selectedProject !== null && dataProject !== null && selectedProject.id !== dataProject.id)) {
...@@ -47,7 +42,7 @@ const ProjectCard = ({ selectedProject }) => { ...@@ -47,7 +42,7 @@ const ProjectCard = ({ selectedProject }) => {
return ( return (
<Fragment> <Fragment>
<Form <Form
// onSubmit={handleSubmit(onSubmit)} onSubmit={handleSubmit(onSubmit)}
> >
<Row> <Row>
<Col md='4' sm='12'> <Col md='4' sm='12'>
...@@ -58,9 +53,9 @@ return ( ...@@ -58,9 +53,9 @@ return (
type='text' type='text'
name='id' name='id'
id='id' id='id'
// innerRef={register({ required: true })} innerRef={register({ required: true })}
placeholder='id' placeholder='id'
defaultValue='1' defaultValue={dataProject && dataProject.id}
/> />
</FormGroup> </FormGroup>
</Col> </Col>
...@@ -71,10 +66,10 @@ return ( ...@@ -71,10 +66,10 @@ return (
type='text' type='text'
name='app_name' name='app_name'
id='app_name' id='app_name'
// innerRef={register({ required: true })} innerRef={register({ required: true })}
placeholder='Project Name' placeholder='Project Name'
defaultValue={dataProject && dataProject.app_name} defaultValue={dataProject && dataProject.app_name}
// className={classnames({ 'is-invalid': errors['app_name'] })} className={classnames({ 'is-invalid': errors['app_name'] })}
/> />
</FormGroup> </FormGroup>
</Col> </Col>
...@@ -88,7 +83,7 @@ return ( ...@@ -88,7 +83,7 @@ return (
// innerRef={register({ required: true })} // innerRef={register({ required: true })}
placeholder='Client Name' placeholder='Client Name'
defaultValue={dataProject && dataProject.customer_name} defaultValue={dataProject && dataProject.customer_name}
// className={classnames({ 'is-invalid': errors['customer_name'] })} className={classnames({ 'is-invalid': errors['customer_name'] })}
/> />
</FormGroup> </FormGroup>
</Col> </Col>
...@@ -110,55 +105,7 @@ return ( ...@@ -110,55 +105,7 @@ return (
</Col> */} </Col> */}
<Col sm='6'> <Col sm='6'>
<div className='permissions border mt-1'> <ProjectPlatform />
<h6 className='py-1 mx-1 mb-0 font-medium-2'>
<Lock size={18} className='mr-25' />
<span className='align-middle'>Platforms</span>
</h6>
<Table borderless striped responsive>
<thead className='thead-light'>
<tr>
<th>Platforms</th>
<th>Active</th>
</tr>
</thead>
<tbody>
<tr>
<td>IOS</td>
<td>
<CustomInput type='checkbox' id='admin-1' label='' defaultChecked />
</td>
</tr>
<tr>
<td>Android</td>
<td>
<CustomInput type='checkbox' id='staff-1' label='' />
</td>
</tr>
<tr>
<td>Android Tv</td>
<td>
<CustomInput type='checkbox' id='author-1' label='' defaultChecked />
</td>
</tr>
<tr>
<td>Roku</td>
<td>
<CustomInput type='checkbox' id='contributor-1' label='' />
</td>
</tr>
<tr>
<td>STV</td>
<td>
<CustomInput type='checkbox' id='user-1' label='' />
</td>
</tr>
</tbody>
</Table>
</div>
</Col> </Col>
<Col className='d-flex flex-sm-row flex-column mt-2' sm='12'> <Col className='d-flex flex-sm-row flex-column mt-2' sm='12'>
<Button.Ripple className='mb-1 mb-sm-0 mr-0 mr-sm-1' type='submit' color='primary'> <Button.Ripple className='mb-1 mb-sm-0 mr-0 mr-sm-1' type='submit' color='primary'>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment