Merge branch 'trunk'

Backoffice

Closes #1

See merge request ldc-web/projets/op-insta!1

.dockerignore

@@ -0,0 +1,2 @@
+.git
+*.md

.env.example

@@ -18,7 +18,7 @@ DB_PASSWORD=
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
 FILESYSTEM_DISK=local
-QUEUE_CONNECTION=sync
+QUEUE_CONNECTION=database
 SESSION_DRIVER=file
 SESSION_LIFETIME=120
 
@@ -32,7 +32,10 @@ MAIL_FROM_ADDRESS="hello@example.com"
 MAIL_FROM_NAME="${APP_NAME}"
 
 FACEBOOK_GRAPH_ACCESS_TOKEN=""
-FACEBOOK_GRAPH_ENDPOINT_IG_TOPMEDIA_IGHASHTAGID=
+FACEBOOK_GRAPH_ENDPOINT_IG_TOPMEDIA_HASHTAGID=
 FACEBOOK_GRAPH_ENDPOINT_IG_TOPMEDIA_USERID=
 # The amount of media to acquire
 FACEBOOK_GRAPH_ENDPOINT_IG_TOPMEDIA_NBMEDIA=
+
+# Sentry
+SENTRY_LARAVEL_DSN=

.gitlab-ci.yml

@@ -11,14 +11,9 @@ include:
   - project: 'ldc-web/shared-ci'
     ref: 'main'
     file: 'test/test.yml'
-  - project: 'ldc-web/shared-ci'
-    ref: 'main'
-    file: 'deploy/deploy.yml'
-
 
 stages:
     - lint
     - security
     - build
     - test
-    - deploy

Dockerfile

@@ -0,0 +1,7 @@
+FROM registry.s-web.fr/ldc-web/projets/ldc-web-images-docker/ldcweb-production-8.2:latest
+COPY --chown=www-data:www-data . /app/srcs
+COPY --chown=www-data:www-data ./public/build /app/srcs/public/build
+COPY --chown=www-data:www-data ./vendor /app/srcs/vendor
+USER root
+RUN chmod -R 755 /app/srcs/storage
+USER www-data

README.md

@@ -12,15 +12,12 @@ php artisan migrate
 .env
 ```
 FACEBOOK_GRAPH_ACCESS_TOKEN=""
-FACEBOOK_GRAPH_ENDPOINT_IG_TOPMEDIA_IGHASHTAGID=
+FACEBOOK_GRAPH_ENDPOINT_IG_TOPMEDIA_HASHTAGID=
 FACEBOOK_GRAPH_ENDPOINT_IG_TOPMEDIA_USERID=
+# The amount of media to acquire
+FACEBOOK_GRAPH_ENDPOINT_IG_TOPMEDIA_NBMEDIA=
 ```
 
-Commande :
-```
-php artisan insta:get-top-medias
-```
-cette commande appelle le Job : InstaGetTopMediasJob
-
 ### TODO:
 - Permettre la recherche d'un hashtag et d'utiliser son id pour topMediaList
+- Refresh le token en automatique si detection expired

app/Exceptions/Handler.php

@@ -40,6 +40,9 @@ class Handler extends ExceptionHandler
     public function register()
     {
         $this->reportable(function (Throwable $e) {
+            if (app()->bound('sentry')) {
+                app('sentry')->captureException($e);
+            }
         });
     }
 }

app/Http/Controllers/Bo/TopMediaController.php

@@ -41,9 +41,7 @@ class TopMediaController extends Controller
             );
         } //end if
 
-        $this->sortQuery($topMediaList);
         $searchFields = trans('Id Instagram, Participant, Lien');
-        $topMediaList->orderBy('updated_at', 'DESC');
         $topMediaList = $topMediaList->paginate();
 
         return \view('bo.pages.top-media.index', \compact('topMediaList', 'searchFields', 'ranking'));

app/Http/Controllers/Fo/HomeController.php

@@ -3,17 +3,16 @@
 namespace App\Http\Controllers\Fo;
 
 use App\Http\Controllers\Controller;
-use Illuminate\Contracts\View\View;
 
 class HomeController extends Controller
 {
     /**
-     * Display a listing of the resource.
+     * Redirect to BO
      *
-     * @return \Illuminate\Contracts\View\View
+     * @return \Illuminate\Http\RedirectResponse
      */
-    public function index(): View
+    public function index(): \Illuminate\Http\RedirectResponse
     {
-        return view('fo.pages.home');
+        return \redirect()->route('bo.dashboard');
     }
 }

config/logging.php

