resolve conflicts

ot_core/Classes/Domain/Repository/BaseApiRepository.php

@@ -8,14 +8,14 @@ use Opentalent\OtCore\Exception\ApiRequestException;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerAwareTrait;
+use TYPO3\CMS\Core\Core\ApplicationContext;
 use TYPO3\CMS\Extbase\Object\ObjectManagerInterface;
-use TYPO3\CMS\Extbase\Persistence\Repository;
 
 /**
  *  Base class for repositories based on the Opentalent API
  *
  */
-abstract class BaseApiRepository extends Repository implements LoggerAwareInterface
+abstract class BaseApiRepository implements LoggerAwareInterface
 {
     use LoggerAwareTrait;
 
@@ -24,13 +24,38 @@ abstract class BaseApiRepository extends Repository implements LoggerAwareInterf
     const HTTP_METHOD = 'GET';
     const DEFAULT_ITEMS_PER_PAGE = 8;
 
-    private $client;
-    private $context;
+    protected $client;
+    protected $context;
 
-    public function __construct(ObjectManagerInterface $objectManager) {
-        parent::__construct($objectManager);
-        $this->client = new Client(['base_uri' => static::BASE_URI]);
-        $this->context = \TYPO3\CMS\Core\Core\Environment::getContext();
+    /**
+     * BaseApiRepository constructor.
+     *
+     * @param ObjectManagerInterface $objectManager
+     * @param Client|null $client  [For tests only]
+     * @param ApplicationContext|null $context  [For tests only]
+     */
+    public function __construct(
+        ?Client $client = null,
+        ?ApplicationContext $context = null
+    ) {
+        if ($client === null) {
+            $this->client = new Client(['base_uri' => static::BASE_URI]);
+        } else {
+            $this->client = $client;
+        }
+        if ($context === null) {
+            $this->context = \TYPO3\CMS\Core\Core\Environment::getContext();
+        } else {
+            $this->context = $context;
+        }
+    }
+
+    /**
+     * [FOR TESTS ONLY]
+     * @param Client $client
+     */
+    protected function injectClient(Client $client) {
+        $this->client = $client;
     }
 
     /**
@@ -43,7 +68,7 @@ abstract class BaseApiRepository extends Repository implements LoggerAwareInterf
      * @throws ApiRequestException
      */
     protected function getApiRecords(string $uri, $params = []) {
-        $body = $this->getJson($uri, $params);
+        $body = $this->getJsonDecoded($uri, $params);
 
         $page = (int)($params['page'] ?? 1);
 
@@ -100,7 +125,7 @@ abstract class BaseApiRepository extends Repository implements LoggerAwareInterf
      * @return array
      * @throws ApiRequestException
      */
-    protected function getJson(string $uri, $params = [])
+    protected function getJsonDecoded(string $uri, $params = [])
     {
         return json_decode($this->getBody($uri, $params),true);
     }
@@ -116,7 +141,7 @@ abstract class BaseApiRepository extends Repository implements LoggerAwareInterf
      */
     protected function getBody(string $uri, $params = [])
     {
-        return (string)$this->get($uri, $params)->getBody();
+        return (string)$this->getResponse($uri, $params)->getBody();
     }
 
     /**
@@ -128,7 +153,7 @@ abstract class BaseApiRepository extends Repository implements LoggerAwareInterf
      * @return ResponseInterface
      * @throws ApiRequestException
      */
-    protected function get(string $uri, $params = [])
+    protected function getResponse(string $uri, $params = [])
     {
         $uri = $uri . '?_format=json';
         if(!isset($params['itemsPerPage'])) {

ot_templating/Configuration/TypoScript/setup.txt

@@ -194,4 +194,28 @@ lib.tx_ottemplating.widgets {
         action = detail
         switchableControllerActions.News.1 = detail
     }
+
+    news_latest < lib.tx_ottemplating.widgets.news_list
+    news_latest {
+        action = list
+
+        settings < plugin.tx_news.settings
+        settings {
+            # settings for the news.list plugin
+            # @see https://docs.typo3.org/p/georgringer/news/master/en-us/AdministratorManual/Configuration/TypoScript/#
+            list.paginate {
+                insertAbove = 0
+            }
+            topNewsFirst = 1
+            media {
+                maxWidth = 50px
+                maxHeight = 50px
+            }
+            media.maxWidth = 50px
+            media.maxHeight = 50px
+            limit = 2
+            hidePagination = 1
+            defaultDetailPid= {newsPageUid}
+        }
+    }
 }

ot_templating/Resources/Private/Layouts/Classic/Home.html

@@ -32,6 +32,9 @@
 
     <f:comment><!-- Right column --></f:comment>
     <div class="rightcol">
+        <f:comment><!-- Render the last news section defined in partial/LastNews.html--></f:comment>
+        <f:render partial="Classic/LatestNews" />
+
         <f:comment><!-- Render the donors section defined in partial/Donors.html--></f:comment>
         <f:render partial="Classic/Donors" arguments="{settings: settings}" />
         <f:render partial="Classic/Donors" arguments="{settings: settings, fromParents: 1}"/>

ot_templating/Resources/Public/assets/Classic/style/classic-blue.css

@@ -1681,6 +1681,16 @@ form button[type=submit]:hover {
   margin-left: 4px;
 }
 
+.ot-last-news img {
+  max-width: 70px;
+  max-height: 70px;
+}
+
+.ot-last-news .article {
+  padding-bottom: 0;
+  margin-bottom: 0;
+}
+
 .contact-form {
   width: 80%;
   margin: auto;

ot_templating/Resources/Public/assets/Classic/style/classic-green.css

@@ -1681,6 +1681,16 @@ form button[type=submit]:hover {
   margin-left: 4px;
 }
 
+.ot-last-news img {
+  max-width: 70px;
+  max-height: 70px;
+}
+
+.ot-last-news .article {
+  padding-bottom: 0;
+  margin-bottom: 0;
+}
+
 .contact-form {
   width: 80%;
   margin: auto;

ot_templating/Resources/Public/assets/Classic/style/classic-grey.css

@@ -1681,6 +1681,16 @@ form button[type=submit]:hover {
   margin-left: 4px;
 }
 
+.ot-last-news img {
+  max-width: 70px;
+  max-height: 70px;
+}
+
+.ot-last-news .article {
+  padding-bottom: 0;
+  margin-bottom: 0;
+}
+
 .contact-form {
   width: 80%;
   margin: auto;

ot_templating/Resources/Public/assets/Classic/style/classic-light-blue.css

@@ -1681,6 +1681,16 @@ form button[type=submit]:hover {
   margin-left: 4px;
 }
 
+.ot-last-news img {
+  max-width: 70px;
+  max-height: 70px;
+}
+
+.ot-last-news .article {
+  padding-bottom: 0;
+  margin-bottom: 0;
+}
+
 .contact-form {
   width: 80%;
   margin: auto;

ot_templating/Resources/Public/assets/Classic/style/classic-light-red.css

@@ -1681,6 +1681,16 @@ form button[type=submit]:hover {
   margin-left: 4px;
 }
 
+.ot-last-news img {
+  max-width: 70px;
+  max-height: 70px;
+}
+
+.ot-last-news .article {
+  padding-bottom: 0;
+  margin-bottom: 0;
+}
+
 .contact-form {
   width: 80%;
   margin: auto;

ot_templating/Resources/Public/assets/Classic/style/classic-orange.css

@@ -1681,6 +1681,16 @@ form button[type=submit]:hover {
   margin-left: 4px;
 }
 
+.ot-last-news img {
+  max-width: 70px;
+  max-height: 70px;
+}
+
+.ot-last-news .article {
+  padding-bottom: 0;
+  margin-bottom: 0;
+}
+
 .contact-form {
   width: 80%;
   margin: auto;

ot_templating/Resources/Public/assets/Classic/style/classic-purple.css

@@ -1681,6 +1681,16 @@ form button[type=submit]:hover {
   margin-left: 4px;
 }
 
+.ot-last-news img {
+  max-width: 70px;
+  max-height: 70px;
+}
+
+.ot-last-news .article {
+  padding-bottom: 0;
+  margin-bottom: 0;
+}
+
 .contact-form {
   width: 80%;
   margin: auto;

ot_templating/Resources/Public/assets/Classic/style/classic-red.css

@@ -1681,6 +1681,16 @@ form button[type=submit]:hover {
   margin-left: 4px;
 }
 
+.ot-last-news img {
+  max-width: 70px;
+  max-height: 70px;
+}
+
+.ot-last-news .article {
+  padding-bottom: 0;
+  margin-bottom: 0;
+}
+
 .contact-form {
   width: 80%;
   margin: auto;

ot_templating/Resources/Public/assets/Classic/style/module/_news.scss

@@ -31,3 +31,13 @@ $content-a-color: $content-a-color;
 .ot-news .f3-widget-paginator li {
   margin-left: 4px;
 }
+
+.ot-last-news img {
+  max-width: 70px;
+  max-height: 70px;
+}
+
+.ot-last-news .article {
+  padding-bottom: 0;
+  margin-bottom: 0;
+}