Merge tag 'v1.1.0' into staging

.github/workflows/asset-lint.yml

@@ -36,7 +36,7 @@ jobs:
       - uses: actions/setup-node@v3
         if: steps.git-diff.outputs.diff
         with:
-          node-version: "16"
+          node-version-file: ".nvmrc"
       - name: Cache node modules
         if: steps.git-diff.outputs.diff
         uses: actions/cache@v3

.github/workflows/frontend.yml

@@ -39,7 +39,7 @@ jobs:
       - uses: actions/setup-node@v3
         if: steps.git-diff.outputs.diff
         with:
-          node-version: "16"
+          node-version-file: ".nvmrc"
       - name: Cache node modules
         if: steps.git-diff.outputs.diff
         uses: actions/cache@v3

.github/workflows/laravel.yml

@@ -42,7 +42,7 @@ jobs:
       - uses: actions/setup-node@v3
         if: steps.git-diff.outputs.diff
         with:
-          node-version: "16"
+          node-version-file: ".nvmrc"
       - name: Cache node modules
         if: steps.git-diff.outputs.diff
         uses: actions/cache@v3

.github/workflows/lighthouse.yml

@@ -42,7 +42,7 @@ jobs:
       - uses: actions/setup-node@v3
         if: steps.git-diff.outputs.diff
         with:
-          node-version: "16"
+          node-version-file: ".nvmrc"
       - name: Cache node modules
         if: steps.git-diff.outputs.diff
         uses: actions/cache@v3
@@ -76,11 +76,11 @@ jobs:
         env:
           DB_PASSWORD: root
           DB_HOST: localhost
-      - name: Use Node 16.x
+      - name: Use Node from .nvmrc file
         if: steps.git-diff.outputs.diff
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version-file: ".nvmrc"
       - name: Run Lighthouse CI
         if: steps.git-diff.outputs.diff
         run: |

.github/workflows/mirror-dev.yml

@@ -1,6 +1,7 @@
 name: Mirror dev to GitLab
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - dev
@@ -23,7 +24,7 @@ jobs:
           git remote add gitlab ${{ vars.GITLAB_URL }}
 
       - name: Setup SSH
-        uses: webfactory/ssh-agent@v0.7.0
+        uses: webfactory/ssh-agent@v0.8.0
         with:
             ssh-private-key: ${{ secrets.GITLAB_SSH_KEY }}
 

.github/workflows/mirror-production.yml

@@ -1,6 +1,7 @@
 name: Mirror production to GitLab
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - production
@@ -23,7 +24,7 @@ jobs:
           git remote add gitlab ${{ vars.GITLAB_URL }}
 
       - name: Setup SSH
-        uses: webfactory/ssh-agent@v0.7.0
+        uses: webfactory/ssh-agent@v0.8.0
         with:
             ssh-private-key: ${{ secrets.GITLAB_SSH_KEY }}
 

.github/workflows/mirror-staging.yml

@@ -1,6 +1,7 @@
 name: Mirror staging to GitLab
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - staging
@@ -23,7 +24,7 @@ jobs:
           git remote add gitlab ${{ vars.GITLAB_URL }}
 
       - name: Setup SSH
-        uses: webfactory/ssh-agent@v0.7.0
+        uses: webfactory/ssh-agent@v0.8.0
         with:
             ssh-private-key: ${{ secrets.GITLAB_SSH_KEY }}
 

.github/workflows/mirror-tags.yml

@@ -1,6 +1,7 @@
 name: Mirror tags to GitLab
 
 on:
+  workflow_dispatch:
   push:
     tags:
       - '*'
@@ -23,7 +24,7 @@ jobs:
           git remote add gitlab ${{ vars.GITLAB_URL }}
 
       - name: Setup SSH
-        uses: webfactory/ssh-agent@v0.7.0
+        uses: webfactory/ssh-agent@v0.8.0
         with:
             ssh-private-key: ${{ secrets.GITLAB_SSH_KEY }}
 

.kube/app/Dockerfile

@@ -1,7 +1,7 @@
 FROM php:8.1-fpm
 
 ENV PHP_VERSION 8.1
-ENV NODE_VERSION 16
+ENV NODE_VERSION 18
 ENV NVM_VERSION 0.39.3
 ENV NVM_DIR /root/.nvm
 

.nvmrc

@@ -1 +1 @@
-16
+18

Dockerfile.cloud

