Merge branch 'develop' into refactor/inline-button

Author: raclim

README.md

@@ -38,7 +38,7 @@ Issues and Pull Requests categorized under the PATCH or MINOR Release Milestones
 
 We will aim to deploy on a 1-2 month basis. Here are some dates we’re working towards: 
 
-2.11.0 MINOR Release: By January 10, 2023
+2.11.0 MINOR Release: By January 16, 2023
 
 [You can read more about Semantic Versioning and the differences between a MINOR and PATCH release](https://semver.org/). 
 

client/constants.js

@@ -90,8 +90,6 @@ export const SHOW_EDITOR_OPTIONS = 'SHOW_EDITOR_OPTIONS';
 export const CLOSE_EDITOR_OPTIONS = 'CLOSE_EDITOR_OPTIONS';
 export const SHOW_KEYBOARD_SHORTCUT_MODAL = 'SHOW_KEYBOARD_SHORTCUT_MODAL';
 export const CLOSE_KEYBOARD_SHORTCUT_MODAL = 'CLOSE_KEYBOARD_SHORTCUT_MODAL';
-export const SHOW_FUNDRAISER_MODAL = 'SHOW_FUNDRAISER_MODAL';
-export const CLOSE_FUNDRAISER_MODAL = 'CLOSE_FUNDRAISER_MODAL';
 export const SHOW_TOAST = 'SHOW_TOAST';
 export const HIDE_TOAST = 'HIDE_TOAST';
 export const SET_TOAST_TEXT = 'SET_TOAST_TEXT';

client/i18n.js

@@ -17,7 +17,8 @@ import {
   zhTW,
   uk,
   sv,
-  tr
+  tr,
+  enIN
 } from 'date-fns/locale';
 
 const fallbackLng = ['en-US'];
@@ -37,12 +38,13 @@ export const availableLanguages = [
   'uk-UA',
   'zh-CN',
   'zh-TW',
-  'tr'
+  'tr',
+  'ur'
 ];
 
 export function languageKeyToLabel(lang) {
   const languageMap = {
-    be: 'Bengali',
+    be: 'বাংলা',
     de: 'Deutsch',
     'en-US': 'English',
     'es-419': 'Español',
@@ -56,7 +58,8 @@ export function languageKeyToLabel(lang) {
     'uk-UA': 'Українська',
     'zh-CN': '简体中文',
     'zh-TW': '正體中文',
-    tr: 'Türkçe'
+    tr: 'Türkçe',
+    ur: 'اردو'
   };
   return languageMap[lang];
 }
@@ -77,7 +80,8 @@ export function languageKeyToDateLocale(lang) {
     'uk-UA': uk,
     'zh-CN': zhCN,
     'zh-TW': zhTW,
-    tr
+    tr,
+    ur: enIN
   };
   return languageMap[lang];
 }

client/images/processing-foundation-logo.svg

@@ -0,0 +1,5 @@
+import { createListenerMiddleware } from '@reduxjs/toolkit';
+
+const listenerMiddleware = createListenerMiddleware();
+
+export default listenerMiddleware;

client/middleware.js

@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
 import React, { useEffect, useRef, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { useLocation } from 'react-router-dom';
-import getConfig from '../../utils/getConfig';
+import { showReduxDevTools } from '../../store';
 import DevTools from './components/DevTools';
 import { setPreviousPath } from '../IDE/actions/ide';
 import { setLanguage } from '../IDE/actions/preferences';
@@ -52,9 +52,7 @@ const App = ({ children }) => {
   return (
     <div className="app">
       <CookieConsent hide={hide} />
-      {isMounted &&
-        !window.devToolsExtension &&
-        getConfig('NODE_ENV') === 'development' && <DevTools />}
+      {isMounted && showReduxDevTools() && <DevTools />}
       {children}
     </div>
   );

client/modules/App/App.jsx

@@ -184,18 +184,6 @@ export function closeKeyboardShortcutModal() {
   };
 }
 
-export function showFundraiserModal() {
-  return {
-    type: ActionTypes.SHOW_FUNDRAISER_MODAL
-  };
-}
-
-export function closeFundraiserModal() {
-  return {
-    type: ActionTypes.CLOSE_FUNDRAISER_MODAL
-  };
-}
-
 export function setUnsavedChanges(value) {
   return {
     type: ActionTypes.SET_UNSAVED_CHANGES,

client/modules/IDE/actions/ide.js

@@ -162,20 +162,6 @@ function About(props) {
             Discord
           </a>
         </p>
-        <p className="about__content-column-list">
-          <a
-            href="https://p5js.org/download/support.html"
-            target="_blank"
-            rel="noopener noreferrer"
-          >
-            <AsteriskIcon
-              className="about__content-column-asterisk"
-              aria-hidden="true"
-              focusable="false"
-            />
-            Donate
-          </a>
-        </p>
         <p className="about__content-column-list">
           <Link to="/privacy-policy">
             <AsteriskIcon

client/modules/IDE/components/About.jsx

@@ -38,17 +38,20 @@ const Button = styled.button`
   }
 `;
 
-const FloatingActionButton = (props) => {
+const FloatingActionButton = ({ syncFileContent, offsetBottom }) => {
   const isPlaying = useSelector((state) => state.ide.isPlaying);
   const dispatch = useDispatch();
 
   return (
     <Button
       className={classNames({ stop: isPlaying })}
-      style={{ paddingLeft: isPlaying ? 0 : remSize(5) }}
+      style={{
+        paddingLeft: isPlaying ? 0 : remSize(5),
+        marginBottom: offsetBottom
+      }}
       onClick={() => {
         if (!isPlaying) {
-          props.syncFileContent();
+          syncFileContent();
           dispatch(startSketch());
         } else dispatch(stopSketch());
       }}
@@ -59,7 +62,8 @@ const FloatingActionButton = (props) => {
 };
 
 FloatingActionButton.propTypes = {
-  syncFileContent: PropTypes.func.isRequired
+  syncFileContent: PropTypes.func.isRequired,
+  offsetBottom: PropTypes.number.isRequired
 };
 
 export default FloatingActionButton;