Merge branch 'restructure-core' into refactor-repositories

forkcms · Jun 2, 2021 · 2e470cd · 2e470cd
2 parents 81f00da + f562a81
commit 2e470cd
Show file tree

Hide file tree

Showing 168 changed files with 2,770 additions and 2,120 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -6,7 +6,7 @@ jobs:
     phpunit:
         runs-on: ubuntu-latest
         strategy:
-            fail-fast: true
+            fail-fast: false
             matrix:
                 php: [7.4, 8.0]
                 testsuite: ["functional", "unit", "installer"]

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -12,8 +12,9 @@
     "@editorjs/header": "^2.3.1",
     "@editorjs/list": "^1.4.0",
     "@editorjs/paragraph": "^2.6.0",
+    "@popperjs/core": "^2.6.0",
     "@symfony/webpack-encore": "^0.30.2",
-    "bootstrap": "^4.4.1",
+    "bootstrap": "^5.0.1",
     "bootstrap-datepicker": "^1.9.0",
     "bootstrap-sass": ">=3.4.1",
     "bootstrap-tagsinput": "https://github.com/mathiashelin/bootstrap-tagsinput.git",
@@ -33,7 +34,6 @@
     "node-sass": "^4.14.1",
     "optimize-css-assets-webpack-plugin": "^5.0.3",
     "photoswipe": "^4.1.1",
-    "popper.js": "^1.16.0",
     "postcss-clean": "^1.1.0",
     "postcss-cssnext": "^3.1.0",
     "postcss-import": "^12.0.1",

