Merge branch 'release-2.12.12' into release

Author: raclim

client/modules/IDE/pages/IDEView.jsx

@@ -87,6 +87,37 @@ function WarnIfUnsavedChanges() {
   );
 }
 
+function 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 (
+    <div className="banner">
+      <a href={textObj.url}>{textObj.copy}</a>
+    </div>
+  );
+}
+
 export const CmControllerContext = React.createContext({});
 
 const IDEView = () => {
@@ -170,6 +201,7 @@ const IDEView = () => {
       <Helmet>
         <title>{getTitle(project)}</title>
       </Helmet>
+      <Banner />
       <IDEKeyHandlers getContent={() => cmRef.current?.getContent()} />
       <WarnIfUnsavedChanges />
       <Toast />

client/styles/layout/_ide.scss

@@ -16,6 +16,19 @@
 	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;
+  }
+}
+
 .sidebar {
   width: 100%;
   height: 100%;

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

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "p5.js-web-editor",
-  "version": "2.12.11",
+  "version": "2.12.12",
   "description": "The web editor for p5.js.",
   "scripts": {
     "clean": "rimraf dist",

package.json

@@ -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) {

server/controllers/user.controller.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(

server/previewServer.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(