Merge pull request #29 from well-it-wasnt-me/english-codebase

Update

.env.example

@@ -28,6 +28,6 @@ STRIPE_SECRET_KEY=""
 
 GOOGLE_FCM_URL="https://fcm.googleapis.com/fcm/send"
 GOOGLE_FCM_KEY=""
-
+GOOLE_MAP_API_KEY=""
 CHATGPT_KEY=""
 LOG_SERVER=""

.github/workflows/versioning.yml

@@ -0,0 +1,35 @@
+name: Release
+on:
+  push:
+    branches:
+      - master
+
+permissions:
+  contents: read # for checkout
+
+jobs:
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write # to be able to publish a GitHub release
+      issues: write # to be able to comment on released issues
+      pull-requests: write # to be able to comment on released pull requests
+      id-token: write # to enable use of OIDC for npm provenance
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: "lts/*"
+      - name: Install dependencies
+        run: npm clean-install
+      - name: Verify the integrity of provenance attestations and registry signatures for installed dependencies
+        run: npm audit signatures
+      - name: Release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: npx semantic-release

.releaserc

@@ -0,0 +1,29 @@
+{
+  "branches": ["master", "next", "english-codebase"],
+  "plugins": [
+          [
+              "@semantic-release/commit-analyzer", {
+                  "preset": "conventionalcommits",
+              }
+          ],
+          [
+          "@semantic-release/release-notes-generator", {
+                  "preset": "conventionalcommits",
+              }
+          ],
+          [
+              "@semantic-release/changelog",
+              {
+                  "changelogTitle": "# Changelog - Because We Love Changes\n\nGreetings, dear user! 🎉 Here's a dazzling list of changes and updates. Brace yourself, for the excitement is overwhelming.. See\n[Conventional Commits](https://conventionalcommits.org) for commit guidelines.",
+                  "changelogFile": "CHANGELOG.md"
+              }
+          ],
+          [
+              "@semantic-release/git",
+              {
+                  "message": "chore: Release ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}",
+                  "assets": ["CHANGELOG.md"]
+              }
+          ]
+      ]
+}

composer.json

@@ -13,44 +13,44 @@
     "ext-pdo": "*",
     "ext-posix": "*",
     "ext-zip": "*",
-    "cakephp/chronos": "^3.0",
-    "cakephp/database": "^4.2",
-    "cakephp/validation": "^4.2",
-    "fig/http-message-util": "^1.1",
-    "guzzlehttp/guzzle": "^7.5",
+    "cakephp/chronos": "2.4.4",
+    "cakephp/database": "4.5.3",
+    "cakephp/validation": "4.5.3",
+    "fig/http-message-util": "1.1.5",
+    "guzzlehttp/guzzle": "7.8.1",
     "lcobucci/jwt": "^5.2",
-    "lulco/phoenix": "^2.4",
-    "mpdf/mpdf": "^8.1",
-    "nyholm/psr7": "^1.4",
-    "nyholm/psr7-server": "^1.0",
-    "odan/session": "^6.1",
+    "lulco/phoenix": ">=2.5",
+    "mpdf/mpdf": "^8.2.2",
+    "nyholm/psr7": "^1.8.1",
+    "nyholm/psr7-server": "^1.1",
+    "odan/session": "5.1.0",
     "peppeocchi/php-cron-scheduler": "^4.0",
-    "php-di/php-di": "^7.0",
-    "phpmailer/phpmailer": "^6.7",
+    "php-di/php-di": "^7.0.6",
+    "phpmailer/phpmailer": "^6.9.1",
     "selective/array-reader": "^2.1",
-    "selective/basepath": "^2.0",
+    "selective/basepath": "^2.2",
     "selective/validation": "^2.1",
