Skip to content

Commit

Permalink
v1.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@blutarche
blutarche committed May 13, 2016
2 parents 55a0916 + 3c82ef9 commit ac8ac87
Show file tree
Hide file tree
Showing 14 changed files with 141 additions and 138 deletions.
119 changes: 54 additions & 65 deletions bundle.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
/******/ }
/******/
/******/ var hotApplyOnUpdate = true;
/******/ var hotCurrentHash = "7b020798967eea07b8a1"; // eslint-disable-line no-unused-vars
/******/ var hotCurrentHash = "ff119907e1ffe18ca150"; // eslint-disable-line no-unused-vars
/******/ var hotCurrentModuleData = {};
/******/ var hotCurrentParents = []; // eslint-disable-line no-unused-vars
/******/
Expand Down Expand Up @@ -25739,7 +25739,13 @@
_react3.default.createElement(
"h6",
null,
"The most intense gif maker"
"The most ",
_react3.default.createElement(
"b",
null,
"intense"
),
" gif maker"
)
);
}
Expand Down Expand Up @@ -26030,21 +26036,21 @@
{ className: 'row' },
_react3.default.createElement(
'div',
{ className: 'text-center col-xs-12 col-sm-8 col-sm-offset-2 col-md-6 col-md-offset-3' },
_react3.default.createElement('canvas', { ref: 'canvas' })
{ className: "text-center " + (this.state.imageUploaded ? "col-sm-6" : "col-sm-6 col-sm-offset-3") },
_react3.default.createElement('canvas', { ref: 'canvas' }),
_react3.default.createElement(_fileinput2.default, { updatePicture: this.updatePictureURL.bind(this) })
),
_react3.default.createElement(
'div',
{ className: 'col-xs-12' },
{ className: this.state.imageUploaded ? "col-sm-6" : "hidden" },
_react3.default.createElement(
'form',
{ className: 'form-horizontal' },
_react3.default.createElement(_fileinput2.default, { updatePicture: this.updatePictureURL.bind(this) }),
_react3.default.createElement(_textinput2.default, { textChange: this.textInputChange.bind(this), shouldShow: this.state.imageUploaded }),
_react3.default.createElement(_rangeinput2.default, { shouldShow: this.state.imageUploaded, rangeChange: this.rangeText.bind(this), labelText: 'Text size', min: this.minRange, max: this.maxRange, step: this.stepRange }),
_react3.default.createElement(_rangeinput2.default, { shouldShow: this.state.imageUploaded, rangeChange: this.rangeVibration.bind(this), labelText: 'Magnitude', min: this.minRange, max: this.maxRange, step: this.stepRange }),
_react3.default.createElement(_rangeinput2.default, { shouldShow: this.state.imageUploaded, rangeChange: this.rangeInterval.bind(this), labelText: 'Vibrate Speed', min: this.minRange, max: this.maxRange, step: this.stepRange }),
_react3.default.createElement(_download2.default, { shouldShow: this.state.imageUploaded, downloadGIF: this.downloadGIF.bind(this) }),
_react3.default.createElement(_textinput2.default, { textChange: this.textInputChange.bind(this) }),
_react3.default.createElement(_rangeinput2.default, { rangeChange: this.rangeText.bind(this), labelText: 'Text size', min: this.minRange, max: this.maxRange, step: this.stepRange }),
_react3.default.createElement(_rangeinput2.default, { rangeChange: this.rangeVibration.bind(this), labelText: 'Magnitude', min: this.minRange, max: this.maxRange, step: this.stepRange }),
_react3.default.createElement(_rangeinput2.default, { rangeChange: this.rangeInterval.bind(this), labelText: 'Speed', min: this.minRange, max: this.maxRange, step: this.stepRange }),
_react3.default.createElement(_download2.default, { downloadGIF: this.downloadGIF.bind(this) }),
_react3.default.createElement(
'a',
{ ref: 'download', href: '#', download: '', className: 'hidden' },
Expand Down Expand Up @@ -26148,18 +26154,9 @@
return _react3.default.createElement(
"div",
{ className: "form-group" },
_react3.default.createElement(
"label",
{ className: "col-sm-4 control-label" },
_react3.default.createElement(
"b",
null,
"Photo"
)
),
_react3.default.createElement(
"div",
{ className: "col-sm-5" },
{ className: "text-center" },
_react3.default.createElement(
"button",
{ type: "button", className: "btn btn-embossed btn-primary upload", onClick: this.fixFirefox },
Expand Down Expand Up @@ -26248,7 +26245,7 @@
value: function render() {
return _react3.default.createElement(
"div",
{ className: this.props.shouldShow ? "form-group" : "hidden" },
{ className: "form-group" },
_react3.default.createElement(
"label",
{ className: "col-sm-4 control-label" },
Expand All @@ -26260,7 +26257,7 @@
),
_react3.default.createElement(
"div",
{ className: "text-center col-sm-5" },
{ className: "text-center col-sm-8" },
_react3.default.createElement("input", { type: "text", placeholder: "[doge intensifies]", className: "form-control input-hg", style: { "width": "100%" }, onChange: this.textChange })
)
);
Expand Down Expand Up @@ -26341,13 +26338,13 @@
value: function render() {
return _react3.default.createElement(
"div",
{ className: this.props.shouldShow ? "form-group" : "hidden" },
{ className: "form-group", style: { "marginTop": "3em" } },
_react3.default.createElement(
"div",
{ className: "col-sm-5 col-sm-offset-4" },
{ className: "col-sm-12 text-center" },
_react3.default.createElement(
"button",
{ className: "btn btn-hg btn-success btn-embossed upload", onClick: this.onClick.bind(this), style: { "width": "100%" } },
{ className: "btn btn-super-hg btn-success btn-embossed", onClick: this.onClick.bind(this) },
_react3.default.createElement(
"b",
null,
Expand Down Expand Up @@ -26429,7 +26426,7 @@
console.log(this.props.labelText);
return _react3.default.createElement(
"div",
{ className: this.props.shouldShow ? "form-group" : "hidden" },
{ className: "form-group" },
_react3.default.createElement(
"label",
{ className: "col-sm-4 control-label" },
Expand All @@ -26441,8 +26438,8 @@
),
_react3.default.createElement(
"div",
{ className: "text-center col-sm-5" },
_react3.default.createElement("input", { className: this.props.shouldShow ? "form-group" : "hidden", type: "range", min: "1", max: "5", step: "0.2", onChange: this.props.rangeChange.bind(this), style: { "marginTop": "13px" } })
{ className: "text-center col-sm-8" },
_react3.default.createElement("input", { className: "form-control", type: "range", min: "1", max: "5", step: "0.2", onChange: this.props.rangeChange.bind(this) })
)
);
}
Expand Down Expand Up @@ -26523,45 +26520,37 @@
"___________"
),
_react3.default.createElement(
"b",
null,
"Contributors"
),
_react3.default.createElement("br", null),
_react3.default.createElement(
"div",
{ className: "row text-center" },
"p",
{ className: "description" },
"Intensifier .gif maker · Created by ",
_react3.default.createElement(
"div",
{ className: "col-sm-6 text-right" },
"Aikdanai Sidhikosol",
_react3.default.createElement("br", null),
"Supanut Apikulvanich",
_react3.default.createElement("br", null),
"Aphichan Chaiyutthasart",
_react3.default.createElement("br", null)
"a",
{ href: "https://twitter.com/aikdanai", target: "_blank" },
"Aikdanai Sidhikosol"
),
" · ",
_react3.default.createElement(
"div",
{ className: "col-sm-6 text-left" },
_react3.default.createElement(
"a",
{ href: "https://github.com/blutarche" },
_react3.default.createElement("i", { className: "fa fa-github" })
),
_react3.default.createElement("br", null),
_react3.default.createElement(
"a",
{ href: "https://github.com/SzNeUrTo" },
_react3.default.createElement("i", { className: "fa fa-github" })
),
_react3.default.createElement("br", null),
_react3.default.createElement(
"a",
{ href: "https://github.com/ak1103dev" },
_react3.default.createElement("i", { className: "fa fa-github" })
),
_react3.default.createElement("br", null)
"a",
{ href: "https://github.com/SzNeUrTo", target: "_blank" },
"Supanut Apikulvanich"
),
" · ",
_react3.default.createElement(
"a",
{ href: "https://github.com/ak1103dev", target: "_blank" },
"Apichan Chaiyutthasat"
),
_react3.default.createElement("br", null),
_react3.default.createElement(
"a",
{ href: "https://github.com/blutarche/intensifier", target: "_blank" },
"GitHub Project"
),
" · ",
_react3.default.createElement(
"a",
{ href: "https://github.com/blutarche/intensifier/issues", target: "_blank" },
"Issues"
)
)
);
Expand Down
6 changes: 3 additions & 3 deletions components/download.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ export default class Download extends React.Component {

render() {
return (
<div className={this.props.shouldShow ? "form-group" : "hidden"}>
<div className="col-sm-5 col-sm-offset-4">
<button className="btn btn-hg btn-success btn-embossed upload" onClick={this.onClick.bind(this)} style={{"width" : "100%"}}>
<div className="form-group" style={{"marginTop": "3em"}} >
<div className="col-sm-12 text-center">
<button className="btn btn-super-hg btn-success btn-embossed" onClick={this.onClick.bind(this)}>
<b><i className="fa fa-download" aria-hidden="true"></i> Download</b>
</button>
</div>
Expand Down
33 changes: 8 additions & 25 deletions components/drawing.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,37 +183,20 @@ export default class Drawing extends React.Component {
this.updateCanvas();
}

rangeInterval(e) {
console.log(e.target.value);
this.interval = e.target.value;
clearInterval(updateInterval);
updateInterval = setInterval(this.updatePosition.bind(this, context), this.getInterval());
}

rangeText(e) {
this.textSize = e.target.value;
}

rangeVibration(e) {
this.vibration = e.target.value;
this.setScale(this.getVibrationRatio());
this.updateCanvas();
}

render() {
return (
<div className="row">
<div className="text-center col-xs-12 col-sm-8 col-sm-offset-2 col-md-6 col-md-offset-3">
<div className={"text-center "+(this.state.imageUploaded ? "col-sm-6" : "col-sm-6 col-sm-offset-3")}>
<canvas ref="canvas" />
<FileInput updatePicture={this.updatePictureURL.bind(this)} />
</div>
<div className="col-xs-12">
<div className={this.state.imageUploaded ? "col-sm-6" : "hidden"}>
<form className="form-horizontal">
<FileInput updatePicture={this.updatePictureURL.bind(this)} />
<TextInput textChange={this.textInputChange.bind(this)} shouldShow={this.state.imageUploaded}/>
<RangeInput shouldShow={this.state.imageUploaded} rangeChange={this.rangeText.bind(this)} labelText="Text size" min={this.minRange} max={this.maxRange} step={this.stepRange} />
<RangeInput shouldShow={this.state.imageUploaded} rangeChange={this.rangeVibration.bind(this)} labelText="Magnitude" min={this.minRange} max={this.maxRange} step={this.stepRange} />
<RangeInput shouldShow={this.state.imageUploaded} rangeChange={this.rangeInterval.bind(this)} labelText="Vibrate Speed" min={this.minRange} max={this.maxRange} step={this.stepRange} />
<Download shouldShow={this.state.imageUploaded} downloadGIF={this.downloadGIF.bind(this)} />
<TextInput textChange={this.textInputChange.bind(this)} />
<RangeInput rangeChange={this.rangeText.bind(this)} labelText="Text size" min={this.minRange} max={this.maxRange} step={this.stepRange} />
<RangeInput rangeChange={this.rangeVibration.bind(this)} labelText="Magnitude" min={this.minRange} max={this.maxRange} step={this.stepRange} />
<RangeInput rangeChange={this.rangeInterval.bind(this)} labelText="Speed" min={this.minRange} max={this.maxRange} step={this.stepRange} />
<Download downloadGIF={this.downloadGIF.bind(this)} />
<a ref="download" href="#" download="" className="hidden">Download</a>
</form>
</div>
Expand Down
5 changes: 1 addition & 4 deletions components/fileinput.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,7 @@ export default class FileInput extends React.Component {
render() {
return (
<div className="form-group">
<label className="col-sm-4 control-label">
<b>Photo</b>
</label>
<div className="col-sm-5">
<div className="text-center">
<button type="button" className="btn btn-embossed btn-primary upload" onClick={this.fixFirefox}>
<i className="fa fa-picture-o" aria-hidden="true"></i> Upload photo
</button>
Expand Down
22 changes: 6 additions & 16 deletions components/footer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,12 @@ export default class Footer extends React.Component {
return (
<div className="text-center footer row">
<p className="splitter">___________</p>
<b>Contributors</b><br/>
<div className="row text-center">
<div className="col-sm-6 text-right">
Aikdanai Sidhikosol<br />
Supanut Apikulvanich<br />
Aphichan Chaiyutthasart<br />
</div>
<div className="col-sm-6 text-left">
<a href="https://github.com/blutarche"><i className="fa fa-github"></i></a>
<br />
<a href="https://github.com/SzNeUrTo"><i className="fa fa-github"></i></a>
<br />
<a href="https://github.com/ak1103dev"><i className="fa fa-github"></i></a>
<br />
</div>
</div>
<p className="description">
Intensifier .gif maker · Created by&nbsp;
<a href="https://twitter.com/aikdanai" target="_blank">Aikdanai Sidhikosol</a> · <a href="https://github.com/SzNeUrTo" target="_blank">Supanut Apikulvanich</a> · <a href="https://github.com/ak1103dev" target="_blank">Apichan Chaiyutthasat</a><br/>
<a href="https://github.com/blutarche/intensifier" target="_blank">GitHub Project</a> · <a href="https://github.com/blutarche/intensifier/issues" target="_blank">Issues</a>
</p>

</div>
);
}
Expand Down
2 changes: 1 addition & 1 deletion components/header.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export default class Header extends React.Component {
return (
<div className="header text-center row">
<h3>Intensifier</h3>
<h6>The most intense gif maker</h6>
<h6>The most <b>intense</b> gif maker</h6>
</div>
);
}
Expand Down
6 changes: 3 additions & 3 deletions components/rangeinput.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ export default class RangeInput extends React.Component {
render() {
console.log(this.props.labelText);
return (
<div className={this.props.shouldShow ? "form-group" : "hidden"}>
<div className="form-group">
<label className="col-sm-4 control-label">
<b>{this.props.labelText}</b>
</label>
<div className="text-center col-sm-5">
<input className="form-control" type="range" min="1" max="5" step="0.2" onChange={this.props.rangeChange.bind(this)} style={{"marginTop": "13px"}} />
<div className="text-center col-sm-8">
<input className="form-control" type="range" min="1" max="5" step="0.2" onChange={this.props.rangeChange.bind(this)}/>
</div>
</div>
)
Expand Down
4 changes: 2 additions & 2 deletions components/textinput.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ export default class TextInput extends React.Component {

render() {
return (
<div className={this.props.shouldShow ? "form-group" : "hidden"}>
<div className="form-group">
<label className="col-sm-4 control-label">
<b>Message</b>
</label>
<div className="text-center col-sm-5">
<div className="text-center col-sm-8">
<input type="text" placeholder="[doge intensifies]" className="form-control input-hg" style={{"width": "100%"}} onChange={this.textChange}/>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion css/core.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit ac8ac87

Please sign in to comment.