Merge branch 'master' of https://hope-fly.de/plesk-git/dog

.vscode/settings.json

@@ -1,3 +1,56 @@
 {
-    "liveServer.settings.port": 3001
+    "liveServer.settings.port": 3001,
+    "deploy": 
+    {
+        "packages": 
+        [
+            {
+                "name": "local Server Version website",
+                "description": "local Server website files",
+                "files": 
+                [
+                    "build/**"
+                ],
+                "exclude": 
+                [
+                    "./build/favicon___.ico"
+                ],
+                "button":
+                {
+                    "text": "local website",
+                    "targets": ["localhost website files"]
+                }
+            },
+            {
+                "name": "local Server Version php",
+                "description": "local Server php files",
+                "files": 
+                [
+                    "/php/php-dog/**",
+
+                ],
+                "button":
+                {
+                    "text": "local php",
+                    "targets": ["localhost php files"]
+                }
+            }
+        ],
+
+        "targets": 
+        [
+            {
+                "type": "local",
+                "name": "localhost website files",
+                "description": "localhost apache website files",
+                "dir": "/opt/lampp/htdocs/dog/www",
+            },
+            {
+                "type": "local",
+                "name": "localhost php files",
+                "description": "localhost apache php files",
+                "dir": "/opt/lampp/htdocs/dog/php-dog/",
+            }
+        ]
+    }
 }

docs/scpUpload.txt

@@ -0,0 +1,2 @@
+cd ./php/php-dog
+scp -rv . hosting181494@hope-fly.de:hope-fly.de/httpdocs/dog/php-dog

package.json

@@ -45,8 +45,8 @@
     "eject": "react-scripts eject",
     "build:local": "env-cmd -f .env.local npm run build",
     "build:hope-fly": "env-cmd -f .env.hope-fly npm run build",
-    "postbuild:local": "cp ./src/.htaccess ./build && cp -vrRT ./build/. /opt/lampp/htdocs/dog/",
+    "postbuild:local": "cp -vrRT ./build/. /opt/lampp/htdocs/dog/",
-    "postbuild:hope-fly": "cp ./src/.htaccess ./build"
+    "___postbuild:hope-fly": "cp ./src/.htaccess ./build"
   },
   "eslintConfig": {
     "extends": [

php/php-dog/upload.php

@@ -135,7 +135,7 @@ try {
     }
 
     $targetFilePath = $targetDir . '/' . $newFilename;
-    echo "targetFilePath   ". $targetFilePath."\n";
+    //echo "targetFilePath   ". $targetFilePath."\n";
 
     if (isset($_POST["submit"]) && !empty($_FILES["file"]["name"])) 
     {

public/.htaccess

@@ -0,0 +1,4 @@
+Options -MultiViews
+    RewriteEngine On
+    RewriteCond %{REQUEST_FILENAME} !-f
+    RewriteRule ^ index.html [QSA,L]

src/components/ContactForm.css

@@ -21,6 +21,7 @@ input[type=email], select, textarea
   cursor: pointer;
   width: auto;
   height: 25px;
+  align-self: end;
 }
 
 div.flexCenter
@@ -87,10 +88,18 @@ div.flexCenter
   .rowForm
   {
     display: flex;
-    flex-direction: row;
+    flex-direction: column;
     justify-content: space-between;
     width: 100%;
-}
+    margin-top: 10px;
+    margin-bottom: 10px;
+  }
+  
+  .label
+  {
+    font-size: 14px;
+    font-weight: 500;
+  }
 
   .row
   {

src/components/DogContactForm.tsx

@@ -1,6 +1,7 @@
 import { useState } from "react";
 import { notificationError, notificationSuccess } from "../services/Notifications";
 import { foundMsg, logFormData } from "../services/PhpApi";
+import { Textarea, TextInput } from '@mantine/core';
 import './ContactForm.css';
 
 export default function DogContactForm(
@@ -85,28 +86,31 @@ export default function DogContactForm(
         <div>Bitte schreib eine Email:</div><div></div>
     </div>
     <div className="rowForm">
-        <div className="col-30">
+        <TextInput
-            <label htmlFor="email">Email</label>
+            label = 'Email:'
-        </div>
+            type="email" 
-        <div className="col-70">
+            name="fromEmail" 
-            <input type="email" id="fromEmail" name="fromEmail" placeholder="Deine Email.." onChange={onChangeInput} required />
+            onChange={onChangeInput} 
-        </div>
+            placeholder="Deine Email" 
+            id="email" 
+            required />
     </div>
     <div className="rowForm">
-        <div className="col-30">
+        <div className='label'>
-            <label>An</label>
+            <label>An:</label>
         </div>
-        <div className="col-70">
+        <div>
             <label>{toEmail}</label>
         </div>
     </div>
     <div className="rowForm">
-        <div className="col-30">
+        <Textarea
-            <label htmlFor="msg">Nachricht</label>
+            label = 'Nachricht:'
-        </div>
+            name="msg" 
-        <div className="col-70">
+            onChange={onChangeInputTextArea} 
-            <textarea className="textArea" id="msg" name="msg" placeholder={`Ich habe ${name} gefunden! Bitte rufen Sie mich an, Telefon:(bitte angeben...)`} onChange={onChangeInputTextArea} required/>
+            placeholder={`Ich habe ${name} gefunden! Bitte rufen Sie mich an, Telefon:(bitte angeben...)`}
-        </div>
+            id="msg" 
+            required />
     </div>
         <div className="rowForm">
         <div></div><input type="submit" value="Nachricht senden!"/>