Merge branch 'develop' into chore/sandbox

catarak · catarak · commit 672f23ea52f6 · 2021-06-14T16:00:33.000-04:00
diff --git a/.prettierrc b/.prettierrc
@@ -14,5 +14,6 @@
   "tabWidth": 2,
   "trailingComma": "none",
   "useTabs": false,
-  "quoteProps": "as-needed"
+  "quoteProps": "as-needed",
+  "endOfLine":"auto"
 }
diff --git a/client/components/Nav.jsx b/client/components/Nav.jsx
@@ -647,6 +647,16 @@ class Nav extends React.PureComponent {
                 Português
               </button>
             </li>
+            <li className="nav__dropdown-item">
+              <button
+                onFocus={this.handleFocusForLang}
+                onBlur={this.handleBlur}
+                value="de"
+                onClick={(e) => this.handleLangSelection(e)}
+              >
+                Deutsch
+              </button>
+            </li>
             <li className="nav__dropdown-item">
               <button
                 onFocus={this.handleFocusForLang}
diff --git a/client/i18n.js b/client/i18n.js
@@ -1,18 +1,19 @@
 import i18n from 'i18next';
 import { initReactI18next } from 'react-i18next';
 import Backend from 'i18next-http-backend';
-import { enUS, es, ja, hi, ptBR } from 'date-fns/locale';
+import { enUS, es, ja, hi, ptBR, de } from 'date-fns/locale';
 
 const fallbackLng = ['en-US'];
-const availableLanguages = ['en-US', 'es-419', 'ja', 'hi', 'pt-BR'];
+const availableLanguages = ['en-US', 'es-419', 'ja', 'hi', 'pt-BR', 'de'];
 
 export function languageKeyToLabel(lang) {
   const languageMap = {
     'en-US': 'English',
     'es-419': 'Español',
     ja: '日本語',
     hi: 'हिन्दी',
-    'pt-BR': 'Português'
+    'pt-BR': 'Português',
+    de: 'Deutsch'
   };
   return languageMap[lang];
 }
@@ -23,6 +24,7 @@ export function languageKeyToDateLocale(lang) {
     'es-419': es,
     ja,
     hi,
+    de,
     'pt-BR': ptBR
   };
   return languageMap[lang];
diff --git a/client/modules/IDE/reducers/files.js b/client/modules/IDE/reducers/files.js
@@ -13,7 +13,7 @@ const defaultHTML = `<!DOCTYPE html>
 <html lang="en">
   <head>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.3.1/p5.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.3.1/addons/p5.sound.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.10.2/addons/p5.sound.min.js"></script>
     <link rel="stylesheet" type="text/css" href="style.css">
     <meta charset="utf-8" />
 
diff --git a/client/modules/User/pages/DashboardView.jsx b/client/modules/User/pages/DashboardView.jsx
@@ -11,6 +11,7 @@ import AssetList from '../../IDE/components/AssetList';
 import AssetSize from '../../IDE/components/AssetSize';
 import CollectionList from '../../IDE/components/CollectionList';
 import SketchList from '../../IDE/components/SketchList';
+import * as ProjectActions from '../../IDE/actions/project';
 import {
   CollectionSearchbar,
   SketchSearchbar
@@ -29,6 +30,7 @@ class DashboardView extends React.Component {
   constructor(props) {
     super(props);
     this.closeAccountPage = this.closeAccountPage.bind(this);
+    this.createNewSketch = this.createNewSketch.bind(this);
     this.gotoHomePage = this.gotoHomePage.bind(this);
     this.toggleCollectionCreate = this.toggleCollectionCreate.bind(this);
     this.state = {
@@ -44,6 +46,10 @@ class DashboardView extends React.Component {
     browserHistory.push(this.props.previousPath);
   }
 
+  createNewSketch() {
+    this.props.newProject();
+  }
+
   gotoHomePage() {
     browserHistory.push('/');
   }
@@ -98,7 +104,9 @@ class DashboardView extends React.Component {
         return (
           <React.Fragment>
             {this.isOwner() && (
-              <Button to="/">{t('DashboardView.NewSketch')}</Button>
+              <Button onClick={this.createNewSketch}>
+                {t('DashboardView.NewSketch')}
+              </Button>
             )}
             <SketchSearchbar />
           </React.Fragment>
@@ -170,7 +178,12 @@ function mapStateToProps(state) {
   };
 }
 
+const mapDispatchToProps = {
+  ...ProjectActions
+};
+
 DashboardView.propTypes = {
+  newProject: PropTypes.func.isRequired,
   location: PropTypes.shape({
     pathname: PropTypes.string.isRequired
   }).isRequired,
@@ -185,4 +198,6 @@ DashboardView.propTypes = {
   t: PropTypes.func.isRequired
 };
 
-export default withTranslation()(connect(mapStateToProps)(DashboardView));
+export default withTranslation()(
+  connect(mapStateToProps, mapDispatchToProps)(DashboardView)
+);
diff --git a/client/testData/testReduxStore.js b/client/testData/testReduxStore.js
@@ -68,7 +68,7 @@ const initialTestState = {
     },
     {
       name: 'index.html',
-      content: `<!DOCTYPE html> <html lang="en"> <head> <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.2.0/p5.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.2.0/addons/p5.sound.min.js"></script> <link rel="stylesheet" type="text/css" href="style.css"> <meta charset="utf-8" /> </head> <body> <script src="sketch.js"></script> </body> </html>`,
+      content: `<!DOCTYPE html> <html lang="en"> <head> <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.3.1/p5.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.10.2/addons/p5.sound.min.js"></script> <link rel="stylesheet" type="text/css" href="style.css"> <meta charset="utf-8" /> </head> <body> <script src="sketch.js"></script> </body> </html>`,
       id: '606fc1c46045e19ca2ee2646',
       _id: '606fc1c46045e19ca2ee2646',
       fileType: 'file',
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "p5.js-web-editor",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "The web editor for p5.js.",
   "scripts": {
     "clean": "rimraf dist",
diff --git a/server/scripts/examples.js b/server/scripts/examples.js
@@ -10,7 +10,7 @@ const defaultHTML = `<!DOCTYPE html>
 <html lang="en">
   <head>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.3.1/p5.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.3.1/addons/p5.sound.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.10.2/addons/p5.sound.min.js"></script>
     <link rel="stylesheet" type="text/css" href="style.css">
     <meta charset="utf-8" />
   </head>
diff --git a/translations/locales/de/translations.json b/translations/locales/de/translations.json

Original file line number	Diff line number	Diff line change
`@@ -14,5 +14,6 @@`
`14`	`14`	`"tabWidth": 2,`
`15`	`15`	`"trailingComma": "none",`
`16`	`16`	`"useTabs": false,`
`17`		`- "quoteProps": "as-needed"`
	`17`	`+ "quoteProps": "as-needed",`
	`18`	`+ "endOfLine":"auto"`
`18`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ const initialTestState = {`
`68`	`68`	`},`
`69`	`69`	`{`
`70`	`70`	`name: 'index.html',`
`71`		- content: `<!DOCTYPE html> <html lang="en"> <head> <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.2.0/p5.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.2.0/addons/p5.sound.min.js"></script> <link rel="stylesheet" type="text/css" href="style.css"> <meta charset="utf-8" /> </head> <body> <script src="sketch.js"></script> </body> </html>`,
	`71`	+ content: `<!DOCTYPE html> <html lang="en"> <head> <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.3.1/p5.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.10.2/addons/p5.sound.min.js"></script> <link rel="stylesheet" type="text/css" href="style.css"> <meta charset="utf-8" /> </head> <body> <script src="sketch.js"></script> </body> </html>`,
`72`	`72`	`id: '606fc1c46045e19ca2ee2646',`
`73`	`73`	`_id: '606fc1c46045e19ca2ee2646',`
`74`	`74`	`fileType: 'file',`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "p5.js-web-editor",`
`3`		`- "version": "1.4.0",`
	`3`	`+ "version": "1.4.1",`
`4`	`4`	`"description": "The web editor for p5.js.",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"clean": "rimraf dist",`