Skip to content

Commit

Permalink
Renamed conversation to comment #172 #174
Browse files Browse the repository at this point in the history
  • Loading branch information
RichardLitt committed May 14, 2015
1 parent bba51dc commit e4340be
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
18 changes: 9 additions & 9 deletions build/main.min.js
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ var Screenshot = require('./components/screenshot.jsx')
var Sidebar = require('./components/sidebar.jsx')
var PDFUrlLink = require('./components/pdfUrlLink.jsx')
var Slack = require('./components/slack.jsx').SendSlack
var Conversation = require('./components/conversation.jsx')
var Comment = require('./components/comment.jsx')

// var Cite = require('./components/cite.jsx')
// var Graph = require('./components/graph.jsx')
Expand All @@ -310,7 +310,7 @@ module.exports = React.createClass({displayName: "exports",

React.createElement(Screenshot, {fingerprint: this.props.fingerprint, location: this.props.location}),

React.createElement(Conversation, {user: user}),
React.createElement(Comment, {user: user}),

React.createElement(EmailForm, {fingerprint: this.props.fingerprint}),

Expand Down Expand Up @@ -353,7 +353,7 @@ module.exports = React.createClass({displayName: "exports",
})


},{"./components/conversation.jsx":"/Users/richard/src/beagle/js/components/conversation.jsx","./components/emailForm.jsx":"/Users/richard/src/beagle/js/components/emailForm.jsx","./components/highlight.jsx":"/Users/richard/src/beagle/js/components/highlight.jsx","./components/login.jsx":"/Users/richard/src/beagle/js/components/login.jsx","./components/pdfUrlLink.jsx":"/Users/richard/src/beagle/js/components/pdfUrlLink.jsx","./components/publication.jsx":"/Users/richard/src/beagle/js/components/publication.jsx","./components/screenshot.jsx":"/Users/richard/src/beagle/js/components/screenshot.jsx","./components/sidebar.jsx":"/Users/richard/src/beagle/js/components/sidebar.jsx","./components/slack.jsx":"/Users/richard/src/beagle/js/components/slack.jsx","./data/sampleData.js":"/Users/richard/src/beagle/js/data/sampleData.js","react":"/Users/richard/src/beagle/node_modules/react/react.js","react-bootstrap":"/Users/richard/src/beagle/node_modules/react-bootstrap/lib/main.js"}],"/Users/richard/src/beagle/js/components/alert.jsx":[function(require,module,exports){
},{"./components/comment.jsx":"/Users/richard/src/beagle/js/components/comment.jsx","./components/emailForm.jsx":"/Users/richard/src/beagle/js/components/emailForm.jsx","./components/highlight.jsx":"/Users/richard/src/beagle/js/components/highlight.jsx","./components/login.jsx":"/Users/richard/src/beagle/js/components/login.jsx","./components/pdfUrlLink.jsx":"/Users/richard/src/beagle/js/components/pdfUrlLink.jsx","./components/publication.jsx":"/Users/richard/src/beagle/js/components/publication.jsx","./components/screenshot.jsx":"/Users/richard/src/beagle/js/components/screenshot.jsx","./components/sidebar.jsx":"/Users/richard/src/beagle/js/components/sidebar.jsx","./components/slack.jsx":"/Users/richard/src/beagle/js/components/slack.jsx","./data/sampleData.js":"/Users/richard/src/beagle/js/data/sampleData.js","react":"/Users/richard/src/beagle/node_modules/react/react.js","react-bootstrap":"/Users/richard/src/beagle/node_modules/react-bootstrap/lib/main.js"}],"/Users/richard/src/beagle/js/components/alert.jsx":[function(require,module,exports){
var React = require('react')

module.exports = React.createClass({
Expand All @@ -375,16 +375,16 @@ module.exports = React.createClass({
})


},{"react":"/Users/richard/src/beagle/node_modules/react/react.js"}],"/Users/richard/src/beagle/js/components/conversation.jsx":[function(require,module,exports){
},{"react":"/Users/richard/src/beagle/node_modules/react/react.js"}],"/Users/richard/src/beagle/js/components/comment.jsx":[function(require,module,exports){
var React = require('react')
var UserBar = require('./userBar.jsx')

var text = 'Realism dolphin sentient artisanal plastic youtube franchise Kowloon numinous pen bridge meta-geodesic tower receding. Convenience store nano-dome 3D-printed bicycle shanty town claymore mine 8-bit. Realism rebar katana paranoid marketing smart-faded systemic skyscraper nano-shrine girl Tokyo urban franchise. Wristwatch dolphin ablative shoes neural voodoo god shrine math. Sunglasses A.I. assassin sub-orbital-ware-space assault Shibuya cardboard skyscraper geodesic crypto-spook kanji. '

var Conversation = React.createClass({
displayName: 'Conversation',
var Comment = React.createClass({
displayName: 'Comment',
render: function () {
var conversationStyle = {
var commentStyle = {
margin: '5px 0px',
border: '1px solid #999',
borderLeft: '3px solid #AE8DC7',
Expand All @@ -396,7 +396,7 @@ var Conversation = React.createClass({
}

return (
React.createElement("div", {style: conversationStyle},
React.createElement("div", {style: commentStyle},
React.createElement(UserBar, {user: this.props.user}),

React.createElement("p", {style: textStyle}, text)
Expand All @@ -406,7 +406,7 @@ var Conversation = React.createClass({
}
})

module.exports = exports = Conversation
module.exports = exports = Comment


},{"./userBar.jsx":"/Users/richard/src/beagle/js/components/userBar.jsx","react":"/Users/richard/src/beagle/node_modules/react/react.js"}],"/Users/richard/src/beagle/js/components/emailForm.jsx":[function(require,module,exports){
Expand Down
4 changes: 2 additions & 2 deletions js/app.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ var Screenshot = require('./components/screenshot.jsx')
var Sidebar = require('./components/sidebar.jsx')
var PDFUrlLink = require('./components/pdfUrlLink.jsx')
var Slack = require('./components/slack.jsx').SendSlack
var Conversation = require('./components/conversation.jsx')
var Comment = require('./components/comment.jsx')

// var Cite = require('./components/cite.jsx')
// var Graph = require('./components/graph.jsx')
Expand All @@ -34,7 +34,7 @@ module.exports = React.createClass({

<Screenshot fingerprint={this.props.fingerprint} location={this.props.location} />

<Conversation user={user} />
<Comment user={user} />

<EmailForm fingerprint={this.props.fingerprint} />

Expand Down
10 changes: 5 additions & 5 deletions js/components/conversation.jsx → js/components/comment.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ var UserBar = require('./userBar.jsx')

var text = 'Realism dolphin sentient artisanal plastic youtube franchise Kowloon numinous pen bridge meta-geodesic tower receding. Convenience store nano-dome 3D-printed bicycle shanty town claymore mine 8-bit. Realism rebar katana paranoid marketing smart-faded systemic skyscraper nano-shrine girl Tokyo urban franchise. Wristwatch dolphin ablative shoes neural voodoo god shrine math. Sunglasses A.I. assassin sub-orbital-ware-space assault Shibuya cardboard skyscraper geodesic crypto-spook kanji. '

var Conversation = React.createClass({
displayName: 'Conversation',
var Comment = React.createClass({
displayName: 'Comment',
render: function () {
var conversationStyle = {
var commentStyle = {
margin: '5px 0px',
border: '1px solid #999',
borderLeft: '3px solid #AE8DC7',
Expand All @@ -18,7 +18,7 @@ var Conversation = React.createClass({
}

return (
<div style={conversationStyle}>
<div style={commentStyle}>
<UserBar user={this.props.user} />

<p style={textStyle}>{text}</p>
Expand All @@ -28,4 +28,4 @@ var Conversation = React.createClass({
}
})

module.exports = exports = Conversation
module.exports = exports = Comment

0 comments on commit e4340be

Please sign in to comment.