From 630672e87ece0bd18193d4472a83046eaebca064 Mon Sep 17 00:00:00 2001
From: Tony Air <tony@twma.pro>
Date: Mon, 22 Apr 2024 15:02:31 +0200
Subject: [PATCH] UPD: Minor edits

---
 .env.dist                              | 15 ++++++++++++++-
 app/_config.php                        |  5 +++++
 app/_config/templates-requirements.yml |  4 ++--
 env-dist                               |  3 ---
 public/index.php                       |  2 --
 5 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/.env.dist b/.env.dist
index ba3f115..b0ec2f3 100755
--- a/.env.dist
+++ b/.env.dist
@@ -6,4 +6,17 @@ SS_DATABASE_NAME=''
 SS_DEFAULT_ADMIN_USERNAME=''
 SS_DEFAULT_ADMIN_PASSWORD=''
 
-SS_ENVIRONMENT_TYPE='dev'
\ No newline at end of file
+SS_ENVIRONMENT_TYPE='dev'
+
+
+NOCAPTCHA_SITE_KEY=''
+NOCAPTCHA_SECRET_KEY=''
+
+TURNSTILE_SITE_KEY=''
+TURNSTILE_SECRET_KEY=''
+
+GOOGLEMAPS_API_KEY=''
+MAPBOX_API_KEY=''
+
+APP_SMTP_USERNAME=''
+APP_SMTP_PASSWORD=''
diff --git a/app/_config.php b/app/_config.php
index c2dc805..6960402 100644
--- a/app/_config.php
+++ b/app/_config.php
@@ -1,5 +1,10 @@
 <?php
 
+use SilverStripe\Core\EnvironmentLoader;
+
+$env = BASE_PATH . '/app/.env';
+$loader = new EnvironmentLoader();
+$loader->loadFile($env);
 /*\SilverStripe\Core\Config\Config::modify()->set(
     \SilverStripe\Control\Email\Email::class,
     'bcc_all_emails_to',//'cc_all_emails_to',
diff --git a/app/_config/templates-requirements.yml b/app/_config/templates-requirements.yml
index 2ba9095..2b34975 100644
--- a/app/_config/templates-requirements.yml
+++ b/app/_config/templates-requirements.yml
@@ -10,11 +10,11 @@ A2nt\CMSNiceties\Templates\DeferredRequirements:
   deferred: true
   noreact: true
   nojquery: true
-  jquery_version: '`JQUERY_VER`'
+  jquery_version: '3.7.1'
   fontawesome_svg: false
 
 SilverStripe\FontAwesome\FontAwesomeField:
-  version: '`FONTAWESOME_VER`'
+  version: '6.5.1'
 
 SilverStripe\View\Requirements:
   disable_flush_combined: true
diff --git a/env-dist b/env-dist
index 4668134..b410570 100644
--- a/env-dist
+++ b/env-dist
@@ -19,6 +19,3 @@ MAPBOX_API_KEY=''
 
 APP_SMTP_USERNAME=''
 APP_SMTP_PASSWORD=''
-
-FONTAWESOME_VER='6.5.1'
-JQUERY_VER='3.4.1'
diff --git a/public/index.php b/public/index.php
index bd24b7a..5ee1af1 100755
--- a/public/index.php
+++ b/public/index.php
@@ -3,7 +3,6 @@
 use SilverStripe\Control\HTTPApplication;
 use SilverStripe\Control\HTTPRequestBuilder;
 use SilverStripe\Core\CoreKernel;
-use SilverStripe\Core\Startup\ErrorControlChainMiddleware;
 
 // Find autoload.php
 if (file_exists(__DIR__ . '/../vendor/autoload.php')) {
@@ -22,6 +21,5 @@ $request = HTTPRequestBuilder::createFromEnvironment();
 // Default application
 $kernel = new CoreKernel(BASE_PATH);
 $app = new HTTPApplication($kernel);
-$app->addMiddleware(new ErrorControlChainMiddleware($app));
 $response = $app->handle($request);
 $response->output();