From e13304227d94c1ddb6819a7099578cd734612b21 Mon Sep 17 00:00:00 2001 From: Thomas Date: Mon, 20 Jan 2025 19:59:22 +0100 Subject: [PATCH] Fixes --- src/new/assets/tailwind/css/backend.css | 11 +- .../Resources/views/dashboard/index.html.twig | 10 +- .../EntityBundle/Document/ContactAddress.php | 8 +- .../EntityBundle/Entity/ContactAddress.php | 14 +- .../views/backend/list/index.html.twig | 68 +- .../translations/core_settings_edit.de.yml | 2 +- src/new/templates/backend_login.html.twig | 2 +- .../templates/backend_tailwind_base.html.twig | 4 +- .../Custom/PSC/CollectLayouter/Api/Update.php | 56 ++ .../Frontend/DesignerController.php | 42 +- .../views/frontend/designer/collect.html.twig | 2 - .../views/frontend/designer/load.html.twig | 2 - .../frontend/designer/load_collect.html.twig | 733 ++++++++++++++++++ src/new/web/build/backend/login.css | 113 ++- src/new/web/build/backend/tailwind.css | 189 +++-- src/new/web/build/manifest.json | 25 +- .../articletemplates/scripts/6.phtml | 7 +- 17 files changed, 1118 insertions(+), 170 deletions(-) create mode 100644 src/new/var/plugins/Custom/PSC/CollectLayouter/Resources/views/frontend/designer/load_collect.html.twig diff --git a/src/new/assets/tailwind/css/backend.css b/src/new/assets/tailwind/css/backend.css index 6ed27699f..b72bddff2 100644 --- a/src/new/assets/tailwind/css/backend.css +++ b/src/new/assets/tailwind/css/backend.css @@ -1,4 +1,4 @@ -@import url('https://fonts.googleapis.com/css2?family=DM+Sans:ital,wght@0,400;0,500;0,700;1,400;1,500;1,700&display=swap'); +@import url('https://fonts.googleapis.com/css2?family=Inter:ital,opsz,wght@0,14..32,100..900;1,14..32,100..900&display=swap'); @tailwind base; @tailwind components; @@ -8,7 +8,7 @@ html { -webkit-text-size-adjust: 100%; font-feature-settings: normal; - font-family: DM Sans,ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji; + font-family: "Inter", serif; font-variation-settings: normal; line-height: 1.5; } @@ -26,3 +26,10 @@ .dropdown:hover .dropdown-menu { display: block; } + +.badge-yes { + @apply inline-flex rounded bg-lime-500 px-2 py-1 text-sm font-medium text-white hover:bg-opacity-90; +} +.badge-no { + @apply inline-flex rounded bg-orange-500 px-2 py-1 text-sm font-medium text-white hover:bg-opacity-90; +} diff --git a/src/new/src/PSC/Backend/DashboardBundle/Resources/views/dashboard/index.html.twig b/src/new/src/PSC/Backend/DashboardBundle/Resources/views/dashboard/index.html.twig index de6d2c9e0..366dd26c6 100755 --- a/src/new/src/PSC/Backend/DashboardBundle/Resources/views/dashboard/index.html.twig +++ b/src/new/src/PSC/Backend/DashboardBundle/Resources/views/dashboard/index.html.twig @@ -8,7 +8,7 @@ {% block body %}
{% if is_granted('ROLE_ADMIN') %} -
+

@@ -28,7 +28,7 @@

-
+

@@ -46,7 +46,7 @@

-
+

@@ -59,7 +59,7 @@

-
+

@@ -99,7 +99,7 @@

-
+

diff --git a/src/new/src/PSC/Shop/EntityBundle/Document/ContactAddress.php b/src/new/src/PSC/Shop/EntityBundle/Document/ContactAddress.php index c2e2a633e..97d8a477a 100755 --- a/src/new/src/PSC/Shop/EntityBundle/Document/ContactAddress.php +++ b/src/new/src/PSC/Shop/EntityBundle/Document/ContactAddress.php @@ -33,22 +33,22 @@ class ContactAddress #[Field(type: 'string')] protected $lid; - public function getLId(): string + public function getLId(): ?string { return (string)$this->lid; } - public function setLId(string $var): void + public function setLId(?string $var): void { $this->lid = $var; } - public function getSteuerId(): string + public function getSteuerId(): ?string { return (string)$this->steuerId; } - public function setSteuerId(string $var): void + public function setSteuerId(?string $var): void { $this->steuerId = $var; } diff --git a/src/new/src/PSC/Shop/EntityBundle/Entity/ContactAddress.php b/src/new/src/PSC/Shop/EntityBundle/Entity/ContactAddress.php index 9095526d5..c1e09d5cb 100755 --- a/src/new/src/PSC/Shop/EntityBundle/Entity/ContactAddress.php +++ b/src/new/src/PSC/Shop/EntityBundle/Entity/ContactAddress.php @@ -15,7 +15,7 @@ class ContactAddress protected $kundenNr = ''; protected $homepage = ''; protected $lid = ''; - protected $steuerid = ''; + protected $steuerId = ''; /** * @var integer */ @@ -774,22 +774,22 @@ class ContactAddress $this->pos = $pos; } - public function getSteuerId(): string + public function getSteuerId(): ?string { - return (string)$this->steuerid; + return (string)$this->steuerId; } - public function setSteuerId(string $var): void + public function setSteuerId(?string $var): void { - $this->steuerid = $var; + $this->steuerId = $var; } - public function getLId(): string + public function getLId(): ?string { return (string)$this->lid; } - public function setLId(string $var): void + public function setLId(?string $var): void { $this->lid = $var; } diff --git a/src/new/src/PSC/Shop/NewsBundle/Resources/views/backend/list/index.html.twig b/src/new/src/PSC/Shop/NewsBundle/Resources/views/backend/list/index.html.twig index 2b948222b..cad784ffc 100755 --- a/src/new/src/PSC/Shop/NewsBundle/Resources/views/backend/list/index.html.twig +++ b/src/new/src/PSC/Shop/NewsBundle/Resources/views/backend/list/index.html.twig @@ -2,16 +2,20 @@ {% trans_default_domain 'core_news_list' %} {% block header %}
-

{{ 'News'|trans }} {{ 'List'|trans }}

+

+ + + + {{ 'News'|trans }} {{ 'List'|trans }}

- {{ 'Addnews'|trans }} + {{ 'Addnews'|trans }}
{% endblock %} {% block body %} -
+
@@ -19,37 +23,33 @@
-
- - - - - - - - - - - - - {% for news in pagination %} - - - - - - - - - {% endfor %} - -
{{ knp_pagination_sortable(pagination, 'Uid'|trans, 'news.uid') }}{{ knp_pagination_sortable(pagination, 'active'|trans, 'news.enable') }}{{ knp_pagination_sortable(pagination, 'Name'|trans, 'news.title') }}{{ knp_pagination_sortable(pagination, 'Introduction'|trans, 'news.introduction') }}{{ knp_pagination_sortable(pagination, 'Sortdate'|trans, 'news.sortDate') }}
{{ news.uid }}{% if news.enable %}{{'yes'|trans}}{% else %}{{'no'|trans}}{% endif %}{{ news.title }}{{ news.introduction }}{{ news.sortDate|date('d.m.Y') }} - - -
+
+
+ +
{{ knp_pagination_sortable(pagination, 'active'|trans, 'news.enable') }}
+
{{ knp_pagination_sortable(pagination, 'Name'|trans, 'news.title') }}
+ + +
+
+ {% for news in pagination %} +
+ +
{% if news.enable %}{{'yes'|trans}}{% else %}{{'no'|trans}}{% endif %}
+
{{ news.title }}
+ + +
+ + +
+
+ {% endfor %}
{{ knp_pagination_render(pagination) }}
diff --git a/src/new/src/PSC/Shop/SettingsBundle/Resources/translations/core_settings_edit.de.yml b/src/new/src/PSC/Shop/SettingsBundle/Resources/translations/core_settings_edit.de.yml index a7ac63bc0..029199e04 100755 --- a/src/new/src/PSC/Shop/SettingsBundle/Resources/translations/core_settings_edit.de.yml +++ b/src/new/src/PSC/Shop/SettingsBundle/Resources/translations/core_settings_edit.de.yml @@ -28,7 +28,7 @@ Logo2: Logo 2 subtitle: Untertitel Private: Privat Registrationpossible: Registrierung möglich -Withoutactivation: Ohne Freischaltung +Withoutactivation: Ohne E-Mail Verifizierung Productoverview: Produktübersicht productsorting: Produktsortierung Keywords: Keywords diff --git a/src/new/templates/backend_login.html.twig b/src/new/templates/backend_login.html.twig index 5359c9a23..e9d343bfa 100644 --- a/src/new/templates/backend_login.html.twig +++ b/src/new/templates/backend_login.html.twig @@ -14,7 +14,7 @@ {% endblock %} - +