diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..b1e5775 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,4 @@ +{ + "html.format.indentInnerHtml": true, + "html.format.wrapLineLength": 0 +} \ No newline at end of file diff --git a/README.md b/README.md index 945cc4d..8eac73d 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ https://gitea.haschek.at/Crispi/dogstats ## Techstack - [HTMX](https://htmx.org/docs/) -- [Tailwind](https://tailwindcss.com/docs/utility-first) +- [Tailwind](https://flowbite.com/docs/components/) ## Start Dev @@ -24,6 +24,13 @@ Erst Tailwind starten 1. `cd tools` 2. `./tailwindcss-linux-x64 -i ../web/css/input.css -o ../web/css/output.css --watch` +### Windows + +Erst Tailwind starten + +1. `cd tools` +2. `tailwindcss-windows-x64.exe -i ../web/css/input.css -o ../web/css/output.css --watch` + In zweitem Terminal dann Webserver starten 1. `cd web` diff --git a/tools/tailwind.config.js b/tools/tailwind.config.js index 1439f21..46a6910 100644 --- a/tools/tailwind.config.js +++ b/tools/tailwind.config.js @@ -1,6 +1,6 @@ /** @type {import('tailwindcss').Config} */ module.exports = { - content: ["../web/**/*.{html,js}"], + content: ["../web/**/*.{html,js,php}"], theme: { extend: {}, }, diff --git a/web/pages/admin/controller.php b/web/pages/admin/controller.php index 7ce84b4..17acbf6 100644 --- a/web/pages/admin/controller.php +++ b/web/pages/admin/controller.php @@ -62,12 +62,12 @@ class Admin extends Page { catch(Exception $e) { $this->set('message', $e->getMessage()); - $this->set('template', '/templates/error.html'); + $this->set('template', '/templates/partials/error.html'); return; } $this->set('message', 'Speichern erfolgreich'); - $this->set('template', '/templates/success.html'); + $this->set('template', '/templates/partials/success.html'); } function maySeeThisPage(){return true;} diff --git a/web/pages/register/controller.php b/web/pages/register/controller.php index 0fef50e..8168262 100644 --- a/web/pages/register/controller.php +++ b/web/pages/register/controller.php @@ -34,7 +34,7 @@ class Register extends Page { if($err) { - $this->set('template', '/templates/error.html'); + $this->set('template', '/templates/partials/error.html'); $this->set('title', 'Error'); $this->set('message', $err); return; @@ -51,7 +51,7 @@ class Register extends Page { } catch(Exception $e) { - $this->set('template', '/templates/error.html'); + $this->set('template', '/templates/partials/error.html'); $this->set('title', 'Error'); $this->set('message', $e->getMessage()); return; @@ -65,7 +65,7 @@ class Register extends Page { function success() { - $this->set('template', '/templates/success.html'); + $this->set('template', '/templates/partials/success.html'); $this->set('title', 'Success'); $this->set('message', 'You have successfully registered. Activate your account from the Link in your email'); } diff --git a/web/templates/error.html b/web/templates/partials/error.html similarity index 100% rename from web/templates/error.html rename to web/templates/partials/error.html diff --git a/web/templates/info.html b/web/templates/partials/info.html similarity index 100% rename from web/templates/info.html rename to web/templates/partials/info.html diff --git a/web/templates/notice.html b/web/templates/partials/notice.html similarity index 100% rename from web/templates/notice.html rename to web/templates/partials/notice.html diff --git a/web/templates/success.html b/web/templates/partials/success.html similarity index 100% rename from web/templates/success.html rename to web/templates/partials/success.html