Skip to content

Commit 7ad2689

Browse files
author
Emmanouil Konstantinidis
committed
Rename fields - prepare booleans
1 parent c7bd5fe commit 7ad2689

File tree

8 files changed

+53
-33784
lines changed

8 files changed

+53
-33784
lines changed

rest_framework_docs/static/rest_framework_docs/js/components/request.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,17 @@ var Request = React.createClass({
3333

3434
addField: function (fieldName) {
3535
var endpoint = this.state.endpoint;
36-
var fields = endpoint.fields;
3736

3837
// Check if field already exists
39-
if (_.findWhere(fields, {'name': fieldName})) return;
38+
if (_.findWhere(endpoint.fields, {'name': fieldName})) return;
4039

41-
fields.push({
40+
endpoint.fields.push({
4241
name: fieldName,
4342
required: false,
4443
type: 'text',
4544
isCustom: true
4645
});
4746

48-
endpoint.fields = fields;
49-
5047
this.setState({
5148
endpoint: endpoint
5249
});

rest_framework_docs/static/rest_framework_docs/js/components/request/add-fields.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ var AddFieldsForm = React.createClass({
5151
<div className="col-sm-2">
5252
<button
5353
type="button"
54-
className='btn btn-sm btn-block btn-primary'
54+
className='btn btn-sm btn-block btn-info'
5555
onClick={this.addField}>
5656
Add
5757
</button>

rest_framework_docs/static/rest_framework_docs/js/components/request/data.js

Lines changed: 34 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,19 @@
11
var React = require('react');
22

3-
var FieldInput = require('../fields/input');
3+
var FieldText = require('../fields/text');
44

55
var Data = React.createClass({
6+
getInitialState: function() {
7+
return {
8+
fields: this.props.fields
9+
};
10+
},
11+
12+
componentWillReceiveProps: function(nextProps) {
13+
this.setState({
14+
fields: nextProps.fields
15+
});
16+
},
617

718
removeCustomField: function (fieldName) {
819
this.props.removeCustomField(fieldName);
@@ -12,23 +23,29 @@ var Data = React.createClass({
1223
this.props.onChange(event.target.value, fieldName);
1324
},
1425

26+
_renderTextInput: function (field, key) {
27+
var value = this.props.data[field.name];
28+
var type = field.name == 'password' ? 'password' : 'text';
29+
return (
30+
<FieldText
31+
key={key}
32+
type={type}
33+
name={field.name}
34+
value={value}
35+
placeholder={field.type}
36+
required={field.required ? 'required' : false}
37+
removeField={this.removeCustomField}
38+
isCustom={field.isCustom ? 'isCustom' : false}
39+
onChange={this.handleChange.bind(this, field.name)} />
40+
);
41+
},
42+
1543
_renderFields: function () {
16-
return this.props.fields.map(function (field, key) {
17-
var value = this.props.data[field.name];
18-
var type = field.name == 'password' ? 'password' : 'text';
19-
20-
return (
21-
<FieldInput
22-
key={key}
23-
type={type}
24-
name={field.name}
25-
value={value}
26-
placeholder={field.type}
27-
required={field.required ? 'required' : false}
28-
removeField={this.removeCustomField}
29-
isCustom={field.isCustom ? 'isCustom' : false}
30-
onChange={this.handleChange.bind(this, field.name)} />
31-
);
44+
return this.state.fields.map(function (field, key) {
45+
switch (field.type) {
46+
case ('CharField'):
47+
return this._renderTextInput(field, key);
48+
}
3249
}, this);
3350
},
3451

rest_framework_docs/static/rest_framework_docs/js/components/request/field-url.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
var React = require('react');
22

33
var Header = require('../helpers/header');
4-
var Input = require('../helpers/input');
4+
var FieldText = require('../fields/text');
55

66
var FieldUrl = React.createClass({
77

@@ -25,7 +25,7 @@ var FieldUrl = React.createClass({
2525
return (
2626
<div>
2727
<Header title='API Endpoint' />
28-
<Input
28+
<FieldText
2929
type='text'
3030
name='Url Endpoint'
3131
value={this.state.url}

rest_framework_docs/static/rest_framework_docs/js/components/request/headers.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
var React = require('react');
22

33
var Header = require('../helpers/header');
4-
var FieldInput = require('../fields/input');
4+
var FieldText = require('../fields/text');
55
var RequestUtils = require('../../utils/request');
66

77
var Headers = React.createClass({
@@ -30,7 +30,7 @@ var Headers = React.createClass({
3030
return (
3131
<div>
3232
<Header title='Headers' />
33-
<FieldInput
33+
<FieldText
3434
name='authorization'
3535
value={this.state.authorization}
3636
placeholder='Token 1234567890'

rest_framework_docs/static/rest_framework_docs/js/components/response.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ var Response = React.createClass({
4646
{hasToken ? (
4747
<div className='well well-default text-center'>
4848
<button className='btn btn-sm btn-info' onClick={this.saveToken}>
49-
<i className='fa fa-key' />
50-
Save Token
49+
<i className='fa fa-key' /> Save Token
5150
</button>
5251
<h6>Your token will be lost when you refresh the page.</h6>
5352
</div>

0 commit comments

Comments
 (0)