Skip to content

Commit b876b1b

Browse files
dakurdakur
committed
controllers to template parts
1 parent cd2ff34 commit b876b1b

File tree

171 files changed

+2091
-3370
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

171 files changed

+2091
-3370
lines changed

‎.github/workflows/default.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ jobs:
9191
-i "config/*" \
9292
-i "CoordinatesResolver/*" \
9393
-i "DataContainers/*" \
94+
-i "Filters/*" \
9495
-i "frontend/*" \
9596
-x "frontend/src/*" \
9697
-i "hb-events/*" \
@@ -99,10 +100,7 @@ jobs:
99100
-i "Rewrites/*" \
100101
-i "template-parts/*" \
101102
-i "UI/*" \
102-
-x "UI/AboutStructure/assets/src/*" \
103-
-x "UI/Contacts/assets/src/*" \
104103
-x "UI/Event/assets/src/*" \
105-
-x "UI/Rentals/assets/src/*" \
106104
-i "vendor/*" \
107105
-i "ApplicationUrlTemplate.php" \
108106
-i "Assets.php" \

‎ApplicationUrlTemplate.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?php declare(strict_types = 1);
1+
<?php
22

33
namespace HnutiBrontosaurus\Theme;
44

‎Assets.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?php declare(strict_types = 1);
1+
<?php
22

33
namespace HnutiBrontosaurus\Theme;
44

‎Configuration.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?php declare(strict_types = 1);
1+
<?php
22

33
namespace HnutiBrontosaurus\Theme;
44

‎Container.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?php declare(strict_types = 1);
1+
<?php
22

33
namespace HnutiBrontosaurus\Theme;
44

‎CoordinatesResolver/Coordinates.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?php declare(strict_types = 1);
1+
<?php
22

33
namespace HnutiBrontosaurus\Theme\CoordinatesResolver;
44

‎CoordinatesResolver/CoordinatesResolver.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?php declare(strict_types = 1);
1+
<?php
22

33
namespace HnutiBrontosaurus\Theme\CoordinatesResolver;
44

‎UI/Courses/CoursesFiltersDC.php renamed to ‎DataContainers/CoursesFiltersDC.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<?php declare(strict_types = 1);
1+
<?php
22

3-
namespace HnutiBrontosaurus\Theme\UI\Courses;
3+
namespace HnutiBrontosaurus\Theme\DataContainers;
44

5-
use HnutiBrontosaurus\Theme\UI\PropertyHandler;
5+
use HnutiBrontosaurus\Theme\PropertyHandler;
66

77

