Merge branch 'dev' into 288-landing-page

Author: Seluj78

backend/PyMatcha/routes/api/auth/email.py

@@ -87,6 +87,6 @@ def request_new_email_conf():
             token = generate_confirmation_token(email=email, token_type="confirm")
             link = FRONTEND_EMAIL_CONFIRMATION_URL + token
             rendered_html = render_template("confirm_email.html", link=link)
-            send_mail_html.delay(dest=data["email"], subject="Confirm your email on PyMatcha", html=rendered_html)
+            send_mail_html.delay(dest=data["email"], subject="Confirm your email on Matcha", html=rendered_html)
     logging.debug("/auth/confirm/new -> New confirmation email sent if user exists in database")
     return Success("New confirmation email sent if user exists in database and isn't already confirmed.")

backend/PyMatcha/routes/api/auth/password.py

@@ -54,7 +54,7 @@ def forgot_password():
         link = FRONTEND_PASSWORD_RESET_URL + token
         rendered_html = render_template("password_reset.html", link=link)
         logging.debug("Sending worker request to send email")
-        send_mail_html.delay(dest=data["email"], subject="Reset your password on PyMatcha", html=rendered_html)
+        send_mail_html.delay(dest=data["email"], subject="Reset your password on Matcha", html=rendered_html)
     logging.debug("Password reset mail sent successfully for user.")
     return Success("Password reset mail sent successfully if user exists in DB.")
 

backend/PyMatcha/routes/api/auth/register.py

@@ -55,6 +55,6 @@ def api_create_user():
         token = generate_confirmation_token(email=data["email"], token_type="confirm")
         link = FRONTEND_EMAIL_CONFIRMATION_URL + token
         rendered_html = render_template("confirm_email.html", link=link)
-        send_mail_html.delay(dest=data["email"], subject="Confirm your email on PyMatcha", html=rendered_html)
+        send_mail_html.delay(dest=data["email"], subject="Confirm your email on Matcha", html=rendered_html)
         logging.info("Registered new user successfully.")
         return SuccessOutputMessage("email", new_user.email, "New user successfully created.")

backend/PyMatcha/routes/api/profile/edit.py

@@ -194,7 +194,7 @@ def edit_email():
     token = generate_confirmation_token(email=new_email, token_type="confirm")
     link = FRONTEND_EMAIL_CONFIRMATION_URL + token
     rendered_html = render_template("confirm_email.html", link=link)
-    send_mail_html.delay(dest=new_email, subject="Confirm your email on PyMatcha", html=rendered_html)
+    send_mail_html.delay(dest=new_email, subject="Confirm your email on Matcha", html=rendered_html)
     logging.info(f"Edited email for {current_user.id}")
     return Success("Email sent for new email.")
 

backend/PyMatcha/templates/confirm_email.html

@@ -23,8 +23,8 @@
     </div>
     <div id="links" v-on:click="openOnSmallerScreens()" v-bind:class="isOpen ? 'block' : 'hidden'" class="px-2 pb-5 text-center md:p-0 md:block md:flex md:items-center">
       <div v-if="!loggedIn" class="md:flex md:bg-purple-matcha md:border-2 md:border-purple-matcha md:rounded-lg">
-        <router-link to="/accounts/signin" class="navigation-button-logged-in md:hover:bg-white-matcha md:hover:text-purple-matcha md:text-purple-matcha md:bg-white-matcha md:py-2 md:px-8 md:rounded-md mx-0">Sign In</router-link>
-        <router-link to="/accounts/signup" class="navigation-button-logged-in md:hover:bg-purple-matcha md:hover:text-white-matcha md:text-white-matcha md:py-2 md:px-8">Get Started</router-link>
+        <router-link to="/accounts/signin" class="navigation-button-logged-in md:hover:bg-white-matcha md:hover:text-purple-matcha md:text-purple-matcha md:bg-white-matcha md:py-2 md:px-8 md:rounded-md mx-0 whitespace-no-wrap">Sign In</router-link>
+        <router-link to="/accounts/signup" class="navigation-button-logged-in md:hover:bg-purple-matcha md:hover:text-white-matcha md:text-white-matcha md:py-2 md:px-8 whitespace-no-wrap">Get Started</router-link>
       </div>
       <router-link v-if="loggedIn && profileCompleted" to="/browse" v-bind:class="{'navigation-button-logged-in': true, 'font-black': currentRoute === 'Browse'}">Browse</router-link>
       <router-link v-if="loggedIn && profileCompleted" to="/search" v-bind:class="{'navigation-button-logged-in': true, 'font-black': currentRoute === 'Search'}">Search</router-link>