-
Notifications
You must be signed in to change notification settings - Fork 487
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add help page #120
Merged
Merged
Add help page #120
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
56b3539
Add help page
tiffon 266e932
Merge branch 'master' into add-help-page
tiffon d0ca950
Revert adding help as a separate page
tiffon bf1eeed
Trace detail keyboard shortcuts help as a modal
tiffon e480392
Misc typo
tiffon 3ad7935
Misc cleanup
tiffon File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
/* | ||
Copyright (c) 2017 Uber Technologies, Inc. | ||
|
||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
|
||
http://www.apache.org/licenses/LICENSE-2.0 | ||
|
||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
.Help { | ||
margin: 1.5em; | ||
} | ||
|
||
.Help code { | ||
background: #f5f5f5; | ||
color: #000; | ||
border: 1px solid #e8e8e8; | ||
border-bottom: 1px solid #e0e0e0; | ||
padding: 0.25em 0.3em; | ||
font-size: 0.91em; | ||
} | ||
|
||
.Help th { | ||
padding: 0.85em 0.5em; | ||
text-align: left; | ||
background: #f6f6f6; | ||
border-bottom: 1px solid #e3e3e3; | ||
} | ||
|
||
.Help td { | ||
padding: 1em 0.5em; | ||
border-bottom: 1px solid #e9e9e9; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
// Copyright (c) 2017 Uber Technologies, Inc. | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
import * as React from 'react'; | ||
|
||
// eslint-disable-next-line import/no-webpack-loader-syntax, import/no-unresolved | ||
import html from '!html-loader!remark-webpack-loader?preset=xtend!./help.md'; | ||
|
||
import './Help.css'; | ||
|
||
export default function Help() { | ||
return <div className="Help" dangerouslySetInnerHTML={{ __html: html }} />; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
// Copyright (c) 2017 Uber Technologies, Inc. | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
import React from 'react'; | ||
import { shallow } from 'enzyme'; | ||
|
||
import Help from './Help'; | ||
|
||
it('Help does not explode', () => { | ||
shallow(<Help />); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
# Jaeger UI Help | ||
|
||
|
||
## Work In Progress | ||
|
||
This document is a work in progress. To request additional documentation of the Jaeger UI, please create a [documentation ticket](https://github.com/jaegertracing/jaeger-ui/issues/new?labels=documentation). | ||
|
||
|
||
## Keyboard Shortcuts | ||
|
||
Keyboard shortcuts to affect scrolling and panning have been added to the Trace timeline view. | ||
|
||
| Key(s) | Description | | ||
| ------------- |-------------| | ||
| `w` | Scroll up | | ||
| `s` | Scroll down | | ||
| `a` | Pan left | | ||
| `d` | Pan right | | ||
| `f` | Scroll to the next visible span | | ||
| `b` | Scroll to the previous visible span | | ||
| `up` | Zoom in | | ||
| `shift` + `up` | Zoom in — Large | | ||
| `down` | Zoom out | | ||
| `shift` + `down` | Zoom out — Large | | ||
| `left` | Pan left | | ||
| `shift` + `left` | Pan left — Large | | ||
| `right` | Pan right | | ||
| `shift` + `right` | Pan right — Large | | ||
|
||
|
||
## Find An Issue? | ||
|
||
If you find an issue, please [file a ticket](https://github.com/jaegertracing/jaeger-ui/issues/new). | ||
|
||
|
||
## Other Resources | ||
|
||
- [Jaeger UI GitHub repo](https://github.com/jaegertracing/jaeger-ui) | ||
- [Jaeger on GitHub](https://github.com/jaegertracing) | ||
- [Jaeger Documentation](http://jaeger.readthedocs.io/en/latest/) | ||
- [Jaeger on Twitter](https://twitter.com/JaegerTracing) | ||
- [Jaeger on Gitter.im](https://gitter.im/jaegertracing/Lobby) | ||
- [Jaeger Discussion Group](https://groups.google.com/forum/#!forum/jaeger-tracing) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
// Copyright (c) 2017 Uber Technologies, Inc. | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
export { default } from './Help'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
export default ''; |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this should go in a modal for the Trace page, since its specific to that. A little tooltip can open it up