diff --git a/postcss.config.js b/postcss.config.js
@@ -2,7 +2,12 @@ module.exports = {
   plugins: {
     'postcss-import': {},
     'postcss-cssnext': {
-      browsers: ['last 2 versions']
+      browsers: ['last 2 versions'],
+      features: {
+        customProperties: {
+          warnings: false
+        }
+      }
     },
     'postcss-clean': {
       level: 2

diff --git a/src/Backend/Core/Engine/DataGrid.php b/src/Backend/Core/Engine/DataGrid.php
@@ -495,11 +495,11 @@ public function setMassAction(SpoonFormDropdown $actionDropDown): void
     {
         // build HTML
         $HTML =
-            '<label class="mr-2" for="' . $actionDropDown->getAttribute('id') . '">' .
+            '<label class="me-2" for="' . $actionDropDown->getAttribute('id') . '">' .
             SpoonFilter::ucfirst(BackendLanguage::lbl('WithSelected')) .
             '</label>' .
             $actionDropDown->parse() .
-            '<button type="button" class="btn btn-default btn-sm ml-2 jsMassActionSubmit">' .
+            '<button type="button" class="btn btn-default btn-sm ms-2 jsMassActionSubmit">' .
             '   <span>' . SpoonFilter::ucfirst(BackendLanguage::lbl('Execute')) . '</span>' .
             '</button>';
 

diff --git a/src/Backend/Core/Engine/DataGridFunctions.php b/src/Backend/Core/Engine/DataGridFunctions.php
@@ -131,7 +131,7 @@ public static function getTimeAgo(int $timestamp): string
         // get the time ago as a string
         $timeAgo = SpoonDate::getTimeAgo($timestamp, BackendLanguage::getInterfaceLanguage(), $format);
 
-        return '<time tabindex="0" data-toggle="tooltip" datetime="'
+        return '<time tabindex="0" data-bs-toggle="tooltip" datetime="'
                . SpoonDate::getDate('Y-m-d H:i:s', $timestamp)
                . '" title="' . SpoonDate::getDate($format, $timestamp, BackendLanguage::getInterfaceLanguage())
                . '">' . $timeAgo . '</time>';

diff --git a/src/Backend/Core/Engine/Form.php b/src/Backend/Core/Engine/Form.php
@@ -102,7 +102,7 @@ public function addEditor($name, $value = null, $class = null, $classError = nul
     public function addFile($name, $class = null, $classError = null): SpoonFormFile
     {
         $name = (string) $name;
-        $class = (string) ($class ?? 'custom-file-input');
+        $class = (string) ($class ?? 'form-control');
         $classError = (string) ($classError ?? 'error form-control-danger is-invalid');
 
         // add element
@@ -123,7 +123,7 @@ public function addFile($name, $class = null, $classError = null): SpoonFormFile
     public function addImage($name, $class = null, $classError = null): FormImage
     {
         $name = (string) $name;
-        $class = (string) ($class ?? 'custom-file-input');
+        $class = (string) ($class ?? 'form-control');
         $classError = (string) ($classError ?? 'error form-control-danger is-invalid');
 
         // add element

diff --git a/src/Backend/Core/Installer/Data/locale.xml b/src/Backend/Core/Installer/Data/locale.xml
@@ -12979,20 +12979,20 @@
         <translation language="pl"><![CDATA[Nieprawidłowa domena.]]></translation>
       </item>
       <item type="error" name="InvalidEmailPasswordCombination">
-        <translation language="nl"><![CDATA[De combinatie van e-mail en wachtwoord is niet correct. <a href="#" id="forgotPasswordLink" rel="forgotPasswordHolder" data-toggle="modal" data-target="#forgotPasswordHolder">Bent u uw wachtwoord vergeten?</a>]]></translation>
-        <translation language="en"><![CDATA[Your e-mail and password combination is incorrect. <a href="#" id="forgotPasswordLink" rel="forgotPasswordHolder" data-toggle="modal" data-target="#forgotPasswordHolder">Did you forget your password?</a>]]></translation>
-        <translation language="hu"><![CDATA[Az e-mail és jelszó kombinációd hibás. <a href="#" id="forgotPasswordLink" rel="forgotPasswordHolder" data-toggle="modal" data-target="#forgotPasswordHolder">Elfelejtetted a jelszavadat?</a>]]></translation>
-        <translation language="it"><![CDATA[La combinazione email password fornita non è corretta. <a href="#" id="forgotPasswordLink" rel="forgotPasswordHolder" data-toggle="modal" data-target="#forgotPasswordHolder">Hai dimenticato la password?</a>]]></translation>
-        <translation language="ru"><![CDATA[Неверная пара логин/пароль. <a href="#" id="forgotPasswordLink" rel="forgotPasswordHolder" data-toggle="modal" data-target="#forgotPasswordHolder">Забыли пароль?</a>]]></translation>
-        <translation language="zh"><![CDATA[你的Email地址或密码输入不正确。Your e-mail and password combination is incorrect. <a href="#" id="forgotPasswordLink" rel="forgotPasswordHolder" data-toggle="modal" data-target="#forgotPasswordHolder">忘记密码？</a>]]></translation>
-        <translation language="fr"><![CDATA[La combinaison e-mail et mot de passe est incorrecte. Your e-mail and password combination is incorrect. <a href="#" id="forgotPasswordLink" rel="forgotPasswordHolder" data-toggle="modal" data-target="#forgotPasswordHolder">Avez-vous oublié votre mot de passe ?</a>]]></translation>
-        <translation language="de"><![CDATA[Diese E-Mail/Passwort-Kombination ist inkorrekt. <a href="#" id="forgotPasswordLink" rel="forgotPasswordHolder" data-toggle="modal" data-target="#forgotPasswordHolder">Hast du dein Passwort vergessen?</a>]]></translation>
-        <translation language="es"><![CDATA[Tu combinación de e-mail y contraseña es incorrecta. <a href="#" id="forgotPasswordLink" rel="forgotPasswordHolder" data-toggle="modal" data-target="#forgotPasswordHolder">¿Olvidaste tu contraseña?</a>]]></translation>
-        <translation language="lt"><![CDATA[Jūsų slaptažodžio ir el.pašto kombinacija neteisinga. <a href="#" id="forgotPasswordLink" rel="forgotPasswordHolder" data-toggle="modal" data-target="#forgotPasswordHolder">Ar pamiršote slaptažodį?</a>]]></translation>
-        <translation language="sv"><![CDATA[Din e-postadress och lösenord kombination är felaktig. <a href="#" id="forgotPasswordLink" rel="forgotPasswordHolder" data-toggle="modal" data-target="#forgotPasswordHolder">Did du forget ditt lösenord?</en>]]></translation>
-        <translation language="el"><![CDATA[Ο συνδυασμός e-mail και κωδικού που δώσατε δεν είναι σωστός. <a href="#" id="forgotPasswordLink" rel="forgotPasswordHolder" data-toggle="modal" data-target="#forgotPasswordHolder">Ξεχάσατε τον κωδικό σας;</a>]]></translation>
-        <translation language="pt"><![CDATA[A combinação e-mail e senha não se encontra correcta. <a href="#" id="forgotPasswordLink" rel="forgotPasswordHolder" data-toggle="modal" data-target="#forgotPasswordHolder">Esqueceu-se da sua senha?</a>]]></translation>
-        <translation language="pl"><![CDATA[Połączenie e-maila i hasła jest nieprawidłowe. <a href="#" id="forgotPasswordLink" rel="forgotPasswordHolder" data-toggle="modal" data-target="#forgotHasłoHasła"> Zapomniałeś hasła? </a>]]></translation>
+        <translation language="nl"><![CDATA[De combinatie van e-mail en wachtwoord is niet correct. <a href="#" id="forgotPasswordLink" rel="forgotPasswordHolder" data-bs-toggle="modal" data-target="#forgotPasswordHolder">Bent u uw wachtwoord vergeten?</a>]]></translation>
+        <translation language="en"><![CDATA[Your e-mail and password combination is incorrect. <a href="#" id="forgotPasswordLink" rel="forgotPasswordHolder" data-bs-toggle="modal" data-target="#forgotPasswordHolder">Did you forget your password?</a>]]></translation>
+        <translation language="hu"><![CDATA[Az e-mail és jelszó kombinációd hibás. <a href="#" id="forgotPasswordLink" rel="forgotPasswordHolder" data-bs-toggle="modal" data-target="#forgotPasswordHolder">Elfelejtetted a jelszavadat?</a>]]></translation>
+        <translation language="it"><![CDATA[La combinazione email password fornita non è corretta. <a href="#" id="forgotPasswordLink" rel="forgotPasswordHolder" data-bs-toggle="modal" data-target="#forgotPasswordHolder">Hai dimenticato la password?</a>]]></translation>
+        <translation language="ru"><![CDATA[Неверная пара логин/пароль. <a href="#" id="forgotPasswordLink" rel="forgotPasswordHolder" data-bs-toggle="modal" data-target="#forgotPasswordHolder">Забыли пароль?</a>]]></translation>
+        <translation language="zh"><![CDATA[你的Email地址或密码输入不正确。Your e-mail and password combination is incorrect. <a href="#" id="forgotPasswordLink" rel="forgotPasswordHolder" data-bs-toggle="modal" data-target="#forgotPasswordHolder">忘记密码？</a>]]></translation>
+        <translation language="fr"><![CDATA[La combinaison e-mail et mot de passe est incorrecte. Your e-mail and password combination is incorrect. <a href="#" id="forgotPasswordLink" rel="forgotPasswordHolder" data-bs-toggle="modal" data-target="#forgotPasswordHolder">Avez-vous oublié votre mot de passe ?</a>]]></translation>
+        <translation language="de"><![CDATA[Diese E-Mail/Passwort-Kombination ist inkorrekt. <a href="#" id="forgotPasswordLink" rel="forgotPasswordHolder" data-bs-toggle="modal" data-target="#forgotPasswordHolder">Hast du dein Passwort vergessen?</a>]]></translation>
+        <translation language="es"><![CDATA[Tu combinación de e-mail y contraseña es incorrecta. <a href="#" id="forgotPasswordLink" rel="forgotPasswordHolder" data-bs-toggle="modal" data-target="#forgotPasswordHolder">¿Olvidaste tu contraseña?</a>]]></translation>
+        <translation language="lt"><![CDATA[Jūsų slaptažodžio ir el.pašto kombinacija neteisinga. <a href="#" id="forgotPasswordLink" rel="forgotPasswordHolder" data-bs-toggle="modal" data-target="#forgotPasswordHolder">Ar pamiršote slaptažodį?</a>]]></translation>
+        <translation language="sv"><![CDATA[Din e-postadress och lösenord kombination är felaktig. <a href="#" id="forgotPasswordLink" rel="forgotPasswordHolder" data-bs-toggle="modal" data-target="#forgotPasswordHolder">Did du forget ditt lösenord?</en>]]></translation>
+        <translation language="el"><![CDATA[Ο συνδυασμός e-mail και κωδικού που δώσατε δεν είναι σωστός. <a href="#" id="forgotPasswordLink" rel="forgotPasswordHolder" data-bs-toggle="modal" data-target="#forgotPasswordHolder">Ξεχάσατε τον κωδικό σας;</a>]]></translation>
+        <translation language="pt"><![CDATA[A combinação e-mail e senha não se encontra correcta. <a href="#" id="forgotPasswordLink" rel="forgotPasswordHolder" data-bs-toggle="modal" data-target="#forgotPasswordHolder">Esqueceu-se da sua senha?</a>]]></translation>
+        <translation language="pl"><![CDATA[Połączenie e-maila i hasła jest nieprawidłowe. <a href="#" id="forgotPasswordLink" rel="forgotPasswordHolder" data-bs-toggle="modal" data-target="#forgotHasłoHasła"> Zapomniałeś hasła? </a>]]></translation>
       </item>
       <item type="error" name="InvalidInteger">
         <translation language="nl"><![CDATA[Ongeldig getal.]]></translation>

diff --git a/src/Backend/Core/Js/Backend.js b/src/Backend/Core/Js/Backend.js
@@ -1,4 +1,5 @@
 // plugins imports
+// You can specify which plugins you need
 import 'bootstrap'
 import 'bootstrap-tagsinput/examples/lib/typeahead.js/dist/typeahead.bundle'
 import 'bootstrap-tagsinput/dist/bootstrap-tagsinput.min'

diff --git a/src/Backend/Core/Js/Components/Forms.js b/src/Backend/Core/Js/Components/Forms.js
@@ -17,15 +17,15 @@ export class Forms {
   }
 
   fileUpload () {
-    $('.custom-file-input').on('change', (event) => {
+    $('.form-control[type="file"]').on('change', (event) => {
       let file = ''
       event = event.originalEvent
 
       for (let i = 0; i < event.target.files.length; i++) {
         file = event.target.files[i]
       }
 
-      $(event.currentTarget).siblings('.custom-file-label').text(file.name)
+      $(event.currentTarget).siblings('.form-label').text(file.name)
     })
   }
 
@@ -51,8 +51,8 @@ export class Forms {
   }
 
   imagePreview () {
-    $('input[type=file]').on('change', () => {
-      const imageField = $(this).get(0)
+    $('input[type=file]').on('change', (event) => {
+      const imageField = event.target
       // make sure we are uploading an image by checking the data attribute
       if (imageField.getAttribute('data-fork-cms-role') === 'image-field' && imageField.files && imageField.files[0]) {
         // get the image preview by matching the image-preview data-id to the ImageField id
@@ -76,7 +76,7 @@ export class Forms {
       const invalidTabId = $invalidField.closest('.tab-pane').attr('id')
 
       // Find the link that corresponds to the pane and have it show
-      $('a[href=#' + invalidTabId + '], [data-target=#' + invalidTabId + ']').tab('show')
+      $('a[href=#' + invalidTabId + '], [data-bs-target=#' + invalidTabId + ']').tab('show')
       $invalidField.focus()
     })
   }

diff --git a/src/Backend/Core/Js/Components/MultiTextBox.js b/src/Backend/Core/Js/Components/MultiTextBox.js
@@ -61,10 +61,10 @@ export class MultiTextBox {
         '<div class="form-group">' +
         '<div class="input-group">' +
         '<input class="form-control dontSubmit" id="addValue-' + id + '" name="addValue-' + id + '" type="text" />' +
-        '<div class="input-group-append"><button id="addButton-' + id + '" class="btn btn-secondary' + (options.showIconOnly ? ' btn-icon-only' : '') + '">' +
+        '<button id="addButton-' + id + '" class="btn btn-secondary' + (options.showIconOnly ? ' btn-icon-only' : '') + '">' +
         '<span class="fas fa-plus-square" aria-hidden="true"></span>' +
-        '<span' + (options.showIconOnly ? ' class="sr-only"' : '') + '>' + options.addLabel + '</span>' +
-        '</button></div>' +
+        '<span' + (options.showIconOnly ? ' class="visually-hidden"' : '') + '>' + options.addLabel + '</span>' +
+        '</button>' +
         '</div>' +
         '</div>' +
         '</div>'
@@ -246,10 +246,10 @@ export class MultiTextBox {
           for (const i in elements) {
             html += '    <div class="form-group"><div class="input-group">' +
               '        <input class="form-control dontSubmit inputField-' + id + '" name="inputField-' + id + '[]" type="text" value="' + elements[i].replace('"', '&quot;') + '" />' +
-              '        <span class="input-group-append"><button class="btn btn-danger deleteButton-' + id + '" data-id="' + i + '" title="' + options.removeLabel + '">' +
+              '        <button class="btn btn-danger deleteButton-' + id + '" data-id="' + i + '" title="' + options.removeLabel + '">' +
               '           <span class="fas fa-trash" aria-hidden="true"></span>' +
               '            <span>' + options.removeLabel + '</span>' +
-              '        </button></span>' +
+              '        </button>' +
               '    </div></div>'
           }
 

diff --git a/src/Backend/Core/Js/Components/PasswordGenerator.js b/src/Backend/Core/Js/Components/PasswordGenerator.js
@@ -8,7 +8,7 @@ export class PasswordGenerator {
 
     // append the button
     $(element).find('input').after(
-      '<span class="input-group-append"><button data-id="' + id + '" class="btn btn-primary" type="button" data-password-generator-button><span>' + StringUtil.ucfirst(window.backend.locale.lbl('Generate')) + '</span></button></span>'
+      '<button data-id="' + id + '" class="btn btn-primary" type="button" data-password-generator-button><span>' + StringUtil.ucfirst(window.backend.locale.lbl('Generate')) + '</span></button>'
     )
 
     $(element).find('[data-password-generator-button]').on('click', (e) => {

diff --git a/src/Backend/Core/Js/Components/Tooltip.js b/src/Backend/Core/Js/Components/Tooltip.js
@@ -1,6 +1,6 @@
 export class Tooltip {
   constructor () {
-    const $tooltip = $('[data-toggle="tooltip"]')
+    const $tooltip = $('[data-bs-toggle="tooltip"]')
 
     if ($tooltip.length > 0) {
       $tooltip.tooltip()

diff --git a/src/Backend/Core/Layout/EditorTemplates/imageText.html b/src/Backend/Core/Layout/EditorTemplates/imageText.html
@@ -1,4 +1,4 @@
-<div class="media d-flex"><img class="media-object mr-3"
+<div class="media d-flex"><img class="media-object me-3"
   src="/src/Backend/Core/Layout/EditorTemplates/images/left_aligned_image.gif" style="max-width: 50%;" />
   <div class="media-body"><p>Type the text here</p></div>
 </div>
diff --git a/src/Backend/Core/Layout/EditorTemplates/textImage.html b/src/Backend/Core/Layout/EditorTemplates/textImage.html
@@ -1,4 +1,4 @@
 <div class="media d-flex">
   <div class="media-body"><p>Type the text here</p></div>
-  <img class="media-object ml-3" src="/src/Backend/Core/Layout/EditorTemplates/images/right_aligned_image.gif"
+  <img class="media-object ms-3" src="/src/Backend/Core/Layout/EditorTemplates/images/right_aligned_image.gif"
     style="max-width: 50%;" /></div>