From f900d6cb7559e84730a027ba480af9505e541165 Mon Sep 17 00:00:00 2001 From: VarunMotiyani Date: Wed, 13 Sep 2023 14:32:17 +0530 Subject: [PATCH 01/67] changed the searchbar to functional --- .../IDE/components/Searchbar/Searchbar.jsx | 100 ++++++++---------- 1 file changed, 47 insertions(+), 53 deletions(-) diff --git a/client/modules/IDE/components/Searchbar/Searchbar.jsx b/client/modules/IDE/components/Searchbar/Searchbar.jsx index a7c79d1f46..1c2217fd7a 100644 --- a/client/modules/IDE/components/Searchbar/Searchbar.jsx +++ b/client/modules/IDE/components/Searchbar/Searchbar.jsx @@ -1,71 +1,65 @@ +import React, { useState, useCallback, useEffect } from 'react'; import PropTypes from 'prop-types'; -import React from 'react'; import { throttle } from 'lodash'; import { withTranslation } from 'react-i18next'; import i18next from 'i18next'; import SearchIcon from '../../../../images/magnifyingglass.svg'; -class Searchbar extends React.Component { - constructor(props) { - super(props); - this.state = { - searchValue: this.props.searchTerm - }; - this.throttledSearchChange = throttle(this.searchChange, 500); - } +const Searchbar = ({ + searchTerm, + setSearchTerm, + resetSearchTerm, + searchLabel, + t +}) => { + const [searchValue, setSearchValue] = useState(searchTerm); - componentWillUnmount() { - this.props.resetSearchTerm(); - } + const throttledSearchChange = useCallback( + throttle((value) => { + setSearchTerm(value.trim()); + }, 500), + [] + ); - handleResetSearch = () => { - this.setState({ searchValue: '' }, () => { - this.props.resetSearchTerm(); - }); + const handleResetSearch = () => { + setSearchValue(''); + resetSearchTerm(); }; - searchChange = () => { - this.props.setSearchTerm(this.state.searchValue.trim()); + const handleSearchChange = (e) => { + const { value } = e.target; + setSearchValue(value); + throttledSearchChange(value.trim()); }; - handleSearchChange = (e) => { - this.setState({ searchValue: e.target.value }, () => { - this.throttledSearchChange(this.state.searchValue.trim()); - }); - }; + useEffect(() => { + setSearchValue(searchTerm); + }, [searchTerm]); - render() { - const { searchValue } = this.state; - return ( -
-
-
- +
+
- ); - } -} + + +
+ ); +}; Searchbar.propTypes = { searchTerm: PropTypes.string.isRequired, From f2ed92e1bf5e424d79f51dc01bdb899e5c9baca9 Mon Sep 17 00:00:00 2001 From: luckyklyist Date: Thu, 14 Sep 2023 14:57:29 +0545 Subject: [PATCH 02/67] confusing icons hover issue fix #2255 --- .../IDE/components/QuickAddList/Icons.jsx | 6 ---- client/styles/components/_quick-add.scss | 36 +++++++++---------- 2 files changed, 17 insertions(+), 25 deletions(-) diff --git a/client/modules/IDE/components/QuickAddList/Icons.jsx b/client/modules/IDE/components/QuickAddList/Icons.jsx index 34363bf63f..868d8cb257 100644 --- a/client/modules/IDE/components/QuickAddList/Icons.jsx +++ b/client/modules/IDE/components/QuickAddList/Icons.jsx @@ -20,12 +20,6 @@ const Icons = ({ isAdded }) => { aria-label="Descending" focusable="false" /> - Date: Thu, 14 Sep 2023 15:06:35 +0545 Subject: [PATCH 03/67] lint fix --- client/modules/IDE/components/QuickAddList/Icons.jsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/client/modules/IDE/components/QuickAddList/Icons.jsx b/client/modules/IDE/components/QuickAddList/Icons.jsx index 868d8cb257..7f25011a55 100644 --- a/client/modules/IDE/components/QuickAddList/Icons.jsx +++ b/client/modules/IDE/components/QuickAddList/Icons.jsx @@ -1,7 +1,5 @@ import React from 'react'; import PropTypes from 'prop-types'; - -import CheckIcon from '../../../../images/check_encircled.svg'; import CloseIcon from '../../../../images/close.svg'; const Icons = ({ isAdded }) => { From cca74b4d0e43f01f6f66df36b967b27980205286 Mon Sep 17 00:00:00 2001 From: Sheikh-JamirAlam Date: Wed, 20 Sep 2023 20:10:08 +0530 Subject: [PATCH 04/67] Changed shortcut format for better accessibility --- client/modules/IDE/components/Header/Nav.jsx | 6 ++---- .../modules/IDE/components/KeyboardShortcutModal.jsx | 12 ++++++------ client/utils/metaKey.js | 2 +- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/client/modules/IDE/components/Header/Nav.jsx b/client/modules/IDE/components/Header/Nav.jsx index b4f7cb151f..d956e81da2 100644 --- a/client/modules/IDE/components/Header/Nav.jsx +++ b/client/modules/IDE/components/Header/Nav.jsx @@ -195,9 +195,7 @@ const ProjectMenu = () => { {t('Nav.Edit.TidyCode')} - - {metaKeyName}+{'\u21E7'}+F - + {metaKeyName}+Shift+F {t('Nav.Edit.Find')} @@ -222,7 +220,7 @@ const ProjectMenu = () => { dispatch(stopSketch())}> {t('Nav.Sketch.Stop')} - {'\u21E7'}+{metaKeyName}+Enter + Shift+{metaKeyName}+Enter diff --git a/client/modules/IDE/components/KeyboardShortcutModal.jsx b/client/modules/IDE/components/KeyboardShortcutModal.jsx index 093630498a..a56710810d 100644 --- a/client/modules/IDE/components/KeyboardShortcutModal.jsx +++ b/client/modules/IDE/components/KeyboardShortcutModal.jsx @@ -25,7 +25,7 @@ function KeyboardShortcutModal() {
  • - {metaKeyName} + {'\u21E7'} + F + {metaKeyName} + Shift + F {t('KeyboardShortcuts.CodeEditing.Tidy')}
    • @@ -39,7 +39,7 @@ function KeyboardShortcutModal() {
  • - {metaKeyName} + {'\u21E7'} + G + {metaKeyName} + Shift + G {t('KeyboardShortcuts.CodeEditing.FindPreviousTextMatch')} @@ -84,24 +84,24 @@ function KeyboardShortcutModal() {
  • - {metaKeyName} + {'\u21E7'} + Enter + {metaKeyName} + Shift + Enter {t('KeyboardShortcuts.General.StopSketch')}
  • - {metaKeyName} + {'\u21E7'} + 1 + {metaKeyName} + Shift + 1 {t('KeyboardShortcuts.General.TurnOnAccessibleOutput')}
  • - {metaKeyName} + {'\u21E7'} + 2 + {metaKeyName} + Shift + 2 {t('KeyboardShortcuts.General.TurnOffAccessibleOutput')}
  • - {'\u21E7'} + Right + Shift + Right Go to Reference for Selected Item in Hinter
diff --git a/client/utils/metaKey.js b/client/utils/metaKey.js index 6d9aab8a6c..cca6d3986b 100644 --- a/client/utils/metaKey.js +++ b/client/utils/metaKey.js @@ -6,6 +6,6 @@ const metaKey = (() => { return 'Ctrl'; })(); -const metaKeyName = metaKey === 'Cmd' ? '⌘' : '⌃'; +const metaKeyName = metaKey === 'Cmd' ? '⌘' : 'Ctrl'; export { metaKey, metaKeyName }; From 3eb7c2ee9e8e34c7928f57fb4208a05b02f2ac1a Mon Sep 17 00:00:00 2001 From: Perminder Singh Date: Fri, 22 Sep 2023 05:23:20 +0530 Subject: [PATCH 05/67] Added eye icon --- client/modules/User/components/LoginForm.jsx | 54 ++++++--- client/modules/User/components/SignupForm.jsx | 109 ++++++++++++------ package-lock.json | 15 +++ package.json | 1 + 4 files changed, 129 insertions(+), 50 deletions(-) diff --git a/client/modules/User/components/LoginForm.jsx b/client/modules/User/components/LoginForm.jsx index d990299322..2d8e756db9 100644 --- a/client/modules/User/components/LoginForm.jsx +++ b/client/modules/User/components/LoginForm.jsx @@ -1,7 +1,8 @@ -import React from 'react'; +import React, { useState } from 'react'; import { useTranslation } from 'react-i18next'; import { Form, Field } from 'react-final-form'; import { useDispatch } from 'react-redux'; +import { AiOutlineEye, AiOutlineEyeInvisible } from 'react-icons/ai'; import Button from '../../../common/Button'; import { validateLogin } from '../../../utils/reduxFormUtils'; import { validateAndLoginUser } from '../actions'; @@ -13,6 +14,10 @@ function LoginForm() { function onSubmit(formProps) { return dispatch(validateAndLoginUser(formProps)); } + const [showPassword, setShowPassword] = useState(false); + const handleVisibility = () => { + setShowPassword(!showPassword); + }; return (
{(field) => ( -

- - - {field.meta.touched && field.meta.error && ( - {field.meta.error} - )} -

+
+

+ + + {field.meta.touched && field.meta.error && ( + {field.meta.error} + )} +

+ +
)} {submitError && !modifiedSinceLastSubmit && ( diff --git a/client/modules/User/components/SignupForm.jsx b/client/modules/User/components/SignupForm.jsx index b80f53f107..8d7a398a5d 100644 --- a/client/modules/User/components/SignupForm.jsx +++ b/client/modules/User/components/SignupForm.jsx @@ -1,7 +1,8 @@ -import React from 'react'; +import { React, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { Form, Field } from 'react-final-form'; import { useDispatch } from 'react-redux'; +import { AiOutlineEye, AiOutlineEyeInvisible } from 'react-icons/ai'; import { validateSignup } from '../../../utils/reduxFormUtils'; import { validateAndSignUpUser } from '../actions'; import Button from '../../../common/Button'; @@ -38,6 +39,14 @@ function SignupForm() { function onSubmit(formProps) { return dispatch(validateAndSignUpUser(formProps)); } + const [showPassword, setShowPassword] = useState(false); + const [showConfirmPassword, setShowConfirmPassword] = useState(false); + const handleVisibility = () => { + setShowPassword(!showPassword); + }; + const handleConfirmVisibility = () => { + setShowConfirmPassword(!showConfirmPassword); + }; return ( {(field) => ( -

- - - {field.meta.touched && field.meta.error && ( - {field.meta.error} - )} -

+
+

+ + + {field.meta.touched && field.meta.error && ( + {field.meta.error} + )} +

+ +
)} {(field) => ( -

- - - {field.meta.touched && field.meta.error && ( - {field.meta.error} - )} -

+
+

+ + + {field.meta.touched && field.meta.error && ( + {field.meta.error} + )} +

+ +
)} @@ -542,7 +542,7 @@ exports[`Nav renders editor version for desktop 1`] = ` - ⌃+F + Ctrl+F @@ -554,7 +554,7 @@ exports[`Nav renders editor version for desktop 1`] = ` - ⌃+H + Ctrl+H @@ -600,7 +600,7 @@ exports[`Nav renders editor version for desktop 1`] = ` - ⌃+Enter + Ctrl+Enter @@ -612,7 +612,7 @@ exports[`Nav renders editor version for desktop 1`] = ` - ⇧+⌃+Enter + Shift+Ctrl+Enter From 1bda2b2eac419bf0692c6673b8b7cea335e93b22 Mon Sep 17 00:00:00 2001 From: luckyklyist Date: Sat, 23 Sep 2023 23:13:53 +0545 Subject: [PATCH 07/67] changed the + icon to the tick one --- client/modules/IDE/components/QuickAddList/Icons.jsx | 3 ++- client/styles/components/_quick-add.scss | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/client/modules/IDE/components/QuickAddList/Icons.jsx b/client/modules/IDE/components/QuickAddList/Icons.jsx index 7f25011a55..6006b0d2cb 100644 --- a/client/modules/IDE/components/QuickAddList/Icons.jsx +++ b/client/modules/IDE/components/QuickAddList/Icons.jsx @@ -1,6 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import CloseIcon from '../../../../images/close.svg'; +import CheckIcon from '../../../../images/check_encircled.svg'; const Icons = ({ isAdded }) => { const classes = [ @@ -18,7 +19,7 @@ const Icons = ({ isAdded }) => { aria-label="Descending" focusable="false" /> - Date: Fri, 27 Oct 2023 21:44:16 +0530 Subject: [PATCH 08/67] Update _forms.scss --- client/styles/components/_forms.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/client/styles/components/_forms.scss b/client/styles/components/_forms.scss index d5eca026d8..2fcc83fc5b 100644 --- a/client/styles/components/_forms.scss +++ b/client/styles/components/_forms.scss @@ -66,6 +66,10 @@ } } +.form__input[type='password']::-ms-reveal { + display: none; +} + .form__input-flexible-height { height: auto; } From c9ae3e3b76799d93e6065a5a595e3b4d6e108841 Mon Sep 17 00:00:00 2001 From: mhsh312 Date: Wed, 1 Nov 2023 00:33:57 +0530 Subject: [PATCH 09/67] implement file type icons --- client/modules/IDE/components/FileNode.jsx | 5 +- .../modules/IDE/components/FileTypeIcon.jsx | 59 +++++++++++++++++++ package-lock.json | 15 +++++ package.json | 1 + 4 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 client/modules/IDE/components/FileTypeIcon.jsx diff --git a/client/modules/IDE/components/FileNode.jsx b/client/modules/IDE/components/FileNode.jsx index 0b6424a783..2925a28d15 100644 --- a/client/modules/IDE/components/FileNode.jsx +++ b/client/modules/IDE/components/FileNode.jsx @@ -10,7 +10,7 @@ import * as FileActions from '../actions/files'; import DownArrowIcon from '../../../images/down-filled-triangle.svg'; import FolderRightIcon from '../../../images/triangle-arrow-right.svg'; import FolderDownIcon from '../../../images/triangle-arrow-down.svg'; -import FileIcon from '../../../images/file.svg'; +import FileTypeIcon from './FileTypeIcon'; function parseFileName(name) { const nameArray = name.split('.'); @@ -256,6 +256,7 @@ class FileNode extends React.Component { const isRoot = this.props.name === 'root'; const { t } = this.props; + const { extension } = parseFileName(this.props.name); return (
@@ -267,7 +268,7 @@ class FileNode extends React.Component { {isFile && ( - )} {isFolder && ( diff --git a/client/modules/IDE/components/FileTypeIcon.jsx b/client/modules/IDE/components/FileTypeIcon.jsx new file mode 100644 index 0000000000..c6bab74f4b --- /dev/null +++ b/client/modules/IDE/components/FileTypeIcon.jsx @@ -0,0 +1,59 @@ +import React from 'react'; +import PropTypes from 'prop-types'; +import { IoLogoHtml5, IoLogoCss3, IoLogoJavascript } from 'react-icons/io'; +import { TbFileTypeXml, TbTxt, TbCsv } from 'react-icons/tb'; +import { VscJson } from 'react-icons/vsc'; +import FileIcon from '../../../images/file.svg'; + +export default function FileTypeIcon({ fileExtension }) { + switch (fileExtension) { + case '.html': + return ( + + + + ); + case '.css': + return ( + + + + ); + case '.js': + return ( + + + + ); + case '.json': + return ( + + + + ); + case '.xml': + return ( + + + + ); + case '.txt': + return ( + + + + ); + case '.csv': + return ( + + + + ); + default: + return
- {touched.name && errors.name && ( + {touched.submitButton && errors.name && ( {errors.name} )} diff --git a/client/modules/IDE/components/NewFolderForm.jsx b/client/modules/IDE/components/NewFolderForm.jsx index bc305b8b18..b0935397ff 100644 --- a/client/modules/IDE/components/NewFolderForm.jsx +++ b/client/modules/IDE/components/NewFolderForm.jsx @@ -52,11 +52,15 @@ function NewFolderForm() { )} - + + {() => ( + + )} + - {touched.name && errors.name && ( + {touched.submitButton && errors.name && ( {errors.name} )} From 93b0a176c1d7e598117b6f90d6f6c66db0b97502 Mon Sep 17 00:00:00 2001 From: Rishi Date: Mon, 29 Jan 2024 00:18:50 +0530 Subject: [PATCH 27/67] Fix : [#2973] Edited CSS to resolve the issue. --- client/modules/User/components/CollectionCreate.jsx | 2 +- client/styles/components/_forms.scss | 1 + client/styles/components/_overlay.scss | 3 +-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/modules/User/components/CollectionCreate.jsx b/client/modules/User/components/CollectionCreate.jsx index 9a19f4abf1..02d3fb59f0 100644 --- a/client/modules/User/components/CollectionCreate.jsx +++ b/client/modules/User/components/CollectionCreate.jsx @@ -71,7 +71,7 @@ const CollectionCreate = () => { value={description} onChange={(e) => setDescription(e.target.value)} placeholder={t('CollectionCreate.DescriptionPlaceholder')} - rows="4" + rows="6" />

+ + ); + }; + useEffect(() => { dispatch(clearPersistedState()); }, [dispatch]); @@ -201,7 +211,7 @@ const IDEView = () => { {getTitle(project)} - + {displayBanner && } cmRef.current?.getContent()} /> diff --git a/client/styles/layout/_ide.scss b/client/styles/layout/_ide.scss index b801ece6eb..8fd503f43c 100644 --- a/client/styles/layout/_ide.scss +++ b/client/styles/layout/_ide.scss @@ -29,6 +29,16 @@ } } +.banner-close-button{ + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + height: 20px; + width:20px; + float: right; +} + .sidebar { width: 100%; height: 100%; From e24f5f9b0ac0dfeeb631c77213d07ca5fde8e82e Mon Sep 17 00:00:00 2001 From: Piyush Date: Wed, 22 May 2024 23:01:13 +0530 Subject: [PATCH 40/67] fix semantic HTML --- client/modules/IDE/components/Editor/MobileEditor.jsx | 2 +- client/modules/IDE/components/Editor/index.jsx | 8 ++++---- client/modules/IDE/components/Header/Nav.jsx | 2 +- client/modules/IDE/components/Header/index.jsx | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/client/modules/IDE/components/Editor/MobileEditor.jsx b/client/modules/IDE/components/Editor/MobileEditor.jsx index c3e56afd79..fa46e33b86 100644 --- a/client/modules/IDE/components/Editor/MobileEditor.jsx +++ b/client/modules/IDE/components/Editor/MobileEditor.jsx @@ -9,7 +9,7 @@ export const EditorContainer = styled.div` transform: ${(props) => props.expanded ? 'translateX(50%)' : 'translateX(0)'}; - > header { + > div { display: flex; ${prop('MobilePanel.secondary')} > span { diff --git a/client/modules/IDE/components/Editor/index.jsx b/client/modules/IDE/components/Editor/index.jsx index 87f456a126..925fdf955b 100644 --- a/client/modules/IDE/components/Editor/index.jsx +++ b/client/modules/IDE/components/Editor/index.jsx @@ -513,7 +513,7 @@ class Editor extends React.Component { {(matches) => matches ? (
-
+
-
+
{ this.codemirrorContainer = element; @@ -555,7 +555,7 @@ class Editor extends React.Component {
) : ( -
+ <> -
+
{ diff --git a/client/modules/IDE/components/Header/Nav.jsx b/client/modules/IDE/components/Header/Nav.jsx index 40381b8f4c..c288fc464b 100644 --- a/client/modules/IDE/components/Header/Nav.jsx +++ b/client/modules/IDE/components/Header/Nav.jsx @@ -270,7 +270,7 @@ const UnauthenticatedUserMenu = () => { - {t('Nav.LoginOr')} +
  • {t('Nav.LoginOr')}
  • diff --git a/client/modules/IDE/components/Header/index.jsx b/client/modules/IDE/components/Header/index.jsx index dd02700e83..79f78ff67e 100644 --- a/client/modules/IDE/components/Header/index.jsx +++ b/client/modules/IDE/components/Header/index.jsx @@ -12,12 +12,12 @@ const Header = (props) => { const isMobile = useIsMobile(); return ( -
    + <>
    + ); }; From 2d7e9a82ca28c7d5dbcf13ec873c1d10d2e79298 Mon Sep 17 00:00:00 2001 From: raclim Date: Thu, 23 May 2024 14:27:01 -0400 Subject: [PATCH 41/67] 2.12.13 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2d3eca9997..f268cfcb8d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "p5.js-web-editor", - "version": "2.12.12", + "version": "2.12.13", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "p5.js-web-editor", - "version": "2.12.12", + "version": "2.12.13", "license": "LGPL-2.1", "dependencies": { "@auth0/s3": "^1.0.0", diff --git a/package.json b/package.json index 0d48b1b975..8dba7ada93 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p5.js-web-editor", - "version": "2.12.12", + "version": "2.12.13", "description": "The web editor for p5.js.", "scripts": { "clean": "rimraf dist", From 7bf90987c5683d4fc59c63682193bc3fa420a4a0 Mon Sep 17 00:00:00 2001 From: Aditya Pandey <144938685+askadityapandey@users.noreply.github.com> Date: Fri, 24 May 2024 21:18:19 +0530 Subject: [PATCH 42/67] Update translations.json --- translations/locales/hi/translations.json | 1 - 1 file changed, 1 deletion(-) diff --git a/translations/locales/hi/translations.json b/translations/locales/hi/translations.json index e13634efca..195dad061e 100644 --- a/translations/locales/hi/translations.json +++ b/translations/locales/hi/translations.json @@ -109,7 +109,6 @@ "PrivacyPolicy": "गोपनीयता नीति", "TermsOfUse": "उपयोग की शर्तें", "CodeOfConduct": "आचार संहिता" - "WebEditor": "वेब एडिटर" }, "Toast": { "OpenedNewSketch": "नया स्केच खोला", From c6282cef67717ecce9a57620b060c3bfda116d79 Mon Sep 17 00:00:00 2001 From: Qianqian Ye Date: Fri, 24 May 2024 18:55:09 -0700 Subject: [PATCH 43/67] Update createDefaultFiles.js to p5.js version 1.9.4 --- server/domain-objects/createDefaultFiles.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/domain-objects/createDefaultFiles.js b/server/domain-objects/createDefaultFiles.js index 19d33a5fbb..7e2f6b71db 100644 --- a/server/domain-objects/createDefaultFiles.js +++ b/server/domain-objects/createDefaultFiles.js @@ -9,8 +9,8 @@ function draw() { export const defaultHTML = ` - - + + From 15b9fa907c860996adb3b010128e4def2e4b0e56 Mon Sep 17 00:00:00 2001 From: Nishikant R Dounekar <119045534+nishikant23@users.noreply.github.com> Date: Sat, 25 May 2024 16:12:38 +0530 Subject: [PATCH 44/67] SignUp page t&c-line japanese translation done --- translations/locales/ja/translations.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/translations/locales/ja/translations.json b/translations/locales/ja/translations.json index f43b64f009..c02c8b6080 100644 --- a/translations/locales/ja/translations.json +++ b/translations/locales/ja/translations.json @@ -358,7 +358,8 @@ "Description": "ユーザー登録", "Or": "もしくは", "AlreadyHave": "既にアカウントをお持ちですか？", - "Login": "ログイン" + "Login": "ログイン", + "Warning": "サインアップすると、p5.js エディターの<0>利用規約 と <1>プライバシー ポリシーに 同意したことになります。" }, "EmailVerificationView": { "Title": "p5.js ウェブエディター | メールアドレス認証", From fc08d74965358df07b1d4b0e71e4d64c7c312323 Mon Sep 17 00:00:00 2001 From: NishikantDounekar <119045534+nishikant23@users.noreply.github.com> Date: Sat, 25 May 2024 20:24:19 +0530 Subject: [PATCH 45/67] Update translations/locales/ja/translations.json Co-authored-by: Leo --- translations/locales/ja/translations.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/locales/ja/translations.json b/translations/locales/ja/translations.json index c02c8b6080..9c531d2397 100644 --- a/translations/locales/ja/translations.json +++ b/translations/locales/ja/translations.json @@ -359,7 +359,7 @@ "Or": "もしくは", "AlreadyHave": "既にアカウントをお持ちですか？", "Login": "ログイン", - "Warning": "サインアップすると、p5.js エディターの<0>利用規約 と <1>プライバシー ポリシーに 同意したことになります。" + "Warning": "アカウント作成をすると、p5.js エディターの <0>利用規約 と <1>プライバシー ポリシー に同意したことになります。" }, "EmailVerificationView": { "Title": "p5.js ウェブエディター | メールアドレス認証", From c2c86e0478c29bb54d723812d552926d09fcca9e Mon Sep 17 00:00:00 2001 From: raclim Date: Fri, 31 May 2024 13:11:01 -0400 Subject: [PATCH 46/67] remove banner content --- client/modules/IDE/pages/IDEView.jsx | 42 ---------------------------- client/styles/layout/_ide.scss | 23 --------------- 2 files changed, 65 deletions(-) diff --git a/client/modules/IDE/pages/IDEView.jsx b/client/modules/IDE/pages/IDEView.jsx index 58cb3f485b..2bd2649770 100644 --- a/client/modules/IDE/pages/IDEView.jsx +++ b/client/modules/IDE/pages/IDEView.jsx @@ -27,7 +27,6 @@ import { } from '../components/Editor/MobileEditor'; import IDEOverlays from '../components/IDEOverlays'; import useIsMobile from '../hooks/useIsMobile'; -import { CrossIcon } from '../../../common/icons'; function getTitle(project) { const { id } = project; @@ -105,7 +104,6 @@ const IDEView = () => { const [sidebarSize, setSidebarSize] = useState(160); const [isOverlayVisible, setIsOverlayVisible] = useState(false); const [MaxSize, setMaxSize] = useState(window.innerWidth); - const [displayBanner, setDisplayBanner] = useState(true); const cmRef = useRef({}); @@ -116,45 +114,6 @@ const IDEView = () => { dispatch(updateFileContent(file.id, file.content)); }; - const Banner = () => { - // temporary banner to display funding opportunities - const [textObj, setTextObj] = useState({}); - - useEffect(() => { - const grant1 = { - copy: - 'Learn to make art with AI with the Social Software High School Summer Institute. Apply by June 1!', - url: 'https://summer.ucla.edu/program/social-software-summer-institute/' - }; - - const grant2 = { - copy: - 'Join us in contributing to p5.js——receive a $10,000 opportunity to grow within the contributor community!', - url: 'https://processingfoundation.org/grants' - }; - - const allMessages = [grant1, grant2]; - const randomIndex = Math.floor(Math.random() * allMessages.length); - const randomMessage = allMessages[randomIndex]; - - setTextObj(randomMessage); - }, []); - - return ( -
    - {textObj.copy} - -
    - ); - }; - useEffect(() => { dispatch(clearPersistedState()); }, [dispatch]); @@ -211,7 +170,6 @@ const IDEView = () => { {getTitle(project)} - {displayBanner && } cmRef.current?.getContent()} /> diff --git a/client/styles/layout/_ide.scss b/client/styles/layout/_ide.scss index 8fd503f43c..bf7c5ae903 100644 --- a/client/styles/layout/_ide.scss +++ b/client/styles/layout/_ide.scss @@ -16,29 +16,6 @@ width: 100%; } -.banner { - width: 100%; - min-height: 2.2rem; - text-align: center; - padding: 0.5rem; - font-weight: bold; - border-bottom: 1px dashed #A6A6A6; - - @media (max-width: 770px) { - min-height: 3.3rem; - } -} - -.banner-close-button{ - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - height: 20px; - width:20px; - float: right; -} - .sidebar { width: 100%; height: 100%; From 8d5f40ee4def8b1c469f5b46b2257a141a4dbe58 Mon Sep 17 00:00:00 2001 From: raclim Date: Fri, 31 May 2024 19:00:22 -0400 Subject: [PATCH 47/67] 2.12.14 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index f268cfcb8d..28c38afc1e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "p5.js-web-editor", - "version": "2.12.13", + "version": "2.12.14", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "p5.js-web-editor", - "version": "2.12.13", + "version": "2.12.14", "license": "LGPL-2.1", "dependencies": { "@auth0/s3": "^1.0.0", diff --git a/package.json b/package.json index 8dba7ada93..23b4969df5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p5.js-web-editor", - "version": "2.12.13", + "version": "2.12.14", "description": "The web editor for p5.js.", "scripts": { "clean": "rimraf dist", From 27c68f8fa45e8807b7cc765ad8798093a4ad693b Mon Sep 17 00:00:00 2001 From: rohanjadhav05 Date: Sat, 1 Jun 2024 21:00:09 +0530 Subject: [PATCH 48/67] p5js Logo On Editor Redirect to My Sketches #3083 --- client/components/PreviewNav.jsx | 14 ++++++++------ client/modules/IDE/components/Header/Nav.jsx | 16 +++++++++------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/client/components/PreviewNav.jsx b/client/components/PreviewNav.jsx index fa42a89427..f66476d92b 100644 --- a/client/components/PreviewNav.jsx +++ b/client/components/PreviewNav.jsx @@ -12,12 +12,14 @@ const PreviewNav = ({ owner, project }) => {