@@ -2,7 +2,7 @@ FROM ubuntu:22.04
 
 LABEL maintainer="Taylor Otwell"
 
-ARG NODE_VERSION=16
+ARG NODE_VERSION=18
 
 WORKDIR /var/www/html
 

README.md

@@ -29,6 +29,9 @@ The platform requires the following:
 -   [PHP](https://www.php.net/supported-versions.php) >= 8.1 with [required extensions](https://laravel.com/docs/9.x/deployment#server-requirements)
 -   [MySQL](https://dev.mysql.com/downloads/) >= 5.7
 -   [Composer](https://getcomposer.org) >= 2.0
+-   [Node](https://nodejs.org) >= 18
+
+Optionally you may wish to install [NVM](https://github.com/nvm-sh/nvm) to make node version management easier.
 
 The deployment process should follow all the recommended [optimization processes](https://laravel.com/docs/9.x/deployment#optimization).
 
@@ -124,8 +127,8 @@ For comprehensive instructions, consult the [Laravel documentation](https://lara
 of how some key tasks can be carried out using Sail:
 
 - [Composer](https://getcomposer.org) commands may be executed by using `sail composer <command>`.
-- [NPM](https://docs.npmjs.com/cli/v7) commands may be executed by using `sail npm <command>`.
-- [Artisan](https://laravel.com/docs/8.x/artisan) commands may be executed by using `sail artisan <command>`.
+- [NPM](https://docs.npmjs.com/cli) commands may be executed by using `sail npm <command>`.
+- [Artisan](https://laravel.com/docs/9.x/artisan) commands may be executed by using `sail artisan <command>`.
 
 ### Local development setup using Laravel Valet
 
@@ -178,8 +181,15 @@ of how some key tasks can be carried out using Sail:
 9. Install Composer and NPM dependencies:
 
     ```bash
+    # install composer dependencies
     composer install
-    npm install
+
+    # To use the version of npm specified in .nvmrc.
+    # requires https://github.com/nvm-sh/nvm
+    nvm use
+
+    # install node dependencies
+    npm ci
     ```
 
 10. Generate an application key:
@@ -233,8 +243,9 @@ For comprehensive instructions, consult the [Laravel documentation](https://lara
 of how some key tasks can be carried out using Valet:
 
 - [Composer](https://getcomposer.org) commands may be executed by using `composer <command>`.
-- [NPM](https://docs.npmjs.com/cli/v7) commands may be executed by using `npm <command>`.
-- [Artisan](https://laravel.com/docs/8.x/artisan) commands may be executed by using `php artisan <command>`.
+- [NVM](https://github.com/nvm-sh/nvm) commands may be executed by using `nvm <command>`.
+- [NPM](https://docs.npmjs.com/cli) commands may be executed by using `npm <command>`.
+- [Artisan](https://laravel.com/docs/9.x/artisan) commands may be executed by using `php artisan <command>`.
 
 ### Running tests
 

app/Models/Course.php

@@ -24,18 +24,21 @@ class Course extends Model
         'title',
         'introduction',
         'video',
+        'author',
     ];
 
     protected $casts = [
         'title' => 'array',
         'introduction' => 'array',
         'video' => 'array',
+        'author' => 'array',
     ];
 
     public array $translatable = [
         'title',
         'introduction',
         'video',
+        'author',
         'slug',
     ];
 
@@ -45,7 +48,8 @@ public function getSlugOptions(): SlugOptions
             ->generateSlugsFrom(function (Course $model, $locale): string {
                 return $this->generateSlugs($model, $locale, 'title');
             })
-            ->saveSlugsTo('slug');
+            ->saveSlugsTo('slug')
+            ->slugsShouldBeNoLongerThan(250);
     }
 
     public function getRouteKeyName(): string

app/Models/Module.php

@@ -57,7 +57,7 @@ public function getRouteKeyName(): string
     public function users(): BelongsToMany
     {
         return $this->belongsToMany(User::class)
-            ->withPivot('started_content_at', 'finished_content_at', 'completed_at')
+            ->withPivot('started_content_at', 'finished_content_at')
             ->withTimestamps();
     }
 

app/Models/User.php

@@ -247,7 +247,7 @@ public function courses(): BelongsToMany
     public function modules(): BelongsToMany
     {
         return $this->belongsToMany(Module::class)
-            ->withPivot('started_content_at', 'finished_content_at', 'completed_at')
+            ->withPivot('started_content_at', 'finished_content_at')
             ->withTimestamps();
     }