Merge branch 'api'

# Conflicts:
#	composer.lock

Author: hose1021

.docker/develop/php/Dockerfile

@@ -14,8 +14,7 @@ RUN apk update && apk add --no-cache \
     shadow \
     bash \
     tzdata \
-    nano \
-    nodejs npm
+    nano
 
 RUN pecl install redis \
     && docker-php-ext-enable redis
@@ -24,9 +23,6 @@ RUN docker-php-ext-install zip pdo_mysql exif opcache pcntl
 
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer --quit
 
-RUN npm --global install yarn \
-    && rm -rf /var/cache/apk/* /tmp/* /var/tmp/*
-
 ENV TZ=Asia/Baku
 
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone

.github/workflows/make.yml

@@ -25,9 +25,6 @@ jobs:
            username: hose1021
            password: ${{ github.token }}
 
-      - name: Docker pull
-        run: make docker-pull
-
       - name: Docker build
         run: make docker-build
 

app/Http/Controllers/Api/ArticleHubController.php

@@ -42,7 +42,7 @@ public function __construct(Request $request, int $day = 1, int $week = 7, int $
     }
 
     /**
-     * @param int $id
+     * @param string $id
      * @return ArticlesResource
      */
     public function articles(string $id): ArticlesResource
@@ -55,7 +55,7 @@ function ($query) use ($id) {
                         $query->where('taggables.hub_id', '=', $id);
                     }
                 )
-                ->withcount('views', )
+                ->withcount('views')
                 ->orderBy('created_at', 'DESC')
                 ->where('created_at', '>=', Carbon::now()->subDays(self::$count)->startOfDay())
                 ->take(50)->paginate(10)