Skip to content

Commit 3ee6b5b

Browse files
authored
Merge branch 'develop' into develop
2 parents 0643db1 + 4a52a00 commit 3ee6b5b

File tree

201 files changed

+79662
-21538
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

201 files changed

+79662
-21538
lines changed

.babelrc

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@
4040
],
4141
"@babel/plugin-proposal-nullish-coalescing-operator",
4242
"@babel/plugin-proposal-do-expressions",
43-
"@babel/plugin-proposal-function-bind"
43+
"@babel/plugin-proposal-function-bind",
44+
["@babel/plugin-proposal-private-methods", { "loose": true }]
4445
],
4546
"presets": [
4647
"@babel/preset-env",
@@ -85,6 +86,8 @@
8586
],
8687
"@babel/plugin-proposal-nullish-coalescing-operator",
8788
"@babel/plugin-proposal-do-expressions",
88-
"@babel/plugin-proposal-function-bind"
89+
"@babel/plugin-proposal-function-bind",
90+
["@babel/plugin-proposal-private-methods", { "loose": true }],
91+
["@babel/plugin-proposal-private-property-in-object", { "loose": true }]
8992
]
9093
}

.env.example

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,24 @@ EXAMPLE_USER_PASSWORD=hellop5js
1010
GG_EXAMPLES_USERNAME=generativedesign
1111
GG_EXAMPLES_EMAIL=[email protected]
1212
GG_EXAMPLES_PASS=generativedesign
13-
ML5_LIBRARY_USERNAME=ml5
14-
ML5_LIBRARY_EMAIL=[email protected]
15-
ML5_LIBRARY_PASS=helloml5
1613
GITHUB_ID=<your-github-client-id>
1714
GITHUB_SECRET=<your-github-client-secret>
1815
GOOGLE_ID=<your-google-client-id> (use google+ api)
1916
GOOGLE_SECRET=<your-google-client-secret> (use google+ api)
2017
MAILGUN_DOMAIN=<your-mailgun-domain>
2118
MAILGUN_KEY=<your-mailgun-api-key>
19+
ML5_LIBRARY_USERNAME=ml5
20+
ML5_LIBRARY_EMAIL=[email protected]
21+
ML5_LIBRARY_PASS=helloml5
22+
MOBILE_ENABLED=true
2223
MONGO_URL=mongodb://localhost:27017/p5js-web-editor
2324
PORT=8000
25+
PREVIEW_PORT=8002
26+
EDITOR_URL=http://localhost:8000
27+
PREVIEW_URL=http://localhost:8002
2428
S3_BUCKET=<your-s3-bucket>
2529
S3_BUCKET_URL_BASE=<alt-for-s3-url>
2630
SESSION_SECRET=whatever_you_want_this_to_be_it_only_matters_for_production
31+
TRANSLATIONS_ENABLED=true
2732
UI_ACCESS_TOKEN_ENABLED=false
2833
UPLOAD_LIMIT=250000000
29-
MOBILE_ENABLED=true

.eslintrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"extends": ["airbnb", "prettier"],
3-
"parser": "babel-eslint",
3+
"parser": "@babel/eslint-parser",
44
"env": {
55
"browser": true,
66
"node": true,
@@ -69,7 +69,7 @@
6969
"react", "jsx-a11y", "import", "prettier"
7070
],
7171
"settings": {
72-
"import/parser": "babel-eslint",
72+
"import/parser": "@babel/eslint-parser",
7373
"import/resolve": {
7474
"moduleDirectory": ["node_modules"]
7575
}

.github/CODE_OF_CONDUCT.md

Lines changed: 35 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,51 @@
1-
# p5.js Code of Conduct
1+
## [p5.js community statement](http://p5js.org/community/)
2+
3+
p5.js is a community interested in exploring the creation of art and design with technology.
4+
5+
We are a community of, and in solidarity with, people from every gender identity and expression, sexual orientation, race, ethnicity, language, neuro-type, size, disability, class, religion, culture, subculture, political opinion, age, skill level, occupation, and background. We acknowledge that not everyone has the time, financial means, or capacity to actively participate, but we recognize and encourage involvement of all kinds. We facilitate and foster access and empowerment. We are all learners.
6+
7+
We like these hashtags: #noCodeSnobs (because we value community over efficiency), #newKidLove (because we all started somewhere), #unassumeCore (because we don't assume knowledge), and #BlackLivesMatter (because of course).
8+
9+
In practice:
10+
* We are not code snobs. We do not assume knowledge or imply there are things that somebody should know.
11+
* We insist on actively engaging with requests for feedback regardless of their complexity.
12+
* We welcome newcomers and prioritize the education of others. We strive to approach all tasks with the enthusiasm of a newcomer. Because we believe that newcomers are just as valuable in this effort as experts.
13+
* We consistently make the effort to actively recognize and validate multiple types of contributions.
14+
* We are always willing to offer help or guidance.
15+
16+
In times of conflict:
17+
* We listen.
18+
* We clearly communicate while acknowledging other's feelings.
19+
* We admit when we're wrong, apologize, and accept responsibility for our actions.
20+
* We are continuously seeking to improve ourselves and our community.
21+
* We keep our community respectful and open.
22+
* We make everyone feel heard.
23+
* We are mindful and kind in our interactions.
24+
25+
In the future:
26+
* The future is now.
27+
28+
29+
## p5.js Code of Conduct
230

331
* **Be mindful of your language.** Any of the following behavior is unacceptable:
432
* Offensive comments related to gender identity and expression, sexual orientation, race, ethnicity, language, neuro-type, size, ability, class, religion, culture, subculture, political opinion, age, skill level, occupation, or background
533
* Threats of violence
634
* Deliberate intimidation
7-
* Sexually explicit or violent material
35+
* Sexually explicit or violent material that is not contextualized and preceded by a considerate warning
836
* Unwelcome sexual attention
937
* Stalking or following
1038
* Or any other kinds of harassment
1139

1240
Use your best judgement. If it will possibly make others uncomfortable, do not post it.
1341

14-
* **Be respectful.** Disagreement is not an opportunity to attack someone else's thoughts or opinions. Although views may differ, remember to approach every situation with patience and care.
15-
* **Be considerate.** Think about how your contribution will affect others in the community.
42+
* **Be respectful.** Disagreement is not an opportunity to attack someone else's thoughts or opinions. Although views may differ, remember to approach every situation with patience and care.
43+
* **Be considerate.** Think about how your contribution will affect others in the community.
1644
* **Be open minded.** Embrace new people and new ideas. Our community is continually evolving and we welcome positive change.
1745

1846
If you believe someone is violating the code of conduct, we ask that you report it by emailing [[email protected]](mailto:[email protected]). Please include your name and a description of the incident, and we will get back to you ASAP.
1947

20-
Participants asked to stop any harassing behavior are expected to comply immediately. If a participant engages in harassing behavior, the p5.js Team may take any action they deem appropriate, up to and including expulsion from all p5.js spaces and identification of the participant as a harasser to other p5.js members or the general public.
21-
22-
## Also
48+
Sometimes, participants violating the Code of Conduct are unaware that their behavior is harmful, and an open conversation clears things up to move forward. However, if a participant continues with the behavior, the p5.js team may take any action they deem appropriate, up to and including expulsion from all p5.js spaces and identification of the participant as a harasser to other p5.js members or the general public.
2349

24-
* You can read our [community statement](http://p5js.org/community/) on our website.
50+
---
51+
This statement is licensed under a [Creative Commons license](https://creativecommons.org/licenses/by-sa/4.0/). Please feel free to share and remix with attribution.

.github/CONTRIBUTING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ Don't know where to begin? Here are some suggestions to get started:
3535
- Translations: Application and documentation
3636
* Use the [p5.js Web Editor](https://editor.p5js.org)! Find a bug? Think of something you think would add to the project? Open an issue.
3737
* Expand an existing issue. Sometimes issues are missing steps to reproduce, or need suggestions for potential solutions. Sometimes they need another voice saying, "this is really important!"
38-
* Try getting the project running locally on your computer by following the [installation steps](./../developer_docs/installation.md).
39-
* Look through the documentation in the [developer docs](../developer_docs/). Is there anything that could be expanded? Is there anything missing?
40-
* Look at the [development guide](./../developer_docs/development.md).
38+
* Try getting the project running locally on your computer by following the [installation steps](./../contributor_docs/installation.md).
39+
* Look through the documentation in the [developer docs](../contributor_docs/). Is there anything that could be expanded? Is there anything missing?
40+
* Look at the [development guide](./../contributor_docs/development.md).
4141

4242
### Good First Issues
4343
For first-time contributors or those who want to start with a small task, [check out the list of good first issues](https://github.com/processing/p5.js-web-editor/labels/good%20first%20issue), or [issues that need documentation of steps to reproduce](https://github.com/processing/p5.js-web-editor/issues?q=is%3Aissue+is%3Aopen+label%3A%22needs+steps+to+reproduce%22). If the issue has not been assigned to anyone, then you can work on it! It's okay to not know how to fix an issue, and feel free to ask questions about to approach the problem! We are all here to learn and make something awesome. Someone from the community would help you out and these are great issues for learning about the web editor, its file structure and its development process.
@@ -60,7 +60,7 @@ If you feel like an issue is tagged incorrectly (e.g. it's low priority and you
6060

6161
If you'd like to work on an issue, please comment on it to let the maintainers know, so that they can assign it to you. If someone else has already commented and taken up that issue, please refrain from working on it and submitting a PR without asking the maintainers as it leads to unnecessary duplication of effort.
6262

63-
Then, look at the [development guide](https://github.com/processing/p5.js-web-editor/blob/develop/developer_docs/development.md) for instructions on how to install the project locally and follow the right development workflow.
63+
Then, look at the [development guide](https://github.com/processing/p5.js-web-editor/blob/develop/contributor_docs/development.md) for instructions on how to install the project locally and follow the right development workflow.
6464

6565
### Contribution Guides
6666

.github/ISSUE_TEMPLATE.md

Lines changed: 0 additions & 27 deletions
This file was deleted.
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
name: Existing Feature Enhancement
3+
about: This template is for suggesting an improvement for an existing feature.
4+
title: ''
5+
labels: enhancement
6+
assignees: ''
7+
8+
---
9+
10+
<!--
11+
Hi there!
12+
13+
To check an option in the sub-areas list, replace the "[ ]" with a "[x]". Be sure to check out how it looks in the Preview tab! Feel free to remove any portion of the template that is not relevant for your issue.
14+
-->
15+
16+
### How would this new feature help [increase access](https://github.com/processing/p5.js/blob/main/contributor_docs/access.md) to the p5.js Editor?
17+
18+
#### Feature enhancement details:
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
name: New Feature Request
3+
about: This template is for requesting a new feature be added.
4+
title: ''
5+
labels: feature request
6+
assignees: ''
7+
8+
---
9+
10+
<!--
11+
Hi there!
12+
13+
Thank you for contributing to the p5.js Editor project
14+
15+
Until further notice, we will only add new features that increase access.
16+
17+
In order to request a new feature for the p5.js Editor, we need to know how the new feature will increase access.
18+
-->
19+
20+
### How would this new feature help [increase access](https://github.com/processing/p5.js/blob/main/contributor_docs/access.md) to the p5.js Editor?
21+
22+
#### New feature details:

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
name: Found a Bug
3+
about: This template is for reporting bugs (broken or incorrect behavior). If you have questions about your own code, please visit our forum discourse.processing.org instead.
4+
title: ''
5+
labels: bug
6+
assignees: ''
7+
8+
---
9+
10+
<!--
11+
Hi there!
12+
13+
To check any option, replace the "[ ]" with a "[x]". Be sure to check out how it looks in the Preview tab! Feel free to remove any portion of the template that is not relevant for your issue.
14+
-->
15+
16+
#### Details about the bug:
17+
18+
- p5.js version: <!-- You can find this in the first line of the p5.js file -->
19+
- Web browser and version: <!-- In the address bar, on Chrome enter "chrome://version", on Firefox enter "about:support". On Safari, use "About Safari". -->
20+
- Operating System: <!-- Ex: Windows/MacOSX/Linux/Android/iOS along with version -->
21+
- Steps to reproduce this:
22+
<!-- Include a simple code snippet that demonstrates the problem, along with any console errors produced. If this isn't possible, then simply describe the issue as best you can! -->

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
Fixes #issue-number
22

3+
Changes:
4+
35
I have verified that this pull request:
46

57
* [ ] has no linting errors (`npm run lint`)
6-
* [ ] is from a uniquely-named feature branch and has been rebased on top of the latest `develop` branch. (If I was asked to make more changes, I have made sure to rebase onto `develop` then too)
8+
* [ ] has no test errors (`npm run test`)
9+
* [ ] is from a uniquely-named feature branch and is up to date with the `develop` branch.
710
* [ ] is descriptively named and links to an issue number, i.e. `Fixes #123`

0 commit comments

Comments
 (0)