Merge branch 'main' into advanced-component-group-ordering

Author: jbrooksuk

.github/workflows/run-tests.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [8.3, 8.2]
+        php: [8.4, 8.3, 8.2]
         laravel: [11.x]
         stability: [prefer-lowest, prefer-stable]
 
@@ -58,7 +58,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [8.3, 8.2]
+        php: [8.4, 8.3, 8.2]
         laravel: [11.x]
         stability: [prefer-lowest, prefer-stable]
 
@@ -115,9 +115,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ 8.3, 8.2 ]
-        laravel: [ 11.x ]
-        stability: [ prefer-lowest, prefer-stable ]
+        php: [8.4, 8.3, 8.2]
+        laravel: [11.x]
+        stability: [prefer-lowest, prefer-stable]
 
     name: Tests - P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - PostgreSQL 13
 

README.md

@@ -33,9 +33,7 @@ Cachet 3.x is currently in development and is not yet completely ready for produ
 - [x] Scheduled Maintenance
 - [x] Scheduled Maintenance Updates
 - [x] Components
-- [ ] Metrics
-  - API and dashboard are working.
-  - Frontend is in progress.
+- [x] Metrics
 - [ ] Subscribers
 - [x] API
   - Complete but may need some tweaks as we progress.
@@ -75,6 +73,7 @@ Login to the account at `/dashboard` and use credentials:
     <a href="https://dreamtilt.com.au"><img width="100px" src="https://github.com/dreamtilt.png" alt="Dreamtilt"></a>
     <a href="https://xyphen-it.nl"><img width="100px" src="https://github.com/xyphen-it.png" alt="Xyphen-IT"></a>
     <a href="https://coderabbit.ai/"><img width="100px" src="https://github.com/coderabbitai.png" alt="Code Rabbit"></a>
+    <a href="https://scramble.dedoc.co/"><img width="100px" src="https://github.com/dedoc.png" alt="de:doc"></a>
 </p>
 
 ## Security Vulnerabilities

composer.json

@@ -20,15 +20,17 @@
     },
     "require": {
         "php": "^8.2",
+        "ext-simplexml": "*",
         "doctrine/dbal": "^3.6",
         "filament/filament": "^3.2.57",
         "filament/spatie-laravel-settings-plugin": "^3.2",
         "guzzlehttp/guzzle": "^7.8",
-        "illuminate/console": "^11.23.0",
-        "illuminate/database": "^11.23.0",
-        "illuminate/events": "^11.23.0",
-        "illuminate/queue": "^11.23.0",
-        "illuminate/support": "^11.23.0",
+        "illuminate/cache": "^11.35.0",
+        "illuminate/console": "^11.35.0",
+        "illuminate/database": "^11.35.0",
+        "illuminate/events": "^11.35.0",
+        "illuminate/queue": "^11.35.0",
+        "illuminate/support": "^11.35.0",
         "laravel/sanctum": "^4.0",
         "nesbot/carbon": "^2.70",
         "spatie/laravel-data": "^4.11",

config/cachet.php

@@ -70,6 +70,7 @@
      */
     'middleware' => [
         'web',
+        //        \Cachet\Http\Middleware\AuthenticateRemoteUser::class,
     ],
 
     'api_middleware' => [
@@ -136,14 +137,32 @@
      |
      */
     'supported_locales' => [
+        'de' => 'Deutsch (DE)',
         'de_AT' => 'Deutsch (AT)',
         'de_CH' => 'Deutsch (CH)',
-        'de_DE' => 'Deutsch (DE)',
         'en' => 'English',
         'en_GB' => 'English (UK)',
-        'nl_NL' => 'Nederlands',
+        'nl' => 'Nederlands',
         'pt_BR' => 'Português (BR)',
         'zh_CN' => '简体中文',
         'zh_TW' => '繁體中文',
+        'ph' => 'Filipino',
     ],
+
+    /*
+     |--------------------------------------------------------------------------
+     | Cachet Demo Mode
+     |--------------------------------------------------------------------------
+     |
+     | Whether to run Cachet in demo mode. This will adjust some of the default
+     | settings to allow Cachet to run in a demo environment.
+     |
+     */
+    'demo_mode' => env('CACHET_DEMO_MODE', false),
+
+    'feed' => [
+        'uri' => env('CACHET_FEED_URI', 'https://blog.cachethq.io/rss'),
+        'cache' => env('CACHET_FEED_CACHE', 3600),
+    ],
+
 ];

database/migrations/2024_10_13_214300_drop_schedule_status.php

@@ -25,7 +25,7 @@ public function up()
      */
     public function down()
     {
-        Schema::table('incidents', function (Blueprint $table) {
+        Schema::table('schedules', function (Blueprint $table) {
             $table->unsignedInteger('status')->unsigned()->default(0);
         });
     }

database/seeders/DatabaseSeeder.php

@@ -60,11 +60,13 @@ public function run(): void
             'completed_at' => now()->subHours(12),
         ]);
 
+        /** @phpstan-ignore-next-line  argument.type */
         tap(Schedule::create([
             'name' => 'Documentation Maintenance',
             'message' => 'We will be conducting maintenance on our documentation servers. You may experience degraded performance during this time.',
             'scheduled_at' => now()->addHours(24),
             'completed_at' => null,
+        /** @phpstan-ignore-next-line argument.type */
         ]), function (Schedule $schedule) use ($user) {
             $update = new Update([
                 'message' => <<<'EOF'

package-lock.json

@@ -22,6 +22,10 @@
         "prettier-plugin-blade": "^2.0.0",
         "prettier-plugin-tailwindcss": "^0.5.11",
         "tailwindcss": "^3.4.13",
-        "vite": "^5.0"
+        "vite": "^5.4"
+    },
+    "dependencies": {
+        "chart.js": "^4.4.7",
+        "chartjs-adapter-moment": "^1.0.1"
     }
 }

package.json

@@ -4,6 +4,7 @@ includes:
 
 parameters:
     level: 5
+    reportUnmatchedIgnoredErrors: false
 
     paths:
         - src