From ac4e15001184841587858208775add46a16fa3b5 Mon Sep 17 00:00:00 2001
From: Akhilbisht798 <akhilbisht798@gmail.com>
Date: Mon, 11 Sep 2023 01:08:47 +0530
Subject: [PATCH 1/6] changed EmailVerificationVeiw Component to functional
 component

---
 .../User/pages/EmailVerificationView.jsx      | 84 +++++++++----------
 1 file changed, 39 insertions(+), 45 deletions(-)

diff --git a/client/modules/User/pages/EmailVerificationView.jsx b/client/modules/User/pages/EmailVerificationView.jsx
index 42960062b4..4516cb57c5 100644
--- a/client/modules/User/pages/EmailVerificationView.jsx
+++ b/client/modules/User/pages/EmailVerificationView.jsx
@@ -1,5 +1,5 @@
 import PropTypes from 'prop-types';
-import React from 'react';
+import React, { useEffect } from 'react';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import { withTranslation } from 'react-i18next';
@@ -9,57 +9,51 @@ import { verifyEmailConfirmation } from '../actions';
 import RootPage from '../../../components/RootPage';
 import Nav from '../../IDE/components/Header/Nav';
 
-class EmailVerificationView extends React.Component {
-  static defaultProps = {
-    emailVerificationTokenState: null
-  };
+const EmailVerificationView = (props) => {
+  const { emailVerificationTokenState, location, t } = props;
 
-  componentWillMount() {
-    const verificationToken = this.verificationToken();
-    if (verificationToken != null) {
-      this.props.verifyEmailConfirmation(verificationToken);
-    }
-  }
-
-  verificationToken = () => {
-    const { location } = this.props;
+  const verificationTokenFromLocation = () => {
     const searchParams = new URLSearchParams(location.search);
     return searchParams.get('t');
   };
 
-  render() {
-    let status = null;
-    const { emailVerificationTokenState } = this.props;
-
-    if (this.verificationToken() == null) {
-      status = <p>{this.props.t('EmailVerificationView.InvalidTokenNull')}</p>;
-    } else if (emailVerificationTokenState === 'checking') {
-      status = <p>{this.props.t('EmailVerificationView.Checking')}</p>;
-    } else if (emailVerificationTokenState === 'verified') {
-      status = <p>{this.props.t('EmailVerificationView.Verified')}</p>;
-      setTimeout(() => browserHistory.push('/'), 1000);
-    } else if (emailVerificationTokenState === 'invalid') {
-      status = <p>{this.props.t('EmailVerificationView.InvalidState')}</p>;
+  useEffect(() => {
+    const verificationToken = verificationTokenFromLocation();
+    if (verificationToken != null) {
+      props.verifyEmailConfirmation(verificationToken);
     }
+  }, [location, props]);
 
-    return (
-      <RootPage>
-        <Nav layout="dashboard" />
-        <div className="form-container">
-          <Helmet>
-            <title>{this.props.t('EmailVerificationView.Title')}</title>
-          </Helmet>
-          <div className="form-container__content">
-            <h2 className="form-container__title">
-              {this.props.t('EmailVerificationView.Verify')}
-            </h2>
-            {status}
-          </div>
-        </div>
-      </RootPage>
-    );
+  let status = null;
+
+  if (verificationTokenFromLocation() == null) {
+    status = <p>{t('EmailVerificationView.InvalidTokenNull')}</p>;
+  } else if (emailVerificationTokenState === 'checking') {
+    status = <p>{t('EmailVerificationView.Checking')}</p>;
+  } else if (emailVerificationTokenState === 'verified') {
+    status = <p>{t('EmailVerificationView.Verified')}</p>;
+    setTimeout(() => browserHistory.push('/'), 1000);
+  } else if (emailVerificationTokenState === 'invalid') {
+    status = <p>{t('EmailVerificationView.InvalidState')}</p>;
   }
-}
+
+  return (
+    <RootPage>
+      <Nav layout="dashboard" />
+      <div className="form-container">
+        <Helmet>
+          <title>{t('EmailVerificationView.Title')}</title>
+        </Helmet>
+        <div className="form-container__content">
+          <h2 className="form-container__title">
+            {t('EmailVerificationView.Verify')}
+          </h2>
+          {status}
+        </div>
+      </div>
+    </RootPage>
+  );
+};
 
 function mapStateToProps(state) {
   return {
@@ -81,7 +75,7 @@ EmailVerificationView.propTypes = {
     'checking',
     'verified',
     'invalid'
-  ]),
+  ]).isRequired,
   verifyEmailConfirmation: PropTypes.func.isRequired,
   t: PropTypes.func.isRequired,
   location: PropTypes.shape({

From 3ddbc81aa68f91fda8afe2f7712e6205da6f2a34 Mon Sep 17 00:00:00 2001
From: BIKI DAS <bikidas@BIKIs-MacBook-Pro.local>
Date: Mon, 11 Sep 2023 17:57:06 +0530
Subject: [PATCH 2/6] Fixed right click bug

---
 client/components/Nav/NavBar.jsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/client/components/Nav/NavBar.jsx b/client/components/Nav/NavBar.jsx
index 897b2ac854..16d92b8689 100644
--- a/client/components/Nav/NavBar.jsx
+++ b/client/components/Nav/NavBar.jsx
@@ -71,7 +71,10 @@ function NavBar({ children, className }) {
         onFocus: clearHideTimeout
       }),
       createMenuItemHandlers: (dropdown) => ({
-        onMouseUp: () => {
+        onMouseUp: (e) => {
+          if (e.button === 2) {
+            return;
+          }
           setDropdownOpen('none');
         },
         onBlur: handleBlur,

From 834a115de75f0a1eecb2517204896840c5a681d8 Mon Sep 17 00:00:00 2001
From: Akhilbisht798 <akhilbisht798@gmail.com>
Date: Tue, 12 Sep 2023 23:36:17 +0530
Subject: [PATCH 3/6] added defaultProps for EmailVerficationVeiw

---
 client/modules/User/pages/EmailVerificationView.jsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/client/modules/User/pages/EmailVerificationView.jsx b/client/modules/User/pages/EmailVerificationView.jsx
index 4516cb57c5..5f7bbd92bb 100644
--- a/client/modules/User/pages/EmailVerificationView.jsx
+++ b/client/modules/User/pages/EmailVerificationView.jsx
@@ -70,12 +70,16 @@ function mapDispatchToProps(dispatch) {
   );
 }
 
+EmailVerificationView.defaultProps = {
+  emailVerificationTokenState: null
+};
+
 EmailVerificationView.propTypes = {
   emailVerificationTokenState: PropTypes.oneOf([
     'checking',
     'verified',
     'invalid'
-  ]).isRequired,
+  ]),
   verifyEmailConfirmation: PropTypes.func.isRequired,
   t: PropTypes.func.isRequired,
   location: PropTypes.shape({

From 09c5ff2dce5c8a6a2b4c120c31bfcffcfd73f260 Mon Sep 17 00:00:00 2001
From: Ankush263 <ankushbanik263@gmail.com>
Date: Tue, 12 Sep 2023 23:53:59 +0530
Subject: [PATCH 4/6] fixes of the issue window.p5._report is not defined

---
 client/modules/Preview/EmbedFrame.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/modules/Preview/EmbedFrame.jsx b/client/modules/Preview/EmbedFrame.jsx
index 43f229fa2d..e445fc152d 100644
--- a/client/modules/Preview/EmbedFrame.jsx
+++ b/client/modules/Preview/EmbedFrame.jsx
@@ -252,7 +252,7 @@ function injectLocalFiles(files, htmlFile, options) {
     'PREVIEW_SCRIPTS_URL'
   )}`;
   previewScripts.setAttribute('crossorigin', '');
-  sketchDoc.head.appendChild(previewScripts);
+  sketchDoc.body.appendChild(previewScripts);
 
   const sketchDocString = `<!DOCTYPE HTML>\n${sketchDoc.documentElement.outerHTML}`;
   scriptOffs = getAllScriptOffsets(sketchDocString);

From d5e8b15c012ad546eff959a752eefa78ef953048 Mon Sep 17 00:00:00 2001
From: Vikram Singh <vs125609@gmail.com>
Date: Thu, 14 Sep 2023 02:11:11 +0530
Subject: [PATCH 5/6] migration of the function which is returned from
 getAssets and deleteAssetRequest to async/await instead of callbacks

---
 client/modules/IDE/actions/assets.js | 40 +++++++++++++---------------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/client/modules/IDE/actions/assets.js b/client/modules/IDE/actions/assets.js
index 8c7a046121..0a7a13e3a0 100644
--- a/client/modules/IDE/actions/assets.js
+++ b/client/modules/IDE/actions/assets.js
@@ -11,20 +11,18 @@ function setAssets(assets, totalSize) {
 }
 
 export function getAssets() {
-  return (dispatch) => {
+  return async (dispatch) => {
     dispatch(startLoader());
-    apiClient
-      .get('/S3/objects')
-      .then((response) => {
-        dispatch(setAssets(response.data.assets, response.data.totalSize));
-        dispatch(stopLoader());
-      })
-      .catch(() => {
-        dispatch({
-          type: ActionTypes.ERROR
-        });
-        dispatch(stopLoader());
+    try {
+      const response = await apiClient.get('/S3/objects');
+      dispatch(setAssets(response.data.assets, response.data.totalSize));
+      dispatch(stopLoader());
+    } catch (error) {
+      dispatch({
+        type: ActionTypes.ERROR
       });
+      dispatch(stopLoader());
+    }
   };
 }
 
@@ -36,16 +34,14 @@ export function deleteAsset(assetKey) {
 }
 
 export function deleteAssetRequest(assetKey) {
-  return (dispatch) => {
-    apiClient
-      .delete(`/S3/${assetKey}`)
-      .then((response) => {
-        dispatch(deleteAsset(assetKey));
-      })
-      .catch(() => {
-        dispatch({
-          type: ActionTypes.ERROR
-        });
+  return async (dispatch) => {
+    try {
+      await apiClient.delete(`/S3/${assetKey}`);
+      dispatch(deleteAsset(assetKey));
+    } catch (error) {
+      dispatch({
+        type: ActionTypes.ERROR
       });
+    }
   };
 }

From b247f9097fa7abaec7ec3440c2428891fa3c5f11 Mon Sep 17 00:00:00 2001
From: BamaCharanChhandogi <b.c.chhandogi@gmail.com>
Date: Fri, 15 Sep 2023 00:23:51 +0530
Subject: [PATCH 6/6] add enhanced CSS

---
 client/styles/components/_form-container.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/client/styles/components/_form-container.scss b/client/styles/components/_form-container.scss
index 53835c3eed..5931bde704 100644
--- a/client/styles/components/_form-container.scss
+++ b/client/styles/components/_form-container.scss
@@ -33,6 +33,7 @@
 	flex-direction: column;
 	justify-content: center;
 	align-items: center;
+	margin-bottom: 20px;
 }
 
 .form-container--align-left .form-container__content {
@@ -71,3 +72,6 @@
 .form-container__stack > * + * {
 	margin-top: #{10 / $base-font-size}rem;
 }
+.form__navigation-options a {
+	font-weight: bold;
+  }