mirror of
				https://github.com/Unleash/unleash.git
				synced 2025-10-27 11:02:16 +01:00 
			
		
		
		
	Improve date formatting in log view.
This commit is contained in:
		
							parent
							
								
									b1f2bce248
								
							
						
					
					
						commit
						13ab89a91e
					
				
							
								
								
									
										10
									
								
								package.json
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								package.json
									
									
									
									
									
								
							@ -45,6 +45,7 @@
 | 
			
		||||
        "jsxhint": "0.4.15",
 | 
			
		||||
        "knex": "^0.7.3",
 | 
			
		||||
        "log4js": "0.6.21",
 | 
			
		||||
        "moment": "^2.9.0",
 | 
			
		||||
        "nconf": "0.6.9",
 | 
			
		||||
        "pg": "3.6.1",
 | 
			
		||||
        "react": "^0.12.0",
 | 
			
		||||
@ -68,7 +69,12 @@
 | 
			
		||||
    },
 | 
			
		||||
    "jest": {
 | 
			
		||||
        "scriptPreprocessor": "<rootDir>/jest-preprocessor.js",
 | 
			
		||||
        "unmockedModulePathPatterns": ["<rootDir>/node_modules/react"],
 | 
			
		||||
        "moduleFileExtensions": ["jsx", "js"]
 | 
			
		||||
        "unmockedModulePathPatterns": [
 | 
			
		||||
            "<rootDir>/node_modules/react"
 | 
			
		||||
        ],
 | 
			
		||||
        "moduleFileExtensions": [
 | 
			
		||||
            "jsx",
 | 
			
		||||
            "js"
 | 
			
		||||
        ]
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -1,4 +1,5 @@
 | 
			
		||||
var React = require('react');
 | 
			
		||||
var moment = require('moment');
 | 
			
		||||
 | 
			
		||||
var DIFF_PREFIXES = {
 | 
			
		||||
    A: ' ',
 | 
			
		||||
@ -20,13 +21,13 @@ var LogEntry = React.createClass({
 | 
			
		||||
    },
 | 
			
		||||
 | 
			
		||||
    render: function() {
 | 
			
		||||
        var d = new Date(this.props.event.createdAt);
 | 
			
		||||
        var date = moment(this.props.event.createdAt);
 | 
			
		||||
 | 
			
		||||
        return (
 | 
			
		||||
            <tr>
 | 
			
		||||
            <td>
 | 
			
		||||
            {d.getDate() + "." + (d.getMonth() + 1) + "." + d.getFullYear()}<br />
 | 
			
		||||
            kl. {d.getHours() + "." + d.getMinutes()}
 | 
			
		||||
              {date.format('ll')}<br />
 | 
			
		||||
              {date.format('HH:mm')}
 | 
			
		||||
            </td>
 | 
			
		||||
            <td>
 | 
			
		||||
            <strong>{this.props.event.data.name}</strong><em>[{this.props.event.type}]</em>
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user