Merge branch 'main' into zero_age_render

.devcontainer/postCreate.sh

@@ -29,17 +29,15 @@ set_conf() {
     setenv "QUEUE_CONNECTION" "sync"
     setenv "SESSION_DRIVER" "database"
     setenv "MAIL_MAILER" "log"
-    setenv "MAIL_FROM_ADDRESS" "[email protected]"
-    setenv "MAIL_REPLY_TO_ADDRESS" "[email protected]"
 }
 
 composer_install() {
     composer install --no-progress --no-interaction --prefer-dist --optimize-autoloader --working-dir=$ROOT
 }
 
 yarn_install() {
-    yarn install --cwd $ROOT --immutable
-    yarn run --cwd $ROOT build
+    yarn --cwd $ROOT install --immutable
+    yarn --cwd $ROOT run build
 }
 
 setup() {

.editorconfig

@@ -20,5 +20,8 @@ indent_size = 2
 [*.md]
 trim_trailing_whitespace = false
 
-[*.yml]
+[*.{yml,yaml}]
 indent_size = 2
+
+[docker-compose.yml]
+indent_size = 4

.env.example

@@ -24,24 +24,24 @@ APP_KEY=
 APP_DEBUG=true
 
 # The URL of your application.
-APP_URL=localhost:8000
+APP_URL=http://localhost:8000
 
 # Database to store information
 # The documentation is here: https://laravel.com/docs/10.x/database
 # You can also see the different values you can use in config/database.php
 DB_CONNECTION=sqlite
-DB_HOST=127.0.0.1
-DB_PORT=3306
-DB_DATABASE=full_path_to_the_sqlite_database
-DB_USERNAME=monica
-DB_PASSWORD=secret
+# DB_HOST=127.0.0.1
+# DB_PORT=3306
+# DB_DATABASE=monica
+# DB_USERNAME=monica
+# DB_PASSWORD=secret
 
-# Database for SQLite - used for local development
+# Database for tests - used for local development
 DB_TEST_DRIVER=sqlite
-DB_TEST_DATABASE=full_path_to_the_sqlite_database
-DB_TEST_HOST=127.0.0.1
-DB_TEST_USERNAME=root
-DB_TEST_PASSWORD=root
+# DB_TEST_DATABASE=monica
+# DB_TEST_HOST=127.0.0.1
+# DB_TEST_USERNAME=root
+# DB_TEST_PASSWORD=root
 
 # Frequency of creation of new log files. Logs are written when an error occurs.
 # Refer to config/logging.php for the possible values.
@@ -59,26 +59,26 @@ LOG_CHANNEL=stack
 #. Queue: sync, database, beanstalkd, sqs, redis
 #  If Queue is not set to 'sync', you'll have to set a queue worker
 #  See https://laravel.com/docs/5.7/queues#running-the-queue-worker
-CACHE_DRIVER=file
+CACHE_STORE=database
 QUEUE_CONNECTION=sync
-SESSION_DRIVER=file
-SESSION_LIFETIME=120
+SESSION_DRIVER=database
 
 # Redis, if you need it for the queues
 REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379
 
 # Mailing
-MAIL_MAILER=smtp
+# Set the MAIL_MAILER to 'smtp' if you want to send emails.
+MAIL_MAILER=log
 MAIL_HOST=smtp.mailtrap.io
 MAIL_PORT=2525
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
-MAIL_FROM_ADDRESS=
+MAIL_FROM_ADDRESS=[email protected]
 MAIL_FROM_NAME="${APP_NAME}"
-MAIL_REPLY_TO_ADDRESS=
+MAIL_REPLY_TO_ADDRESS=[email protected]
 MAIL_REPLY_TO_NAME="${APP_NAME}"
 
 # Search

.env.example.sail

@@ -0,0 +1,47 @@
+# Example configuration file to use with Laravel sail
+# Copy this file to .env and adjust the values to your needs
+
+# Initial setup:
+#  cp .env.example.sail .env
+#  docker run --rm -u "$(id -u):$(id -g)" -v "$(pwd):/var/www/html" -w /var/www/html laravelsail/php83-composer:latest composer install --ignore-platform-reqs
+#  ./vendor/bin/sail up -d
+
+APP_NAME=Monica
+APP_ENV=local
+APP_KEY=
+APP_DEBUG=true
+APP_URL=http://localhost
+
+DB_CONNECTION=mariadb
+DB_HOST=mariadb
+DB_PORT=3306
+DB_DATABASE=monica
+DB_USERNAME=monica
+DB_PASSWORD=password
+
+LOG_CHANNEL=stack
+
+CACHE_STORE=memcached
+QUEUE_CONNECTION=redis
+SESSION_DRIVER=database
+
+REDIS_HOST=redis
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_MAILER=smtp
+MAIL_HOST=mailpit
+MAIL_PORT=1025
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
+[email protected]
+MAIL_FROM_NAME="${APP_NAME}"
+[email protected]
+MAIL_REPLY_TO_NAME="${APP_NAME}"
+
+SCOUT_DRIVER=meilisearch
+SCOUT_QUEUE=true
+MEILISEARCH_HOST=http://meilisearch:7700
+MEILISEARCH_KEY=
+MEILISEARCH_NO_ANALYTICS=false

.github/workflows/push.yml → .github/workflows/deploy.yml

@@ -1,9 +1,10 @@
-name: Push
+name: Deploy
 
 on:
   push:
     branches:
       - main
+  workflow_dispatch:
 
 jobs:
   build:

.github/workflows/docker.yml

@@ -26,6 +26,16 @@ jobs:
 
     strategy:
       fail-fast: false
+      matrix:
+        flavor:
+          - name: apache
+            file: scripts/docker/Dockerfile
+            tag: main
+            suffix:
+          - name: fpm
+            file: scripts/docker/Dockerfile-fpm
+            tag: main-fpm
+            suffix: -fpm
 
     permissions:
       contents: read
@@ -54,6 +64,9 @@ jobs:
             org.opencontainers.image.description="This is MonicaHQ, your personal memory! MonicaHQ is like a CRM but for the friends, family, and acquaintances around you."
             org.opencontainers.image.title="MonicaHQ, the Personal Relationship Manager"
             org.opencontainers.image.vendor="Monica"
+          flavor: |
+            latest=${{ matrix.flavor.tag == 'main' && 'auto' || 'false' }}
+            suffix=${{ matrix.flavor.suffix }}
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -72,13 +85,13 @@ jobs:
       # Build docker
       - name: Docker build
         id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.docker_meta.outputs.tags }}
