Merge branch 'develop' into piyush/fix-error-modal

raclim · web-flow · commit 46eaf8815b16 · 2024-05-31T18:04:51.000-04:00
diff --git 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
@@ -513,7 +513,7 @@ class Editor extends React.Component {
         {(matches) =>
           matches ? (
             <section className={editorSectionClass}>
-              <header className="editor__header">
+              <div className="editor__header">
                 <button
                   aria-label={this.props.t('Editor.OpenSketchARIA')}
                   className="sidebar__contract"
@@ -538,7 +538,7 @@ class Editor extends React.Component {
                   </span>
                   <Timer />
                 </div>
-              </header>
+              </div>
               <article
                 ref={(element) => {
                   this.codemirrorContainer = element;
@@ -555,7 +555,7 @@ class Editor extends React.Component {
             </section>
           ) : (
             <EditorContainer expanded={this.props.isExpanded}>
-              <header>
+              <>
                 <IconButton
                   onClick={this.props.expandSidebar}
                   icon={FolderIcon}
@@ -564,7 +564,7 @@ class Editor extends React.Component {
                   {this.props.file.name}
                   <UnsavedChangesIndicator />
                 </span>
-              </header>
+              </>
               <section>
                 <EditorHolder
                   ref={(element) => {
diff --git a/client/modules/IDE/components/Header/Nav.jsx b/client/modules/IDE/components/Header/Nav.jsx
@@ -270,7 +270,7 @@ const UnauthenticatedUserMenu = () => {
           </span>
         </Link>
       </li>
-      <span className="nav__item-or">{t('Nav.LoginOr')}</span>
+      <li className="nav__item-or">{t('Nav.LoginOr')}</li>
       <li className="nav__item">
         <Link to="/signup" className="nav__auth-button">
           <span className="nav__item-header" title="SignUp">
diff --git 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 (
-    <header>
+    <>
       <Nav />
       {!isMobile && (
         <Toolbar syncFileContent={props.syncFileContent} key={project.id} />
       )}
-    </header>
+    </>
   );
 };
 
diff --git a/kubernetes_app.yml b/kubernetes_app.yml
@@ -65,7 +65,7 @@ spec:
   selector:
     matchLabels:
       app: web-editor
-  replicas: 3
+  replicas: 4
   template:
     metadata:
       labels:
@@ -99,8 +99,8 @@ metadata:
   name: web-editor-node
   namespace: production
 spec:
-  maxReplicas: 6
-  minReplicas: 2
+  maxReplicas: 9
+  minReplicas: 3
   scaleTargetRef:
     apiVersion: extensions/v1beta1
     kind: Deployment
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": "2.12.11",
+  "version": "2.12.13",
   "description": "The web editor for p5.js.",
   "scripts": {
     "clean": "rimraf dist",
diff --git a/server/controllers/user.controller.js b/server/controllers/user.controller.js
@@ -295,6 +295,16 @@ export async function updateSettings(req, res) {
     }
     user.username = req.body.username;
 
+    if (req.body.newPassword) {
+      if (user.password === undefined) {
+        user.password = req.body.newPassword;
+        saveUser(res, user);
+      }
+      if (!req.body.currentPassword) {
+        res.status(401).json({ error: 'Current password is not provided.' });
+        return;
+      }
+    }
     if (req.body.currentPassword) {
       const isMatch = await user.comparePassword(req.body.currentPassword);
       if (!isMatch) {
diff --git a/server/domain-objects/createDefaultFiles.js b/server/domain-objects/createDefaultFiles.js
@@ -9,8 +9,8 @@ function draw() {
 export const defaultHTML = `<!DOCTYPE html>
 <html lang="en">
   <head>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.9.3/p5.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.9.3/addons/p5.sound.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.9.4/p5.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.9.4/addons/p5.sound.min.js"></script>
     <link rel="stylesheet" type="text/css" href="style.css">
     <meta charset="utf-8" />
 
diff --git a/server/previewServer.js b/server/previewServer.js
@@ -15,12 +15,24 @@ const app = new Express();
 // This also works if you take out the mongoose connection
 // but i have no idea why
 const mongoConnectionString = process.env.MONGO_URL;
+
 // Connect to MongoDB
-mongoose.Promise = global.Promise;
-mongoose.connect(mongoConnectionString, {
-  useNewUrlParser: true,
-  useUnifiedTopology: true
-});
+const connectToMongoDB = async () => {
+  try {
+    await mongoose.connect(mongoConnectionString, {
+      useNewUrlParser: true,
+      useUnifiedTopology: true,
+      useCreateIndex: true,
+      useFindAndModify: false
+    });
+  } catch (error) {
+    console.error('Failed to connect to MongoDB: ', error);
+    process.exit(1);
+  }
+};
+
+connectToMongoDB();
+
 mongoose.set('useCreateIndex', true);
 mongoose.connection.on('error', () => {
   console.error(
diff --git a/server/server.js b/server/server.js
@@ -152,11 +152,22 @@ app.use('/', passportRoutes);
 require('./config/passport');
 
 // Connect to MongoDB
-mongoose.Promise = global.Promise;
-mongoose.connect(mongoConnectionString, {
-  useNewUrlParser: true,
-  useUnifiedTopology: true
-});
+const connectToMongoDB = async () => {
+  try {
+    await mongoose.connect(mongoConnectionString, {
+      useNewUrlParser: true,
+      useUnifiedTopology: true,
+      useCreateIndex: true,
+      useFindAndModify: false
+    });
+  } catch (error) {
+    console.error('Failed to connect to MongoDB: ', error);
+    process.exit(1);
+  }
+};
+
+connectToMongoDB();
+
 mongoose.set('useCreateIndex', true);
 mongoose.connection.on('error', () => {
   console.error(
diff --git a/translations/locales/hi/translations.json b/translations/locales/hi/translations.json
@@ -109,7 +109,6 @@
       "PrivacyPolicy": "गोपनीयता नीति",
       "TermsOfUse": "उपयोग की शर्तें",
       "CodeOfConduct": "आचार संहिता"
-      "WebEditor": "वेब एडिटर"
     },
     "Toast": {
       "OpenedNewSketch": "नया स्केच खोला",
diff --git 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>利用規約</0> と <1>プライバシー ポリシー</1> に同意したことになります。"
     },
     "EmailVerificationView": {
       "Title": "p5.js ウェブエディター | メールアドレス認証",

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": "2.12.11",`
	`3`	`+ "version": "2.12.13",`
`4`	`4`	`"description": "The web editor for p5.js.",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"clean": "rimraf dist",`