From c9227cf9b99854f496e786e511d2d9e5e9e9c05d Mon Sep 17 00:00:00 2001
From: Ahmed Al-Taiar <ahmed.altaiar.06@gmail.com>
Date: Fri, 27 Sep 2024 22:57:30 -0400
Subject: [PATCH] Split name env variable

---
 .env.defaults                                              | 3 ++-
 .env.example                                               | 3 ++-
 api/src/lib/email.ts                                       | 2 +-
 redwood.toml                                               | 4 ++--
 web/src/components/ContactCard/ContactCard/ContactCard.tsx | 2 +-
 web/src/components/Portrait/PortraitForm/PortraitForm.tsx  | 4 ++--
 web/src/layouts/NavbarLayout/NavbarLayout.tsx              | 4 ++--
 7 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.env.defaults b/.env.defaults
index b9bcba8..5f93c8a 100644
--- a/.env.defaults
+++ b/.env.defaults
@@ -15,7 +15,8 @@ PRISMA_HIDE_UPDATE_MESSAGE=true
 # Ordered by how verbose they are: trace | debug | info | warn | error | silent
 # LOG_LEVEL=debug
 
-NAME=Ahmed Al-Taiar
+FIRST_NAME=Ahmed
+LAST_NAME=Al-Taiar
 
 GMAIL=example@gmail.com
 GMAIL_SMTP_PASSWORD=chan geme xyza bcde
diff --git a/.env.example b/.env.example
index 35cdd80..95b21a6 100644
--- a/.env.example
+++ b/.env.example
@@ -3,7 +3,8 @@
 # PRISMA_HIDE_UPDATE_MESSAGE=true
 # LOG_LEVEL=trace
 
-NAME=Firstname Lastname
+FIRST_NAME=firstname
+LAST_NAME=lastname
 
 GMAIL=example@gmail.com
 GMAIL_SMTP_PASSWORD=chan geme xyza bcde
diff --git a/api/src/lib/email.ts b/api/src/lib/email.ts
index e6d32f5..c40981f 100644
--- a/api/src/lib/email.ts
+++ b/api/src/lib/email.ts
@@ -17,7 +17,7 @@ const transporter = nodemailer.createTransport({
 
 export const sendEmail = async ({ to, subject, text, html }: Options) => {
   return await transporter.sendMail({
-    from: `"${process.env.NAME} (noreply)" <${process.env.GMAIL}>`,
+    from: `"${process.env.FIRST_NAME} ${process.env.LAST_NAME} (noreply)" <${process.env.GMAIL}>`,
     to: Array.isArray(to) ? to : [to],
     subject,
     text,
diff --git a/redwood.toml b/redwood.toml
index 60398ba..c4f986d 100644
--- a/redwood.toml
+++ b/redwood.toml
@@ -6,10 +6,10 @@
 # https://redwoodjs.com/docs/app-configuration-redwood-toml
 
 [web]
-  title = "${NAME}"
+  title = "${FIRST_NAME} ${LAST_NAME}"
   port = 8910
   apiUrl = "/api"
-  includeEnvironmentVariables = ["NAME", "API_ADDRESS_PROD", "API_ADDRESS_DEV"]
+  includeEnvironmentVariables = ["FIRST_NAME", "LAST_NAME", "API_ADDRESS_PROD", "API_ADDRESS_DEV"]
 [generate]
   tests = false
   stories = false
diff --git a/web/src/components/ContactCard/ContactCard/ContactCard.tsx b/web/src/components/ContactCard/ContactCard/ContactCard.tsx
index f234f00..e470dc2 100644
--- a/web/src/components/ContactCard/ContactCard/ContactCard.tsx
+++ b/web/src/components/ContactCard/ContactCard/ContactCard.tsx
@@ -56,7 +56,7 @@ const ContactCard = ({ portraitUrl }: ContactCardProps) => {
             <img
               className="contact-me-image aspect-portrait object-cover"
               src={portraitUrl}
-              alt={`${process.env.NAME}`}
+              alt={`${process.env.FIRST_NAME} ${process.env.LAST_NAME}`}
             />
           </figure>
           <div
diff --git a/web/src/components/Portrait/PortraitForm/PortraitForm.tsx b/web/src/components/Portrait/PortraitForm/PortraitForm.tsx
index 8aacdaa..8e2210d 100644
--- a/web/src/components/Portrait/PortraitForm/PortraitForm.tsx
+++ b/web/src/components/Portrait/PortraitForm/PortraitForm.tsx
@@ -110,7 +110,7 @@ const PortraitForm = (props: PortraitFormProps) => {
         <img
           className="aspect-portrait max-w-2xl rounded-xl object-cover"
           src={props.portrait?.fileId}
-          alt={`${process.env.NAME} Portrait`}
+          alt={`${process.env.FIRST_NAME} Portrait`}
         />
         <div className="flex justify-center">
           <button
@@ -150,7 +150,7 @@ const PortraitForm = (props: PortraitFormProps) => {
           <img
             className="aspect-portrait max-w-2xl rounded-xl object-cover"
             src={fileId}
-            alt={`${process.env.NAME} Portrait`}
+            alt={`${process.env.FIRST_NAME} Portrait`}
           />
         )}
         {fileId && (
diff --git a/web/src/layouts/NavbarLayout/NavbarLayout.tsx b/web/src/layouts/NavbarLayout/NavbarLayout.tsx
index 9fa58cb..7d201ce 100644
--- a/web/src/layouts/NavbarLayout/NavbarLayout.tsx
+++ b/web/src/layouts/NavbarLayout/NavbarLayout.tsx
@@ -110,7 +110,7 @@ const NavbarLayout = ({ children }: NavbarLayoutProps) => {
               to={routes.home()}
               className="btn btn-ghost hidden font-syne text-xl sm:flex"
             >
-              {process.env.NAME}
+              {process.env.FIRST_NAME + ' ' + process.env.LAST_NAME}
             </Link>
           </div>
           <div className="navbar-center">
@@ -118,7 +118,7 @@ const NavbarLayout = ({ children }: NavbarLayoutProps) => {
               to={routes.home()}
               className="btn btn-ghost font-syne text-xl sm:hidden"
             >
-              {process.env.NAME}
+              {process.env.FIRST_NAME + ' ' + process.env.LAST_NAME}
             </Link>
           </div>
           <div className="navbar-center hidden lg:flex">