iteration

This commit is contained in:
Ceolter
2016-01-22 15:02:20 +00:00
parent d3f7a66dc1
commit 71aed2114d
5 changed files with 44 additions and 7 deletions

View File

@@ -26,6 +26,8 @@
"webpack": "1.12.11", "webpack": "1.12.11",
"react": "0.14.6", "react": "0.14.6",
"react-dom": "0.14.6", "react-dom": "0.14.6",
"css-loader": "0.23.1",
"style-loader": "0.13.0",
"babel-loader": "6.2.1", "babel-loader": "6.2.1",
"babel-preset-react": "6.3.13", "babel-preset-react": "6.3.13",
"babel-preset-es2015": "6.3.13" "babel-preset-es2015": "6.3.13"

View File

@@ -3,6 +3,8 @@
import ReactDOM from 'react-dom'; import ReactDOM from 'react-dom';
import React from 'react'; import React from 'react';
import {MyApp} from './myApp.jsx'; import {MyApp} from './myApp.jsx';
import 'ag-grid-root/ag-grid.css';
import 'ag-grid-root/theme-fresh.css';
document.addEventListener('DOMContentLoaded', ()=> { document.addEventListener('DOMContentLoaded', ()=> {
var container = document.getElementById('myAppContainer'); var container = document.getElementById('myAppContainer');

29
src/myApp.css Normal file
View File

@@ -0,0 +1,29 @@
.ag-cell {
padding-top: 2px !important;
padding-bottom: 2px !important;
}
label {
font-weight: normal !important;
}
.div-percent-bar {
display: inline-block;
height: 100%;
position: relative;
}
.div-percent-value {
position: absolute;
z-index: 1;
padding-left: 4px;
font-weight: bold;
font-size: 13px;
}
.div-outer-div {
display: inline-block;
height: 100%;
width: 100%;
}

View File

@@ -1,6 +1,7 @@
import ReactDOM from 'react-dom'; import ReactDOM from 'react-dom';
import React from 'react'; import React from 'react';
import AgGrid from 'ag-grid'; import AgGrid from 'ag-grid';
import './myApp.css';
var firstNames = ["Sophie", "Isabelle", "Emily", "Olivia", "Lily", "Chloe", "Isabella", var firstNames = ["Sophie", "Isabelle", "Emily", "Olivia", "Lily", "Chloe", "Isabella",
"Amelia", "Jessica", "Sophia", "Ava", "Charlotte", "Mia", "Lucy", "Grace", "Ruby", "Amelia", "Jessica", "Sophia", "Ava", "Charlotte", "Mia", "Lucy", "Grace", "Ruby",
@@ -136,7 +137,7 @@ export class MyApp extends React.Component {
</div> </div>
<div style={{clear: 'both'}}/> <div style={{clear: 'both'}}/>
</div> </div>
<MyGrid mouse="white" style={{width: '100%', height: '400px'}}></MyGrid> <MyGrid style={{width: '100%', height: '400px'}} className="ag-fresh"></MyGrid>
</div>; </div>;
} }
} }
@@ -169,7 +170,7 @@ class MyGrid extends React.Component {
} }
render() { render() {
return <div style={this.props.style} />; return <div style={this.props.style} className={this.props.className} />;
} }
createRowData() { createRowData() {
@@ -237,8 +238,7 @@ class MyGrid extends React.Component {
MyGrid.propTypes = { MyGrid.propTypes = {
'style': React.PropTypes.object, 'style': React.PropTypes.object,
'class': React.PropTypes.string, 'className': React.PropTypes.string
mouse: React.PropTypes.string
}; };
var btBringGridBack; var btBringGridBack;
@@ -337,12 +337,12 @@ MyGrid.propTypes = {
} }
var SKILL_TEMPLATE = var SKILL_TEMPLATE =
'<label style="border: 1px solid lightgrey; margin: 4px; padding: 4px;">' + '<label style="border: 1px solid lightgrey; margin: 4px; padding: 4px; display: inline-block;">' +
' <span>' + ' <span>' +
' <div style="text-align: center;">SKILL_NAME</div>' + ' <div style="text-align: center;">SKILL_NAME</div>' +
' <div>' + ' <div>' +
' <input type="checkbox"/>' + ' <input type="checkbox"/>' +
' <img src="/images/skills/SKILL.png" width="30px"/>' + ' <img src="images/skills/SKILL.png" width="30px"/>' +
' </div>' + ' </div>' +
' </span>' + ' </span>' +
'</label>'; '</label>';
@@ -368,6 +368,7 @@ MyGrid.propTypes = {
SkillFilter.prototype.getGui = function () { SkillFilter.prototype.getGui = function () {
var eGui = document.createElement('div'); var eGui = document.createElement('div');
eGui.style.width = '380px';
var eInstructions = document.createElement('div'); var eInstructions = document.createElement('div');
eInstructions.innerHTML = FILTER_TITLE.replace('TITLE_NAME', 'Custom Skills Filter'); eInstructions.innerHTML = FILTER_TITLE.replace('TITLE_NAME', 'Custom Skills Filter');
eGui.appendChild(eInstructions); eGui.appendChild(eInstructions);

View File

@@ -20,6 +20,9 @@ module.exports = {
] ]
}, },
resolve: { resolve: {
alias: {"ag-grid" : __dirname + "/node_modules/ag-grid/dist/ag-grid.js"} alias: {
"ag-grid" : __dirname + "/node_modules/ag-grid/dist/ag-grid.js",
"ag-grid-root" : __dirname + "/node_modules/ag-grid/dist"
}
} }
}; };