-          cache-from: type=registry,ref=${{ env.registry }}/${{ github.repository_owner }}/${{ env.package-name }}:main
+          cache-from: type=registry,ref=${{ env.registry }}/${{ github.repository_owner }}/${{ env.package-name }}:${{ matrix.flavor.tag }}
           labels: ${{ steps.docker_meta.outputs.labels }}
-          file: scripts/docker/Dockerfile
+          file: ${{ matrix.flavor.file }}
           context: .
           platforms: ${{ (github.event_name != 'pull_request') && 'linux/amd64,linux/arm64' || 'linux/amd64' }}
           outputs: type=image,name=target,annotation-index.org.opencontainers.image.description=This is MonicaHQ your personal memory! MonicaHQ is like a CRM but for the friends family and acquaintances around you.

.github/workflows/release.yml

@@ -24,7 +24,7 @@ jobs:
     if: github.event_name != 'pull_request'
     uses: monicahq/workflows/.github/workflows/release.yml@v2
     with:
-      semantic_version: 19
+      semantic_version: 23
     secrets:
       GH_TOKEN_RELEASE: ${{ secrets.GH_TOKEN_RELEASE }}
 

.github/workflows/static_analysis.yml

@@ -14,3 +14,4 @@ jobs:
     uses: monicahq/workflows/.github/workflows/static.yml@v2
     with:
       php-version: 8.3
+      with: phpstan

.gitignore

@@ -37,3 +37,4 @@ npm-debug.log
 .phpunit.result.cache
 yarn-error.log
 monica.db
+sail

.husky/pre-commit

@@ -1,4 +1 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
 npx lint-staged

.prettierignore

@@ -3,3 +3,4 @@ storage
 vendor
 node_modules
 composer.lock
+.yarn/*

.tool-versions

@@ -1,3 +1,3 @@
 php 8.2.0
-nodejs 18.16.0
-yarn 1.22.19
+nodejs 21.7.1
+yarn 4.1.1