Skip to content

Commit 4bf35ec

Browse files
committed
Merge remote-tracking branch 'upstream/develop' into refactor/keydown
2 parents 5a7dc12 + 7212f76 commit 4bf35ec

38 files changed

+1299
-463
lines changed

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
blank_issues_enabled: false
2+
3+
contact_links:
4+
- name: 🌸 p5.js Issues
5+
url: https://github.com/processing/p5.js/issues
6+
about: Report issues with the p5.js here.
7+
- name: 🌐 Website Issues
8+
url: https://github.com/processing/p5.js-website/issues
9+
about: Report issues with the p5.js website here.
10+
- name: 💬 Forum
11+
url: https://discourse.processing.org/c/p5js
12+
about: Have other questions about using p5.js? Ask them here!
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: 💡 Existing Feature Enhancement
2+
description: Suggest an improvement to an existing feature.
3+
labels: [ Enhancement ]
4+
body:
5+
- type: textarea
6+
attributes:
7+
label: Increasing Access
8+
description: How would this new feature help [increase access](https://github.com/processing/p5.js/blob/main/contributor_docs/access.md) to the p5.js Web Editor? (If you're not sure, you can type "Unsure" here and let others from the community offer their thoughts.)
9+
validations:
10+
required: true
11+
12+
- type: textarea
13+
attributes:
14+
label: Feature enhancement details
15+
validations:
16+
required: true
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: 🌱 New Feature Request
2+
description: Request a new feature be added.
3+
labels: [ Feature Request ]
4+
body:
5+
- type: textarea
6+
attributes:
7+
label: Increasing Access
8+
description: How would this new feature help [increase access](https://github.com/processing/p5.js/blob/main/contributor_docs/access.md) to the p5.js Web Editor? (If you're not sure, you can type "Unsure" here and let others from the community offer their thoughts.)
9+
validations:
10+
required: true
11+
12+
- type: textarea
13+
attributes:
14+
label: Feature request details
15+
validations:
16+
required: true
Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
name: 🐛 Found a Bug
2+
description: Report p5.js web editor bugs (broken or incorrect behaviour).
3+
labels: [ Bug ]
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: |
8+
- Please make sure to [search for existing issues](https://github.com/processing/p5.js-web-editor/issues) before filing a new one!
9+
10+
- type: input
11+
attributes:
12+
label: p5.js version
13+
description: You can find this in the first line of the p5.js file.
14+
validations:
15+
required: false
16+
17+
- type: dropdown
18+
attributes:
19+
label: What is your operating system?
20+
options:
21+
- Windows
22+
- Mac OS
23+
- Linux
24+
- Android
25+
- iOS
26+
- Other (specify if possible)
27+
validations:
28+
required: false
29+
30+
- type: input
31+
attributes:
32+
label: Web browser and version
33+
description: |
34+
In the address bar, on Chrome enter `chrome://version`, on Firefox enter `about:support`. On Safari, use `About Safari`.
35+
validations:
36+
required: false
37+
38+
- type: textarea
39+
attributes:
40+
label: Actual Behavior
41+
placeholder: What is currently happening.
42+
validations:
43+
required: true
44+
45+
- type: textarea
46+
attributes:
47+
label: Expected Behavior
48+
description: |
49+
If you want to include screenshots, paste them into the markdown editor below.
50+
placeholder: What were you expecting?
51+
validations:
52+
required: true
53+
54+
- type: textarea
55+
attributes:
56+
label: Steps to reproduce
57+
description: |
58+
- Add steps to reproduce bugs or add information on the place where the feature should be implemented.
59+
- Add links to a sample deployment or code.
60+
value: "### Steps:
61+
62+
1.
63+
2.
64+
3.
65+
66+
### Snippet:
67+
68+
```js
69+
70+
71+
// Paste your code here :)
72+
73+
74+
```"
75+
validations:
76+
required: true

.github/ISSUE_TEMPLATE/🌱-new-feature-request.md

Lines changed: 0 additions & 22 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/🐛-found-a-bug.md

Lines changed: 0 additions & 24 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/💡-existing-feature-enhancement.md

Lines changed: 0 additions & 18 deletions
This file was deleted.

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,5 @@ terraform/.terraform/
2020

2121
storybook-static
2222
duplicates.json
23+
24+
coverage

client/common/Button.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ Button.propTypes = {
257257
* The visible part of the button, telling the user what
258258
* the action is
259259
*/
260-
children: PropTypes.element,
260+
children: PropTypes.oneOfType([PropTypes.element, PropTypes.string]),
261261
/**
262262
If the button can be activated or not
263263
*/

client/components/Nav.jsx

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import { logoutUser } from '../modules/User/actions';
1919
import getConfig from '../utils/getConfig';
2020
import { metaKeyName, metaKey } from '../utils/metaKey';
2121
import { getIsUserOwner } from '../modules/IDE/selectors/users';
22+
import { selectSketchPath } from '../modules/IDE/selectors/project';
2223

2324
import CaretLeftIcon from '../images/left-arrow.svg';
2425
import TriangleIcon from '../images/down-filled-triangle.svg';
@@ -236,7 +237,7 @@ class Nav extends React.PureComponent {
236237
/>
237238
</li>
238239
<li className="nav__item nav__item--no-icon">
239-
<Link to="/" className="nav__back-link">
240+
<Link to={this.props.editorLink} className="nav__back-link">
240241
<CaretLeftIcon
241242
className="nav__back-icon"
242243
focusable="false"
@@ -743,6 +744,16 @@ class Nav extends React.PureComponent {
743744
正體中文
744745
</button>
745746
</li>
747+
<li className="nav__dropdown-item">
748+
<button
749+
onFocus={this.handleFocusForLang}
750+
onBlur={this.handleBlur}
751+
value="tr"
752+
onClick={(e) => this.handleLangSelection(e)}
753+
>
754+
Türkçe
755+
</button>
756+
</li>
746757
</ul>
747758
</li>
748759
</React.Fragment>
@@ -976,7 +987,8 @@ Nav.propTypes = {
976987
t: PropTypes.func.isRequired,
977988
setLanguage: PropTypes.func.isRequired,
978989
language: PropTypes.string.isRequired,
979-
isUserOwner: PropTypes.bool.isRequired
990+
isUserOwner: PropTypes.bool.isRequired,
991+
editorLink: PropTypes.string
980992
};
981993

982994
Nav.defaultProps = {
@@ -989,7 +1001,8 @@ Nav.defaultProps = {
9891001
warnIfUnsavedChanges: undefined,
9901002
params: {
9911003
username: undefined
992-
}
1004+
},
1005+
editorLink: '/'
9931006
};
9941007

9951008
function mapStateToProps(state) {
@@ -999,7 +1012,8 @@ function mapStateToProps(state) {
9991012
unsavedChanges: state.ide.unsavedChanges,
10001013
rootFile: state.files.filter((file) => file.name === 'root')[0],
10011014
language: state.preferences.language,
1002-
isUserOwner: getIsUserOwner(state)
1015+
isUserOwner: getIsUserOwner(state),
1016+
editorLink: selectSketchPath(state)
10031017
};
10041018
}
10051019

0 commit comments

Comments
 (0)