diff --git a/.vscode/settings.json b/.vscode/settings.json index 46704a8..7695f7d 100644 --- a/.vscode/settings.json +++ b/.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/", + } + ] + } } \ No newline at end of file diff --git a/docs/scpUpload.txt b/docs/scpUpload.txt new file mode 100644 index 0000000..896e69a --- /dev/null +++ b/docs/scpUpload.txt @@ -0,0 +1,2 @@ +cd ./php/php-dog +scp -rv . hosting181494@hope-fly.de:hope-fly.de/httpdocs/dog/php-dog \ No newline at end of file diff --git a/package.json b/package.json index e973ec7..c7c9d9f 100644 --- a/package.json +++ b/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:hope-fly": "cp ./src/.htaccess ./build" + "postbuild:local": "cp -vrRT ./build/. /opt/lampp/htdocs/dog/", + "___postbuild:hope-fly": "cp ./src/.htaccess ./build" }, "eslintConfig": { "extends": [ diff --git a/php/php-dog/upload.php b/php/php-dog/upload.php index 36e0165..6776768 100644 --- a/php/php-dog/upload.php +++ b/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"])) { diff --git a/public/.htaccess b/public/.htaccess new file mode 100644 index 0000000..1cccaa1 --- /dev/null +++ b/public/.htaccess @@ -0,0 +1,4 @@ +Options -MultiViews + RewriteEngine On + RewriteCond %{REQUEST_FILENAME} !-f + RewriteRule ^ index.html [QSA,L] \ No newline at end of file diff --git a/public/favicon___.ico b/public/favicon___.ico deleted file mode 100644 index a11777c..0000000 Binary files a/public/favicon___.ico and /dev/null differ diff --git a/src/components/ContactForm.css b/src/components/ContactForm.css index 5a4a7bf..c294f9f 100644 --- a/src/components/ContactForm.css +++ b/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,11 +88,19 @@ 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 { display: flex; diff --git a/src/components/DogContactForm.tsx b/src/components/DogContactForm.tsx index 1b1e825..86f11c3 100644 --- a/src/components/DogContactForm.tsx +++ b/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(
Bitte schreib eine Email:
-
- -
-
- -
+
-
- +
+
-
+
-
- -
-
-