Add ability to edit events. Relies upon members_api adjust_event_route_and_permissions #10
+300
−60
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,6 +32,8 @@ COPY package.json /home/app/ | |
| COPY . /home/app | ||
|
|
||
| #RUN npm run build | ||
| #RUN npm install | ||
| RUN yarn | ||
|
|
||
| CMD ./docker-run.sh | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,201 @@ | ||
| // Copyright 2019 Iced Development, LLC | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| import React, { Component } from 'react'; | ||
| import { connect } from 'react-redux'; | ||
| import { Link } from 'react-router-dom'; | ||
| import CircularProgress from '@material-ui/core/CircularProgress'; | ||
| import TextField from '@material-ui/core/TextField'; | ||
| import Button from '@material-ui/core/Button'; | ||
| import { DataGrid } from '@material-ui/data-grid'; | ||
| import Header from '../components/header'; | ||
| import { read, edit, add } from '../state/events'; | ||
|
|
||
|
|
||
| const styles = { | ||
| eventDescription: { | ||
| whiteSpace: 'pre-line', | ||
| }, | ||
| tableContainer: { | ||
| // margin: '10px', | ||
| }, | ||
| gridContainer: { | ||
| width: '100%', | ||
| display: 'flex', | ||
| height: 450 | ||
| }, | ||
| nameField: { | ||
| fontSize: '1.5em', | ||
| magin: '5px', | ||
| }, | ||
| descriptionFeild: { | ||
| width: '125ch', | ||
| magin: '5px', | ||
| }, | ||
| form: { | ||
| width: '90%', | ||
| margin: '5px', | ||
| }, | ||
| formButton: { | ||
| margin: '5px', | ||
| }, | ||
| }; | ||
|
|
||
| const columns = [ | ||
|
There was a problem hiding this comment. Unless I'm missing something this is unused? |
||
| { field: 'id', hide: true }, | ||
| { | ||
| field: 'user_name', | ||
| headerName: 'Name', | ||
| align: 'left', | ||
| width: 250, | ||
| renderCell: (params) => { | ||
| return <Link to={`/users/${params.data.user_id}`}>{params.value}</Link> | ||
| }, | ||
| }, | ||
| { | ||
| field: 'created_at', | ||
| headerName: 'Created', | ||
| align: 'right', | ||
| valueFormatter: (params) => { | ||
| return new Date(params.value).toLocaleDateString(); | ||
| }, | ||
| }, | ||
| ]; | ||
|
|
||
| class Events extends Component { | ||
| state = { | ||
| name: '', | ||
| frequency: '', | ||
| location: '', | ||
| description: '', | ||
| start_date: '', | ||
| end_date: '' | ||
| }; | ||
|
|
||
| nameChange = (e) => { | ||
| this.setState({name: e.target.value}); | ||
| }; | ||
|
|
||
| frequencyChange = (e) => { | ||
| this.setState({frequency: e.target.value}); | ||
| }; | ||
|
|
||
| locationChange = (e) => { | ||
| this.setState({location: e.target.value}); | ||
| }; | ||
|
|
||
| descriptionChange = (e) => { | ||
| this.setState({description: e.target.value}); | ||
| }; | ||
|
|
||
| startDateChange = (e) => { | ||
| this.setState({start_date: e.target.value}); | ||
| }; | ||
|
|
||
| endDateChange = (e) => { | ||
| this.setState({end_date: e.target.value}); | ||
| }; | ||
|
|
||
| submitForm = () => { | ||
| const { event_id } = this.props.match.params; | ||
| const { name, frequency, description } = this.state; | ||
| this.props.edit(event_id, { name, frequency, description }); | ||
| }; | ||
|
|
||
| async componentDidMount(){ | ||
| const { event_id } = this.props.match.params; | ||
|
There was a problem hiding this comment. Any reference to props.match.Paramus will break after the update. Tldr is react router stopped supporting classes and we have to use a hack to get access to the params (on my big update PR, look for withRouter calls.) |
||
| const { id, name, frequency, location, description, start_date, end_date } = await this.props.read(event_id); | ||
| this.setState({ id, name, frequency, location, description, start_date, end_date }); | ||
| } | ||
|
|
||
| render() { | ||
|
|
||
| const { read } = this.props.events; | ||
| const { auth } = this.props.user; | ||
| return ( | ||
| <div style={styles.container}> | ||
| <Header/> | ||
| {auth.isAdmin && read ? ( | ||
| <div style={styles.form}> | ||
| <TextField | ||
| label="Name" | ||
| style={styles.nameField} | ||
| value={this.state.name} | ||
| onChange={this.nameChange} | ||
| /> | ||
| <br/> | ||
| <TextField | ||
| label="Frequency" | ||
| style={styles.frequencyField} | ||
| value={this.state.frequency} | ||
| onChange={this.frequencyChange} | ||
| /> | ||
| <br/> | ||
| <TextField | ||
| label="Location" | ||
| style={styles.locationField} | ||
| value={this.state.location} | ||
| onChange={this.locationChange} | ||
| /> | ||
| <br/> | ||
| <TextField | ||
| label="Description" | ||
| fullWidth | ||
| multiline | ||
| style={styles.nameField} | ||
| value={this.state.description} | ||
| onChange={this.descriptionChange} | ||
| /> | ||
| <TextField | ||
| label="Start Date" | ||
| style={styles.startDateField} | ||
| value={this.state.start_date} | ||
| onChange={this.startDateChange} | ||
| /> | ||
| <TextField | ||
| label="End Date" | ||
| style={styles.endDateField} | ||
| value={this.state.end_date} | ||
| onChange={this.endDateChange} | ||
| /> | ||
| <br/> | ||
| <Button | ||
| style={styles.formButton} | ||
| variant="contained" | ||
| color="primary" | ||
| onClick={this.submitForm} | ||
| > | ||
| Update | ||
| </Button> | ||
| <Link to={`/events/${this.state.id}`}>Back</Link> | ||
| </div> | ||
| ) : ( | ||
| <> | ||
| <h1>{read ? read.name : ''}</h1> | ||
| <h2>{read ? read.description : ''}</h2> | ||
| </> | ||
| )} | ||
|
|
||
| </div> | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| function mapStateToProps(state) { | ||
| const { events } = state; | ||
| return { events }; | ||
| } | ||
|
|
||
|
|
||
| export default connect(mapStateToProps, { read, edit, add })(Events); | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Changes should probably be discarded