From 8495a59e36f83b09ce44722bc0c4b9ce41be027a Mon Sep 17 00:00:00 2001 From: Cassie Tarakajian Date: Wed, 26 Sep 2018 16:14:06 -0400 Subject: [PATCH] Development documentation (#705) * delete unused files, move webpack configs to their own directory * start of improved developer documentation, moving everything to developer_docs/ directory * documentation updates --- .env.example | 5 - .eslintignore | 2 +- .github/CONTRIBUTING.md | 33 +---- Dockerfile | 3 +- Dockerfile-development | 20 --- README.md | 130 ++---------------- backup.sh | 57 -------- developer_docs/README.md | 12 ++ developer_docs/accessibility.md | 20 +++ developer_docs/deployment.md | 22 +++ developer_docs/development.md | 25 ++++ developer_docs/installation.md | 78 +++++++++++ developer_docs/preparing_a_pull_request.md | 47 +++++++ docker-compose-development.yml | 2 +- docker-compose.yml | 30 +--- ecosystem.json | 9 -- index.js | 2 +- kubernetes/app.yml => kubernetes_app.yml | 0 mongo/init.sh | 1 - package.json | 9 +- server/scripts/examples-gg-latest.js | 18 +-- server/scripts/examples.js | 17 +-- server/server.js | 19 +-- .../config.babel.js | 0 .../config.dev.js | 6 +- .../config.examples.js | 12 +- .../config.prod.js | 9 +- .../config.server.js | 6 +- 28 files changed, 257 insertions(+), 337 deletions(-) delete mode 100644 Dockerfile-development delete mode 100755 backup.sh create mode 100644 developer_docs/README.md create mode 100644 developer_docs/accessibility.md create mode 100644 developer_docs/deployment.md create mode 100644 developer_docs/development.md create mode 100644 developer_docs/installation.md create mode 100644 developer_docs/preparing_a_pull_request.md delete mode 100644 ecosystem.json rename kubernetes/app.yml => kubernetes_app.yml (100%) delete mode 100644 mongo/init.sh rename webpack.config.babel.js => webpack/config.babel.js (100%) rename webpack.config.dev.js => webpack/config.dev.js (93%) rename webpack.config.examples.js => webpack/config.examples.js (78%) rename webpack.config.prod.js => webpack/config.prod.js (93%) rename webpack.config.server.js => webpack/config.server.js (83%) diff --git a/.env.example b/.env.example index 0c80d768..3bfd7e50 100644 --- a/.env.example +++ b/.env.example @@ -1,10 +1,5 @@ API_URL=/api MONGO_URL=mongodb://localhost:27017/p5js-web-editor -MONGO_HOSTNAME=localhost -MONGO_PORT=27017 -MONGO_NAME=p5js-web-editor -MONGO_ROOT_USERNAME=processing_user -MONGO_ROOT_PASSWORD= PORT=8000 SESSION_SECRET=whatever_you_want_this_to_be_it_only_matters_for_production AWS_ACCESS_KEY= diff --git a/.eslintignore b/.eslintignore index 8d1287fa..017248a5 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,2 +1,2 @@ -webpack.config.js +webpack/* index.js \ No newline at end of file diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 0d74b0fb..870f11fc 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -1,17 +1,12 @@ -# Contributing to the p5.js web editor +# Contributing to the p5.js Web Editor -Hello! We welcome community contributions to the p5.js web editor. Contributing takes many forms and doesn't have to be **writing code**, it can be **documenting bugs**, **proposing new features**, and **updating documentation**. We would also like to Thank you for choosing to contribute p5.js web editor, any way possible. You are awesome! :blush: - -This **web editor** for **p5.js**, a JavaScript library with the goal of making coding accessible to **artists**, **designers**, **educators**, and **beginners**, is an environment to make p5.js sketches without needing to download any software or do any configuration, which makes it a great place to start learning how to code and start learning p5.js. +Hello! We welcome community contributions to the p5.js Web Editor. Contributing takes many forms and doesn't have to be **writing code**, it can be **report bugs**, **proposing new features**, **creating UI/UX designs**, and **updating documentation**. Here are links to all the sections in this document: - [Code of Conduct](#code-of-conduct) -- [Technologies Used](#technologies-used) -- [Development Installation](#development-installation) -- [New Design](#new-design) - [How Can I Contribute ?](#how-can-i-contribute?) - [First Timers](#first-timers) - [Want something more challenging](#want-something-more-challenging) @@ -23,30 +18,6 @@ Here are links to all the sections in this document: Please follow the guidelines mentioned at [CODE OF CONDUCT.md](https://github.com/processing/p5.js-web-editor/blob/master/CODE_OF_CONDUCT.md#p5js-code-of-conduct). -# Technologies Used - - > **MERN stack - MongoDB, Express, React/Redux, and Node**. - - - For a reference to the **file structure format** I am using, please look at the [Mern Starter](https://github.com/Hashnode/mern-starter). - - - This project **does not use CSS Modules, but uses Sass**. [BEM guidelines and naming conventions](http://getbem.com/) are followed. - - - For repeatitive and common styles, write OOSCSS (Object-Oriented SCSS) with placeholders and mixins. For organizing styles, follow the 7-1 Pattern for Sass. - - - We're using [ES6](http://es6-features.org/) and transpiling to ES5 using [Babel](https://babeljs.io/). - - - For reference to the JavaScript style guide, see the [Airbnb Style Guide](https://github.com/airbnb/javascript), [React ESLint Plugin](https://github.com/yannickcr/eslint-plugin-react). - - - The ESLint configuration is based on a few popular React/Redux boilerplates. Open to suggestions on this. If in development, **you're getting annoyed with ESLint**, you can **remove** it from `webpack.config.dev.js` in the JavaScript loader, or disable any line from eslint by commenting at the end of the line `// eslint-disable-line`. - -# Development Installation - -To get started on a patch, first read the instruction from [README.md](https://github.com/processing/p5.js-web-editor#development-installation). - -# New Design - -Design proposed and theme changes are present at: [Zeplin](https://scene.zeplin.io/project/55f746c54a02e1e50e0632c3). - # How Can I Contribute? ### First Timers diff --git a/Dockerfile b/Dockerfile index 9ac483dc..51864673 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,8 @@ ENV NODE_ENV development COPY package.json package-lock.json ./ RUN npm install RUN npm rebuild node-sass -COPY .babelrc index.js nodemon.json webpack.config.babel.js webpack.config.dev.js webpack.config.prod.js webpack.config.server.js webpack.config.examples.js ./ +COPY .babelrc index.js nodemon.json ./ +COPY ./webpack ./webpack COPY client ./client COPY server ./server CMD ["npm", "start"] diff --git a/Dockerfile-development b/Dockerfile-development deleted file mode 100644 index a1330f5c..00000000 --- a/Dockerfile-development +++ /dev/null @@ -1,20 +0,0 @@ -FROM node:8.11.1 - -ENV APP_HOME=/opt/node/app \ - TERM=xterm - -# Copy in the project files and set as working directory -ADD . $APP_HOME -WORKDIR $APP_HOME - -# Install node modules -RUN npm install - -# Rebuild node-sass just to be safe -RUN npm rebuild node-sass - -# For development, mark the directory as a mount override point -VOLUME $APP_HOME - -# Expose default server port -EXPOSE 8000 diff --git a/README.md b/README.md index 667e5988..d4ee0ebf 100644 --- a/README.md +++ b/README.md @@ -1,127 +1,23 @@ -# p5.js Web Editor +# [p5.js Web Editor](https://editor.p5js.org) -This project is currently in development! It will be announced when there is a (public) beta release. +The p5.js Web Editor is an in-browser code editor for creating [p5.js](https://p5js.org/) sketches. p5.js, which is a separate project, is a JavaScript library with the goal of making coding accessible for artists, designers, educators, and beginners, and the web editor shares this same spirit. It is designed with the benginner in mind—when using the web editor, you don't need to download or configure anything, you can simply open the website, and start writing code. You can also host their work online and share it with others. -## Development Installation +The p5.js Web Editor is currently in active development, and looking for contributions of any type! Please check out the [contribution guide](https://github.com/processing/p5.js-web-editor/blob/master/.github/CONTRIBUTING.md) for more details. -1. Fork this repository. -2. Clone the forked repository and cd into it -3. `$ npm install` -4. Install MongoDB and make sure it is running - * For Mac OSX with [homebrew](http://brew.sh/): `brew install mongodb` then `brew services start mongodb` - * For Windows and Linux: [MongoDB Installation](https://docs.mongodb.com/manual/installation/) -5. `$ cp .env.example .env` -6. (Optional) Update `.env` with necessary keys to enable certain app behavoirs, i.e. add Github ID and Github Secret if you want to be able to log in with Github. -7. `$ npm run fetch-examples` - this downloads the example sketches into a user called 'p5' -8. `$ npm start` -9. Navigate to [http://localhost:8000](http://localhost:8000) in your browser -10. Install the [React Developer Tools](https://chrome.google.com/webstore/detail/react-developer-tools/fmkadmapgofadopljbjfkapdkoienihi?hl=en) -11. Open and close the Redux DevTools using `ctrl+h`, and move them with `ctrl+w` +If you have found a bug in the p5.js Web Editor, you can file it under the ["issues" tab](https://github.com/processing/p5.js-web-editor/issues). -### Testing SSL on your local machine -Please refer to [this gist](https://gist.github.com/andrewn/953ffd5cb17ac2634dc969fc7bdaff3f). This allows you to access the editor using both HTTP and HTTPS. Don't worry about this unless you need to make changes or test HTTPS behavior. +## Issues -The automatic redirection to HTTPS is turned off by default in development. If you need to test this behavior, put `FORCE_TO_HTTPS=true` in your `.env` file. +Please post bugs and feature requests in the correct repository: -## Development Installation using Docker +* p5.js general and p5.dom: [https://github.com/processing/p5.js/issues](https://github.com/processing/p5.js/issues) +* p5.accessibility: [https://github.com/processing/p5.accessibility/issues](https://github.com/processing/p5.accessibility/issues) +* p5.sound: [https://github.com/processing/p5.js-sound/issues](https://github.com/processing/p5.js-sound/issues) +* p5.js website: [https://github.com/processing/p5.js-website/issues](https://github.com/processing/p5.js-website/issues) -Using Docker, you can have a complete, consistent development environment without having to manually install dependencies such as Node, Mongo, etc. It also helps isolate these dependencies and their data from other projects that you may have on the same computer that use different/conflicting versions, etc. +## Get Involved -Note that this takes up a significant amount of space on your machine. Make sure you have at least 5GB free. +The p5.js Web Editor is a collaborative project created by many individuals, and you are invited to help. All types of involvement are welcome. You can start with the [p5.js community section](https://p5js.org/community), which also applies to this project. -1. Install Docker for your operating system - * Mac: https://www.docker.com/docker-mac - * Windows: https://www.docker.com/docker-windows -2. Clone this repository and cd into it -3. `$ docker-compose -f docker-compose-development.yml build` -4. `$ docker-compose -f docker-compose-development.yml run --rm app npm run fetch-examples` +Developers, check the [developer docs](https://github.com/processing/p5.js-web-editor/blob/master/developer_docs/) details about contributing code, bug fixes, and documentation. -Now, anytime you wish to start the server with its dependencies, you can run: - -5. `$ docker-compose -f docker-compose-development.yml up` -6. Navigate to [http://localhost:8000](http://localhost:8000) in your browser - -To open a terminal/shell in the running Docker server (i.e. after `docker-compose up` has been run): - -7. `$ docker-compose -f docker-compose-development.yml exec app bash -l` - -If you don't have the full server environment running, you can launch a one-off container instance (and have it automatically deleted after you're done using it): - -8. `$ docker-compose -f docker-compose-development.yml run app --rm bash -l` - -## Production Installation -1. Clone this repository and `cd` into it -2. `$ npm install` -3. Install MongoDB and make sure it is running -4. `$ cp .env.example .env` -5. (NOT Optional) edit `.env` and fill in all necessart values. -6. `$ npm run fetch-examples` - this downloads the example sketches into a user called 'p5' -7. `$ npm run build` -8. `$ npm run start:prod` - -### For Production Setup with PM2 -1. `$ npm install -g pm2` -2. `$ pm2 start ecosystem.json` - -## S3 Bucket Configuration - -Please refer to the folllowing [gist](https://gist.github.com/catarak/70c9301f0fd1ac2d6b58de03f61997e3) to set up an S3 bucket to be used with this project. - - -If your S3 bucket is in the US East (N Virginia) region (us-east-1), you'll -need to set a custom URL base for it, because it does not follow the standard -naming pattern as the rest of the regions. Instead, add the following to your -environment/.env file: - -`S3_BUCKET_URL_BASE=https://s3.amazonaws.com` - -If you've configured your S3 bucket and DNS records to use a custom domain -name, you can also set it using this variable. I.e.: - -`S3_BUCKET_URL_BASE=https://files.mydomain.com` - -For more information on using a custom domain, see this documentation link: - -http://docs.aws.amazon.com/AmazonS3/latest/dev/VirtualHosting.html#VirtualHostingCustomURLs - -## Accessibility Guidelines - -Here is guide on [how to use the accessible editor](https://gist.github.com/MathuraMG/e86666b7b41fbc8c078bad9aff3f666d) and here is an overview of the [p5-accessibility.js](https://github.com/processing/p5.accessibility) library that makes p5.js sketches accessible to screen readers. - -The code for the p5.js web editor adheres to web accessibility standards. The following guidelines will help to ensure that accessibility continues to be a priority as development continues. - -**Code Structure** - -* Screen Readers are an assistive technology for vision loss which helps users to navigate a web page. They are able to prioritize content based on the semantic meaning of HTML tags. Therefore, it is important to use specific tags, such as `nav`, `ul`, `li`, `section`, and so on. `div` is the least screen reader friendly tag. For example, [here is the semantic meaning of the `body` tag](http://html5doctor.com/element-index/#body) -* All buttons/links/windows need to be accessible by the keyboard ( By tabbing, pressing space etc.) -* In cases where tags are not screen reader friendly, we can take advantage of [tabIndex](http://webaim.org/techniques/keyboard/tabindex). Using tabIndex ensures that all elements are accessible via keyboard. [code example](https://github.com/processing/p5.js-web-editor/blob/master/client/modules/IDE/components/Editor.jsx#L249) -* When opening a new window or pop up window, ensure the keyboard focus also moves to the new window. [code example](https://github.com/processing/p5.js-web-editor/blob/master/client/modules/IDE/components/NewFileForm.jsx#L16) - -**Labeling** - -* When creating button icons, images, or something without text (this does not include an HTML5 `