From 03fde3f0b561c7a8364d18a13bf06b554da84865 Mon Sep 17 00:00:00 2001 From: Cassie Tarakajian Date: Wed, 4 Dec 2019 14:46:38 -0500 Subject: [PATCH 01/15] update default version of p5.js to 0.10.2 --- client/modules/IDE/reducers/files.js | 6 +++--- server/scripts/examples.js | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/client/modules/IDE/reducers/files.js b/client/modules/IDE/reducers/files.js index 46c0dd30..a7bcda16 100644 --- a/client/modules/IDE/reducers/files.js +++ b/client/modules/IDE/reducers/files.js @@ -13,9 +13,9 @@ const defaultHTML = ` - - - + + + diff --git a/server/scripts/examples.js b/server/scripts/examples.js index ff108b9e..44a6a2f4 100644 --- a/server/scripts/examples.js +++ b/server/scripts/examples.js @@ -11,9 +11,8 @@ const defaultHTML = ` - - - + + From 91511aa4605e5cc0157e91c90d25adae3f5cba91 Mon Sep 17 00:00:00 2001 From: Cassie Tarakajian Date: Thu, 5 Dec 2019 14:08:36 -0500 Subject: [PATCH 02/15] remove p5.dom from default files as it's been integrated into p5 core library --- client/modules/IDE/reducers/files.js | 1 - 1 file changed, 1 deletion(-) diff --git a/client/modules/IDE/reducers/files.js b/client/modules/IDE/reducers/files.js index a7bcda16..781f3023 100644 --- a/client/modules/IDE/reducers/files.js +++ b/client/modules/IDE/reducers/files.js @@ -14,7 +14,6 @@ const defaultHTML = - From 20ac7527bc47873d406618d4333599a08a6067af Mon Sep 17 00:00:00 2001 From: Cassie Tarakajian Date: Thu, 5 Dec 2019 15:13:45 -0500 Subject: [PATCH 03/15] fixes #1219 --- server/utils/fileUtils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/utils/fileUtils.js b/server/utils/fileUtils.js index c63cff9f..d61c0b75 100644 --- a/server/utils/fileUtils.js +++ b/server/utils/fileUtils.js @@ -2,7 +2,7 @@ export const fileExtensionsArray = ['gif', 'jpg', 'jpeg', 'png', 'bmp', 'wav', 'flac', 'ogg', 'oga', 'mp4', 'm4p', 'mp3', 'm4a', 'aiff', 'aif', 'm4v', 'aac', 'webm', 'mpg', 'mp2', - 'mpeg', 'mpe', 'mpv', 'js', 'jsx', 'html', 'htm', 'css', 'json', 'csv', 'obj', 'svg', + 'mpeg', 'mpe', 'mpv', 'js', 'jsx', 'html', 'htm', 'css', 'json', 'csv', 'tsv', 'obj', 'svg', 'otf', 'ttf', 'txt', 'mov', 'vert', 'frag', 'bin']; export const mimeTypes = `image/*,audio/*,text/javascript,text/html,text/css, From 6120655ef2283d82943f9e905498e244757071d7 Mon Sep 17 00:00:00 2001 From: shyash Date: Mon, 23 Dec 2019 17:12:10 +0530 Subject: [PATCH 04/15] align toolbar --- client/styles/components/_toolbar.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/client/styles/components/_toolbar.scss b/client/styles/components/_toolbar.scss index a7c81415..274cad11 100644 --- a/client/styles/components/_toolbar.scss +++ b/client/styles/components/_toolbar.scss @@ -68,6 +68,11 @@ align-items: center; } +.toolbar__autorefresh{ + display: flex; + align-items: center; +} + .toolbar__project-name-container { @include themify() { border-color: getThemifyVariable('inactive-text-color'); From 813b57d04b5aa9d4920c23f9529626025f68287e Mon Sep 17 00:00:00 2001 From: Gabriel Sroka Date: Sun, 29 Dec 2019 15:16:58 -0800 Subject: [PATCH 05/15] Update README.md --- developer_docs/README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/developer_docs/README.md b/developer_docs/README.md index cf72650c..3586d5cb 100644 --- a/developer_docs/README.md +++ b/developer_docs/README.md @@ -1,13 +1,13 @@ This folder contains documents intended for developers of the p5.js Web Editor. ## List of Documents -* [Installation](https://github.com/processing/p5.js-web-editor/blob/master/developer_docs/installation.md) - A guide for setting up your development environment -* [Development](https://github.com/processing/p5.js-web-editor/blob/master/developer_docs/development.md) - A guide for adding code to the web editor -* [Preparing a pull-request](https://github.com/processing/p5.js/blob/master/developer_docs/preparing_a_pull_request.md) - Instructions for how to make a pull-request -* [Accessibility Guidelines](https://github.com/processing/p5.js-web-editor/blob/master/developer_docs/accessibility.md) - Guidelines for writing code to create an accessible application -* [Deployment](https://github.com/processing/p5.js-web-editor/blob/master/developer_docs/deployment.md) - A guide to production deployment, and all platforms that are being used. +* [Installation](installation.md) - A guide for setting up your development environment +* [Development](development.md) - A guide for adding code to the web editor +* [Preparing a pull-request](preparing_a_pull_request.md) - Instructions for how to make a pull-request +* [Accessibility Guidelines](accessibility.md) - Guidelines for writing code to create an accessible application +* [Deployment](deployment.md) - A guide to production deployment, and all platforms that are being used. ## Documents to Create * Design Principles - reference [p5.js design principles](https://github.com/processing/p5.js/edit/master/developer_docs/design_principles.md) * Issue Labels - reference [p5.js issue labels](https://github.com/processing/p5.js/blob/master/developer_docs/issue_labels.md) -* File Structure - An explanation of the file structure of this application. \ No newline at end of file +* File Structure - An explanation of the file structure of this application. From dabcccc4940049dad578745e9d9d7c096975c403 Mon Sep 17 00:00:00 2001 From: Gabriel Sroka Date: Sun, 29 Dec 2019 15:43:06 -0800 Subject: [PATCH 06/15] Update IDEView.jsx ` {this.props.ide.preferencesIsVisible && @@ -389,6 +390,7 @@ class IDEView extends React.Component { } { this.props.location.pathname === '/about' && @@ -397,6 +399,7 @@ class IDEView extends React.Component { } { this.props.location.pathname === '/feedback' && @@ -405,6 +408,7 @@ class IDEView extends React.Component { } { this.props.ide.shareModalVisible && @@ -417,6 +421,7 @@ class IDEView extends React.Component { } { this.props.ide.keyboardShortcutVisible && @@ -425,6 +430,7 @@ class IDEView extends React.Component { } { this.props.ide.errorType && From a1cd362780e27b8a9f325e19d5d3dd5068f611ed Mon Sep 17 00:00:00 2001 From: amitch6097 Date: Sat, 4 Jan 2020 23:24:08 -0500 Subject: [PATCH 07/15] Fix p5 console being cleared on pause The p5 console was being cleared on pause not allowing a user to view what was outputed on the last run. To fix clearConsole function is now only called if playing. --- client/modules/IDE/components/PreviewFrame.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/modules/IDE/components/PreviewFrame.jsx b/client/modules/IDE/components/PreviewFrame.jsx index 45fa00fd..ef19c96d 100644 --- a/client/modules/IDE/components/PreviewFrame.jsx +++ b/client/modules/IDE/components/PreviewFrame.jsx @@ -334,10 +334,10 @@ class PreviewFrame extends React.Component { } renderSketch() { - this.props.clearConsole(); const doc = this.iframeElement; const localFiles = this.injectLocalFiles(); if (this.props.isPlaying) { + this.props.clearConsole(); srcDoc.set(doc, localFiles); if (this.props.endSketchRefresh) { this.props.endSketchRefresh(); From df27b36b0bd3ba91e0eeda91a03627a6067c07a0 Mon Sep 17 00:00:00 2001 From: Cassie Tarakajian Date: Wed, 8 Jan 2020 12:33:36 -0500 Subject: [PATCH 08/15] Fixes #914, aligns project name and autorefresh on Mac and Windows --- client/modules/IDE/components/Toolbar.jsx | 2 +- client/styles/components/_toolbar.scss | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/client/modules/IDE/components/Toolbar.jsx b/client/modules/IDE/components/Toolbar.jsx index 7e659a20..b331e10e 100644 --- a/client/modules/IDE/components/Toolbar.jsx +++ b/client/modules/IDE/components/Toolbar.jsx @@ -116,7 +116,7 @@ class Toolbar extends React.Component { } }} > - {this.props.project.name}  + {this.props.project.name} { this.canEditProjectName() && diff --git a/client/styles/components/_toolbar.scss b/client/styles/components/_toolbar.scss index 274cad11..86dec1b2 100644 --- a/client/styles/components/_toolbar.scss +++ b/client/styles/components/_toolbar.scss @@ -68,18 +68,12 @@ align-items: center; } -.toolbar__autorefresh{ - display: flex; - align-items: center; -} - .toolbar__project-name-container { @include themify() { border-color: getThemifyVariable('inactive-text-color'); } margin-left: #{10 / $base-font-size}rem; padding-left: #{10 / $base-font-size}rem; - height: 70%; display: flex; align-items: center; } @@ -95,7 +89,8 @@ } } cursor: pointer; - line-height: #{18 / $base-font-size}rem; + display: flex; + align-items: center; .toolbar__project-name-container--editing & { display: none; @@ -156,7 +151,6 @@ display: inline-block; vertical-align: top; height: #{18 / $base-font-size}rem; - margin-left: #{-4 / $base-font-size}rem; & svg { width: #{18 / $base-font-size}rem; height: #{18 / $base-font-size}rem; From 65712ff474e1bb0af1931a8e4ec2d034e18d61bf Mon Sep 17 00:00:00 2001 From: ashu8912 Date: Tue, 14 Jan 2020 11:08:51 +0530 Subject: [PATCH 09/15] Updated Contributing Installation Guide Fixes Node Version and Mentioned Correct installation guide for mongodb. --- developer_docs/installation.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/developer_docs/installation.md b/developer_docs/installation.md index 3851abdb..26c477fb 100644 --- a/developer_docs/installation.md +++ b/developer_docs/installation.md @@ -6,7 +6,7 @@ Follow these instructions to set up your development environment, which you need _Note_: The installation steps assume you are using a Unix-like shell. If you are using Windows, you will need to use `copy` instead of `cp`. -1. Install [node.js](http://nodejs.org/), which also automatically installs the [npm](https://www.npmjs.org) package manager. +1. Install [node.js](https://nodejs.org/download/release/v10.15.0/) version 10.15.0 which also automatically installs the [npm](https://www.npmjs.org) package manager. 2. [Fork](https://help.github.com/articles/fork-a-repo) the [p5.js Web Editor repository](https://github.com/processing/p5.js-web-editor) into your own GitHub account. 3. [Clone](https://help.github.com/articles/cloning-a-repository/) your new fork of the repository from GitHub onto your local computer. @@ -21,7 +21,7 @@ _Note_: The installation steps assume you are using a Unix-like shell. If you ar $ npm install ``` 5. 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 Mac OSX with [homebrew](http://brew.sh/): `brew tap mongodb/brew` then `brew install mongodb-community` and finally start the server with `brew services start mongodb-community` or you can visit the installation guide here [Installation Guide For MacOS](https://docs.mongodb.com/manual/tutorial/install-mongodb-on-os-x/) * For Windows and Linux: [MongoDB Installation](https://docs.mongodb.com/manual/installation/) 6. `$ cp .env.example .env` 7. (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. From 2bd08483de5ec39bc200a044a14ffec3547f184c Mon Sep 17 00:00:00 2001 From: amitch6097 Date: Thu, 23 Jan 2020 19:50:28 -0500 Subject: [PATCH 10/15] fix #1246, Find modal does not select input text on second Command + F --- client/utils/codemirror-search.js | 1 + 1 file changed, 1 insertion(+) diff --git a/client/utils/codemirror-search.js b/client/utils/codemirror-search.js index 6e904656..9dbfd010 100644 --- a/client/utils/codemirror-search.js +++ b/client/utils/codemirror-search.js @@ -143,6 +143,7 @@ export default function(CodeMirror) { } } else { searchField.focus(); + searchField.select(); } } From 79238bd0b1227bc7237278e1bfd275422a15208d Mon Sep 17 00:00:00 2001 From: Cassie Tarakajian Date: Tue, 28 Jan 2020 16:52:39 -0500 Subject: [PATCH 11/15] Update node and npm engines in package.json to lts --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 9b24a5bf..95b119d7 100644 --- a/package.json +++ b/package.json @@ -92,8 +92,8 @@ "webpack-node-externals": "^1.7.2" }, "engines": { - "node": "10.15.0", - "npm": "6.4.1" + "node": "12.14.1", + "npm": "6.13.4" }, "dependencies": { "@babel/core": "^7.4.5", From e9bccd747b69d0d3824c9fdda2c60d7f71d320b9 Mon Sep 17 00:00:00 2001 From: Cassie Tarakajian Date: Tue, 28 Jan 2020 17:03:30 -0500 Subject: [PATCH 12/15] Fixes #1211, fixes HTML in index.html to be valid --- server/views/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/views/index.js b/server/views/index.js index 5b9c4bde..79631fda 100644 --- a/server/views/index.js +++ b/server/views/index.js @@ -12,7 +12,7 @@ export function renderIndex() { ${process.env.NODE_ENV === 'production' ? `` : ''} - + diff --git a/server/scripts/examples-gg-latest.js b/server/scripts/examples-gg-latest.js index 10ff94e5..9230de65 100644 --- a/server/scripts/examples-gg-latest.js +++ b/server/scripts/examples-gg-latest.js @@ -19,7 +19,7 @@ const clientSecret = process.env.GITHUB_SECRET; const defaultHTML = ` - + diff --git a/server/scripts/examples.js b/server/scripts/examples.js index 44a6a2f4..7e11fe3d 100644 --- a/server/scripts/examples.js +++ b/server/scripts/examples.js @@ -9,7 +9,7 @@ import Project from '../models/project'; const defaultHTML = ` - + diff --git a/server/views/404Page.js b/server/views/404Page.js index 77666f9a..dd46d86d 100644 --- a/server/views/404Page.js +++ b/server/views/404Page.js @@ -127,7 +127,7 @@ export function get404Sketch(callback) { }); } else { callback(insertErrorMessage(` - + diff --git a/server/views/index.js b/server/views/index.js index 79631fda..ced45615 100644 --- a/server/views/index.js +++ b/server/views/index.js @@ -2,7 +2,7 @@ export function renderIndex() { const assetsManifest = process.env.webpackAssets && JSON.parse(process.env.webpackAssets); return ` - + From 82c9135d2c63f97248516f65e9ca1f583db72744 Mon Sep 17 00:00:00 2001 From: Cassie Tarakajian Date: Tue, 28 Jan 2020 17:25:04 -0500 Subject: [PATCH 14/15] Change node engine to 11.15.0, since 12 wasn't working --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 95b119d7..460bab9f 100644 --- a/package.json +++ b/package.json @@ -92,8 +92,8 @@ "webpack-node-externals": "^1.7.2" }, "engines": { - "node": "12.14.1", - "npm": "6.13.4" + "node": "11.15.0", + "npm": "6.7.0" }, "dependencies": { "@babel/core": "^7.4.5", From 66053e5c94c9bd55fa2eee37362223887813d897 Mon Sep 17 00:00:00 2001 From: Cassie Tarakajian Date: Tue, 28 Jan 2020 17:12:46 -0500 Subject: [PATCH 15/15] Fixes #1192, adds lang=en to all html files --- client/modules/IDE/reducers/files.js | 2 +- server/scripts/examples-gg-latest.js | 2 +- server/scripts/examples.js | 2 +- server/views/404Page.js | 2 +- server/views/index.js | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/modules/IDE/reducers/files.js b/client/modules/IDE/reducers/files.js index 781f3023..f5b92f5e 100644 --- a/client/modules/IDE/reducers/files.js +++ b/client/modules/IDE/reducers/files.js @@ -11,7 +11,7 @@ function draw() { const defaultHTML = ` - + diff --git a/server/scripts/examples-gg-latest.js b/server/scripts/examples-gg-latest.js index 10ff94e5..9230de65 100644 --- a/server/scripts/examples-gg-latest.js +++ b/server/scripts/examples-gg-latest.js @@ -19,7 +19,7 @@ const clientSecret = process.env.GITHUB_SECRET; const defaultHTML = ` - + diff --git a/server/scripts/examples.js b/server/scripts/examples.js index 44a6a2f4..7e11fe3d 100644 --- a/server/scripts/examples.js +++ b/server/scripts/examples.js @@ -9,7 +9,7 @@ import Project from '../models/project'; const defaultHTML = ` - + diff --git a/server/views/404Page.js b/server/views/404Page.js index 77666f9a..dd46d86d 100644 --- a/server/views/404Page.js +++ b/server/views/404Page.js @@ -127,7 +127,7 @@ export function get404Sketch(callback) { }); } else { callback(insertErrorMessage(` - + diff --git a/server/views/index.js b/server/views/index.js index 79631fda..ced45615 100644 --- a/server/views/index.js +++ b/server/views/index.js @@ -2,7 +2,7 @@ export function renderIndex() { const assetsManifest = process.env.webpackAssets && JSON.parse(process.env.webpackAssets); return ` - +