From fcc8c268bd0589efa0eb129a2781a330bb5a8220 Mon Sep 17 00:00:00 2001
From: Peter Hoppe <p-hoppe@gmx.de>
Date: Fri, 10 Feb 2023 15:44:31 +0100
Subject: [PATCH] aussehen rahmen

---
 php/php-dog/foundEmail.php       |  2 +-
 php/php-dog/wantNewPw.php        |  8 ++++----
 src/components/ContactForm.css   |  5 +++++
 src/components/InputForm.css     | 24 +++++++++++++++++++++++-
 src/components/Login.tsx         |  9 ++++++---
 src/components/PasswordReset.tsx |  6 +++++-
 src/components/Profil.tsx        |  4 ++++
 src/components/Register.tsx      |  4 ++++
 src/components/WantNewPw.tsx     |  4 ++++
 9 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/php/php-dog/foundEmail.php b/php/php-dog/foundEmail.php
index 68d0f46..caf4aaf 100644
--- a/php/php-dog/foundEmail.php
+++ b/php/php-dog/foundEmail.php
@@ -72,7 +72,7 @@ if (!filter_var($toEmail, FILTER_VALIDATE_EMAIL))
     return;
 }
 
-$subject = 'Tier gefunden: ' . $name .' ID: '. $qr_id;
+$subject = 'Tier gefunden: ' . $name .'         ID: '. $qr_id;
 
 // $headers = 
 //     array(
diff --git a/php/php-dog/wantNewPw.php b/php/php-dog/wantNewPw.php
index 4111279..e3a3878 100644
--- a/php/php-dog/wantNewPw.php
+++ b/php/php-dog/wantNewPw.php
@@ -43,18 +43,18 @@ function sendMail($email, $pwtoken)
     $mail = new CNetcupMailer();
     $mail->CharSet = "UTF-8";
     
-    $mail->setFrom('dog@hope-fly.de', 'Administrator');
+    $mail->setFrom('dog@hope-fly.de', 'Administrator hope-fly.de/dog');
     $mail->addAddress($email);     //Add a recipient
     $mail->addReplyTo('No Reply');
     $mail->isHTML(true);
     //Attachments
 
     //Content
-    $mail->Subject = 'Passwort zurücksetzen!';
+    $mail->Subject = 'Ihr neues Passwort!';
     $mail->Body    = 
 "<h3>Neues Passwort setzen</h3>
-<p>Gültig bis $expiresStr</p>
-<a href='https://hope-fly.de/dog/pwreset/$pwtoken'>Setzen</a>";
+<p>Link gültig 30 Minuten bis $expiresStr</p>
+<a href='https://hope-fly.de/dog/pwreset/$pwtoken'>Passwort setzen</a>";
 
     return $mail->send();
 }
diff --git a/src/components/ContactForm.css b/src/components/ContactForm.css
index d54879a..5a4a7bf 100644
--- a/src/components/ContactForm.css
+++ b/src/components/ContactForm.css
@@ -53,6 +53,10 @@ div.flexCenter
     padding: 20px;
     justify-content: center;   
     width: 60%;
+    
+    padding: 10px;
+    border-style: solid;
+    border-width: 2px;
   }
   
   .formForm
@@ -92,6 +96,7 @@ div.flexCenter
   {
     display: flex;
     flex-direction: column;
+    align-items: center;
   }
 
   .textArea
diff --git a/src/components/InputForm.css b/src/components/InputForm.css
index b552d12..e251df5 100644
--- a/src/components/InputForm.css
+++ b/src/components/InputForm.css
@@ -1,8 +1,30 @@
 .InputForm
 form
 {
-    width: 65%;
     display: flex;
     flex-direction: column;
     align-items: flex-end;
 }
+
+.InputForm
+.frame
+{
+    padding: 10px;
+    margin: 10px;
+    border: 2px;
+    border-radius: 5px;
+    border-style: solid;
+
+
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+}
+
+.InputForm
+.frameCenter
+{
+    align-items: center;
+    display: flex;
+    flex-direction: column;
+}
diff --git a/src/components/Login.tsx b/src/components/Login.tsx
index 028f1ad..13a9e83 100644
--- a/src/components/Login.tsx
+++ b/src/components/Login.tsx
@@ -70,13 +70,14 @@ const Login = () =>
         <div className='InputForm'>
             <Toaster toastOptions={{ position: "top-center" }} />
             <h2>Login</h2>
