Skip to content

Commit bcaa0bf

Browse files
authored
Merge branch 'develop' into logoutGlitchFix
2 parents 88cbe22 + 0497096 commit bcaa0bf

File tree

7 files changed

+69
-62
lines changed

7 files changed

+69
-62
lines changed

README.md

Lines changed: 40 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,10 @@ The p5.js Editor is a collaborative project created by many individuals, mostly
1212

1313
Learn more about [our community](https://p5js.org/community/) and read our community statement and [code of conduct](./.github/CODE_OF_CONDUCT.md). You can directly support our work with p5.js by [donating to the Processing Foundation](https://processingfoundation.org/support).
1414

15-
## Get Started
15+
## Getting Started
1616

1717
Make your first sketch in the [p5.js Editor](https://editor.p5js.org/)! Learn more about sketching with p5.js on the [Get Started](https://p5js.org/get-started/) and find everything you can do in the [Reference](https://p5js.org/reference/). You can also look at [examples](https://editor.p5js.org/p5/sketches) and remix them in the p5.js Editor.
1818

19-
## Setting Up the Development Environment
20-
21-
- Refer to [this documentation for setting up your environment](https://github.com/processing/p5.js-web-editor/blob/develop/contributor_docs/installation.md)
22-
23-
2419

2520
## Issues
2621

@@ -31,10 +26,47 @@ If you have found a bug in the p5.js Web Editor, you can file it under the ["iss
3126
* p5.sound: [https://github.com/processing/p5.js-sound/issues](https://github.com/processing/p5.js-sound/issues)
3227
* p5.js website: [https://github.com/processing/p5.js-website/issues](https://github.com/processing/p5.js-website/issues)
3328

29+
30+
### How Do I Know My Issue or Pull Request is Getting Reviewed?
31+
32+
To see which pull requests and issues are currently being reviewed, check the [PR Review Board](https://github.com/processing/p5.js-web-editor/projects/9) or the following Milestones: [PATCH Release](https://github.com/processing/p5.js-web-editor/milestone/9), [MINOR Release](https://github.com/processing/p5.js-web-editor/milestone/8).
33+
34+
Issues and Pull Requests categorized under the PATCH or MINOR Release Milestones will be prioritized since they are planned to be merged for the next release to Production. Please feel free to [comment on this pinned issue](https://github.com/processing/p5.js-web-editor/issues/2534) if you would like your issue to be considered for the next release!
35+
36+
37+
### When Will the Next Production Release Be?
38+
39+
We will aim to deploy on a 1-2 month basis. Here are some dates we’re working towards:
40+
41+
MINOR Release for [p5.js version 1.8.0](https://github.com/processing/p5.js/releases/tag/v1.8.0): By October 27, 2023
42+
43+
PATCH Release: By November 2, 2023
44+
45+
MINOR Release: By November 30, 2023
46+
47+
[You can read more about Semantic Versioning and the differences between a MINOR and PATCH release](https://semver.org/).
48+
49+
50+
## References for Contributing to the p5.js Web Editor
51+
52+
[Code of Conduct](https://editor.p5js.org/code-of-conduct)
53+
54+
[Contribution Guidelines for p5.js](https://p5js.org/contributor-docs/#/)
55+
56+
[Contribution Guidelines for the p5.js Web Editor](https://github.com/processing/p5.js-web-editor/tree/develop/contributor_docs)
57+
58+
[p5.js Community Statement](https://p5js.org/community/)
59+
60+
3461
## Acknowledgements
3562

3663
Support for this project has come from [Processing Foundation](https://processingfoundation.org/), [NYU ITP](https://tisch.nyu.edu/itp), [CS4All, NYC DOE](http://cs4all.nyc/), [COSA at DU](https://liberalarts.du.edu/emergent-digital-practices/open-source-arts), [STUDIO for Creative Inquiry](https://studioforcreativeinquiry.org/), [Grant for the Web](https://www.grantfortheweb.org/), [New Media Rights](https://www.newmediarights.org/), and many others.
3764

38-
Hosting and technical support has come from: <br />
39-
<a href="https://releasehub.com/" target="_blank"><img width="100" src="https://assets.website-files.com/603dd147c5b0a480611bd348/603dd147c5b0a469bc1bd451_logo--dark.svg" /></a>
65+
Hosting and technical support has come from:
66+
<br />
67+
<br />
68+
<a href="https://releasehub.com/" target="_blank"><img width="100" src="https://assets.website-files.com/603dd147c5b0a480611bd348/603dd147c5b0a469bc1bd451_logo--dark.svg" /></a>
69+
<br />
4070
<a href="https://www.browserstack.com/" target="_blank"><img width="100" src="https://user-images.githubusercontent.com/6063380/46976166-ab280a80-d096-11e8-983b-18dd38c8cc9b.png" /></a>
71+
<br />
72+
<a href="https://www.fastly.com/" target="_blank"><img width="100" src="https://cdn-assets-us.frontify.com/s3/frontify-enterprise-files-us/eyJwYXRoIjoiZmFzdGx5XC9hY2NvdW50c1wvYzJcLzQwMDEwMjNcL3Byb2plY3RzXC8xMVwvYXNzZXRzXC80ZVwvNzc0XC9lZTZmYzlkOWYzNWE1NjBkNjUzNjFkNGI0NGQ2MTNmZi0xNjIxNTIyODg4LnBuZyJ9:fastly:nVuY3PxyFqQMI6elJsMzxAGLH3IFlmiuMdacHAGRMkE?width=2400" /></a>

client/modules/IDE/pages/IDEView.jsx

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import PreviewFrame from '../components/PreviewFrame';
1111
import Console from '../components/Console';
1212
import Toast from '../components/Toast';
1313
import { updateFileContent } from '../actions/files';
14-
import { stopSketch } from '../actions/ide';
14+
1515
import {
1616
autosaveProject,
1717
clearPersistedState,
@@ -80,7 +80,7 @@ const IDEView = () => {
8080

8181
const [consoleSize, setConsoleSize] = useState(150);
8282
const [sidebarSize, setSidebarSize] = useState(160);
83-
const [isOverlayVisible, setIsOverlayVisible] = useState(true);
83+
const [isOverlayVisible, setIsOverlayVisible] = useState(false);
8484

8585
const cmRef = useRef({});
8686

@@ -93,8 +93,6 @@ const IDEView = () => {
9393

9494
useEffect(() => {
9595
dispatch(clearPersistedState());
96-
97-
dispatch(stopSketch());
9896
}, [dispatch]);
9997

10098
useEffect(() => {
@@ -160,7 +158,6 @@ const IDEView = () => {
160158
setIsOverlayVisible(true);
161159
}}
162160
onDragFinished={() => {
163-
// overlayRef.current.style.display = 'none';
164161
setIsOverlayVisible(false);
165162
}}
166163
resizerStyle={{

client/routes.jsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,10 @@ const withParams = (Component) => (props) => (
4848
const Route = ({ component, ...props }) => (
4949
<RouterRoute component={withParams(component)} {...props} />
5050
);
51-
Route.propTypes = { ...RouterRoute.propTypes };
52-
Route.propTypes.component = PropTypes.elementType.isRequired;
51+
Route.propTypes = {
52+
...RouterRoute.propTypes,
53+
component: PropTypes.elementType.isRequired
54+
};
5355

5456
const routes = (
5557
<Switch>

package-lock.json

Lines changed: 18 additions & 42 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)