Merge branch 'main' into userModels

OpenLake · Feb 3, 2024 · 8310bb0 · 8310bb0
2 parents d28aeb8 + f97f117
commit 8310bb0
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 29 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 **/.DS_Store
-
+.vscode/easycode.ignore
 ## Backend ignored file (Root level)
 backend/.DS_Store
 node_modules/

diff --git a/.vscode/easycode.ignore b/.vscode/easycode.ignore
diff --git a/backend/constants/mailOption.js b/backend/constants/mailOption.js
@@ -1,4 +1,3 @@
-export const senderEmail = '[email protected]';
 export const subjectOTPLogin = 'OTP for Login';
 
 export function createOTPEmailBody(otp) {

diff --git a/backend/resources/otpResource.js b/backend/resources/otpResource.js
@@ -49,7 +49,7 @@ otpRouter.post('/send-otp', async (req, res) => {
   // Store OTP with the associated email
   otpStorage.set(email, otp);
   const mailOptions = {
-    from: mailOption.senderEmail,
+    from: process.env.SENDER_EMAIL,
     to: email,
     subject: mailOption.subjectOTPLogin,
     text: mailOption.createOTPEmailBody(otp)

diff --git a/frontend/lib/constants/constants.dart b/frontend/lib/constants/constants.dart
@@ -1,4 +1,3 @@
-import 'package:email_validator/email_validator.dart';
 import 'package:flutter/material.dart';
 
 class AppConstants {
@@ -137,8 +136,7 @@ class MessMenuConstants {
   ];
 
   static final List<Text> mealTypes = [
-    Text('Breakfast',
-        style: TextStyle(color: Colors.teal.shade900, fontSize: 14)),
+    Text('Breakfast', style: TextStyle(color: Colors.teal.shade900, fontSize: 14)),
     Text('Lunch', style: TextStyle(color: Colors.teal.shade900, fontSize: 14)),
     Text('Snacks', style: TextStyle(color: Colors.teal.shade900, fontSize: 14)),
     Text('Dinner', style: TextStyle(color: Colors.teal.shade900, fontSize: 14)),
@@ -160,7 +158,7 @@ class Validators {
     if (value == null || value.isEmpty) {
       return "Email cannot be empty";
     }
-    if (!EmailValidator.validate(value)) {
+    if (!RegExp(r"^[a-zA-Z0-9+_.-]+@[a-zA-Z0-9.-]+$").hasMatch(value)) {
       return "Invalid email";
     }
     return null;

diff --git a/frontend/pubspec.lock b/frontend/pubspec.lock
@@ -153,14 +153,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.0"
-  email_validator:
-    dependency: "direct main"
-    description:
-      name: email_validator
-      sha256: e9a90f27ab2b915a27d7f9c2a7ddda5dd752d6942616ee83529b686fc086221b
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.17"
   fake_async:
     dependency: transitive
     description:

diff --git a/frontend/pubspec.yaml b/frontend/pubspec.yaml
@@ -50,7 +50,6 @@ dependencies:
   grouped_list: ^5.1.2
   slide_switcher: ^1.1.2
   awesome_snackbar_content: ^0.1.1
-  email_validator: ^2.1.17
   delightful_toast: ^1.1.0
 
 dev_dependencies: