Move assets into separate file #301
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
moved font and color css handling to new theme css file;
also handle null logo urls from twig.
tomtomklima
commented
Nov 23, 2024
| public static function getFullLogoUrl(?string $logoUrl): string | ||
| { | ||
| if ($logoUrl === null) { return "";} | ||
| return "/assets" . $logoUrl; |
There was a problem hiding this comment.
Takto natvrdo vypálená adresa do kódu není dobře - když to budeme chtít přesunout, tak budeme muset změnit kód, což je špatně. Lepší by bylo toto zanést do infra, aby webserver hledal v této složce automaticky a kód appky to vůbec nemusel vědět
| @@ -232,7 +232,7 @@ public function showIban(): bool | |||
|
|
|||
| public function getSkautLogoPath(Participant $participant): string | |||
| { | |||
| return '/SKAUT_horizontalni_logo_250.png'; | |||
| return '/assets/SKAUT_horizontalni_logo_250.png'; | |||
There was a problem hiding this comment.
dtto v src/Event/Event.php
| @@ -224,7 +225,7 @@ private function sendMailFromTemplate( | |||
| $email->htmlTemplate('emails/' . $templateName . '.twig'); | |||
| $email->context(array_merge($parameters, [ | |||
| 'fullRegistrationLink' => $this->settings->getFullUrlLink(), | |||
| 'eventImageExists' => is_file(__DIR__ . '/../../public/' . $event->logoUrl), | |||
| 'eventImageExists' => is_file(__DIR__ . '/../../public/' . Event::getFullLogoUrl($event->logoUrl)), | |||
There was a problem hiding this comment.
Není potřeba volat staticky, když máme k dispozici už konkrétní objekt, kde to je
|
|
||
| <link rel="shortcut icon" href="/favicon-16x16.png" type="image/x-icon"> | ||
| <link rel="shortcut icon" href="../../../public/assets/favicon-16x16.png" type="image/x-icon"> |
There was a problem hiding this comment.
dtto src/Event/Event.php
Comment on lines
+23
to
+29
| public function getFunctions() :array | ||
| { | ||
| return [ | ||
| new TwigFunction('eventLogo', [Event::class, 'getFullLogoUrl']), | ||
| ]; | ||
| } | ||
|
|
There was a problem hiding this comment.
není potřeba, když se nebude volat staticky
| <a href="{{ event.webUrl }}" class="footer-item" target="_blank"> | ||
| <img class="footer-logo" src="{{ event.logoUrl }}" alt="logo of {{ event.readableName }}"> | ||
| <img class="footer-logo" src="{{ eventLogo(event.logoUrl) }}" alt="logo of {{ event.readableName }}"> |
There was a problem hiding this comment.
dtto src/Settings/TwigExtension.php
| @@ -67,7 +67,7 @@ | |||
| <footer> | |||
| {% if eventImageExists %} | |||
| <a href="{{ event.webUrl }}" class="footer-item" target="_blank"> | |||
| <img class="footer-logo" src="{{ email.image( event.logoUrl ) }}" alt="logo of {{ event.readableName }}"> | |||
| <img class="footer-logo" src="{{ email.image(eventLogo(event.logoUrl)) }}" alt="logo of {{ event.readableName }}"> | |||
There was a problem hiding this comment.
dtto src/Settings/TwigExtension.php
| @@ -81,7 +81,7 @@ | |||
| <footer> | |||
| {% if eventImageExists %} | |||
| <a href="{{ event.webUrl }}" class="footer-item" target="_blank"> | |||
| <img class="footer-logo" src="{{ email.image( event.logoUrl ) }}" alt="logo of {{ event.readableName }}"> | |||
| <img class="footer-logo" src="{{ email.image(eventLogo(event.logoUrl)) }}" alt="logo of {{ event.readableName }}"> | |||
There was a problem hiding this comment.
dtto src/Settings/TwigExtension.php
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.