Cleanup

.devcontainer/docker-compose.yml

@@ -9,10 +9,9 @@ services:
         # Update 'VARIANT' to pick a version of PHP version: 8, 8.1, 8.0, 7, 7.4
         # Append -bullseye or -buster to pin to an OS version.
         # Use -bullseye variants on local arm64/Apple Silicon.
-        VARIANT: "8-bullseye"
+        VARIANT: 8-bullseye
         # Optional Node.js version
-        NODE_VERSION: "lts/*"
-
+        NODE_VERSION: 'lts/*'
 
     volumes:
       - ..:/workspace:cached

.editorconfig

@@ -4,10 +4,11 @@ root = true
 [*]
 charset = utf-8
 end_of_line = lf
-indent_size = 2
-indent_style = space
+indent_size = 4
+indent_style = tab
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[*.{php,md,ps1,Dockerfile}]
-indent_size = 4
+[*.{json,yaml,yml}]
+indent_style = space
+indent_size = 2

.gitpod.yml

@@ -13,28 +13,15 @@ tasks:
       php artisan serve --host=0.0.0.0
   - command: gp ports await 8080 && gp preview $(gp url 8000)
 
-github:
-  prebuilds:
-    # enable for the master/default branch (defaults to true)
-    master: true
-    # enable for all branches in this repo (defaults to false)
-    branches: false
-    # enable for pull requests coming from this repo (defaults to true)
-    pullRequests: true
-    # add a check to pull requests (defaults to true)
-    addCheck: true
-    # add a "Review in Gitpod" button as a comment to pull requests (defaults to false)
-    addComment: false
-
 vscode:
   extensions:
-    - 'editorconfig.editorconfig'
-    - 'eamodio.gitlens'
-    - 'bmewburn.vscode-intelephense-client'
-    - 'esbenp.prettier-vscode'
-    - 'jpoissonnier.vscode-styled-components'
-    - 'mblode.twig-language-2'
-    - 'felixfbecker.php-debug'
+    - editorconfig.editorconfig
+    - eamodio.gitlens
+    - bmewburn.vscode-intelephense-client
+    - esbenp.prettier-vscode
+    - jpoissonnier.vscode-styled-components
+    - mblode.twig-language-2
+    - felixfbecker.php-debug
 
 ports:
   - port: 8080

.vscode/launch.json

@@ -1,38 +1,38 @@
 {
-    "version": "0.2.0",
-    "configurations": [
-      {
-        "type": "node",
-        "request": "launch",
-        "name": "Launch Jest Tests",
-        "program": "${workspaceFolder}/node_modules/.bin/jest",
-        "args": ["${file}"],
-        "internalConsoleOptions": "openOnSessionStart",
-        "skipFiles": [
-          "<node_internals>/**"
-        ]
-      },
-      {
-        "type": "php",
-        "request": "launch",
-        "name": "Launch with XDebug",
-        "ignore": [
-          "**/vendor/**/*.php"
-        ]
-      },
-      {
-        "type": "firefox",
-        "request": "launch",
-        "reAttach": true,
-        "name": "Launch with Firefox Debugger",
-        "url": "http://localhost/",
-        "webRoot": "${workspaceFolder}",
-        "pathMappings": [
-          {
-            "url": "webpack:///",
-            "path": "${workspaceFolder}/"
-          }
-        ]
-      }
-    ]
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Launch Jest Tests",
+      "program": "${workspaceFolder}/node_modules/.bin/jest",
+      "args": ["${file}"],
+      "internalConsoleOptions": "openOnSessionStart",
+      "skipFiles": [
+        "<node_internals>/**"
+      ]
+    },
+    {
+      "type": "php",
+      "request": "launch",
+      "name": "Launch with XDebug",
+      "ignore": [
+        "**/vendor/**/*.php"
+      ]
+    },
+    {
+      "type": "firefox",
+      "request": "launch",
+      "reAttach": true,
+      "name": "Launch with Firefox Debugger",
+      "url": "http://localhost/",
+      "webRoot": "${workspaceFolder}",
+      "pathMappings": [
+        {
+          "url": "webpack:///",
+          "path": "${workspaceFolder}/"
+        }
+      ]
+    }
+  ]
 }

app/Http/View/Composers/UserMenuComposer.php

@@ -41,7 +41,6 @@ public function compose(View $view)
                 ['label' => trans('general.admin-panel'), 'link' => route('admin.view')],
                 ['label' => trans('general.user-manage'), 'link' => route('admin.users.view')],
                 ['label' => trans('general.report-manage'), 'link' => route('admin.reports.view')],
-                ['label' => 'Web CLI', 'link' => '#launch-cli'],
             );
         }
         $menuItems = $this->filter->apply('user_menu', $menuItems, [$user]);

composer.json

@@ -29,7 +29,7 @@
     "lorisleiva/laravel-search-string": "^1.0",
     "nesbot/carbon": "^2.0",
     "nunomaduro/collision": "^7.0",
-    "rcrowe/twigbridge": "^0.14",
+    "rcrowe/twigbridge": "dev-blessing",
     "spatie/laravel-translation-loader": "^2.7",
     "symfony/process": "^6.0",
     "symfony/yaml": "^5.0",
@@ -81,10 +81,14 @@
       ]
     }
   },
-  "repositories": {
-    "packagist": {
+  "repositories": [
+    {
+      "type": "vcs",
+      "url": "https://github.com/bs-community/TwigBridge"
+    },
+    {
       "type": "composer",
       "url": "https://packagist.org/"
     }
-  }
+  ]
 }