@@ -126,6 +126,22 @@ return [
         'emergency' => [
             'path' => storage_path('logs/laravel.log'),
         ],
+
+        'stdout' => [
+            'driver' => 'monolog',
+            'level' => env('LOG_LEVEL', 'debug'),
+            'handler' => StreamHandler::class,
+            'formatter' => env('LOG_STDOUT_FORMATTER'),
+            'with' => [
+                'stream' => 'php://stdout',
+            ],
+        ],
+
+        'k8s' => [
+            'driver' => 'stack',
+            'channels' => ['daily', 'stdout'],
+            'ignore_exceptions' => false,
+        ],
     ],
 
 ];

public/robots.txt

@@ -1,2 +1,2 @@
 User-agent: *
-Disallow:
+Disallow: /

resources/views/bo/pages/top-media/indexList.blade.php

@@ -2,47 +2,45 @@
     <table class="table fix-action">
         <thead>
             @php
-                $cols = [
+            $cols = [
-                    'id' => __('Classement'),
+            'id' => __('Classement'),
-                    'username' => __('Participant'),
+            'username' => __('Participant'),
-                    'timestamp' => __('Date de création du post')];
+            'timestamp' => __('Date de création du post')];
-                $routeName = request()->route()->getName();
+            $routeName = request()->route()->getName();
-                $rst = !is_null(request()->rst) || !Session::has("$routeName.sorted");
+            $rst = !is_null(request()->rst) || !Session::has("$routeName.sorted");
-                $noOrder = Session::get("$routeName.sort_col") !== 'order' and (Session::has("$routeName.sort_col") or Session::has("$routeName.sort_way"));
+            $noOrder = Session::get("$routeName.sort_col") !== 'order' and (Session::has("$routeName.sort_col") or Session::has("$routeName.sort_way"));
-                $noOrder = Session::get("$routeName.sort_col") !== '' and (Session::has("$routeName.sort_col") or Session::has("$routeName.sort_way"));
+            $noOrder = Session::get("$routeName.sort_col") !== '' and (Session::has("$routeName.sort_col") or Session::has("$routeName.sort_way"));
             @endphp
-            @include('modules.table-col-sorter', [
+            <th>Classement</th>
-                'cols' => $cols,
+            <th>Participant</th>
-                'ignore' => ['total', 'timeslot_date', 'shop'],
+            <th>Date de création du post</th>
-                'mobileHide' => ['shop'],
+            <th></th>
-            ])
         </thead>
         <tbody>
             @if ($topMediaList->count())
-                @foreach ($topMediaList as $topMediaModel)
+            @foreach ($topMediaList as $topMediaModel)
-                    <tr>
+            <tr>
-                        <td>
+                <td>
-                            <strong class="fs-{{ $ranking->get($topMediaModel->insta_id) + 1 }}">#{{ $ranking->get($topMediaModel->insta_id) + 1 }}</strong>
+                    <strong class="fs-{{ $ranking->get($topMediaModel->insta_id) + 1 }}">#{{ $ranking->get($topMediaModel->insta_id) + 1 }}</strong>
-                        </td>
+                </td>
-                        <td>{{ $topMediaModel->username }}</td>
+                <td>{{ $topMediaModel->username }}</td>
-                        <td>
+                <td>
-                            {{ $topMediaModel->timestamp->isoFormat('LLLL') }}
+                    {{ $topMediaModel->timestamp->isoFormat('LLLL') }}
-                        </td>
+                </td>
-                        <td>
+                <td>
-                            <a href="{{ $topMediaModel->permalink }}" title="{{ __('Voir le media sur instagram') }}" target="_blank" data-bs-toggle="tooltip">
+                    <a href="{{ $topMediaModel->permalink }}" title="{{ __('Voir le media sur instagram') }}" target="_blank" data-bs-toggle="tooltip">
-                                <i class="fa-solid fa-arrow-up-right-from-square"></i>
+                        <i class="fa-solid fa-arrow-up-right-from-square"></i>
-                            </a>
+                    </a>
-                        </td>
+                </td>
-                    </tr>
+            </tr>
-                @endforeach
+            @endforeach
             @else
-                <tr>
+            <tr>
-                    <td colspan="11" class="text-center">
+                <td colspan="11" class="text-center">
-                        <span
+                    <span class="h3">{{ __('Aucun résultat pour les :models', ['models' => __('models.classes.insta_media')]) }}
-                            class="h3">{{ __('Aucun résultat pour les :models', ['models' => __('models.classes.insta_media')]) }}
+                    </span>
-                        </span>
+                </td>
-                    </td>
+            </tr>
-                </tr>
             @endif
         </tbody>
     </table>