Skip to content

Commit 2477299

Browse files
simuraisimurai
committed
Add more comments
1 parent 8b6af6b commit 2477299

File tree

2 files changed

+185
-20
lines changed

2 files changed

+185
-20
lines changed

‎lib/items/mock-item.js‎

Lines changed: 177 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ export default class MockItem extends React.Component {
2626
<header className="github-Reviews-header">
2727
<h1 className="github-Reviews-title">Reviews</h1>
2828
<span className="github-Reviews-progress">
29-
<span className="github-Reviews-count">Resolved <span className="github-Reviews-countNr">1</span> of <span className="github-Reviews-countNr">3</span></span>
30-
<progress class='github-Reviews-progessBar' value='1' max='3'></progress>
29+
<span className="github-Reviews-count">Resolved <span className="github-Reviews-countNr">1</span> of <span className="github-Reviews-countNr">7</span></span>
30+
<progress class='github-Reviews-progessBar' value='1' max='7'></progress>
3131
</span>
3232
</header>
3333
<main className="github-Reviews-container">
@@ -61,26 +61,36 @@ export default class MockItem extends React.Component {
6161
<header className="github-Review-commentHeader">
6262
<img className="github-Review-avatar" src="https://avatars.githubusercontent.com/u/e?email=annthurium%40github.com&s=32"/>
6363
<a className="github-Review-username" href="https://github.com/annthurium">annthurium</a>
64-
<span className="github-Review-commentTimeAgo">4 hours ago</span>
64+
<span className="github-Review-commentTimeAgo">1 hour ago</span>
6565
</header>
6666
<div className="github-Review-commentText"><a href="https://github.com/simurai">@simurai</a>: how many lines do you think constitutes a large diff? Not just from a performance perspective, but from a user experience perspective. Like how many lines is disruptive to a user when they're trying to read, because often large diffs are the result of auto generated code.</div>
6767
</div>
6868
<div className="github-Review-comment">
6969
<header className="github-Review-commentHeader">
7070
<img className="github-Review-avatar" src="https://avatars.githubusercontent.com/u/e?email=simurai%40github.com&s=32"/>
7171
<a className="github-Review-username" href="https://github.com/simurai">simurai</a>
72-
<span className="github-Review-commentTimeAgo">4 hours ago</span>
72+
<span className="github-Review-commentTimeAgo">1 hour ago</span>
7373
</header>
7474
<div className="github-Review-commentText">Hmmm.. will large diffs be collapsed by default or there is a "load" button? Maybe if the diff is so large that it fills the whole scroll height. Then I can uncollapse only if I'm really interested in that file. 100 seems fine. 👍</div>
7575
</div>
7676
<div className="github-Review-comment">
7777
<header className="github-Review-commentHeader">
7878
<img className="github-Review-avatar" src="https://avatars.githubusercontent.com/u/e?email=annthurium%40github.com&s=32"/>
7979
<a className="github-Review-username" href="https://github.com/annthurium">annthurium</a>
80-
<span className="github-Review-commentTimeAgo">4 hours ago</span>
80+
<span className="github-Review-commentTimeAgo">1 hour ago</span>
8181
</header>
8282
<div className="github-Review-commentText"><a href="https://github.com/kuychaco">@kuychaco</a> <a href="https://github.com/vanessayuenn">@vanessayuenn</a> <a href="https://github.com/smashwilson">@smashwilson</a> care to weigh in?</div>
8383
</div>
84+
<div className="github-Review-comment">
85+
<header className="github-Review-commentHeader">
86+
<img className="github-Review-avatar" src="https://avatars.githubusercontent.com/u/e?email=vanessayuenn%40github.com&s=32"/>
87+
<a className="github-Review-username" href="https://github.com/vanessayuenn">vanessayuenn</a>
88+
<span className="github-Review-commentTimeAgo">25 minutes ago</span>
89+
</header>
90+
<div className="github-Review-commentText">mm we were using 1000 lines as the threshold before, but that's for performance reasons. 100 does seem a bit small though considering it's counting both deleted and added lines. 🤔 <br/>
91+
<br/>
92+
300 seems a bit more reasonable, but still an arbitrary number.</div>
93+
</div>
8494

8595
<div className="github-Review-reply">
8696
<img className="github-Review-avatar" src="https://avatars.githubusercontent.com/u/e?email=annthurium%40github.com&s=32"/>
@@ -138,7 +148,7 @@ export default class MockItem extends React.Component {
138148
<img className="github-Review-avatar" src="https://avatars.githubusercontent.com/u/e?email=simurai%40github.com&s=32"/>
139149
<a className="github-Review-username" href="https://github.com/simurai">simurai</a>
140150
<span className="github-Review-type">requested changes</span>
141-
<span className="github-Review-timeAgo">2 hour ago</span>
151+
<span className="github-Review-timeAgo">2 hours ago</span>
142152
</header>
143153

144154
<div className="github-Review-summary is-requesting-changes">
@@ -165,7 +175,7 @@ export default class MockItem extends React.Component {
165175
<header className="github-Review-commentHeader">
166176
<img className="github-Review-avatar" src="https://avatars.githubusercontent.com/u/e?email=simurai%40github.com&s=32"/>
167177
<a className="github-Review-username" href="https://github.com/simurai">simurai</a>
168-
<span className="github-Review-commentTimeAgo">4 hours ago</span>
178+
<span className="github-Review-commentTimeAgo">2 hours ago</span>
169179
</header>
170180
<div className="github-Review-commentText">Should we move the chevron icon to the left? So that the position doesn't jump when there are more buttons. Alternative would be to move it all the way to the right.</div>
171181
</div>
@@ -182,6 +192,166 @@ export default class MockItem extends React.Component {
182192
</details>
183193
</div>
184194

195+
<div className="github-Review">
196+
<header className="github-Review-header">
197+
<span className="github-Review-icon icon icon-comment"></span>
198+
<img className="github-Review-avatar" src="https://avatars.githubusercontent.com/u/e?email=annthurium%40github.com&s=32"/>
199+
<a className="github-Review-username" href="https://github.com/annthurium">annthurium</a>
200+
<span className="github-Review-type">commented</span>
201+
<span className="github-Review-timeAgo">4 hours ago</span>
202+
</header>
203+
204+
<div className="github-Review-summary is-comment">
205+
looking good so far -- just found a few nits to address.
206+
</div>
207+
208+
<details className="github-Review-thread" open>
209+
<summary className="github-Review-threadHeader">
210+
<span className="github-Review-resolvedIcon icon icon-check"></span>
211+
<span onClick={this.didClickLink} data-file-path="lib/views/file-patch-header-view.js">
212+
<span className="github-Review-path">lib/views/</span>
213+
<span className="github-Review-file">file-patch-header-view.js</span>
214+
</span>
215+
<span className="github-Review-lineNr">22</span>
216+
</summary>
217+
<pre className="github-Review-diff">
218+
<div className="github-Review-diffLine ">{ ' ),' }</div>
219+
<div className="github-Review-diffLine ">{ ' }),' }</div>
220+
<div className="github-Review-diffLine ">{ ' getBufferRowForDiffPosition: PropTypes.func.isRequired,' }</div>
221+
<div className="github-Review-diffLine is-added">{ ' isPatchTooLargeOrCollapsed: PropTypes.func.isRequired,' }</div>
222+
</pre>
223+
<main className="github-Review-comments">
224+
<div className="github-Review-comment">
225+
<header className="github-Review-commentHeader">
226+
<img className="github-Review-avatar" src="https://avatars.githubusercontent.com/u/e?email=annthurium%40github.com&s=32"/>
227+
<a className="github-Review-username" href="https://github.com/annthurium">annthurium</a>
228+
<span className="github-Review-commentTimeAgo">4 hours ago</span>
229+
</header>
230+
<div className="github-Review-commentText">this is a really long name -- can you come up with something more concise?</div>
231+
</div>
232+
233+
<div className="github-Review-reply">
234+
<img className="github-Review-avatar" src="https://avatars.githubusercontent.com/u/e?email=annthurium%40github.com&s=32"/>
235+
<textarea className='github-Review-replyInput input-textarea native-key-bindings' placeholder='Reply...'></textarea>
236+
<button className="github-Review-replyButton btn" title="Add your comment">Comment</button>
237+
</div>
238+
</main>
239+
<footer className="github-Review-footer">
240+
<button className="github-Review-resolveButton btn btn-primary icon icon-check" title="Mark this comment as resolved">Mark as resolved</button>
241+
</footer>
242+
</details>
243+
244+
<details className="github-Review-thread" open>
245+
<summary className="github-Review-threadHeader">
246+
<span className="github-Review-resolvedIcon icon icon-check"></span>
247+
<span onClick={this.didClickLink} data-file-path="lib/models/patch/multi-file-patch.js">
248+
<span className="github-Review-path">lib/models/patch/</span>
249+
<span className="github-Review-file">multi-file-patch.js</span>
250+
</span>
251+
<span className="github-Review-lineNr">359</span>
252+
</summary>
253+
<pre className="github-Review-diff">
254+
<div className="github-Review-diffLine is-added">{ ' }' }</div>
255+
<div className="github-Review-diffLine is-added">{ ' }' }</div>
256+
<div className="github-Review-diffLine is-added">{ '' }</div>
257+
<div className="github-Review-diffLine is-added">{ ' isPatchTooLargeOrCollapsed = filePatchPath => {' }</div>
258+
</pre>
259+
<main className="github-Review-comments">
260+
<div className="github-Review-comment">
261+
<header className="github-Review-commentHeader">
262+
<img className="github-Review-avatar" src="https://avatars.githubusercontent.com/u/e?email=annthurium%40github.com&s=32"/>
263+
<a className="github-Review-username" href="https://github.com/annthurium">annthurium</a>
264+
<span className="github-Review-commentTimeAgo">4 hours ago</span>
265+
</header>
266+
<div className="github-Review-commentText">same as above - this name is too long and the line length linters are gonna be unhappy.</div>
267+
</div>
268+
269+
<div className="github-Review-reply">
270+
<img className="github-Review-avatar" src="https://avatars.githubusercontent.com/u/e?email=annthurium%40github.com&s=32"/>
271+
<textarea className='github-Review-replyInput input-textarea native-key-bindings' placeholder='Reply...'></textarea>
272+
<button className="github-Review-replyButton btn" title="Add your comment">Comment</button>
273+
</div>
274+
</main>
275+
<footer className="github-Review-footer">
276+
<button className="github-Review-resolveButton btn btn-primary icon icon-check" title="Mark this comment as resolved">Mark as resolved</button>
277+
</footer>
278+
</details>
279+
280+
<details className="github-Review-thread" open>
281+
<summary className="github-Review-threadHeader">
282+
<span className="github-Review-resolvedIcon icon icon-check"></span>
283+
<span onClick={this.didClickLink} data-file-path="test/views/pr-comments-view.test.js">
284+
<span className="github-Review-path">test/views/</span>
285+
<span className="github-Review-file">pr-comments-view.test.js</span>
286+
</span>
287+
<span className="github-Review-lineNr">17</span>
288+
</summary>
289+
<pre className="github-Review-diff">
290+
<div className="github-Review-diffLine is-added">{ ' };' }</div>
291+
<div className="github-Review-diffLine is-added">{ ' return shallow(' }</div>
292+
<div className="github-Review-diffLine is-added">{ ' <PullRequestCommentsView' }</div>
293+
<div className="github-Review-diffLine is-added">{ ' isPatchTooLargeOrCollapsed={sinon.stub().returns(false)}' }</div>
294+
</pre>
295+
<main className="github-Review-comments">
296+
<div className="github-Review-comment">
297+
<header className="github-Review-commentHeader">
298+
<img className="github-Review-avatar" src="https://avatars.githubusercontent.com/u/e?email=annthurium%40github.com&s=32"/>
299+
<a className="github-Review-username" href="https://github.com/annthurium">annthurium</a>
300+
<span className="github-Review-commentTimeAgo">4 hours ago</span>
301+
</header>
302+
<div className="github-Review-commentText">again, this variable name is too long</div>
303+
</div>
304+
305+
<div className="github-Review-reply">
306+
<img className="github-Review-avatar" src="https://avatars.githubusercontent.com/u/e?email=annthurium%40github.com&s=32"/>
307+
<textarea className='github-Review-replyInput input-textarea native-key-bindings' placeholder='Reply...'></textarea>
308+
<button className="github-Review-replyButton btn" title="Add your comment">Comment</button>
309+
</div>
310+
</main>
311+
<footer className="github-Review-footer">
312+
<button className="github-Review-resolveButton btn btn-primary icon icon-check" title="Mark this comment as resolved">Mark as resolved</button>
313+
</footer>
314+
</details>
315+
316+
<details className="github-Review-thread" open>
317+
<summary className="github-Review-threadHeader">
318+
<span className="github-Review-resolvedIcon icon icon-check"></span>
319+
<span onClick={this.didClickLink} data-file-path="lib/controllers/commit-detail-controller.js">
320+
<span className="github-Review-path">lib/controllers/</span>
321+
<span className="github-Review-file">commit-detail-controller.js</span>
322+
</span>
323+
<span className="github-Review-lineNr">19</span>
324+
</summary>
325+
<pre className="github-Review-diff">
326+
<div className="github-Review-diffLine ">{ ' messageCollapsible: this.props.commit.isBodyLong(),' }</div>
327+
<div className="github-Review-diffLine ">{ ' messageOpen: !this.props.commit.isBodyLong(),' }</div>
328+
<div className="github-Review-diffLine is-deleted ">{ ' };' }</div>
329+
<div className="github-Review-diffLine is-added ">{ ' }' }</div>
330+
</pre>
331+
<main className="github-Review-comments">
332+
<div className="github-Review-comment">
333+
<header className="github-Review-commentHeader">
334+
<img className="github-Review-avatar" src="https://avatars.githubusercontent.com/u/e?email=annthurium%40github.com&s=32"/>
335+
<a className="github-Review-username" href="https://github.com/annthurium">annthurium</a>
336+
<span className="github-Review-commentTimeAgo">4 hours ago</span>
337+
</header>
338+
<div className="github-Review-commentText">mind adding the missing semicolon here?</div>
339+
</div>
340+
341+
<div className="github-Review-reply">
342+
<img className="github-Review-avatar" src="https://avatars.githubusercontent.com/u/e?email=annthurium%40github.com&s=32"/>
343+
<textarea className='github-Review-replyInput input-textarea native-key-bindings' placeholder='Reply...'></textarea>
344+
<button className="github-Review-replyButton btn" title="Add your comment">Comment</button>
345+
</div>
346+
</main>
347+
<footer className="github-Review-footer">
348+
<button className="github-Review-resolveButton btn btn-primary icon icon-check" title="Mark this comment as resolved">Mark as resolved</button>
349+
</footer>
350+
</details>
351+
352+
353+
</div>
354+
185355
</main>
186356
</div>
187357

‎styles/mock-item.less‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,9 @@
9999
margin-bottom: @component-padding;
100100
padding: @component-padding;
101101
font-size: @font-size-body;
102-
border: 1px solid @base-border-color;
102+
border: 1px solid mix(@text-color-info, @base-border-color, 24%);
103103
border-radius: @component-border-radius;
104-
background-color: @base-background-color;
104+
background-color: mix(@background-color-info, @base-background-color, 12%);
105105

106106
&:before {
107107
content: "";
@@ -115,15 +115,6 @@
115115
background-color: inherit;
116116
transform: rotate(45deg);
117117
}
118-
119-
&.is-approved {
120-
border-color: fade(@text-color-success, 40%);
121-
background-color: mix(@background-color-success, @base-background-color, 12%);
122-
}
123-
&.is-requesting-changes {
124-
border-color: fade(@text-color-warning, 40%);
125-
background-color: mix(@background-color-warning, @base-background-color, 10%);
126-
}
127118
}
128119

129120
// Header --------------------------------------
@@ -227,6 +218,7 @@
227218
}
228219

229220
&::before {
221+
content: " ";
230222
margin-right: .5em;
231223
}
232224

@@ -255,7 +247,6 @@
255247
&-comments {
256248
padding: @component-padding;
257249
padding-left: @component-padding + @avatar-size + 5px; // space for avatar
258-
// border-top: 1px solid @base-border-color;
259250
}
260251

261252
&-comment {
@@ -287,10 +278,14 @@
287278

288279
&-replyInput {
289280
width: 100%;
290-
height: 3.75em; // two lines
281+
height: 2.125em; // one line
291282
min-height: 2.125em;
292283
resize: vertical;
293284

285+
&:focus {
286+
height: 3.75em; // two lines
287+
}
288+
294289
&:focus + .github-Review-replyButton {
295290
display: block;
296291
}

0 commit comments

Comments
 (0)