-    "slim/php-view": "^3.1",
-    "slim/psr7": "^1.4",
-    "slim/slim": "4.*",
-    "slim/twig-view": "^3.2",
-    "stripe/stripe-php": "^13.4",
-    "symfony/console": "^6.4",
-    "symfony/mailer": "^6.0",
-    "symfony/polyfill-uuid": "^1.23",
-    "symfony/uid": "^6.2",
-    "symfony/yaml": "^6.4",
-    "tuupola/cors-middleware": "^1.4",
-    "tuupola/slim-jwt-auth": "^3.7",
-    "twig/twig": "^3.3",
+    "slim/php-view": "^3.2",
+    "slim/psr7": "^1.6.1",
+    "slim/slim": "^4.12",
+    "slim/twig-view": "^3.3",
+    "stripe/stripe-php": "^13.12",
+    "symfony/console": "^6.4.3",
+    "symfony/mailer": "^6.4.3",
+    "symfony/polyfill-uuid": "^1.29",
+    "symfony/uid": "^6.4.3",
+    "symfony/yaml": "^6.4.3",
+    "tuupola/cors-middleware": "^1.4.3",
+    "tuupola/slim-jwt-auth": "^3.8",
+    "twig/twig": "^3.8",
     "vlucas/phpdotenv": "~5.6"
   },
   "require-dev": {
-    "dg/bypass-finals": "^1.3",
-    "phpstan/phpstan": "^1.9",
-    "phpunit/phpunit": "^10.4",
+    "dg/bypass-finals": "^1.6",
+    "phpstan/phpstan": "^1.10.59",
+    "phpunit/phpunit": "^11.0.3",
     "selective/test-traits": "^4.1",
-    "squizlabs/php_codesniffer": "^3.6"
+    "squizlabs/php_codesniffer": "^3.9"
   },
   "autoload": {
     "psr-4": {

config/settings.php

@@ -1,13 +1,12 @@
 <?php
 
-//$dotenv = \Dotenv\Dotenv::create(__DIR__ . '/../');
 $dotenv = \Dotenv\Dotenv::createMutable(__DIR__ . '/../');
 $dotenv->load();
 // Should be set to 0 in production
-getenv('ENVIRONMENT') == 'prod' ? error_reporting(0) : error_reporting(E_ALL);
+env('ENVIRONMENT') == 'prod' ? error_reporting(0) : error_reporting(E_ALL);
 
 // Should be set to '0' in production
-getenv('ENVIRONMENT') == 'prod' ? ini_set('display_errors', '0') : ini_set('display_errors', '1');
+env('ENVIRONMENT') == 'prod' ? ini_set('display_errors', '0') : ini_set('display_errors', '1');
 
 // Timezone
 date_default_timezone_set('Europe/Rome');
@@ -22,7 +21,7 @@
 $settings['template'] = $settings['root'] . '/templates';
 
 // Error Handling Middleware settings
-if (getenv('ENVIRONMENT') == 'dev') {
+if (env('ENVIRONMENT') == 'dev') {
     $settings['error'] = [
 
         // Should be set to false in production
@@ -55,10 +54,10 @@
 // Database settings
 $settings['db'] = [
     'driver' => \Cake\Database\Driver\Mysql::class,
-    'host' => getenv('DB_HOST'),
-    'username' => getenv('DB_USER'),
-    'database' => getenv('DB_NAME'),
-    'password' => getenv('DB_PASS'),
+    'host' => env('DB_HOST'),
+    'username' => env('DB_USER'),
+    'database' => env('DB_NAME'),
+    'password' => env('DB_PASS'),
     // Enable identifier quoting
     'quoteIdentifiers' => true,
     // Set to null to use MySQL servers timezone
@@ -99,11 +98,11 @@
     'environments' => [
         'local' => [
             'adapter' => 'mysql',
-            'host' => getenv('DB_HOST'),
+            'host' => env('DB_HOST'),
             'port' => 3306,
-            'username' => getenv('DB_USER'),
-            'password' => getenv('DB_PASS'),
-            'db_name' => getenv('DB_NAME'),
+            'username' => env('DB_USER'),
+            'password' => env('DB_PASS'),
+            'db_name' => env('DB_NAME'),
             'charset' => 'utf8',
         ],
     ],
@@ -146,11 +145,11 @@
 // E-Mail settings
 $settings['smtp'] = [
     // use 'null' for the null adapter
-    'type' => getenv('MAIL_TYPE'),
-    'host' => getenv('MAIL_SMTP'),
-    'port' => getenv('MAIL_PORT'),
-    'username' => getenv('MAIL_USER'),
-    'password' => getenv('MAIL_PASS'),
+    'type' => env('MAIL_TYPE'),
+    'host' => env('MAIL_SMTP'),
+    'port' => env('MAIL_PORT'),
+    'username' => env('MAIL_USER'),
+    'password' => env('MAIL_PASS'),
 ];
 
 $settings['jwt'] = [

public/app-assets/js/scripts/pages/modal-edit-smartbox.js

@@ -57,8 +57,8 @@ dtUserTable = $("#tbl_trattamento_farmacologico").DataTable({
         columns: [
             // columns according to JSON
             { data: 'id' },
-            { data: 'principio_attivo' },
-            { data: 'descrizione_gruppo' },
+            { data: 'active_principle' },
+            { data: 'group_description' },
             { data: '' }
         ],
         columnDefs: [