From 78e64babf47be07978212ed4ceefd42e6e24e9b8 Mon Sep 17 00:00:00 2001
From: rlacko <rlacko@sch.bme.hu>
Date: Thu, 13 Feb 2020 09:26:17 +0100
Subject: [PATCH] better news, schedule and small fixes
---
package-lock.json | 2 +-
package.json | 2 +-
src/components/pages/Mentors.js | 25 -------------------------
src/components/pages/News.js | 2 +-
src/components/pages/Schedule.js | 6 +++---
src/configureStore.js | 6 +++---
6 files changed, 9 insertions(+), 34 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 9e9c511..fabe84c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "kszkepzes-frontend",
- "version": "0.2.4",
+ "version": "0.2.6",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index 2dfb8a6..ab55a7a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "kszkepzes-frontend",
- "version": "0.2.5",
+ "version": "0.2.6",
"private": false,
"dependencies": {
"axios": "^0.19.2",
diff --git a/src/components/pages/Mentors.js b/src/components/pages/Mentors.js
index 3f17c7c..31fa8b4 100644
--- a/src/components/pages/Mentors.js
+++ b/src/components/pages/Mentors.js
@@ -38,31 +38,6 @@ class Mentors extends Component {
renderMentorsMobile() {
return this.props.mentors.map( (item, index) => (
- // <Card style={{maxWidth: '100%', minWidth: '100%'}}>
- // <Card.Content style={{padding: '0'}}>
- // <Item.Group>
- // <Item>
- // <Item.Image size='medium' src={item.image} />
- // <Item.Content style={{padding: '1rem'}}>
- // <Item.Header>{item.name}</Item.Header>
- // <Item.Extra>
- // <Label><Icon name='mail'></Icon>{item.email}</Label>
- // </Item.Extra>
- // </Item.Content>
- // </Item>
- // <Item>
- // <Item.Content style={{padding: '1rem'}}>
- // <Item.Description>
- // <p>{item.text}</p>
- // </Item.Description>
- // <Item.Extra>
- // <Label><Icon name='mail'></Icon>{item.email}</Label>
- // </Item.Extra>
- // </Item.Content>
- // </Item>
- // </Item.Group>
- // </Card.Content>
- // </Card>
<Card key={item.id}>
<Image src={item.image} wrapped ui={false}/>
<Card.Content>
diff --git a/src/components/pages/News.js b/src/components/pages/News.js
index 4389f44..6faf5d1 100644
--- a/src/components/pages/News.js
+++ b/src/components/pages/News.js
@@ -70,7 +70,7 @@ class News extends Component {
render() {
return (
- <div style={{paddingTop: '1em'}}>
+ <div style={{paddingTop: '1em', paddingBottom: '5em'}}>
<Segment vertical>
{/* { this.props.user.is_superuser ? <AddNewsForm /> : ''} */}
<Container text textAlign='center'>
diff --git a/src/components/pages/Schedule.js b/src/components/pages/Schedule.js
index e8b1c9c..cda5bc0 100644
--- a/src/components/pages/Schedule.js
+++ b/src/components/pages/Schedule.js
@@ -34,7 +34,7 @@ class Schedule extends Component {
<h2>
<Grid>
<Grid.Column floated='left' width={5} textAlign='left'>
- <Icon name='quidditch' color='blue' />{event.name}
+ <Icon name='calendar alternate outline' color='blue' /> {event.name}
</Grid.Column>
<Grid.Column floated='right' width={8} textAlign='right'>
{moment(event.date).locale('hu').format('LLLL')}
@@ -42,8 +42,8 @@ class Schedule extends Component {
</Grid>
</h2>
</Accordion.Title>
- <Accordion.Content active={activeIndex === event.id}>
- <Segment>
+ <Accordion.Content active={activeIndex === event.id} >
+ <Segment textAlign='left' style={{overflowWrap:'break-word'}}>
{event.description}
</Segment>
</Accordion.Content>
diff --git a/src/configureStore.js b/src/configureStore.js
index cdb2694..9579c62 100644
--- a/src/configureStore.js
+++ b/src/configureStore.js
@@ -1,9 +1,9 @@
import { createStore, applyMiddleware } from 'redux';
import thunkMiddleware from 'redux-thunk';
-import { createLogger } from 'redux-logger';
+// import { createLogger } from 'redux-logger';
import rootReducer from './reducers';
-const loggerMiddleware = createLogger();
+// const loggerMiddleware = createLogger();
export default function configureStore(preloadedState) {
return createStore(
@@ -11,7 +11,7 @@ export default function configureStore(preloadedState) {
preloadedState,
applyMiddleware(
thunkMiddleware,
- loggerMiddleware,
+ // loggerMiddleware,
),
);
}
--
GitLab