Refactored code

VampireAotD · Sep 29, 2024 · a1c7b09 · a1c7b09
1 parent 7abae85
commit a1c7b09
Show file tree

Hide file tree

Showing 81 changed files with 976 additions and 646 deletions.
diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile
@@ -3,7 +3,7 @@
 ARG PHP_VERSION=8.3
 ARG COMPOSER_VERSION=2.7.7
 ARG NODE_VERSION=20.16
-ARG PNPM_VERSION=9.7.1
+ARG PNPM_VERSION=9.11.0
 
 FROM node:${NODE_VERSION}-alpine AS node
 

diff --git a/src/.prettierrc b/src/.prettierrc
@@ -5,5 +5,17 @@
     "singleQuote": true,
     "bracketSpacing": true,
     "bracketSameLine": false,
-    "endOfLine": "lf"
-}
+    "endOfLine": "lf",
+    "plugins": [
+        "@trivago/prettier-plugin-sort-imports"
+    ],
+    "importOrder": [
+        "^(vue|@vue|vitest)",
+        "^primevue",
+        "<THIRD_PARTY_MODULES>",
+        "^@/(entities|features|shared|widgets|pages|types)",
+        "^[./]"
+    ],
+    "importOrderSeparation": true,
+    "importOrderSortSpecifiers": true
+}
diff --git a/src/app/Services/Elasticsearch/Index/AnimeIndexService.php b/src/app/Services/Elasticsearch/Index/AnimeIndexService.php
@@ -37,8 +37,8 @@ public function multiMatchSearch(string $term): array
                 'body'  => [
                     'query' => [
                         'multi_match' => [
-                            'query'                => $term,
-                            'fields'               => [
+                            'query'  => $term,
+                            'fields' => [
                                 'title^3',
                                 'synonyms.synonym',
                             ],
@@ -75,7 +75,7 @@ public function paginate(AnimePaginationDTO $dto): array
                             'filter' => $dto->getMappedFilters(),
                         ],
                     ],
-                    'sort'  => $dto->sort,
+                    'sort' => $dto->sort,
                 ],
             ])->asArray();
 
@@ -99,27 +99,27 @@ public function getFacets(): array
                 'body'  => [
                     'size' => 0,
                     'aggs' => [
-                        'min_year'     => [
+                        'min_year' => [
                             'min' => [
                                 'field' => 'year',
                             ],
                         ],
-                        'max_year'     => [
+                        'max_year' => [
                             'max' => [
                                 'field' => 'year',
                             ],
                         ],
-                        'types'        => [
+                        'types' => [
                             'terms' => [
                                 'field' => 'type',
                             ],
                         ],
-                        'statuses'     => [
+                        'statuses' => [
                             'terms' => [
                                 'field' => 'status',
                             ],
                         ],
-                        'genres'       => [
+                        'genres' => [
                             'terms' => [
                                 'field' => 'genres.name',
                                 'size'  => 50,

diff --git a/src/package.json b/src/package.json
@@ -11,17 +11,18 @@
         "test": "vitest run"
     },
     "devDependencies": {
-        "@eslint/js": "^9.10.0",
+        "@eslint/js": "^9.11.1",
         "@inertiajs/vue3": "^1.2.0",
         "@tailwindcss/forms": "^0.5.9",
+        "@trivago/prettier-plugin-sort-imports": "^4.3.0",
         "@vitejs/plugin-vue": "^5.1.4",
         "@vue/eslint-config-prettier": "^9.0.0",
         "@vue/eslint-config-typescript": "^13.0.0",
         "@vue/test-utils": "^2.4.6",
         "autoprefixer": "^10.4.20",
         "axios": "^1.7.7",
-        "chokidar": "^4.0.0",
-        "eslint": "^9.10.0",
+        "chokidar": "^4.0.1",
+        "eslint": "^9.11.1",
         "eslint-config-prettier": "^9.1.0",
         "eslint-plugin-prettier": "^5.2.1",
         "eslint-plugin-vue": "^9.28.0",
@@ -32,12 +33,12 @@
         "postcss": "^8.4.47",
         "prettier": "^3.3.3",
         "pusher-js": "8.4.0-rc2",
-        "tailwindcss": "^3.4.12",
+        "tailwindcss": "^3.4.13",
         "typescript": "^5.6.2",
-        "typescript-eslint": "^8.6.0",
-        "vite": "^5.4.6",
+        "typescript-eslint": "^8.7.0",
+        "vite": "^5.4.8",
         "vitest": "^2.1.1",
-        "vue": "^3.5.6",
+        "vue": "^3.5.10",
         "vue-eslint-parser": "^9.4.3",
         "vue-tsc": "^2.1.6",
         "ziggy-js": "^2.3.0"