Merge branch 'develop' into pr05/setup_server_ts_deps

Author: clairep94

client/index.jsx

@@ -20,21 +20,25 @@ const initialState = window.__INITIAL_STATE__;
 
 const store = configureStore(initialState);
 
-// Add a banner to the page
-const banner = document.createElement('div');
-banner.id = 'processing-banner';
-document.body.appendChild(banner);
+if (
+  window.location.href.indexOf('full') === -1 &&
+  window.location.href.indexOf('embed') === -1
+) {
+  // Add a banner to the page
+  const banner = document.createElement('div');
+  banner.id = 'processing-banner';
+  document.body.appendChild(banner);
 
-const link = document.createElement('link');
-link.rel = 'stylesheet';
-link.href = 'https://foundation-donate-banner.netlify.app/static/css/main.css';
-document.head.appendChild(link);
+  const link = document.createElement('link');
+  link.rel = 'stylesheet';
+  link.href =
+    'https://foundation-donate-banner.netlify.app/static/css/main.css';
+  document.head.appendChild(link);
 
-const script = document.createElement('script');
-script.src = 'https://foundation-donate-banner.netlify.app/static/js/main.js';
-document.body.appendChild(script);
+  const script = document.createElement('script');
+  script.src = 'https://foundation-donate-banner.netlify.app/static/js/main.js';
+  document.body.appendChild(script);
 
-if (window.location.href.indexOf('full') === -1) {
   const buttonScript = document.createElement('script');
   buttonScript.type = 'text/javascript';
   buttonScript.defer = true;

client/modules/IDE/components/Header/MobileNav.jsx

@@ -437,17 +437,16 @@ const MoreMenu = () => {
           <MobileMenuItem onClick={() => dispatch(newFolder(rootFile.id))}>
             {t('Nav.Sketch.AddFolder')}
           </MobileMenuItem>
-          {/* TODO: Add Translations */}
-          <b>Settings</b>
+          <b>{t('MobilePreferences.Settings')}</b>
           <MobileMenuItem
             onClick={() => {
               dispatch(openPreferences());
             }}
           >
-            Preferences
+            {t('MobilePreferences.Preferences')}
           </MobileMenuItem>
           <MobileMenuItem onClick={() => setIsLanguageModalVisible(true)}>
-            Language
+            {t('MobilePreferences.Language')}
           </MobileMenuItem>
           <b>{t('Nav.Help.Title')}</b>
           <MobileMenuItem onClick={() => dispatch(showKeyboardShortcutModal())}>

client/modules/IDE/components/SketchList.jsx

@@ -148,7 +148,8 @@ const SketchList = ({
                   context: mobile ? 'mobile' : ''
                 })
               )}
-              {userIsOwner && renderFieldHeader('visibility', 'Visibility')}
+              {userIsOwner &&
+                renderFieldHeader('visibility', t('Visibility.Label'))}
               <th scope="col"></th>
             </tr>
           </thead>

client/modules/User/components/VisibilityDropdown.jsx

@@ -1,5 +1,6 @@
 import React, { useState, useRef, useEffect } from 'react';
 import PropTypes from 'prop-types';
+import { useTranslation } from 'react-i18next';
 import LockIcon from '../../../images/lock.svg';
 import EarthIcon from '../../../images/earth.svg';
 import CheckmarkIcon from '../../../images/checkmark.svg';
@@ -8,18 +9,20 @@ const VisibilityDropdown = ({ sketch, onVisibilityChange, location }) => {
   const [isOpen, setIsOpen] = useState(false);
   const dropdownRef = useRef(null);
 
+  const { t } = useTranslation();
+
   const visibilityOptions = [
     {
       value: 'Public',
-      label: 'Public',
+      label: t('Visibility.Public.Label'),
       icon: <EarthIcon className="visibility-icon" />,
-      description: 'Anyone can see this sketch'
+      description: t('Visibility.Public.Description')
     },
     {
       value: 'Private',
-      label: 'Private',
+      label: t('Visibility.Private.Label'),
       icon: <LockIcon className="visibility-icon" />,
-      description: 'Only you can see this sketch'
+      description: t('Visibility.Private.Description')
     }
   ];
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "p5.js-web-editor",
-  "version": "2.18.1",
+  "version": "2.18.2",
   "description": "The web editor for p5.js.",
   "scripts": {
     "clean": "rimraf dist",
@@ -204,7 +204,7 @@
     "@redux-devtools/log-monitor": "^4.0.2",
     "@reduxjs/toolkit": "^1.9.3",
     "async": "^3.2.3",
-    "axios": "^1.8.2",
+    "axios": "^1.12.1",
     "babel-plugin-styled-components": "^1.13.2",
     "bcryptjs": "^2.4.3",
     "blob-util": "^1.2.1",

package.json

@@ -122,7 +122,7 @@
     "EmailAddress": "[email protected]",
     "Socials": "Socials",
     "LinkDescriptions": {
-      "Home": "Learn more about p5.js and our community.", 
+      "Home": "Learn more about p5.js and our community.",
       "Examples": "Explore the possibilities of p5.js with short examples.",
       "CodeOfConduct": "Read our Community State and Code of Conduct.",
       "Libraries": "Expand the possibilities of p5.js with community-created libraries.",
@@ -143,7 +143,7 @@
     "SettingsSaved": "Settings saved.",
     "EmptyCurrentPass": "Current password field is empty",
     "IncorrectCurrentPass": "Current password is incorrect",
-    "DefaultError":"Something went wrong",
+    "DefaultError": "Something went wrong",
     "UserNotFound": "User not found",
     "NetworkError": "Network error"
   },
@@ -295,9 +295,9 @@
     "SubmitFeedback": "Submit Feedback",
     "SubmitFeedbackARIA": "submit-feedback",
     "AddCollectionTitle": "Add to collection",
-    "AddCollectionARIA":"add to collection",
+    "AddCollectionARIA": "add to collection",
     "ShareTitle": "Share",
-    "ShareARIA":"share"
+    "ShareARIA": "share"
   },
   "NewFileModal": {
     "Title": "Create File",
@@ -342,7 +342,7 @@
     "errorShortPassword": "Password must be at least 6 characters",
     "errorConfirmPassword": "Please confirm your password",
     "errorNewPassword": "Please enter a new password or leave the current password empty.",
-    "errorNewPasswordRepeat":"Your New Password must differ from the current one.",
+    "errorNewPasswordRepeat": "Your New Password must differ from the current one.",
     "errorEmptyUsername": "Please enter a username.",
     "errorLongUsername": "Username must be less than 20 characters.",
     "errorValidUsername": "Username must only consist of numbers, letters, periods, dashes, and underscores."
@@ -498,7 +498,7 @@
     "Description": "description",
     "NumSketches": "{{count}} sketch",
     "NumSketches_plural": "{{count}} sketches",
-    "By":"Collection by ",
+    "By": "Collection by ",
     "NoSketches": "No sketches in collection",
     "TableSummary": "table containing all collections",
     "HeaderName": "Name",
@@ -562,7 +562,7 @@
   "Overlay": {
     "AriaLabel": "Close {{title}} overlay"
   },
-  "QuickAddList":{
+  "QuickAddList": {
     "ButtonRemoveARIA": "Remove from collection",
     "ButtonAddToCollectionARIA": "Add to collection",
     "View": "View"
@@ -644,7 +644,9 @@
     "UsedScreenReader": "Used with screen reader",
     "PlainText": "Plain-text",
     "TableText": "Table-text",
-    "Sound": "Sound"
+    "Sound": "Sound",
+    "Preferences": "Preferences",
+    "Language": "Language"
   },
   "PreferenceCreators": {
     "On": "On",
@@ -675,5 +677,16 @@
   },
   "SkipLink": {
     "PlaySketch": "Skip to Play Sketch"
+  },
+  "Visibility": {
+    "Label": "Visibility",
+    "Public": {
+      "Description": "Anyone can see this sketch.",
+      "Label": "Public"
+    },
+    "Private": {
+      "Description": "Only you can see this sketch.",
+      "Label": "Private"
+    }
   }
 }

translations/locales/en-US/translations.json

@@ -589,6 +589,11 @@
     "EditSketchARIA": "Editar esboço",
     "ByUser": "por"
   },
+  "MobilePreferences": {
+    "Settings": "Configurações",
+    "Preferences": "Preferências",
+    "Language": "Idioma"
+  },
   "PreferenceCreators": {
     "On": "Ligado",
     "Off": "Desligado"
@@ -606,5 +611,16 @@
   },
   "SkipLink": {
     "PlaySketch": "Pule para reproduzir o esboço"
+  },
+  "Visibility": {
+    "Label": "Visibilidade",
+    "Public": {
+      "Description": "Qualquer um pode ver este esboço.",
+      "Label": "Público"
+    },
+    "Private": {
+      "Description": "Apenas você pode ver este esboço.",
+      "Label": "Privado"
+    }
   }
 }