-
+            <div className='frameCenter'>
+            <div className='frame'>
             <form onSubmit={submitForm}>
-                <div>
+                <div className='neben'>
                     <label htmlFor="email">Email:</label>
                     <input type="email" name="email" onChange={onChangeInput} placeholder="Your email" id="email" value={formData.email} required />
                 </div>
-                <div>
+                <div className='neben'>
                     <label htmlFor="password">Password:</label>
                     <input type="password" name="password" onChange={onChangeInput} placeholder="New password" id="password" value={formData.password} required />
                 </div>
@@ -84,6 +85,8 @@ const Login = () =>
                 <div className="bottom-link"><Link to="/reg">Register</Link></div>
                 <div className="bottom-link"><Link to="/wantnewpw">Passwort vergessen</Link></div>
             </form>
+            </div>
+            </div>
         </div>
     )
 }
diff --git a/src/components/PasswordReset.tsx b/src/components/PasswordReset.tsx
index 93688e1..301a7e5 100644
--- a/src/components/PasswordReset.tsx
+++ b/src/components/PasswordReset.tsx
@@ -69,7 +69,7 @@ export default function PasswordReset()
         if(dataRes.success)
         {
             toast.success('Erfolgreich Passwort geändert!');
-            e.currentTarget.reset();
+            e.currentTarget?.reset();
         }
         else if(!dataRes.success && dataRes.message)
         {
@@ -81,6 +81,8 @@ export default function PasswordReset()
         <div className='InputForm'>
             <Toaster toastOptions={{ position: "top-center" }} />
             <h2>Passwort zurücksetzten!</h2>
+            <div className='frameCenter'>
+            <div className='frame'>
             <form onSubmit={submitForm}>
                 <div className='neben'>
                     <label htmlFor="password1">Passwort: </label>
@@ -93,6 +95,8 @@ export default function PasswordReset()
                 <button type="submit" >Passwort </button>
                 <div className="bottom-link"><Link to="/login">Login</Link></div>
             </form>
+            </div>
+            </div>
         </div>
     )
 } 
diff --git a/src/components/Profil.tsx b/src/components/Profil.tsx
index 5bd18f5..b79db00 100644
--- a/src/components/Profil.tsx
+++ b/src/components/Profil.tsx
@@ -145,6 +145,8 @@ function Profil()
         <div className='InputForm'>
             <Toaster toastOptions={{ position: "top-center" }} />
             <h2>Profil</h2>
+            <div className='frameCenter'>
+            <div className='frame'>
             <div className='neben'>
                 <div className='margin'>
                     {data.data && <Img pth={data.data.picture} className=''/>}
@@ -171,6 +173,8 @@ function Profil()
                 </div>
                 <button type="submit">Update</button>
             </form>
+            </div>
+            </div>
         <Link to={"/qr"}>QR-Code drucken</Link>
         </div>
   )
diff --git a/src/components/Register.tsx b/src/components/Register.tsx
index 68c6c14..685c809 100644
--- a/src/components/Register.tsx
+++ b/src/components/Register.tsx
@@ -51,6 +51,8 @@ const Register = () =>
         <div className='InputForm'>
             <Toaster toastOptions={{ position: "top-center" }} />
             <h2>Register</h2>
+            <div className='frameCenter'>
+            <div className='frame'>
             <form onSubmit={submitForm}>
                 <div className='neben'>
                     <label htmlFor="email">Email: </label>                    
@@ -67,6 +69,8 @@ const Register = () =>
                 <button type="submit" >Register</button>
                 <div className="bottom-link"><Link to="/login">Login</Link></div>
             </form>
+            </div>
+            </div>
         </div>
     )
 }
diff --git a/src/components/WantNewPw.tsx b/src/components/WantNewPw.tsx
index 7e64f30..667d023 100644
--- a/src/components/WantNewPw.tsx
+++ b/src/components/WantNewPw.tsx
@@ -40,6 +40,8 @@ function WantNewPw()
         <div className='InputForm'>
             <Toaster toastOptions={{ position: "top-center" }} />
             <h2>Neues Passwort setzen!</h2>
+            <div className='frameCenter'>
+            <div className='frame'>
             <form onSubmit={submitForm}>
                 <div className='neben'>
                     <label htmlFor="email">Email: </label>
@@ -49,6 +51,8 @@ function WantNewPw()
                 </div> 
                 <button type="submit" >Passwort anfordern</button>
             </form>
+            </div>
+            </div>
         </div>
     )
 }