Skip to content
Snippets Groups Projects
Commit 2b2d01bc authored by Chif Gergő's avatar Chif Gergő
Browse files

Format date as in another branch by barni2000

parent 3c4f72e7
No related branches found
No related tags found
No related merge requests found
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
"jsx-quotes": ["error", "prefer-single"], "jsx-quotes": ["error", "prefer-single"],
"import/prefer-default-export": 0, "import/prefer-default-export": 0,
"react/prop-types": 1, "react/prop-types": 1,
"react/prefer-stateless-function": 0 "react/prefer-stateless-function": 0,
"no-case-declarations": 1
} }
} }
Source diff could not be displayed: it is too large. Options to address this: view the blob.
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
"private": true, "private": true,
"dependencies": { "dependencies": {
"axios": "^0.17.1", "axios": "^0.17.1",
"moment": "^2.23.0",
"prop-types": "^15.6.0", "prop-types": "^15.6.0",
"react": "^16.2.0", "react": "^16.2.0",
"react-dom": "^16.2.0", "react-dom": "^16.2.0",
......
import React, { Component } from 'react'; import React, { Component } from 'react';
import { Container, Segment, Item, Button, Grid } from 'semantic-ui-react'; import { Container, Segment, Item, Button, Grid } from 'semantic-ui-react';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import moment from 'moment';
import AddNewsForm from '../forms/AddNewsForm'; import AddNewsForm from '../forms/AddNewsForm';
import EditNewsForm from '../forms/EditNewsForm'; import EditNewsForm from '../forms/EditNewsForm';
...@@ -43,9 +44,9 @@ class News extends Component { ...@@ -43,9 +44,9 @@ class News extends Component {
<Grid> <Grid>
<Grid.Row className='news-extra'> <Grid.Row className='news-extra'>
<Grid.Column floated='left' width={10}> <Grid.Column floated='left' width={10}>
<p> Készült: {item.created_at} </p> <p> Készült: {moment(item.created_at).format('LLLL')} </p>
{/* TODO get the name who edited it */} {/* TODO get the time when was edited */}
<p> Szerkesztve: {item.created_at} </p> <p> Szerkesztve: {moment(item.updated_at).format('LLLL')}</p>
</Grid.Column> </Grid.Column>
<Grid.Column floated='right' width={5}> <Grid.Column floated='right' width={5}>
<p> Írta: <strong>{item.author_name}</strong></p> <p> Írta: <strong>{item.author_name}</strong></p>
......
...@@ -10,6 +10,10 @@ import configureStore from './configureStore'; ...@@ -10,6 +10,10 @@ import configureStore from './configureStore';
import App from './components/App'; import App from './components/App';
import registerServiceWorker from './registerServiceWorker'; import registerServiceWorker from './registerServiceWorker';
import moment from 'moment';
moment.locale();
const store = configureStore(); const store = configureStore();
render( render(
...@@ -22,4 +26,3 @@ render( ...@@ -22,4 +26,3 @@ render(
); );
registerServiceWorker(); registerServiceWorker();
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment