Fixed email html, backURL for google login

tiller1010 · Dec 31, 2022 · 74cab85 · 74cab85
1 parent 9db544b
commit 74cab85
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 82,123 deletions.
diff --git a/js/components/Login.jsx b/js/components/Login.jsx
@@ -71,7 +71,7 @@ class Login extends React.Component {
 					    Register
 					    <FontAwesomeIcon icon={faLongArrowAltRight}/>
 				    </a>
-				    <a href="/auth/google" className="button">
+				    <a href={`/auth/google?backURL=${backURL}`} className="button">
 					    Login with Google
 					    <FontAwesomeIcon icon={faGoogle}/>
 				    </a>

diff --git a/js/components/VideoChat.js b/js/components/VideoChat.js
@@ -316,7 +316,7 @@ var VideoChat = /** @class */ (function (_super) {
                         catch (e) {
                             host = 'https://localhost';
                         }
-                        return [4 /*yield*/, (0, emailFetch_js_1.sendEmailToUser)(forUserID, "Call Started", "<p><b>Your video call has started. <a href=\"".concat(host, "/video-chat?withUserID=").concat(authenticatedUserID, "\">Use this link to go to your video call.</a></p>\t\t\t<br>\t\t\t<p><b>Or go to your account profile and click the video chat link under your purchase.</b>"))];
+                        return [4 /*yield*/, (0, emailFetch_js_1.sendEmailToUser)(forUserID, "Call Started", "<p><b>Your video call has started. <a href=\"".concat(host, "/video-chat?withUserID=").concat(authenticatedUserID, "\">Use this link to go to your video call.</a><b></p>\t\t\t<br>\t\t\t<p><b>Or go to your account profile and click the video chat link under your purchase.</b></p>"))];
                     case 5:
                         emailResponse = _b.sent();
                         // Listen for remote answer
@@ -402,7 +402,7 @@ var VideoChat = /** @class */ (function (_super) {
                             host = 'https://localhost';
                         }
                         if (!withUserID) return [3 /*break*/, 8];
-                        return [4 /*yield*/, (0, emailFetch_js_1.sendEmailToUser)(withUserID, "Call Answered", "<p><b>The video call has started. The customer has answered your call.</p>\t\t\t\t<p></p>\t\t\t\t<p><a href=\"".concat(host, "/video-chat?forUserID=").concat(authenticatedUserID, "\">Use this link to go to your video call.</a></b></p>"))];
+                        return [4 /*yield*/, (0, emailFetch_js_1.sendEmailToUser)(withUserID, "Call Answered", "<p><b>The video call has started. The customer has answered your call.</b></p>\t\t\t\t<br>\t\t\t\t<p><b><a href=\"".concat(host, "/video-chat?forUserID=").concat(authenticatedUserID, "\">Use this link to go to your video call.</a></b></p>"))];
                     case 7:
                         emailResponse = _b.sent();
                         _b.label = 8;

diff --git a/js/components/VideoChat.tsx b/js/components/VideoChat.tsx
@@ -265,9 +265,9 @@ export default class VideoChat extends React.Component<VideoChatProps, VideoChat
 		const emailResponse = await sendEmailToUser(
 			forUserID,
 			`Call Started`,
-			`<p><b>Your video call has started. <a href="${host}/video-chat?withUserID=${authenticatedUserID}">Use this link to go to your video call.</a></p>\
+			`<p><b>Your video call has started. <a href="${host}/video-chat?withUserID=${authenticatedUserID}">Use this link to go to your video call.</a><b></p>\
 			<br>\
-			<p><b>Or go to your account profile and click the video chat link under your purchase.</b>`
+			<p><b>Or go to your account profile and click the video chat link under your purchase.</b></p>`
 		);
 
 		// Listen for remote answer
@@ -339,9 +339,9 @@ export default class VideoChat extends React.Component<VideoChatProps, VideoChat
 			const emailResponse = await sendEmailToUser(
 				withUserID,
 				`Call Answered`,
-				`<p><b>The video call has started. The customer has answered your call.</p>\
-				<p></p>\
-				<p><a href="${host}/video-chat?forUserID=${authenticatedUserID}">Use this link to go to your video call.</a></b></p>`
+				`<p><b>The video call has started. The customer has answered your call.</b></p>\
+				<br>\
+				<p><b><a href="${host}/video-chat?forUserID=${authenticatedUserID}">Use this link to go to your video call.</a></b></p>`
 			);
 		}