88
/**

‎UI/DataContainers/Events/AgeDC.php renamed to ‎DataContainers/Events/AgeDC.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<?php declare(strict_types = 1);
1+
<?php
22

3-
namespace HnutiBrontosaurus\Theme\UI\DataContainers\Events;
3+
namespace HnutiBrontosaurus\Theme\DataContainers\Events;
44

55
use HnutiBrontosaurus\BisClient\Event\Response\Event;
6-
use HnutiBrontosaurus\Theme\UI\PropertyHandler;
6+
use HnutiBrontosaurus\Theme\PropertyHandler;
77

88

99
/**

‎UI/DataContainers/Events/ContactDC.php renamed to ‎DataContainers/Events/ContactDC.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<?php declare(strict_types = 1);
1+
<?php
22

3-
namespace HnutiBrontosaurus\Theme\UI\DataContainers\Events;
3+
namespace HnutiBrontosaurus\Theme\DataContainers\Events;
44

55
use HnutiBrontosaurus\BisClient\Response\ContactPerson;
6-
use HnutiBrontosaurus\Theme\UI\PropertyHandler;
6+
use HnutiBrontosaurus\Theme\PropertyHandler;
77

88

99
/**

‎UI/DataContainers/Events/EventCollectionDC.php renamed to ‎DataContainers/Events/EventCollectionDC.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<?php declare(strict_types = 1);
1+
<?php
22

3-
namespace HnutiBrontosaurus\Theme\UI\DataContainers\Events;
3+
namespace HnutiBrontosaurus\Theme\DataContainers\Events;
44

55
use HnutiBrontosaurus\BisClient\Event\Response\Event;
6-
use HnutiBrontosaurus\Theme\UI\PropertyHandler;
6+
use HnutiBrontosaurus\Theme\PropertyHandler;
77

88

99
/**

‎UI/DataContainers/Events/EventDC.php renamed to ‎DataContainers/Events/EventDC.php

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<?php declare(strict_types = 1);
1+
<?php
22

3-
namespace HnutiBrontosaurus\Theme\UI\DataContainers\Events;
3+
namespace HnutiBrontosaurus\Theme\DataContainers\Events;
44

55
use Brick\DateTime\LocalDate;
66
use Brick\DateTime\TimeZone;
@@ -10,8 +10,7 @@
1010
use HnutiBrontosaurus\BisClient\Event\Program;
1111
use HnutiBrontosaurus\BisClient\Event\Response\Event;
1212
use HnutiBrontosaurus\BisClient\Event\Response\Tag;
13-
use HnutiBrontosaurus\Theme\UI\Event\EventController;
14-
use HnutiBrontosaurus\Theme\UI\Utils;
13+
use HnutiBrontosaurus\Theme\Utils;
1514
use function array_map;
1615
use function get_site_url;
1716
use function implode;
@@ -56,7 +55,7 @@ public function __construct(Event $event, string $dateFormatHuman, string $dateF
5655
$this->id = $event->getId();
5756
$this->link = sprintf('%s/%s/%d/', // todo: use rather WP routing somehow
5857
rtrim(get_site_url(), '/'),
59-
EventController::PAGE_SLUG,
58+
'akce',
6059
$event->getId(),
6160
);
6261
$this->title = Utils::handleNonBreakingSpaces($event->getName());

‎UI/DataContainers/Events/InvitationDC.php renamed to ‎DataContainers/Events/InvitationDC.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
<?php declare(strict_types = 1);
1+
<?php
22

3-
namespace HnutiBrontosaurus\Theme\UI\DataContainers\Events;
3+
namespace HnutiBrontosaurus\Theme\DataContainers\Events;
44

55
use HnutiBrontosaurus\BisClient\Event\Response\Diet;
66
use HnutiBrontosaurus\BisClient\Event\Response\Event;
77
use HnutiBrontosaurus\BisClient\Event\Response\Food;
8-
use HnutiBrontosaurus\Theme\UI\PropertyHandler;
9-
use HnutiBrontosaurus\Theme\UI\Utils;
8+
use HnutiBrontosaurus\Theme\PropertyHandler;
9+
use HnutiBrontosaurus\Theme\Utils;
1010

1111

1212
/**

‎UI/DataContainers/Events/InvitationPresentationDC.php renamed to ‎DataContainers/Events/InvitationPresentationDC.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
<?php declare(strict_types = 1);
1+
<?php
22

3-
namespace HnutiBrontosaurus\Theme\UI\DataContainers\Events;
3+
namespace HnutiBrontosaurus\Theme\DataContainers\Events;
44

55
use HnutiBrontosaurus\BisClient\Event\Response\Image;
6-
use HnutiBrontosaurus\Theme\UI\PropertyHandler;
7-
use HnutiBrontosaurus\Theme\UI\Utils;
6+
use HnutiBrontosaurus\Theme\PropertyHandler;
7+
use HnutiBrontosaurus\Theme\Utils;
88

99

1010
/**

‎UI/DataContainers/Events/Label.php renamed to ‎DataContainers/Events/Label.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<?php declare(strict_types = 1);
1+
<?php
22

3-
namespace HnutiBrontosaurus\Theme\UI\DataContainers\Events;
3+
namespace HnutiBrontosaurus\Theme\DataContainers\Events;
44

5-
use HnutiBrontosaurus\Theme\UI\PropertyHandler;
5+
use HnutiBrontosaurus\Theme\PropertyHandler;
66

77

88
/**

‎UI/DataContainers/Events/PlaceDC.php renamed to ‎DataContainers/Events/PlaceDC.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
<?php declare(strict_types = 1);
1+
<?php
22

3-
namespace HnutiBrontosaurus\Theme\UI\DataContainers\Events;
3+
namespace HnutiBrontosaurus\Theme\DataContainers\Events;
44

55
use HnutiBrontosaurus\BisClient\Response\Location;
6-
use HnutiBrontosaurus\Theme\UI\PropertyHandler;
7-
use HnutiBrontosaurus\Theme\UI\Utils;
6+
use HnutiBrontosaurus\Theme\PropertyHandler;
7+
use HnutiBrontosaurus\Theme\Utils;
88

99

1010
/**

‎UI/ForChildren/ForChildrenFiltersDC.php renamed to ‎DataContainers/ForChildrenFiltersDC.php

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
<?php declare(strict_types = 1);
1+
<?php
22

3-
namespace HnutiBrontosaurus\Theme\UI\ForChildren;
3+
namespace HnutiBrontosaurus\Theme\DataContainers;
44

5-
6-
use HnutiBrontosaurus\Theme\UI\PropertyHandler;
5+
use HnutiBrontosaurus\Theme\PropertyHandler;
76

87

98
/**

‎UI/DataContainers/MonthWrapperDC.php renamed to ‎DataContainers/MonthWrapperDC.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
<?php declare(strict_types = 1);
1+
<?php
22

3-
namespace HnutiBrontosaurus\Theme\UI\DataContainers;
3+
namespace HnutiBrontosaurus\Theme\DataContainers;
44

55
use HnutiBrontosaurus\BisClient\Event\Response\Event;
6-
use HnutiBrontosaurus\Theme\UI\DataContainers\Events\EventCollectionDC;
7-
use HnutiBrontosaurus\Theme\UI\PropertyHandler;
6+
use HnutiBrontosaurus\Theme\DataContainers\Events\EventCollectionDC;
7+
use HnutiBrontosaurus\Theme\PropertyHandler;
88

99

1010
/**

‎DataContainers/NewsPost.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
<?php declare(strict_types = 1);
1+
<?php
22

33
namespace HnutiBrontosaurus\Theme\DataContainers;
44

55
use DateTimeImmutable;
6-
use HnutiBrontosaurus\Theme\UI\PropertyHandler;
7-
use HnutiBrontosaurus\Theme\UI\Utils;
6+
use HnutiBrontosaurus\Theme\PropertyHandler;
7+
use HnutiBrontosaurus\Theme\Utils;
88
use function get_the_post_thumbnail_url;
99

1010

‎UI/BaseUnitsAndClubsList/OrganizationalUnitDC.php renamed to ‎DataContainers/OrganizationalUnitDC.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<?php declare(strict_types = 1);
1+
<?php
22

3-
namespace HnutiBrontosaurus\Theme\UI\BaseUnitsAndClubsList;
3+
namespace HnutiBrontosaurus\Theme\DataContainers;
44

55
use HnutiBrontosaurus\BisClient\AdministrationUnit\Response\AdministrationUnit;
6-
use HnutiBrontosaurus\Theme\UI\PropertyHandler;
6+
use HnutiBrontosaurus\Theme\PropertyHandler;
77

88

99
/**

‎UI/DataContainers/Structure/AdministrationUnit.php renamed to ‎DataContainers/Structure/AdministrationUnit.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<?php declare(strict_types = 1);
1+
<?php
22

3-
namespace HnutiBrontosaurus\Theme\UI\DataContainers\Structure;
3+
namespace HnutiBrontosaurus\Theme\DataContainers\Structure;
44

55
use HnutiBrontosaurus\BisClient\AdministrationUnit\Response\AdministrationUnit as AdministrationUnitFromClient;
66
use HnutiBrontosaurus\Theme\CoordinatesResolver\Coordinates;

‎UI/Voluntary/VoluntaryFiltersDC.php renamed to ‎DataContainers/VoluntaryFiltersDC.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<?php declare(strict_types = 1);
1+
<?php
22

3-
namespace HnutiBrontosaurus\Theme\UI\Voluntary;
3+
namespace HnutiBrontosaurus\Theme\DataContainers;
44

5-
use HnutiBrontosaurus\Theme\UI\PropertyHandler;
5+
use HnutiBrontosaurus\Theme\PropertyHandler;
66

77

88
/**

‎UI/Courses/CoursesFilters.php renamed to ‎Filters/CoursesFilters.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<?php declare(strict_types = 1);
1+
<?php
22

3-
namespace HnutiBrontosaurus\Theme\UI\Courses;
3+
namespace HnutiBrontosaurus\Theme\Filters;
44

55
use HnutiBrontosaurus\BisClient\Event\Category;
66
use HnutiBrontosaurus\BisClient\Event\Request\EventParameters;

‎UI/ForChildren/ForChildrenFilters.php renamed to ‎Filters/ForChildrenFilters.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<?php declare(strict_types = 1);
1+
<?php
22

3-
namespace HnutiBrontosaurus\Theme\UI\ForChildren;
3+
namespace HnutiBrontosaurus\Theme\Filters;
44

55
use HnutiBrontosaurus\BisClient\Event\Category;
66
use HnutiBrontosaurus\BisClient\Event\Group;

‎UI/Meetups/MeetupsFilters.php renamed to ‎Filters/MeetupsFilters.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<?php declare(strict_types = 1);
1+
<?php
22

3-
namespace HnutiBrontosaurus\Theme\UI\Meetups;
3+
namespace HnutiBrontosaurus\Theme\Filters;
44

55
use HnutiBrontosaurus\BisClient\Event\Category;
66
use HnutiBrontosaurus\BisClient\Event\Request\EventParameters;

‎UI/Voluntary/VoluntaryFilters.php renamed to ‎Filters/VoluntaryFilters.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<?php declare(strict_types = 1);
1+
<?php
22

3-
namespace HnutiBrontosaurus\Theme\UI\Voluntary;
3+
namespace HnutiBrontosaurus\Theme\Filters;
44

55
use HnutiBrontosaurus\BisClient\Event\Category;
66
use HnutiBrontosaurus\BisClient\Event\Group;

‎PostTypeInitializer.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?php declare(strict_types = 1);
1+
<?php
22

33
namespace HnutiBrontosaurus\Theme;
44

‎PropertyHandler.php

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?php
2+
3+
namespace HnutiBrontosaurus\Theme\UI;
4+
5+
use Nette\Utils\Strings;
6+
7+
8+
trait PropertyHandler
9+
{
10+
11+
public function __get(string $property): mixed
12+
{
13+
if ( ! \property_exists($this, $property)) {
14+
throw new \LogicException(\sprintf('Property `%s` is not declared.', $property));
15+
}
16+
17+
if (Strings::startsWith($property, '_')) {
18+
throw new \LogicException(\sprintf('Can not use property `%s` as it starts with underscore which implies inaccessibility from outside.', $property));
19+
}
20+
21+
return $this->{$property};
22+
}
23+
24+
public function __isset(string $name): bool
25+
{
26+
return \property_exists($this, $name);
27+
}
28+
29+
}

‎Rewrites/Event.php

+3-13
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
<?php declare(strict_types = 1);
1+
<?php
22

33
namespace HnutiBrontosaurus\Theme\Rewrites;
44

5-
use HnutiBrontosaurus\Theme\UI\Event\EventController;
65
use function add_rewrite_rule;
76
use function array_push;
87
use function sprintf;
@@ -13,21 +12,12 @@ final class Event
1312

1413
public static function rewriteRule(): void
1514
{
16-
add_rewrite_rule(
17-
sprintf('^%s/([\d]+)',
18-
EventController::PAGE_SLUG,
19-
),
20-
sprintf('index.php?pagename=%s&%s=$matches[1]',
21-
EventController::PAGE_SLUG,
22-
EventController::PARAM_EVENT_ID,
23-
),
24-
'top',
25-
);
15+
add_rewrite_rule('^akce/([\d]+)', 'index.php?pagename=akce&eventId=$matches[1]', 'top');
2616
}
2717

2818
public static function queryVars(array &$vars): void
2919
{
30-
array_push($vars, EventController::PARAM_EVENT_ID);
20+
array_push($vars, 'eventId');
3121
}
3222

3323
}

‎Rewrites/Opportunity.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?php declare(strict_types = 1);
1+
<?php
22

33
namespace HnutiBrontosaurus\Theme\Rewrites;
44

0 commit comments

Comments
 (0)