From e64de3f4b99a0c6ac9bbba1a21b8984cd34f7a79 Mon Sep 17 00:00:00 2001
From: Cypro Freelance <110410268+Proxyy587@users.noreply.github.com>
Date: Sat, 6 Jul 2024 00:59:16 +0530
Subject: [PATCH] <br/> fixing #1

---
 app/(root)/contact/page.tsx | 44 +++++++++++++++++++++++++++----------
 app/api/contact/route.ts    | 13 ++++++-----
 2 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/app/(root)/contact/page.tsx b/app/(root)/contact/page.tsx
index 5a8b066..1755a67 100644
--- a/app/(root)/contact/page.tsx
+++ b/app/(root)/contact/page.tsx
@@ -1,6 +1,6 @@
 "use client";
 import Iconss from "@/components/ui/icons";
-import { MapPin, Phone, Mail, Send } from "lucide-react";
+import { Mail, Send, WebhookIcon, Bug, Shield } from "lucide-react";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { useForm } from "react-hook-form";
 import { z } from "zod";
@@ -79,7 +79,7 @@ const ContactUs = () => {
 			</div>
 
 			<section id="contact" className="w-full">
-				<div className="flex max-md:flex-center flex-col md:flex-row justify-between mx-auto p-5 max-w-3xl">
+				<div className="flex max-md:flex-center flex-col md:flex-row justify-between mx-auto p-5 max-w-4xl">
 					{/* Left contact page */}
 					<Form {...form}>
 						<form
@@ -143,28 +143,48 @@ const ContactUs = () => {
 					<div className="max-w-xl mt-3 md:ml-5">
 						<ul className="ml-2 max-md:flex-center flex-col pr-5">
 							<li className="mb-2 text-[#aaa] flex items-center">
-								<MapPin className="mr-2" size={24} />
-								<span>webmaster@svrjs.org</span>
-							</li>
-							<li className="mb-2 text-[#aaa] flex items-center">
-								<Phone className="mr-2" size={24} />
+								<WebhookIcon className="mr-2" size={24} />
 								<span>
 									<a
-										href="tel:1-212-555-5555"
-										title="Give me a call"
-										className="text-[#bbb] hover:text-white transition duration-200"
+										href="mailto:#"
+										title="Send me an email"
+										className="opacity-70 hover:opacity-100 transition duration-200"
+									>
+										webmaster@svrjs.org
+									</a>
+								</span>
+							</li>
+							<li className="mb-2 text-[#aaa] flex items-center">
+								<Bug className="mr-2" size={24} />
+								<span>
+									<a
+										href="mailto:#"
+										title="Send me an email"
+										className="opacity-70 hover:opacity-100 transition duration-200"
 									>
 										bugreports@svrjs.org
 									</a>
 								</span>
 							</li>
+							<li className="mb-2 text-[#aaa] flex items-center">
+								<Shield className="mr-2" size={24} />
+								<span>
+									<a
+										href="mailto:#"
+										title="Send me an email"
+										className="opacity-70 hover:opacity-100 transition duration-200"
+									>
+										vulnerability-reports@svrjs.org
+									</a>
+								</span>
+							</li>
 							<li className="mb-2 text-[#aaa] flex items-center">
 								<Mail className="mr-2" size={24} />
 								<span>
 									<a
 										href="mailto:#"
 										title="Send me an email"
-										className="text-[#bbb] hover:text-white transition duration-200"
+										className="opacity-70 hover:opacity-100 transition duration-200"
 									>
 										support@svrjs.org
 									</a>
@@ -177,7 +197,7 @@ const ContactUs = () => {
 						</ul>
 						<hr className="border-t border-white opacity-60 my-4" />
 						<div className="text-center text-[#555] text-sm font-light">
-							© ALL RIGHTS RESERVED
+							© ALL RIGHTS RESERVED SVRJS
 						</div>
 					</div>
 				</div>
diff --git a/app/api/contact/route.ts b/app/api/contact/route.ts
index dc681f2..4be3e52 100644
--- a/app/api/contact/route.ts
+++ b/app/api/contact/route.ts
@@ -12,17 +12,15 @@ const escapeHtml = (text: string) => {
 		.replace(/&/g, "&amp;")
 		.replace(/</g, "&lt;")
 		.replace(/>/g, "&gt;")
-		.replace(/\n/g, "<br/>");
+		.replace(/"/g, "&quot;")
+		.replace(/'/g, "&#039;");
 };
 
 const generateEmailContent = (data: Record<string, string>) => {
 	const stringData = Object.entries(data).reduce(
 		(str, [key, val]) =>
 			str +
-			`${CONTACT_MESSAGE_FIELDS[key] || key}: ${val.replace(
-				/\n/g,
-				"<br/>"
-			)} <br/><br/>`,
+			`${CONTACT_MESSAGE_FIELDS[key] || key}: ${val.replace(/\n/g, "\n")} \n\n`,
 		""
 	);
 
@@ -31,7 +29,10 @@ const generateEmailContent = (data: Record<string, string>) => {
 			str +
 			`<h3 class="form-heading">${escapeHtml(
 				CONTACT_MESSAGE_FIELDS[key] || key
-			)}</h3><p class="form-answer">${escapeHtml(val)}</p>`,
+			)}</h3><p class="form-answer">${escapeHtml(val).replace(
+				/\n/g,
+				"<br/>"
+			)}</p>`,
 		""
 	);