Merge branch 'master' of https://gitea.haschek.at/Crispi/dogstats
All checks were successful
Build and push / Pulling repo on server (push) Successful in 18s

This commit is contained in:
piapassecker 2023-10-22 16:21:41 +02:00
commit 9bdeb92e20
9 changed files with 18 additions and 7 deletions

4
.vscode/settings.json vendored Normal file
View File

@ -0,0 +1,4 @@
{
"html.format.indentInnerHtml": true,
"html.format.wrapLineLength": 0
}

View File

@ -5,7 +5,7 @@ https://gitea.haschek.at/Crispi/dogstats
## Techstack ## Techstack
- [HTMX](https://htmx.org/docs/) - [HTMX](https://htmx.org/docs/)
- [Tailwind](https://tailwindcss.com/docs/utility-first) - [Tailwind](https://flowbite.com/docs/components/)
## Start Dev ## Start Dev
@ -24,6 +24,13 @@ Erst Tailwind starten
1. `cd tools` 1. `cd tools`
2. `./tailwindcss-linux-x64 -i ../web/css/input.css -o ../web/css/output.css --watch` 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 In zweitem Terminal dann Webserver starten
1. `cd web` 1. `cd web`

View File

@ -1,6 +1,6 @@
/** @type {import('tailwindcss').Config} */ /** @type {import('tailwindcss').Config} */
module.exports = { module.exports = {
content: ["../web/**/*.{html,js}"], content: ["../web/**/*.{html,js,php}"],
theme: { theme: {
extend: {}, extend: {},
}, },

View File

@ -62,12 +62,12 @@ class Admin extends Page {
catch(Exception $e) catch(Exception $e)
{ {
$this->set('message', $e->getMessage()); $this->set('message', $e->getMessage());
$this->set('template', '/templates/error.html'); $this->set('template', '/templates/partials/error.html');
return; return;
} }
$this->set('message', 'Speichern erfolgreich'); $this->set('message', 'Speichern erfolgreich');
$this->set('template', '/templates/success.html'); $this->set('template', '/templates/partials/success.html');
} }
function maySeeThisPage(){return true;} function maySeeThisPage(){return true;}

View File

@ -34,7 +34,7 @@ class Register extends Page {
if($err) if($err)
{ {
$this->set('template', '/templates/error.html'); $this->set('template', '/templates/partials/error.html');
$this->set('title', 'Error'); $this->set('title', 'Error');
$this->set('message', $err); $this->set('message', $err);
return; return;
@ -51,7 +51,7 @@ class Register extends Page {
} }
catch(Exception $e) catch(Exception $e)
{ {
$this->set('template', '/templates/error.html'); $this->set('template', '/templates/partials/error.html');
$this->set('title', 'Error'); $this->set('title', 'Error');
$this->set('message', $e->getMessage()); $this->set('message', $e->getMessage());
return; return;
@ -65,7 +65,7 @@ class Register extends Page {
function success() function success()
{ {
$this->set('template', '/templates/success.html'); $this->set('template', '/templates/partials/success.html');
$this->set('title', 'Success'); $this->set('title', 'Success');
$this->set('message', 'You have successfully registered. Activate your account from the Link in your email'); $this->set('message', 'You have successfully registered. Activate your account from the Link in your email');
} }