Merge branch 'develop' into refactor/loading

Author: lindapaiste

README.md

@@ -38,7 +38,7 @@ Issues and Pull Requests categorized under the PATCH or MINOR Release Milestones
 
 We will aim to deploy on a 1-2 month basis. Here are some dates we’re working towards: 
 
-2.11.0 MINOR Release: By January 16, 2023
+2.12.0 MINOR Release: By February 27, 2024
 
 [You can read more about Semantic Versioning and the differences between a MINOR and PATCH release](https://semver.org/). 
 

client/modules/IDE/actions/collections.js

@@ -80,7 +80,7 @@ export function addToCollection(collectionId, projectId) {
 
         const collectionName = response.data.name;
 
-        dispatch(setToastText(`Added to "${collectionName}`));
+        dispatch(setToastText(`Added to "${collectionName}"`));
         dispatch(showToast(TOAST_DISPLAY_TIME_MS));
 
         return response.data;
@@ -110,7 +110,7 @@ export function removeFromCollection(collectionId, projectId) {
 
         const collectionName = response.data.name;
 
-        dispatch(setToastText(`Removed from "${collectionName}`));
+        dispatch(setToastText(`Removed from "${collectionName}"`));
         dispatch(showToast(TOAST_DISPLAY_TIME_MS));
 
         return response.data;

client/styles/components/_editor.scss

@@ -91,7 +91,7 @@ pre.CodeMirror-line {
   position: fixed;
   top: 0;
   left: 50%;
-  margin-left: math.div(552 * 0.5, $base-font-size);
+  margin-left: #{math.div(-552 * 0.5, $base-font-size)}rem;
 
   @media (max-width: 770px) {
     left: 0;
@@ -100,7 +100,7 @@ pre.CodeMirror-line {
     margin-left: 0;
   }
 
-  z-index: 1;
+  z-index: 10;
 
   width: 580px;
   font-family: Montserrat, sans-serif;
@@ -139,8 +139,11 @@ pre.CodeMirror-line {
 }
 
 .CodeMirror-find-controls {
+  width: 100%;
   display: flex;
   align-items: center;
+  justify-content: space-between;
+  height: #{math.div(35, $base-font-size)}rem;
 }
 .CodeMirror-search-inputs {
   width: 30%;
@@ -152,9 +155,11 @@ pre.CodeMirror-line {
   align-items: center;
 }
 .CodeMirror-search-controls {
+  width: 60%;
   display: flex;
-  align-items: center;
-  justify-content: end;
+  flex-wrap: wrap-reverse;
+  justify-content: flex-start;
+  align-items: flex-end;
 }
 .CodeMirror-replace-controls {
   display: flex;

server/controllers/user.controller.js

@@ -30,8 +30,7 @@ const random = (done) => {
 };
 
 export function createUser(req, res, next) {
-  const { username, email } = req.body;
-  const { password } = req.body;
+  const { username, email, password } = req.body;
   const emailLowerCase = email.toLowerCase();
   const EMAIL_VERIFY_TOKEN_EXPIRY_TIME = Date.now() + 3600000 * 24; // 24 hours
   random((tokenError, token) => {