Compare commits

..
7 Commits
56 changed files with 1890 additions and 5656 deletions

No files matched your search

+4
View File
@@ -0,0 +1,4 @@
# Tailwind 4's floor: browsers without cascade layers, or Chrome before 111, can't render the
# app's CSS, so the JS isn't transpiled for them either.
defaults and fully supports css-cascade-layers
not chrome < 111
+1 -1
View File
@@ -17,7 +17,7 @@ use_dns_when_possible: true
timezone: Europe/Berlin timezone: Europe/Berlin
composer_version: "2" composer_version: "2"
web_environment: [] web_environment: []
nodejs_version: "18" nodejs_version: "24"
corepack_enable: false corepack_enable: false
disable_upload_dirs_warning: true disable_upload_dirs_warning: true
+1 -1
View File
@@ -1 +1 @@
18 24
+9
View File
@@ -3,6 +3,15 @@ htmx.config.includeIndicatorStyles = false
htmx.config.historyCacheSize = 0 htmx.config.historyCacheSize = 0
htmx.config.allowScriptTags = false htmx.config.allowScriptTags = false
// A boosted link is a page navigation: show the error page like the browser would, instead of
// swallowing the 4xx/5xx and leaving the click without effect.
document.addEventListener('htmx:beforeSwap', (event) => {
if (true === event.detail.boosted && event.detail.xhr.status >= 400) {
event.detail.shouldSwap = true
event.detail.isError = false
}
})
import './bootstrap.js'; import './bootstrap.js';
/* /*
* Welcome to your app's main JavaScript file! * Welcome to your app's main JavaScript file!
+9 -9
View File
@@ -1,9 +1,9 @@
@import "components/badge.css"; @import "./components/badge.css";
@import "components/autocomplete.css"; @import "./components/autocomplete.css";
@import "components/button.css"; @import "./components/button.css";
@import "components/datatable.css"; @import "./components/datatable.css";
@import "components/datepicker.css"; @import "./components/datepicker.css";
@import "components/toast.css"; @import "./components/toast.css";
@import "components/tooltip.css"; @import "./components/tooltip.css";
@import "components/timeline.css"; @import "./components/timeline.css";
@import "components/mail-body.css"; @import "./components/mail-body.css";
+44 -5
View File
@@ -1,7 +1,46 @@
@import "tailwindcss/base"; @import "tailwindcss";
@import "_base.css"; @import "./_base.css" layer(base);
@import "./_components.css" layer(components);
@import "tailwindcss/components"; @plugin "@tailwindcss/forms";
@import "_components.css";
@import "tailwindcss/utilities"; @source inline("rotate-90");
@theme {
--font-sans: Lato, sans-serif;
--font-weight-semibold: 700;
--font-weight-bold: 900;
--color-primary: #3d8ccb;
--color-secondary: #f9c700;
}
/*
* Tailwind 3 defaults that Tailwind 4 changed: borders were gray-200 instead of currentColor,
* and buttons had a pointer cursor.
*/
@layer base {
*,
::after,
::before,
::backdrop,
::file-selector-button {
border-color: var(--color-gray-200, currentcolor);
}
button:not(:disabled),
[role="button"]:not(:disabled) {
cursor: pointer;
}
}
/*
* Thin scrollbars without a track for inner scrolling areas. The page scrollbar takes its
* style from <html>, which body * leaves out. Firefox and Chrome/Edge 121+ honour these;
* Safari keeps its own overlay scrollbars.
*/
@layer base {
body * {
scrollbar-width: thin;
scrollbar-color: var(--color-gray-300) transparent;
}
}
+3 -3
View File
@@ -3,11 +3,11 @@
.flatpickr-day.selected, .flatpickr-day.selected,
.flatpickr-day.selected:hover, .flatpickr-day.selected:hover,
.flatpickr-day.selected:focus { .flatpickr-day.selected:focus {
background-color: theme('colors.secondary'); background-color: var(--color-secondary);
border-color: theme('colors.secondary'); border-color: var(--color-secondary);
} }
.flatpickr-monthDropdown-months, .flatpickr-monthDropdown-months,
.flatpickr-current-month .flatpickr-monthDropdown-months { .flatpickr-current-month .flatpickr-monthDropdown-months {
@apply form-select pt-0 pb-0 focus:outline-none focus:shadow-none; @apply form-select pt-0 pb-0 focus:outline-hidden focus:shadow-none;
} }
+1 -1
View File
@@ -1,4 +1,4 @@
.scroll-container { .scroll-container {
@apply overflow-scroll; @apply overflow-auto;
max-height: calc(100vh - 320px); max-height: calc(100vh - 320px);
} }
+4 -4
View File
@@ -1,20 +1,20 @@
@import "toastify-js/src/toastify.css"; @import "toastify-js/src/toastify.css";
.toastify { .toastify {
@apply shadow-lg rounded; @apply shadow-lg rounded-sm;
} }
.toastify--success { .toastify--success {
@apply text-gray-100; @apply text-gray-100;
background: theme('colors.emerald.600'); background: var(--color-emerald-600);
} }
.toastify--warning { .toastify--warning {
@apply text-gray-100; @apply text-gray-100;
background: theme('colors.red.600'); background: var(--color-red-600);
} }
.toastify--info { .toastify--info {
@apply text-gray-100; @apply text-gray-100;
background: theme('colors.blue.600'); background: var(--color-blue-600);
} }
+5 -5
View File
@@ -1,18 +1,18 @@
@import "tippy.js/dist/tippy.css"; @import "tippy.js/dist/tippy.css";
.tippy-box { .tippy-box {
background-color: theme('colors.primary'); background-color: var(--color-primary);
} }
.tippy-box[data-placement^='top'] > .tippy-arrow::before { .tippy-box[data-placement^='top'] > .tippy-arrow::before {
border-top-color: theme('colors.primary'); border-top-color: var(--color-primary);
} }
.tippy-box[data-placement^='bottom'] > .tippy-arrow::before { .tippy-box[data-placement^='bottom'] > .tippy-arrow::before {
border-bottom-color: theme('colors.primary'); border-bottom-color: var(--color-primary);
} }
.tippy-box[data-placement^='left'] > .tippy-arrow::before { .tippy-box[data-placement^='left'] > .tippy-arrow::before {
border-left-color: theme('colors.primary'); border-left-color: var(--color-primary);
} }
.tippy-box[data-placement^='right'] > .tippy-arrow::before { .tippy-box[data-placement^='right'] > .tippy-arrow::before {
border-right-color: theme('colors.primary'); border-right-color: var(--color-primary);
} }
+2 -1
View File
@@ -38,6 +38,7 @@ $rsyncOptions = [
'.env.test.local', '.env.test.local',
'.gitignore', '.gitignore',
'.nvmrc', '.nvmrc',
'.browserslistrc',
'.php-cs-fixer.cache', '.php-cs-fixer.cache',
'.php-cs-fixer.dist.php', '.php-cs-fixer.dist.php',
'.phpunit.result.cache', '.phpunit.result.cache',
@@ -51,7 +52,7 @@ $rsyncOptions = [
'phpunit.xml.dist', 'phpunit.xml.dist',
'public/.htaccess', 'public/.htaccess',
'tailwind.config.js', 'tailwind.config.js',
'webpack.config.js', 'webpack.config.mjs',
'rapidapi.paw', 'rapidapi.paw',
'bin/.phpunit', 'bin/.phpunit',
'temp/*', 'temp/*',
+1676 -5443
View File
File diff suppressed because it is too large. Load diff
+12 -14
View File
@@ -1,39 +1,37 @@
{ {
"name": "myep-team", "name": "myep-team",
"dependencies": { "dependencies": {
"@babel/core": "^7.17.0", "@babel/core": "^8.0.0",
"@babel/preset-env": "^7.16.0", "@babel/preset-env": "^8.0.0",
"@hotwired/stimulus": "^3.0.0", "@hotwired/stimulus": "^3.0.0",
"@symfony/stimulus-bridge": "^3.2.0", "@symfony/stimulus-bridge": "^3.2.0",
"@symfony/webpack-encore": "^4.0.0", "@symfony/webpack-encore": "^7.2.0",
"@tailwindcss/forms": "^0.5.6", "@tailwindcss/forms": "^0.5.6",
"@tailwindcss/typography": "^0.5.10", "@tailwindcss/postcss": "^4.3.3",
"@trevoreyre/autocomplete-js": "^2.4.1", "@trevoreyre/autocomplete-js": "^2.4.1",
"autoprefixer": "^10.4.15", "babel-plugin-polyfill-corejs3": "^1.0.0",
"chart.js": "^4.5.1", "chart.js": "^4.5.1",
"core-js": "^3.23.0", "core-js": "^3.50.0",
"dropzone": "^6.0.0-beta.2", "dropzone": "^6.0.0-beta.2",
"file-loader": "^6.2.0",
"flatpickr": "^4.6.13", "flatpickr": "^4.6.13",
"htmx.org": "^1.9.10", "htmx.org": "^2.0.11",
"lightningcss": "^1.32.0",
"mjml": "^4.15.3", "mjml": "^4.15.3",
"postcss": "^8.4.29", "postcss": "^8.4.29",
"postcss-import": "^15.1.0", "postcss-loader": "^8.1.1",
"postcss-loader": "^7.3.3",
"pretty-bytes": "^6.1.1", "pretty-bytes": "^6.1.1",
"regenerator-runtime": "^0.13.9", "regenerator-runtime": "^0.13.9",
"sortablejs": "^1.15.0", "sortablejs": "^1.15.0",
"stimulus-use": "^0.52.2", "stimulus-use": "^0.52.2",
"tailwindcss": "^3.3.3", "tailwindcss": "^4.3.3",
"tippy.js": "^6.3.7", "tippy.js": "^6.3.7",
"toastify-js": "^1.12.0", "toastify-js": "^1.12.0",
"webpack": "^5.74.0", "webpack": "^5.101.0",
"webpack-cli": "^4.10.0" "webpack-cli": "^7.0.0"
}, },
"license": "UNLICENSED", "license": "UNLICENSED",
"private": true, "private": true,
"scripts": { "scripts": {
"dev-server": "encore dev-server",
"dev": "encore dev", "dev": "encore dev",
"watch": "encore dev --watch", "watch": "encore dev --watch",
"build": "encore production --progress", "build": "encore production --progress",
+2 -4
View File
@@ -1,7 +1,5 @@
module.exports = { module.exports = {
plugins: { plugins: {
'postcss-import': {}, '@tailwindcss/postcss': {},
tailwindcss: {},
autoprefixer: {},
} }
} }
+4 -9
View File
@@ -5,7 +5,6 @@ namespace App\Form;
use App\Entity\Feedback; use App\Entity\Feedback;
use App\Entity\FeedbackSet; use App\Entity\FeedbackSet;
use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\TextareaType;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\Form\FormInterface; use Symfony\Component\Form\FormInterface;
use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -24,20 +23,16 @@ abstract class AbstractFeedbackType extends AbstractType
'label' => false, 'label' => false,
'feedback_set' => $feedbackSet, 'feedback_set' => $feedbackSet,
]) ])
->add('comment', TextareaType::class, [ ->add('comment', AutosizeTextareaType::class, [
'label' => 'Kommentar (öffentlich)', 'label' => 'Kommentar (öffentlich)',
'required' => false, 'required' => false,
'attr' => [ 'min_rows' => 5,
'rows' => 5,
],
'help' => 'Bitte formuliere deinen Kommentar so, dass er an das Team weitergegeben werden kann', 'help' => 'Bitte formuliere deinen Kommentar so, dass er an das Team weitergegeben werden kann',
]) ])
->add('commentInternal', TextareaType::class, [ ->add('commentInternal', AutosizeTextareaType::class, [
'label' => 'Kommentar (intern)', 'label' => 'Kommentar (intern)',
'required' => false, 'required' => false,
'attr' => [ 'min_rows' => 5,
'rows' => 5,
],
]) ])
; ;
} }
+2 -5
View File
@@ -7,7 +7,6 @@ use App\Model\ApplicationStatusDto;
use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\CheckboxType; use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\Form\Extension\Core\Type\TextareaType;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -24,12 +23,10 @@ class ApplicationStatusType extends AbstractType
'neu' => Application::STATUS_NEW, 'neu' => Application::STATUS_NEW,
], ],
]) ])
->add('comment', TextareaType::class, [ ->add('comment', AutosizeTextareaType::class, [
'label' => 'Kommentar/Begründung', 'label' => 'Kommentar/Begründung',
'required' => false, 'required' => false,
'attr' => [ 'min_rows' => 3,
'rows' => 3,
],
]) ])
->add('commentVisible', CheckboxType::class, [ ->add('commentVisible', CheckboxType::class, [
'label' => 'Kommentar/Begründung sichtbar für Teamer:in', 'label' => 'Kommentar/Begründung sichtbar für Teamer:in',
+4 -9
View File
@@ -15,7 +15,6 @@ use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\CheckboxType; use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\Form\Extension\Core\Type\IntegerType; use Symfony\Component\Form\Extension\Core\Type\IntegerType;
use Symfony\Component\Form\Extension\Core\Type\TextareaType;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\Form\FormEvent; use Symfony\Component\Form\FormEvent;
use Symfony\Component\Form\FormEvents; use Symfony\Component\Form\FormEvents;
@@ -73,23 +72,19 @@ class AssignmentType extends AbstractType
->where('job_profile.deletedAt IS NULL'); ->where('job_profile.deletedAt IS NULL');
}, },
]) ])
->add('jobProfileInfo', TextareaType::class, [ ->add('jobProfileInfo', AutosizeTextareaType::class, [
'label' => 'Zusatzinfos', 'label' => 'Zusatzinfos',
'required' => false, 'required' => false,
'attr' => [ 'min_rows' => 3,
'rows' => 3,
],
]) ])
// ->add('pickupDate', DatepickerType::class, [ // ->add('pickupDate', DatepickerType::class, [
// 'label' => 'abweichender Zustieg bei Busbegleitung', // 'label' => 'abweichender Zustieg bei Busbegleitung',
// 'required' => false, // 'required' => false,
// ]) // ])
->add('benefits', TextareaType::class, [ ->add('benefits', AutosizeTextareaType::class, [
'label' => 'Benefits', 'label' => 'Benefits',
'required' => false, 'required' => false,
'attr' => [ 'min_rows' => 5,
'rows' => 5,
],
]) ])
->add('fees', EntityType::class, [ ->add('fees', EntityType::class, [
'label' => 'Honorar(e)', 'label' => 'Honorar(e)',
+3 -6
View File
@@ -6,7 +6,6 @@ use App\Entity\Upload;
use App\Model\DocumentCheckDto; use App\Model\DocumentCheckDto;
use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\Form\Extension\Core\Type\TextareaType;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\Form\FormEvent; use Symfony\Component\Form\FormEvent;
use Symfony\Component\Form\FormEvents; use Symfony\Component\Form\FormEvents;
@@ -21,12 +20,10 @@ class DocumentCheckType extends AbstractType
'label' => 'neuer Status', 'label' => 'neuer Status',
'choices' => $options['status_choices'][$options['document_type']], 'choices' => $options['status_choices'][$options['document_type']],
]) ])
->add('comment', TextareaType::class, [ ->add('comment', AutosizeTextareaType::class, [
'label' => 'Kommentar/Begründung', 'label' => 'Kommentar/Begründung',
'required' => false, 'required' => false,
'attr' => [ 'min_rows' => 3,
'rows' => 3,
],
]) ])
->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) { ->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) {
/** @var DocumentCheckDto $data */ /** @var DocumentCheckDto $data */
@@ -34,7 +31,7 @@ class DocumentCheckType extends AbstractType
$upload = $data->getUpload(); $upload = $data->getUpload();
if (Upload::TYPE_INVOICE === $upload->getType()) { if (Upload::TYPE_INVOICE === $upload->getType()) {
$event->getForm()->add('specialAgreements', TextareaType::class, [ $event->getForm()->add('specialAgreements', AutosizeTextareaType::class, [
'label' => 'zusätzliche Absprache', 'label' => 'zusätzliche Absprache',
'required' => false, 'required' => false,
]); ]);
+2 -5
View File
@@ -6,7 +6,6 @@ use App\Entity\Upload;
use App\Model\DriverLicenseCheckDto; use App\Model\DriverLicenseCheckDto;
use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\Form\Extension\Core\Type\TextareaType;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -23,12 +22,10 @@ class DriverLicenseCheckType extends AbstractType
'abgelehnt' => Upload::STATUS_REJECTED, 'abgelehnt' => Upload::STATUS_REJECTED,
], ],
]) ])
->add('comment', TextareaType::class, [ ->add('comment', AutosizeTextareaType::class, [
'label' => 'Kommentar/Begründung', 'label' => 'Kommentar/Begründung',
'required' => false, 'required' => false,
'attr' => [ 'min_rows' => 3,
'rows' => 3,
],
]) ])
; ;
} }
+2 -2
View File
@@ -4,7 +4,6 @@ namespace App\Form;
use App\Entity\Faq; use App\Entity\Faq;
use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\TextareaType;
use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -17,8 +16,9 @@ class FaqType extends AbstractType
->add('question', TextType::class, [ ->add('question', TextType::class, [
'label' => 'Frage', 'label' => 'Frage',
]) ])
->add('answer', TextareaType::class, [ ->add('answer', AutosizeTextareaType::class, [
'label' => 'Antwort', 'label' => 'Antwort',
'min_rows' => 5,
]) ])
; ;
} }
+4 -9
View File
@@ -4,7 +4,6 @@ namespace App\Form;
use App\Entity\Feedback; use App\Entity\Feedback;
use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\TextareaType;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -13,19 +12,15 @@ class FeedbackApproveType extends AbstractType
public function buildForm(FormBuilderInterface $builder, array $options): void public function buildForm(FormBuilderInterface $builder, array $options): void
{ {
$builder $builder
->add('comment', TextareaType::class, [ ->add('comment', AutosizeTextareaType::class, [
'label' => 'Kommentar (öffentlich)', 'label' => 'Kommentar (öffentlich)',
'required' => false, 'required' => false,
'attr' => [ 'min_rows' => 5,
'rows' => 5,
],
]) ])
->add('commentInternal', TextareaType::class, [ ->add('commentInternal', AutosizeTextareaType::class, [
'label' => 'Kommentar (intern)', 'label' => 'Kommentar (intern)',
'required' => false, 'required' => false,
'attr' => [ 'min_rows' => 5,
'rows' => 5,
],
]) ])
; ;
} }
+2 -5
View File
@@ -5,7 +5,6 @@ namespace App\Form;
use App\Entity\News; use App\Entity\News;
use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\Form\Extension\Core\Type\TextareaType;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -22,11 +21,9 @@ class NewsType extends AbstractType
'label.news.status.2' => News::STATUS_IMPORTANT, 'label.news.status.2' => News::STATUS_IMPORTANT,
], ],
]) ])
->add('message', TextareaType::class, [ ->add('message', AutosizeTextareaType::class, [
'label' => 'Nachricht', 'label' => 'Nachricht',
'attr' => [ 'min_rows' => 5,
'rows' => 5,
],
]) ])
; ;
} }
+2 -5
View File
@@ -7,7 +7,6 @@ use App\Service\Common\PickupOptions;
use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\CheckboxType; use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\Form\Extension\Core\Type\TextareaType;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\Form\FormEvent; use Symfony\Component\Form\FormEvent;
use Symfony\Component\Form\FormEvents; use Symfony\Component\Form\FormEvents;
@@ -19,12 +18,10 @@ class TeamerApplicationType extends AbstractType
public function buildForm(FormBuilderInterface $builder, array $options): void public function buildForm(FormBuilderInterface $builder, array $options): void
{ {
$builder $builder
->add('requests', TextareaType::class, [ ->add('requests', AutosizeTextareaType::class, [
'label' => 'Wünsche', 'label' => 'Wünsche',
'required' => false, 'required' => false,
'attr' => [ 'min_rows' => 3,
'rows' => 3,
],
]) ])
->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) { ->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) {
/** @var Application $application */ /** @var Application $application */
+2 -5
View File
@@ -7,7 +7,6 @@ use App\Entity\Teamer;
use Doctrine\ORM\EntityRepository; use Doctrine\ORM\EntityRepository;
use Symfony\Bridge\Doctrine\Form\Type\EntityType; use Symfony\Bridge\Doctrine\Form\Type\EntityType;
use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\TextareaType;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\Translation\TranslatableMessage; use Symfony\Component\Translation\TranslatableMessage;
@@ -59,12 +58,10 @@ class TeamerJobProfileType extends AbstractType
'expanded' => true, 'expanded' => true,
'multiple' => true, 'multiple' => true,
]) ])
->add('remarks', TextareaType::class, [ ->add('remarks', AutosizeTextareaType::class, [
'label' => 'Wünsche/Anmerkungen', 'label' => 'Wünsche/Anmerkungen',
'required' => false, 'required' => false,
'attr' => [ 'min_rows' => 3,
'rows' => 3,
],
]) ])
; ;
} }
+2 -5
View File
@@ -6,7 +6,6 @@ use App\Enum\WorkMonthStatus;
use App\Model\WorkMonthReviewDto; use App\Model\WorkMonthReviewDto;
use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\Form\Extension\Core\Type\TextareaType;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -27,12 +26,10 @@ class WorkMonthReviewType extends AbstractType
], ],
'choice_value' => static fn (?WorkMonthStatus $status) => $status?->value, 'choice_value' => static fn (?WorkMonthStatus $status) => $status?->value,
]) ])
->add('comment', TextareaType::class, [ ->add('comment', AutosizeTextareaType::class, [
'label' => 'Kommentar/Begründung', 'label' => 'Kommentar/Begründung',
'required' => false, 'required' => false,
'attr' => [ 'min_rows' => 3,
'rows' => 3,
],
]) ])
; ;
} }
+6 -2
View File
@@ -51,11 +51,15 @@ class BpnAuthenticator extends AbstractLoginFormAuthenticator implements Authent
* The firewall saves the requested url as the target path right before it calls this. An * The firewall saves the requested url as the target path right before it calls this. An
* htmx request is a fragment - a modal, a table body - that cannot stand as a page, so * htmx request is a fragment - a modal, a table body - that cannot stand as a page, so
* after the login it must not be where the user lands. htmx does not send the * after the login it must not be where the user lands. htmx does not send the
* X-Requested-With header that would make Symfony skip it on its own. * X-Requested-With header that would make Symfony skip it on its own. A boosted request
* (a paginator or sort link) is the exception: it fetches a whole page and stays the deeplink.
*/ */
public function start(Request $request, ?AuthenticationException $authException = null): Response public function start(Request $request, ?AuthenticationException $authException = null): Response
{ {
if (true === $request->headers->has('HX-Request') && true === $request->hasSession()) { if (true === $request->headers->has('HX-Request')
&& false === $request->headers->has('HX-Boosted')
&& true === $request->hasSession()
) {
$this->removeTargetPath($request->getSession(), self::FIREWALL_NAME); $this->removeTargetPath($request->getSession(), self::FIREWALL_NAME);
} }
-32
View File
@@ -1,32 +0,0 @@
/** @type {import('tailwindcss').Config} */
module.exports = {
content: [
'./templates/**/*.twig',
'./src/Twig/*.php',
],
safelist: ['rotate-90'],
theme: {
container: {
center: true,
padding: '2rem',
},
extend: {
fontFamily: {
sans: ['Lato', 'sans-serif'],
},
fontWeight: {
semibold: '700',
bold: '900',
},
colors: {
primary: '#3d8ccb',
secondary: '#f9c700',
}
},
},
plugins: [
require('@tailwindcss/forms'),
require('@tailwindcss/typography'),
],
}
+1 -1
View File
@@ -1,7 +1,7 @@
{% set type = type|default('info') %} {% set type = type|default('info') %}
<div class="{{ html_classes('p-4 mb-4 flex items-start space-x-2 text-gray-100 rounded-md', { 'bg-blue-600': type == 'info', 'bg-red-600': type == 'warning', 'bg-green-600': type == 'success' }) }}"> <div class="{{ html_classes('p-4 mb-4 flex items-start space-x-2 text-gray-100 rounded-md', { 'bg-blue-600': type == 'info', 'bg-red-600': type == 'warning', 'bg-green-600': type == 'success' }) }}">
{{ icon(type == 'success' ? 'check' : 'alert', 'w-5 h-5 flex-shrink-0') }} {{ icon(type == 'success' ? 'check' : 'alert', 'w-5 h-5 shrink-0') }}
<div class="leading-relaxed text-base"> <div class="leading-relaxed text-base">
{% block message %} {% block message %}
{{ message | nl2br }} {{ message | nl2br }}
@@ -4,7 +4,7 @@
<dt class="text-sm font-bold leading-6 text-gray-900"> <dt class="text-sm font-bold leading-6 text-gray-900">
Jobprofil Jobprofil
</dt> </dt>
<dd class="mt-1 text-sm leading-6 text-gray-700 sm:col-span-3 sm:mt-0 max-h-96 overflow-y-scroll"> <dd class="mt-1 text-sm leading-6 text-gray-700 sm:col-span-3 sm:mt-0 max-h-96 overflow-y-auto pr-3">
<strong>{{ assignment.jobProfile.name }}</strong> <strong>{{ assignment.jobProfile.name }}</strong>
{% if assignment.jobProfileInfo %} {% if assignment.jobProfileInfo %}
<div class="pt-2"> <div class="pt-2">
@@ -1,6 +1,6 @@
{% if is_maintenance_mode() %} {% if is_maintenance_mode() %}
<div class="sticky top-0 z-50 bg-red-600 text-gray-100 px-4 lg:px-8 py-2 flex items-center justify-center space-x-2"> <div class="sticky top-0 z-50 bg-red-600 text-gray-100 px-4 lg:px-8 py-2 flex items-center justify-center space-x-2">
{{ icon('alert', 'w-5 h-5 flex-shrink-0') }} {{ icon('alert', 'w-5 h-5 shrink-0') }}
<span class="leading-relaxed">Wartungsmodus — das Portal ist für andere Benutzer gesperrt.</span> <span class="leading-relaxed">Wartungsmodus — das Portal ist für andere Benutzer gesperrt.</span>
</div> </div>
{% endif %} {% endif %}
+1 -1
View File
@@ -11,7 +11,7 @@
'- Punkt': 'Aufzählung', '- Punkt': 'Aufzählung',
'1. Punkt': 'Nummerierung', '1. Punkt': 'Nummerierung',
} %} } %}
<span class="inline-flex items-center space-x-1 py-1 px-2 bg-gray-50 border border-gray-200 rounded"> <span class="inline-flex items-center space-x-1 py-1 px-2 bg-gray-50 border border-gray-200 rounded-sm">
<code>{{ example }}</code> <code>{{ example }}</code>
<span>{{ label }}</span> <span>{{ label }}</span>
</span> </span>
@@ -12,13 +12,13 @@
} }
}) }}> }) }}>
<div {{ stimulus_target('upload-collection', 'dropzone') }} class="w-full flex flex-col space-y-4"> <div {{ stimulus_target('upload-collection', 'dropzone') }} class="w-full flex flex-col space-y-4">
<div class="border border-dashed border-gray-400 rounded flex flex-col justify-center items-center p-4 pointer-events-none"> <div class="border border-dashed border-gray-400 rounded-sm flex flex-col justify-center items-center p-4 pointer-events-none">
{{ icon('upload', 'w-6 h-6') }} {{ icon('upload', 'w-6 h-6') }}
<span class="block text-sm text-center">{{ 'uploader.drop_files'|trans }} <strong>{{ 'uploader.click_here'|trans }}</strong></span> <span class="block text-sm text-center">{{ 'uploader.drop_files'|trans }} <strong>{{ 'uploader.click_here'|trans }}</strong></span>
</div> </div>
<div class="border border-red-500 rounded-md p-4 text-red-500 hidden" {{ stimulus_target('upload-collection', 'errors') }}></div> <div class="border border-red-500 rounded-md p-4 text-red-500 hidden" {{ stimulus_target('upload-collection', 'errors') }}></div>
<template {{ stimulus_target('upload-collection', 'previewTemplate') }}> <template {{ stimulus_target('upload-collection', 'previewTemplate') }}>
<div class="bg-gray-100 border rounded p-2"> <div class="bg-gray-100 border rounded-sm p-2">
<div class="pb-2"> <div class="pb-2">
<span class="block bg-gray-400 h-1 w-0" data-dz-uploadprogress></span> <span class="block bg-gray-400 h-1 w-0" data-dz-uploadprogress></span>
</div> </div>
+5 -5
View File
@@ -61,7 +61,7 @@
<span>{{ newContractsCount }} neu, {{ pendingContractsCount }} in Bearbeitung</span> <span>{{ newContractsCount }} neu, {{ pendingContractsCount }} in Bearbeitung</span>
{% endif %} {% endif %}
</h2> </h2>
<div class="max-h-64 overflow-y-scroll overflow-x-hidden"> <div class="max-h-64 overflow-y-auto overflow-x-hidden pr-3">
<ul class="divide-y divide-gray-200"> <ul class="divide-y divide-gray-200">
{% for document in newContracts %} {% for document in newContracts %}
{% set assignment = document.disposition.assignment %} {% set assignment = document.disposition.assignment %}
@@ -95,7 +95,7 @@
<span>{{ newInvoicesCount }} neu, {{ pendingInvoicesCount }} in Bearbeitung</span> <span>{{ newInvoicesCount }} neu, {{ pendingInvoicesCount }} in Bearbeitung</span>
{% endif %} {% endif %}
</h2> </h2>
<div class="max-h-64 overflow-y-scroll overflow-x-hidden"> <div class="max-h-64 overflow-y-auto overflow-x-hidden pr-3">
<ul class="divide-y divide-gray-200"> <ul class="divide-y divide-gray-200">
{% for document in newInvoices %} {% for document in newInvoices %}
{% set assignment = document.disposition.assignment %} {% set assignment = document.disposition.assignment %}
@@ -128,7 +128,7 @@
<span>{{ newDriverLicensesCount }} neu</span> <span>{{ newDriverLicensesCount }} neu</span>
{% endif %} {% endif %}
</h2> </h2>
<div class="max-h-64 overflow-y-scroll overflow-x-hidden"> <div class="max-h-64 overflow-y-auto overflow-x-hidden pr-3">
<ul class="divide-y divide-gray-200"> <ul class="divide-y divide-gray-200">
{% for document in newDriverLicenses %} {% for document in newDriverLicenses %}
<li class="py-2 first:pt-0 last:pb-0"> <li class="py-2 first:pt-0 last:pb-0">
@@ -242,7 +242,7 @@
<span>{{ overdueFeedbacksCount }} überfällig</span> <span>{{ overdueFeedbacksCount }} überfällig</span>
{% endif %} {% endif %}
</h2> </h2>
<div class="max-h-64 overflow-y-scroll overflow-x-hidden"> <div class="max-h-64 overflow-y-auto overflow-x-hidden pr-3">
<ul class="divide-y divide-gray-200"> <ul class="divide-y divide-gray-200">
{% for disposition in overdueFeedbacks %} {% for disposition in overdueFeedbacks %}
{% set assignment = disposition.assignment %} {% set assignment = disposition.assignment %}
@@ -278,7 +278,7 @@
<span>{{ overdueContractsCount }} überfällig</span> <span>{{ overdueContractsCount }} überfällig</span>
{% endif %} {% endif %}
</h2> </h2>
<div class="max-h-64 overflow-y-scroll overflow-x-hidden"> <div class="max-h-64 overflow-y-auto overflow-x-hidden pr-3">
<ul class="divide-y divide-gray-200"> <ul class="divide-y divide-gray-200">
{% for disposition in overdueContracts %} {% for disposition in overdueContracts %}
{% set assignment = disposition.assignment %} {% set assignment = disposition.assignment %}
@@ -37,7 +37,7 @@
{% if chips|length > 0 %} {% if chips|length > 0 %}
<div class="flex flex-wrap gap-2"> <div class="flex flex-wrap gap-2">
{% for chip in chips %} {% for chip in chips %}
<span class="inline-flex items-center space-x-1 py-1 px-2 text-sm bg-white border border-gray-200 rounded"> <span class="inline-flex items-center space-x-1 py-1 px-2 text-sm bg-white border border-gray-200 rounded-sm">
<span class="text-gray-500">{{ chip.label }}:</span> <span class="text-gray-500">{{ chip.label }}:</span>
<span>{{ chip.value }}</span> <span>{{ chip.value }}</span>
</span> </span>
+1 -1
View File
@@ -61,7 +61,7 @@
</div> </div>
<div class="flex flex-wrap gap-2"> <div class="flex flex-wrap gap-2">
{% for placeholder, label in placeholders %} {% for placeholder, label in placeholders %}
<span class="inline-flex items-center space-x-1 py-1 px-2 bg-gray-50 border border-gray-200 rounded"> <span class="inline-flex items-center space-x-1 py-1 px-2 bg-gray-50 border border-gray-200 rounded-sm">
<code>{{ placeholder }}</code> <code>{{ placeholder }}</code>
<span>{{ label }}</span> <span>{{ label }}</span>
</span> </span>
@@ -25,14 +25,14 @@
<a href="{{ path('app_common_download', { 'uuid': workMonth.currentDocument.uuid }) }}" <a href="{{ path('app_common_download', { 'uuid': workMonth.currentDocument.uuid }) }}"
class="flex items-center space-x-1"> class="flex items-center space-x-1">
{{ icon('download') }} {{ icon('download') }}
<span class="flex-shrink-0">Hochgeladenen Nachweis ansehen</span> <span class="shrink-0">Hochgeladenen Nachweis ansehen</span>
</a> </a>
{% endif %} {% endif %}
<a href="{{ path('app_admin_work_month_pdf', { 'uuid': workMonth.uuid }) }}" <a href="{{ path('app_admin_work_month_pdf', { 'uuid': workMonth.uuid }) }}"
class="flex items-center space-x-1" class="flex items-center space-x-1"
target="_blank"> target="_blank">
{{ icon('pdf') }} {{ icon('pdf') }}
<span class="flex-shrink-0">Nachweis aus den Daten erzeugen</span> <span class="shrink-0">Nachweis aus den Daten erzeugen</span>
</a> </a>
</div> </div>
@@ -37,7 +37,7 @@
<li> <li>
<a href="mailto:{{ teamer.communication.email }}" class="flex items-center space-x-2"> <a href="mailto:{{ teamer.communication.email }}" class="flex items-center space-x-2">
{{ icon('mail', 'w-4 h-4') }} {{ icon('mail', 'w-4 h-4') }}
<span class="flex-0 underline">{{ teamer.communication.email }}</span> <span class="underline">{{ teamer.communication.email }}</span>
</a> </a>
</li> </li>
{% endif %} {% endif %}
@@ -45,7 +45,7 @@
<li> <li>
<a href="tel:{{ teamer.communication.mobile }}" class="flex items-center space-x-2"> <a href="tel:{{ teamer.communication.mobile }}" class="flex items-center space-x-2">
{{ icon('phone', 'w-4 h-4') }} {{ icon('phone', 'w-4 h-4') }}
<span class="flex-0 underline">{{ teamer.communication.mobile }}</span> <span class="underline">{{ teamer.communication.mobile }}</span>
</a> </a>
</li> </li>
{% endif %} {% endif %}
@@ -9,7 +9,7 @@
</h1> </h1>
</div> </div>
<div class="bg-white rounded-lg shadow p-4 mb-8"> <div class="bg-white rounded-lg shadow-sm p-4 mb-8">
{{ form_start(form, { attr: { class: 'flex flex-wrap items-end gap-4' } }) }} {{ form_start(form, { attr: { class: 'flex flex-wrap items-end gap-4' } }) }}
<div class="flex-1 min-w-[150px]"> <div class="flex-1 min-w-[150px]">
{{ form_row(form.dateFrom) }} {{ form_row(form.dateFrom) }}
@@ -32,11 +32,11 @@
</p> </p>
{% if statistics is empty %} {% if statistics is empty %}
<div class="bg-white rounded-lg shadow p-8 text-center text-gray-500"> <div class="bg-white rounded-lg shadow-sm p-8 text-center text-gray-500">
Keine Daten im ausgewählten Zeitraum vorhanden. Keine Daten im ausgewählten Zeitraum vorhanden.
</div> </div>
{% else %} {% else %}
<div class="bg-white rounded-lg shadow overflow-hidden"> <div class="bg-white rounded-lg shadow-sm overflow-hidden">
<table class="w-full text-sm"> <table class="w-full text-sm">
<thead> <thead>
<tr class="bg-gray-50 border-b"> <tr class="bg-gray-50 border-b">
@@ -9,7 +9,7 @@
</h1> </h1>
</div> </div>
<div class="bg-white rounded-lg shadow p-4 mb-8"> <div class="bg-white rounded-lg shadow-sm p-4 mb-8">
{{ form_start(form, { attr: { class: 'flex flex-wrap items-end gap-4' } }) }} {{ form_start(form, { attr: { class: 'flex flex-wrap items-end gap-4' } }) }}
<div class="flex-1 min-w-[150px]"> <div class="flex-1 min-w-[150px]">
{{ form_row(form.dateFrom) }} {{ form_row(form.dateFrom) }}
@@ -32,11 +32,11 @@
</p> </p>
{% if statistics is empty %} {% if statistics is empty %}
<div class="bg-white rounded-lg shadow p-8 text-center text-gray-500"> <div class="bg-white rounded-lg shadow-sm p-8 text-center text-gray-500">
Keine Daten im ausgewählten Zeitraum vorhanden. Keine Daten im ausgewählten Zeitraum vorhanden.
</div> </div>
{% else %} {% else %}
<div class="bg-white rounded-lg shadow overflow-hidden"> <div class="bg-white rounded-lg shadow-sm overflow-hidden">
<table class="w-full text-sm"> <table class="w-full text-sm">
<thead> <thead>
<tr class="bg-gray-50 border-b"> <tr class="bg-gray-50 border-b">
@@ -55,7 +55,7 @@
<td class="px-4 py-3 text-right">{{ stat.providedFeedbacks }}</td> <td class="px-4 py-3 text-right">{{ stat.providedFeedbacks }}</td>
<td class="px-4 py-3 text-right">{{ stat.missingFeedbacks }}</td> <td class="px-4 py-3 text-right">{{ stat.missingFeedbacks }}</td>
<td class="px-4 py-3 text-right"> <td class="px-4 py-3 text-right">
<span class="{{ html_classes('inline-flex items-center px-2 py-0.5 rounded text-xs font-medium', { <span class="{{ html_classes('inline-flex items-center px-2 py-0.5 rounded-sm text-xs font-medium', {
'bg-green-100 text-green-800': stat.percentageProvided >= 80, 'bg-green-100 text-green-800': stat.percentageProvided >= 80,
'bg-yellow-100 text-yellow-800': stat.percentageProvided >= 50 and stat.percentageProvided < 80, 'bg-yellow-100 text-yellow-800': stat.percentageProvided >= 50 and stat.percentageProvided < 80,
'bg-red-100 text-red-800': stat.percentageProvided < 50 'bg-red-100 text-red-800': stat.percentageProvided < 50
@@ -80,7 +80,7 @@
<td class="px-4 py-3 text-right">{{ totalProvided }}</td> <td class="px-4 py-3 text-right">{{ totalProvided }}</td>
<td class="px-4 py-3 text-right">{{ totalMissing }}</td> <td class="px-4 py-3 text-right">{{ totalMissing }}</td>
<td class="px-4 py-3 text-right"> <td class="px-4 py-3 text-right">
<span class="{{ html_classes('inline-flex items-center px-2 py-0.5 rounded text-xs font-medium', { <span class="{{ html_classes('inline-flex items-center px-2 py-0.5 rounded-sm text-xs font-medium', {
'bg-green-100 text-green-800': totalPercentage >= 80, 'bg-green-100 text-green-800': totalPercentage >= 80,
'bg-yellow-100 text-yellow-800': totalPercentage >= 50 and totalPercentage < 80, 'bg-yellow-100 text-yellow-800': totalPercentage >= 50 and totalPercentage < 80,
'bg-red-100 text-red-800': totalPercentage < 50 'bg-red-100 text-red-800': totalPercentage < 50
@@ -9,7 +9,7 @@
</h1> </h1>
</div> </div>
<div class="bg-white rounded-lg shadow p-4 mb-8"> <div class="bg-white rounded-lg shadow-sm p-4 mb-8">
{{ form_start(form, { attr: { class: 'flex flex-wrap items-end gap-4' } }) }} {{ form_start(form, { attr: { class: 'flex flex-wrap items-end gap-4' } }) }}
<div class="flex-1 min-w-[150px]"> <div class="flex-1 min-w-[150px]">
{{ form_row(form.dateFrom) }} {{ form_row(form.dateFrom) }}
@@ -32,13 +32,13 @@
</p> </p>
{% if chartsData is empty %} {% if chartsData is empty %}
<div class="bg-white rounded-lg shadow p-8 text-center text-gray-500"> <div class="bg-white rounded-lg shadow-sm p-8 text-center text-gray-500">
Keine Feedback-Daten im ausgewählten Zeitraum vorhanden. Keine Feedback-Daten im ausgewählten Zeitraum vorhanden.
</div> </div>
{% else %} {% else %}
<div class="grid gap-8"> <div class="grid gap-8">
{% for chartData in chartsData %} {% for chartData in chartsData %}
<div class="bg-white rounded-lg shadow overflow-hidden"> <div class="bg-white rounded-lg shadow-sm overflow-hidden">
<div class="p-4 border-b bg-gray-50"> <div class="p-4 border-b bg-gray-50">
<h2 class="text-lg font-semibold">{{ chartData.feedbackSet.name }}</h2> <h2 class="text-lg font-semibold">{{ chartData.feedbackSet.name }}</h2>
<p class="text-sm text-gray-600">{{ chartData.count }} Feedbacks</p> <p class="text-sm text-gray-600">{{ chartData.count }} Feedbacks</p>
@@ -9,7 +9,7 @@
</h1> </h1>
</div> </div>
<div class="bg-white rounded-lg shadow p-4 mb-8"> <div class="bg-white rounded-lg shadow-sm p-4 mb-8">
{{ form_start(form, { attr: { class: 'flex flex-wrap items-end gap-4' } }) }} {{ form_start(form, { attr: { class: 'flex flex-wrap items-end gap-4' } }) }}
<div class="flex-1 min-w-[150px]"> <div class="flex-1 min-w-[150px]">
{{ form_row(form.dateFrom) }} {{ form_row(form.dateFrom) }}
@@ -32,11 +32,11 @@
</p> </p>
{% if destinations is empty %} {% if destinations is empty %}
<div class="bg-white rounded-lg shadow p-8 text-center text-gray-500"> <div class="bg-white rounded-lg shadow-sm p-8 text-center text-gray-500">
Keine Daten im ausgewählten Zeitraum vorhanden. Keine Daten im ausgewählten Zeitraum vorhanden.
</div> </div>
{% else %} {% else %}
<div class="bg-white rounded-lg shadow overflow-hidden"> <div class="bg-white rounded-lg shadow-sm overflow-hidden">
<div class="overflow-x-auto"> <div class="overflow-x-auto">
<table class="w-full text-sm"> <table class="w-full text-sm">
<thead> <thead>
@@ -103,20 +103,20 @@
<li class="py-2"> <li class="py-2">
<a href="tel:{{ teamer.communication.phone }}" class="flex items-center space-x-2 hover:text-primary"> <a href="tel:{{ teamer.communication.phone }}" class="flex items-center space-x-2 hover:text-primary">
{{ icon('phone', 'w-4 h-4') }} {{ icon('phone', 'w-4 h-4') }}
<span class="flex-shrink-0">{{ teamer.communication.phone }}</span> <span class="shrink-0">{{ teamer.communication.phone }}</span>
</a> </a>
</li> </li>
{% endif %} {% endif %}
<li class="py-2"> <li class="py-2">
<a href="tel:{{ teamer.communication.mobile }}" class="flex items-center space-x-2 hover:text-primary"> <a href="tel:{{ teamer.communication.mobile }}" class="flex items-center space-x-2 hover:text-primary">
{{ icon('mobile', 'w-4 h-4') }} {{ icon('mobile', 'w-4 h-4') }}
<span class="flex-shrink-0">{{ teamer.communication.mobile }}</span> <span class="shrink-0">{{ teamer.communication.mobile }}</span>
</a> </a>
</li> </li>
<li class="py-2"> <li class="py-2">
<a href="mailto:{{ teamer.communication.email }}" class="flex items-center space-x-2 hover:text-primary"> <a href="mailto:{{ teamer.communication.email }}" class="flex items-center space-x-2 hover:text-primary">
{{ icon('at', 'w-4 h-4') }} {{ icon('at', 'w-4 h-4') }}
<span class="flex-shrink-0">{{ teamer.communication.email }}</span> <span class="shrink-0">{{ teamer.communication.email }}</span>
</a> </a>
</li> </li>
</ul> </ul>
+2 -2
View File
@@ -1,10 +1,10 @@
<div class="relative inline-block text-left group"> <div class="relative inline-block text-left group">
<button type="button" class="flex items-center text-gray-400 hover:text-gray-600 focus:outline-none focus:ring-0" aria-expanded="true" aria-haspopup="true"> <button type="button" class="flex items-center text-gray-400 hover:text-gray-600 focus:outline-hidden focus:ring-0" aria-expanded="true" aria-haspopup="true">
<span class="sr-only">Funktionen</span> <span class="sr-only">Funktionen</span>
{{ icon('dots', 'w-6 h-6') }} {{ icon('dots', 'w-6 h-6') }}
</button> </button>
<div class="hidden group-hover:block absolute right-0 top-0 z-10 w-56 origin-top-right pt-4" role="menu" aria-orientation="vertical" aria-labelledby="menu-button" tabindex="-1"> <div class="hidden group-hover:block absolute right-0 top-0 z-10 w-56 origin-top-right pt-4" role="menu" aria-orientation="vertical" aria-labelledby="menu-button" tabindex="-1">
<div class="rounded-md bg-white shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none"> <div class="rounded-md bg-white shadow-lg ring-1 ring-black/5 focus:outline-hidden">
<div class="py-1 menu menu--pulldown" role="none"> <div class="py-1 menu menu--pulldown" role="none">
{% block content %}{% endblock %} {% block content %}{% endblock %}
</div> </div>
+7 -7
View File
@@ -35,7 +35,7 @@
{%- block form_widget_simple -%} {%- block form_widget_simple -%}
{%- set type = type|default('text') -%} {%- set type = type|default('text') -%}
{%- if type != 'hidden' -%} {%- if type != 'hidden' -%}
{%- set attr = attr|merge({'class': (attr.class|default('') ~ ' block w-full rounded-md border-0 py-1.5 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 focus:ring-2 focus:ring-inset text-sm')|trim }) -%} {%- set attr = attr|merge({'class': (attr.class|default('') ~ ' block w-full rounded-md border-0 py-1.5 text-gray-900 shadow-xs ring-1 ring-inset ring-gray-300 focus:ring-2 focus:ring-inset text-sm')|trim }) -%}
{%- if errors|length -%} {%- if errors|length -%}
{%- set attr = attr|merge({'class': attr.class|default('') ~ ' ring-red-500 placeholder-red-500 focus:ring-red-500' }) -%} {%- set attr = attr|merge({'class': attr.class|default('') ~ ' ring-red-500 placeholder-red-500 focus:ring-red-500' }) -%}
{% else %} {% else %}
@@ -52,7 +52,7 @@
{%- endblock form_widget_simple -%} {%- endblock form_widget_simple -%}
{%- block textarea_widget -%} {%- block textarea_widget -%}
{%- set attr = attr|merge({'class': (attr.class|default('') ~ ' block w-full rounded-md border-0 py-1.5 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 focus:ring-2 focus:ring-inset text-sm')|trim }) -%} {%- set attr = attr|merge({'class': (attr.class|default('') ~ ' block w-full rounded-md border-0 py-1.5 text-gray-900 shadow-xs ring-1 ring-inset ring-gray-300 focus:ring-2 focus:ring-inset text-sm')|trim }) -%}
{%- if errors|length -%} {%- if errors|length -%}
{%- set attr = attr|merge({'class': attr.class|default('') ~ ' ring-red-500 placeholder-red-500 focus:ring-red-500' }) -%} {%- set attr = attr|merge({'class': attr.class|default('') ~ ' ring-red-500 placeholder-red-500 focus:ring-red-500' }) -%}
{% else %} {% else %}
@@ -68,7 +68,7 @@
{%- endblock textarea_widget -%} {%- endblock textarea_widget -%}
{%- block checkbox_widget -%} {%- block checkbox_widget -%}
{%- set attr = attr|merge({'class': (attr.class|default('') ~ ' h-4 w-4 rounded text-primary')|trim }) -%} {%- set attr = attr|merge({'class': (attr.class|default('') ~ ' h-4 w-4 rounded-sm text-primary')|trim }) -%}
{%- if errors|length -%} {%- if errors|length -%}
{%- set attr = attr|merge({'class': attr.class|default('') ~ ' border-red-500 text-red-500 ring-red-500 focus:ring-red-500' }) -%} {%- set attr = attr|merge({'class': attr.class|default('') ~ ' border-red-500 text-red-500 ring-red-500 focus:ring-red-500' }) -%}
{% else %} {% else %}
@@ -96,7 +96,7 @@
{% endblock %} {% endblock %}
{%- block choice_widget_collapsed -%} {%- block choice_widget_collapsed -%}
{%- set attr = attr|merge({'class': (attr.class|default('') ~ ' block w-full rounded-md border-0 py-1.5 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 focus:ring-2 focus:ring-inset text-sm')|trim }) -%} {%- set attr = attr|merge({'class': (attr.class|default('') ~ ' block w-full rounded-md border-0 py-1.5 text-gray-900 shadow-xs ring-1 ring-inset ring-gray-300 focus:ring-2 focus:ring-inset text-sm')|trim }) -%}
{%- if errors|length -%} {%- if errors|length -%}
{%- set attr = attr|merge({'class': attr.class|default('') ~ ' ring-red-500 placeholder-red-500 focus:ring-red-500' }) -%} {%- set attr = attr|merge({'class': attr.class|default('') ~ ' ring-red-500 placeholder-red-500 focus:ring-red-500' }) -%}
{% else %} {% else %}
@@ -204,7 +204,7 @@
{%- block datepicker_widget -%} {%- block datepicker_widget -%}
{%- set minDate = form.vars.min_date ? form.vars.min_date | date('Y-m-d') : null -%} {%- set minDate = form.vars.min_date ? form.vars.min_date | date('Y-m-d') : null -%}
{%- set maxDate = form.vars.max_date ? form.vars.max_date | date('Y-m-d') : null -%} {%- set maxDate = form.vars.max_date ? form.vars.max_date | date('Y-m-d') : null -%}
{%- set attr = attr|merge({'class': (attr.class|default('') ~ ' block w-full rounded-md border-0 py-1.5 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 focus:ring-2 focus:ring-inset text-sm')|trim }) -%} {%- set attr = attr|merge({'class': (attr.class|default('') ~ ' block w-full rounded-md border-0 py-1.5 text-gray-900 shadow-xs ring-1 ring-inset ring-gray-300 focus:ring-2 focus:ring-inset text-sm')|trim }) -%}
{%- if errors|length -%} {%- if errors|length -%}
{%- set attr = attr|merge({'class': attr.class|default('') ~ ' ring-red-500 placeholder:red-500 focus:ring-red-500' }) -%} {%- set attr = attr|merge({'class': attr.class|default('') ~ ' ring-red-500 placeholder:red-500 focus:ring-red-500' }) -%}
{% else %} {% else %}
@@ -222,7 +222,7 @@
{%- endblock datepicker_widget %} {%- endblock datepicker_widget %}
{%- block autocomplete_widget -%} {%- block autocomplete_widget -%}
{%- set attr = attr|merge({'class': (attr.class|default('') ~ ' autocomplete-input block w-full rounded-md border-0 py-1.5 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 focus:ring-2 focus:ring-inset text-sm')|trim }) -%} {%- set attr = attr|merge({'class': (attr.class|default('') ~ ' autocomplete-input block w-full rounded-md border-0 py-1.5 text-gray-900 shadow-xs ring-1 ring-inset ring-gray-300 focus:ring-2 focus:ring-inset text-sm')|trim }) -%}
{%- if errors|length -%} {%- if errors|length -%}
{%- set attr = attr|merge({'class': attr.class|default('') ~ ' ring-red-500 placeholder-red-500 focus:ring-red-500' }) -%} {%- set attr = attr|merge({'class': attr.class|default('') ~ ' ring-red-500 placeholder-red-500 focus:ring-red-500' }) -%}
{% else %} {% else %}
@@ -269,7 +269,7 @@
<div {{ stimulus_target('multiselect', 'label') }} class="flex-1 min-h-8 py-1.5 text-gray-900 text-sm"></div> <div {{ stimulus_target('multiselect', 'label') }} class="flex-1 min-h-8 py-1.5 text-gray-900 text-sm"></div>
{{ icon('dots', 'w-4 h-4 mt-2') }} {{ icon('dots', 'w-4 h-4 mt-2') }}
</div> </div>
<div {{ stimulus_target('multiselect', 'dropdown')}} class="absolute z-10 top-full -mt-1.5 left-0 inset-x-0 max-h-48 overflow-y-scroll px-3 py-2 bg-white shadow-lg rounded-md rounded-t-none border border-gray-300 border-t-0 hidden"> <div {{ stimulus_target('multiselect', 'dropdown')}} class="absolute z-10 top-full -mt-1.5 left-0 inset-x-0 max-h-48 overflow-y-auto px-3 py-2 bg-white shadow-lg rounded-md rounded-t-none border border-gray-300 border-t-0 hidden">
{% for item in form.children %} {% for item in form.children %}
{{ form_row(item, { 'attr': { 'data-action': 'multiselect#update', 'data-multiselect-target': 'choice', 'data-label': item.vars.label } }) }} {{ form_row(item, { 'attr': { 'data-action': 'multiselect#update', 'data-multiselect-target': 'choice', 'data-label': item.vars.label } }) }}
{% endfor %} {% endfor %}
+1 -1
View File
@@ -12,7 +12,7 @@
{{ icon('close', 'w-6 h-6')}} {{ icon('close', 'w-6 h-6')}}
</button> </button>
</div> </div>
<div class="h-96 overflow-y-scroll"> <div class="h-96 overflow-y-auto">
<div class="px-8"> <div class="px-8">
{% block content %}{% endblock %} {% block content %}{% endblock %}
</div> </div>
+1 -1
View File
@@ -47,7 +47,7 @@
{{ icon('close', 'w-8 h-8') }} {{ icon('close', 'w-8 h-8') }}
</button> </button>
</div> </div>
<div class="w-full h-full p-8 pt-0 overflow-y-scroll"> <div class="w-full h-full p-8 pt-0 overflow-y-auto">
{% block mobile_menu %}{% endblock %} {% block mobile_menu %}{% endblock %}
</div> </div>
</div> </div>
+3 -3
View File
@@ -9,7 +9,7 @@
<span>{{ newContractsCount }} neu, {{ pendingContractsCount }} in Bearbeitung</span> <span>{{ newContractsCount }} neu, {{ pendingContractsCount }} in Bearbeitung</span>
{% endif %} {% endif %}
</h2> </h2>
<div class="max-h-64 overflow-y-scroll overflow-x-hidden"> <div class="max-h-64 overflow-y-auto overflow-x-hidden pr-3">
<ul class="divide-y divide-gray-200"> <ul class="divide-y divide-gray-200">
{% for document in newContracts %} {% for document in newContracts %}
{% set assignment = document.disposition.assignment %} {% set assignment = document.disposition.assignment %}
@@ -42,7 +42,7 @@
<span>{{ newInvoicesCount }} neu, {{ pendingInvoicesCount }} in Bearbeitung</span> <span>{{ newInvoicesCount }} neu, {{ pendingInvoicesCount }} in Bearbeitung</span>
{% endif %} {% endif %}
</h2> </h2>
<div class="max-h-64 overflow-y-scroll overflow-x-hidden"> <div class="max-h-64 overflow-y-auto overflow-x-hidden pr-3">
<ul class="divide-y divide-gray-200"> <ul class="divide-y divide-gray-200">
{% for document in newInvoices %} {% for document in newInvoices %}
{% set assignment = document.disposition.assignment %} {% set assignment = document.disposition.assignment %}
@@ -96,7 +96,7 @@
<span>{{ overdueFeedbacksCount }} überfällig</span> <span>{{ overdueFeedbacksCount }} überfällig</span>
{% endif %} {% endif %}
</h2> </h2>
<div class="max-h-64 overflow-y-scroll overflow-x-hidden"> <div class="max-h-64 overflow-y-auto overflow-x-hidden pr-3">
<ul class="divide-y divide-gray-200"> <ul class="divide-y divide-gray-200">
{% for disposition in overdueFeedbacks %} {% for disposition in overdueFeedbacks %}
{% set assignment = disposition.assignment %} {% set assignment = disposition.assignment %}
+2 -2
View File
@@ -8,7 +8,7 @@
<select name="limit" <select name="limit"
class="text-sm py-1 border-gray-300" class="text-sm py-1 border-gray-300"
hx-get="{{ path(route, query|merge({(pageParameterName): 1})) }}" hx-get="{{ path(route, query|merge({(pageParameterName): 1})) }}"
hx-replace-url="{{ path(route, query|merge({(pageParameterName): 1})) }}" hx-replace-url="true"
hx-target="body"> hx-target="body">
<option value="10"{% if numItemsPerPage == 10 %} selected{% endif %}>10 pro Seite</option> <option value="10"{% if numItemsPerPage == 10 %} selected{% endif %}>10 pro Seite</option>
<option value="20"{% if numItemsPerPage == 20 %} selected{% endif %}>20 pro Seite</option> <option value="20"{% if numItemsPerPage == 20 %} selected{% endif %}>20 pro Seite</option>
@@ -16,7 +16,7 @@
</select> </select>
</div> </div>
<div> <div>
<nav class="relative z-0 inline-flex"> <nav class="relative z-0 inline-flex" hx-boost="true">
{% if pageCount > 1 %} {% if pageCount > 1 %}
{% if first is defined and current != first %} {% if first is defined and current != first %}
<a href="{{ path(route, query|merge({(pageParameterName): first})) }}" class="relative inline-flex items-center px-2 py-2 border border-gray-300 bg-white text-sm leading-5 font-medium hover:bg-secondary hover:text-white"> <a href="{{ path(route, query|merge({(pageParameterName): first})) }}" class="relative inline-flex items-center px-2 py-2 border border-gray-300 bg-white text-sm leading-5 font-medium hover:bg-secondary hover:text-white">
+1 -1
View File
@@ -5,7 +5,7 @@
<p class="text-sm leading-5 text-gray-700">{{ 'paginator.info'|trans({ '{from}': firstItemNumber, '{to}': lastItemNumber, '{total}': totalCount })|raw }}</p> <p class="text-sm leading-5 text-gray-700">{{ 'paginator.info'|trans({ '{from}': firstItemNumber, '{to}': lastItemNumber, '{total}': totalCount })|raw }}</p>
</div> </div>
<div> <div>
<nav class="relative z-0 inline-flex"> <nav class="relative z-0 inline-flex" hx-boost="true">
{% if pageCount > 1 %} {% if pageCount > 1 %}
{% if previous is defined %} {% if previous is defined %}
<a href="{{ path(route, query|merge({(pageParameterName): previous})) }}" class="relative inline-flex items-center px-2 py-2 border border-gray-300 bg-white text-sm leading-5 font-medium hover:bg-secondary hover:text-white" aria-label="Previous"> <a href="{{ path(route, query|merge({(pageParameterName): previous})) }}" class="relative inline-flex items-center px-2 py-2 border border-gray-300 bg-white text-sm leading-5 font-medium hover:bg-secondary hover:text-white" aria-label="Previous">
+1 -1
View File
@@ -1,4 +1,4 @@
<a href="{{ options.href }}" class="flex items-center space-x-2"> <a href="{{ options.href }}" class="flex items-center space-x-2" hx-boost="true">
<span>{{ title|raw }}</span> <span>{{ title|raw }}</span>
{%- if sorted -%} {%- if sorted -%}
{%- if direction == 'desc' -%} {%- if direction == 'desc' -%}
+2 -2
View File
@@ -24,7 +24,7 @@
id="username" id="username"
name="_username" name="_username"
value="{{ last_username }}" value="{{ last_username }}"
class="mt-2 block w-full rounded-md border-0 py-1.5 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-primary sm:text-sm sm:leading-6" class="mt-2 block w-full rounded-md border-0 py-1.5 text-gray-900 shadow-xs ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-primary sm:text-sm sm:leading-6"
required required
autofocus autofocus
autocomplete="username"> autocomplete="username">
@@ -36,7 +36,7 @@
<input type="password" <input type="password"
id="password" id="password"
name="_password" name="_password"
class="mt-2 block w-full rounded-md border-0 py-1.5 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-primary sm:text-sm sm:leading-6" class="mt-2 block w-full rounded-md border-0 py-1.5 text-gray-900 shadow-xs ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-primary sm:text-sm sm:leading-6"
required required
autocomplete="current-password"> autocomplete="current-password">
</div> </div>
+1 -1
View File
@@ -16,7 +16,7 @@
<dd class="mt-1 text-sm leading-6 text-gray-700 sm:mt-0"> <dd class="mt-1 text-sm leading-6 text-gray-700 sm:mt-0">
<a href="{{ path('app_common_download', { 'uuid': document.uuid }) }}" class="flex items-center space-x-1"> <a href="{{ path('app_common_download', { 'uuid': document.uuid }) }}" class="flex items-center space-x-1">
{{ icon('download') }} {{ icon('download') }}
<span class="flex-shrink-0">Download</span> <span class="shrink-0">Download</span>
</a> </a>
</dd> </dd>
</div> </div>
+2 -2
View File
@@ -38,7 +38,7 @@
{% if row.document is not null %} {% if row.document is not null %}
<a href="{{ path('app_common_download', { 'uuid': row.document.uuid }) }}" class="flex items-center space-x-1"> <a href="{{ path('app_common_download', { 'uuid': row.document.uuid }) }}" class="flex items-center space-x-1">
{{ icon('download') }} {{ icon('download') }}
<span class="flex-shrink-0">Vorlage herunterladen</span> <span class="shrink-0">Vorlage herunterladen</span>
</a> </a>
{% elseif row.definition.provides == constant('App\\Config\\SeasonTaskProvision::STANDARD') %} {% elseif row.definition.provides == constant('App\\Config\\SeasonTaskProvision::STANDARD') %}
<div class="text-gray-500">kein Dokument hinterlegt</div> <div class="text-gray-500">kein Dokument hinterlegt</div>
@@ -60,7 +60,7 @@
<div>{{ document.displayName | default(document.originalFilename) }}</div> <div>{{ document.displayName | default(document.originalFilename) }}</div>
<a href="{{ path('app_common_download', { 'uuid': document.uuid }) }}" class="flex items-center space-x-1"> <a href="{{ path('app_common_download', { 'uuid': document.uuid }) }}" class="flex items-center space-x-1">
{{ icon('download') }} {{ icon('download') }}
<span class="flex-shrink-0">Download</span> <span class="shrink-0">Download</span>
</a> </a>
</div> </div>
{% endfor %} {% endfor %}
+3 -3
View File
@@ -45,7 +45,7 @@
<a href="{{ path('app_teamer_work_month_pdf', { 'uuid': workMonth.uuid }) }}" <a href="{{ path('app_teamer_work_month_pdf', { 'uuid': workMonth.uuid }) }}"
class="flex items-center space-x-1"> class="flex items-center space-x-1">
{{ icon('download') }} {{ icon('download') }}
<span class="flex-shrink-0">Nachweis herunterladen</span> <span class="shrink-0">Nachweis herunterladen</span>
</a> </a>
{% if workMonth.status.value != 'approved' %} {% if workMonth.status.value != 'approved' %}
@@ -55,7 +55,7 @@
hx-target="#htmx-modal" hx-target="#htmx-modal"
hx-swap="outerHTML"> hx-swap="outerHTML">
{{ icon('upload') }} {{ icon('upload') }}
<span class="flex-shrink-0"> <span class="shrink-0">
{{ workMonth.currentDocument ? 'Erneut hochladen' : 'Unterschrieben hochladen' }} {{ workMonth.currentDocument ? 'Erneut hochladen' : 'Unterschrieben hochladen' }}
</span> </span>
</a> </a>
@@ -65,7 +65,7 @@
<a href="{{ path('app_common_download', { 'uuid': workMonth.currentDocument.uuid }) }}" <a href="{{ path('app_common_download', { 'uuid': workMonth.currentDocument.uuid }) }}"
class="flex items-center space-x-1 text-gray-500"> class="flex items-center space-x-1 text-gray-500">
{{ icon('document') }} {{ icon('document') }}
<span class="flex-shrink-0"> <span class="shrink-0">
Hochgeladen am {{ workMonth.submittedAt|date('d.m.Y') }} Hochgeladen am {{ workMonth.submittedAt|date('d.m.Y') }}
</span> </span>
</a> </a>
+13
View File
@@ -169,6 +169,19 @@ class BpnAuthenticatorTest extends TestCase
$this->assertFalse($request->getSession()->has('_security.main.target_path')); $this->assertFalse($request->getSession()->has('_security.main.target_path'));
} }
public function testABoostedHtmxRequestIsKeptAsTheDeeplink(): void
{
// a paginator or sort link fetches a whole page, so it is worth landing on after the login
$request = $this->createRequest();
$request->headers->set('HX-Request', 'true');
$request->headers->set('HX-Boosted', 'true');
$request->getSession()->set('_security.main.target_path', 'https://team.example.com/administrative/assignment?page=3');
$this->createAuthenticator()->start($request);
$this->assertSame('https://team.example.com/administrative/assignment?page=3', $request->getSession()->get('_security.main.target_path'));
}
public function testAPageRequestIsKeptAsTheDeeplink(): void public function testAPageRequestIsKeptAsTheDeeplink(): void
{ {
$request = $this->createRequest(); $request = $this->createRequest();
+9 -6
View File
@@ -1,4 +1,4 @@
const Encore = require('@symfony/webpack-encore'); import Encore from '@symfony/webpack-encore';
// Manually configure the runtime environment if not already configured yet by the "encore" command. // Manually configure the runtime environment if not already configured yet by the "encore" command.
// It's useful when you use tools that rely on webpack.config.js file. // It's useful when you use tools that rely on webpack.config.js file.
@@ -50,14 +50,17 @@ Encore
// config.plugins.push('@babel/a-babel-plugin'); // config.plugins.push('@babel/a-babel-plugin');
// }) // })
// enables and configure @babel/preset-env polyfills // adds the core-js polyfills the code uses (Babel 8 dropped useBuiltIns/corejs for this)
.configureBabelPresetEnv((config) => { .configureBabel((config) => {
config.useBuiltIns = 'usage'; config.plugins.push(['babel-plugin-polyfill-corejs3', { method: 'usage-global', version: '3.50' }]);
config.corejs = '3.23';
}) })
.enablePostCssLoader() .enablePostCssLoader()
.configureCssMinimizerPlugin((options, MinimizerPlugin) => {
options.minify = MinimizerPlugin.lightningCssMinify;
})
// enables Sass/SCSS support // enables Sass/SCSS support
//.enableSassLoader() //.enableSassLoader()
@@ -79,4 +82,4 @@ Encore
]) ])
; ;
module.exports = Encore.getWebpackConfig(); export default await Encore.getWebpackConfig();