이벤트 내용 new line 처리 추가

.gitignore

@@ -12,4 +12,4 @@ yarn-debug.log*
 yarn-error.log*
 /.changelog
 .npm/
-.idea/
+devtools/sh/

src/main/webapp/app/components/card/events.tsx

@@ -24,12 +24,12 @@ const styles = createStyles({
  }
 });
 
-export interface IHomeCardProp {
+export interface IEventsCardProp {
  classes?: any;
  userParticipations: any;
 }
 
-export class Events extends React.Component<IHomeCardProp> {
+export class Events extends React.Component<IEventsCardProp> {
  render() {
  const { classes, userParticipations } = this.props;
  return (
@@ -38,7 +38,7 @@ export class Events extends React.Component<IHomeCardProp> {
  <CardActions className={ classes.text }>
  <CardContent className={ classes.margin }>
  <Typography variant="subtitle1" component="p" color="textSecondary">
- 참여
+ 참여수
  </Typography>
  <Typography component="p">
  { userParticipations && userParticipations.totalDocs }

src/main/webapp/app/pages/events/event/event-detail.tsx

@@ -5,6 +5,7 @@ import { RouteComponentProps, withRouter } from 'react-router-dom';
 import Paper from '@material-ui/core/Paper';
 import Grid from '@material-ui/core/Grid';
 import Divider from '@material-ui/core/Divider';
+import TextField from '@material-ui/core/TextField';
 import { connect } from 'react-redux';
 import { getSession } from 'app/shared/reducers/authentication';
 import { getEvent, getEventParticipations, getEventRewards } from '../event.reducer';
@@ -18,7 +19,6 @@ import Avatar from '@material-ui/core/Avatar';
 import { convertDate } from 'app/shared/util/date-utils';
 import queryString from 'query-string';
 import { getUser } from 'app/pages/users/users.reducer';
-import HomeStatus from 'app/components/card/home-status';
 
 const styles = theme =>
  createStyles({
@@ -37,6 +37,9 @@ const styles = theme =>
  margin: '10px',
  backgroundColor: 'transparent'
  },
+ textField: {
+ fontSize: 20
+ },
  'history-back-btn': {
  'margin-top': '20px'
  }
@@ -50,7 +53,7 @@ const mainContent = (classes, event, user) => (
  </Typography>
  <Grid>
  <Grid item className={ classes.item }>
- <Avatar style={ { float: 'left' } }>H</Avatar>
+ <Avatar src={ user.avatar } style={ { float: 'left' } }>{ user.name }</Avatar>
  <div style={ { float: 'left', paddingLeft: '10px' } }>
  <Typography component="h6" variant="h6">
  { user.name }
@@ -71,9 +74,18 @@ const mainContent = (classes, event, user) => (
  { convertDate(event.startDate) } ~ { convertDate(event.finishDate) }
  </Typography>
  <Typography className={ classes.item } variant="h6" color="textSecondary">내용</Typography>
- <Typography variant="h6">
- { event.description }
- </Typography>
+ <TextField
+ InputProps={ {
+ readOnly: true,
+ classes: {
+ input: classes.textField
+ }
+ } }
+ margin="normal"
+ fullWidth
+ multiline
+ rows="8"
+ value={ event.description }/>
  </div>
  </Paper>
  </React.Fragment>
@@ -82,7 +94,7 @@ const mainContent = (classes, event, user) => (
 const sidebarContent = (classes, user, eventId) => (
  <Paper className={ classes.paper }>
  <ApplyList participations={ [] } eventId={ eventId }/>
- <Divider variant="middle" className={ classes['divider-margin']}/>
+ <Divider variant="middle" className={ classes[ 'divider-margin' ] }/>
  <CompletionList eventId={ eventId }/>
  </Paper>
 );
@@ -91,7 +103,7 @@ const gridContainer = (classes, leftXs, rightXs, event, rewards, user, eventId)
  <Grid container spacing={ 24 }>
  <Grid item xs={ leftXs }>
  { mainContent(classes, event, user) }
- <Divider variant="middle" className={ classes['divider-margin']}/>
+ <Divider variant="middle" className={ classes[ 'divider-margin' ] }/>
  <RewardList items={ rewards }/>
  </Grid>
  <Grid item xs={ rightXs }>
@@ -128,7 +140,7 @@ export class EventDetailPage extends React.Component<IEventDetailPageProp> {
  console.log('user', user);
  console.dir(this.props);
 
- console.log(classes['history-back-btn']);
+ console.log(classes[ 'history-back-btn' ]);
  return (
  <div>
  { gridContainer(classes, 9, 3, event, rewards, user, queryString.parse(this.props.location.search).id) }

src/main/webapp/app/pages/events/event/event-new.tsx

@@ -179,4 +179,4 @@ const mapDispatchToProps = { getSession, getEvents, createEvent, getAggsParticip
 type StateProps = ReturnType<typeof mapStateToProps>;
 type DispatchProps = typeof mapDispatchToProps;
 
-export default withRouter(connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(EventNewPage)));
+export default withRouter(connect(mapStateToProps, mapDispatchToProps)(withStyles(styles)(EventNewPage)));

src/main/webapp/app/pages/profile/profile-card.tsx

@@ -92,16 +92,13 @@ export class ProfileCard extends React.Component<IProfileCardProp, IProfileCardS
  };
 
  saveCroppedImg = croppedImg => {
- // const file = new File([ croppedImg ], 'avatar');
- // console.log('saveCroppedImg ==>', file);
- // this.props.uploadFile('1', this.props.account.id, file);
- this.props.uploadFile('1', this.props.account.id, croppedImg);
+ this.props.uploadFile('1', this.props.account._id, croppedImg);
  this.setState({ open: false, img: croppedImg });
  };
 
  handleUpdateProfile = () => {
  const { account } = this.props;
- this.props.updateUser('1', account.id, this.state.name, account.status, account.role);
+ this.props.updateUser('1', account._id, this.state.name, account.status, account.role);
  };
 
  handleNameChange = e => {
@@ -120,8 +117,6 @@ export class ProfileCard extends React.Component<IProfileCardProp, IProfileCardS
  thumbnail = account.thumbnail;
  }
 
- // console.log(this.state.img);
-
  return (
  <React.Fragment>
  <Card className={ classes.card }>

src/main/webapp/app/pages/profile/profile.tsx

@@ -1,7 +1,6 @@
 import './profile.css';
 
 import React from 'react';
-import Paper from '@material-ui/core/Paper';
 import Grid from '@material-ui/core/Grid';
 import Divider from '@material-ui/core/Divider';
 import { connect } from 'react-redux';