Merge branch 'master' into chamilogh-5377-remove-vuex-1

.env.dist

@@ -1,8 +1,13 @@
 # Set variables here that may be different on each deployment target of the app, e.g. development, staging, production.
 # https://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration
 
-###> doctrine/doctrine-bundle ###
-# Format described at http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
+# Format described at https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
+# IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml
+#
+# DATABASE_URL="sqlite:///%kernel.project_dir%/var/data.db"
+# DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=8.0.32&charset=utf8mb4"
+# DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=10.11.2-MariaDB&charset=utf8mb4"
+# DATABASE_URL="postgresql://app:!ChangeMe!@127.0.0.1:5432/app?serverVersion=16&charset=utf8"
 DATABASE_HOST='{{DATABASE_HOST}}'
 DATABASE_PORT='{{DATABASE_PORT}}'
 DATABASE_NAME='{{DATABASE_NAME}}'

.yarnrc.yml

@@ -1,3 +1,3 @@
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-4.1.0.cjs
+yarnPath: .yarn/releases/yarn-4.1.1.cjs

README.md

@@ -104,7 +104,7 @@ chown -R root .env config/
 If you have already installed it and just want to update it from Git, do:
 ~~~~
 git pull
-composer update
+composer install
 
 # Database update
 php bin/console doctrine:schema:update --force --complete

assets/css/app.scss

@@ -599,6 +599,31 @@ form .field {
   textarea {
     width: 100%;
   }
+
+  .freeze {
+    display: block;
+    padding-top: 10px;
+  }
+
+  .freeze + label,
+  .advmultiselect + label {
+    font-size: 13px;
+    @apply absolute top-0 left-0 text-support-3 text-caption px-1 bg-white text-primary;
+  }
+}
+
+.flatpickr-calendar .flatpickr-validate-btn {
+  margin-top: 10px;
+  width: 100%;
+  padding: 5px;
+  background-color: #569ff7;
+  border: none;
+  cursor: pointer;
+  color: #ffffff;
+}
+
+.mce-translatehtml, span[lang] {
+  display: none;
 }
 
 //@import 'primevue-md-light-indigo/theme.css';

assets/css/document.css

@@ -1,4 +1,8 @@
 /** CSS that will be included when loading an HTML in the Document tool */
 .hidden {
     display: none;
-}
+}
+
+.mce-translatehtml, span[lang] {
+    display: none;
+}

assets/css/scorm.scss

@@ -444,6 +444,7 @@ body {
 
 .icon-toolbar .fa:hover,
 .icon-toolbar .mdi:hover {
+  color: #666666;
 }
 
 .expand .fa,

assets/css/scss/_admin_index.scss

@@ -10,3 +10,21 @@
     @apply border-none border-0 m-0 p-0 w-full;
   }
 }
+
+.admin-colors {
+  &__container {
+    @apply flex flex-col md:flex-row gap-4 mt-6;
+  }
+
+  &__settings {
+    @apply space-y-4 flex-1;
+
+    .row-group {
+      @apply flex flex-col gap-4 items-start md:items-end md:grid md:grid-cols-1 lg:grid-cols-2 xl:grid-cols-3;
+    }
+  }
+
+  &__preview {
+    @apply space-y-4 flex-1;
+  }
+}

assets/css/scss/atoms/_dropdown.scss

@@ -1,93 +1,71 @@
 .p-dropdown, .p-multiselect {
-  @apply border border-support-3 bg-white rounded-lg transition w-full duration-200
+  @apply inline-flex cursor-pointer relative select-none
+      border border-support-3 bg-white rounded-lg transition w-full duration-200
     hover:border-primary hover:text-gray-90 hover:outline-0 hover:outline-none;
 
-  &.p-dropdown-clearable {
-    .p-dropdown-label {
-      //padding-right: nth($inputPadding, 2) + $primeIconFontSize;
-    }
+  .p-dropdown-panel, .p-autocomplete-panel, .p-multiselect-panel {
+    @apply min-w-full;
   }
 
-  .p-dropdown-label, .p-multiselect-label {
-    @apply bg-transparent border-none
-      focus:outline-0 focus:outline-none;
-
-    &.p-placeholder {
-      //color: $inputPlaceholderTextColor;
-    }
+  &.p-invalid.p-component {
+    @apply border-error text-error;
   }
+}
 
-  .p-dropdown-trigger {
-    @apply bg-transparent rounded-r-lg w-12;
-  }
+.p-dropdown-clear-icon {
+  @apply absolute top-1/2 -mt-2;
+}
 
-  .p-dropdown-clear-icon {
-  }
+.p-dropdown-trigger {
+  @apply flex items-center justify-center flex-shrink-0
+      bg-transparent rounded-r-lg w-9;
+}
 
-  &.p-invalid.p-component {
-    @apply border-error text-error;
-  }
+.p-dropdown-label, .p-multiselect-label {
+  @apply block whitespace-nowrap overflow-hidden flex-1 w-[1%] overflow-ellipsis cursor-pointer
+      bg-transparent border-none
+    focus:outline-0 focus:outline-none;
 }
 
-.p-dropdown-panel, .p-autocomplete-panel, .p-multiselect-panel {
-  @apply bg-white rounded-lg text-gray-90 shadow-lg;
-
-  .p-dropdown-header {
-    //padding: $inputListHeaderPadding;
-    //border-bottom: $inputListHeaderBorder;
-    //color: $inputListHeaderTextColor;
-    //background: $inputOverlayHeaderBg;
-    //margin: $inputListHeaderMargin;
-    //border-top-right-radius: $borderRadius;
-    //border-top-left-radius: $borderRadius;
-
-    .p-dropdown-filter {
-      //padding-right: nth($inputPadding, 2) + $primeIconFontSize;
-      //margin-right: -1 * (nth($inputPadding, 2) + $primeIconFontSize);
-    }
+.p-dropdown-label-empty {
+  @apply overflow-hidden opacity-0;
+}
 
-    .p-dropdown-filter-icon {
-      //right: nth($inputPadding, 2);
-      //color: $inputIconColor;
-    }
-  }
+.p-dropdown-panel, .p-autocomplete-panel, .p-multiselect-panel {
+  @apply absolute min-w-full top-2 left-0
+    bg-white rounded-lg text-gray-90 drop-shadow-lg;
 
   .p-dropdown-items {
-    @apply py-1.5;
+    @apply rounded-lg
+      after:content-[""] after:w-full after:block after:h-3 after:sticky after:bg-white after:z-[2] after:bottom-0 after:rounded-b-lg
+      before:content-[""] before:w-full before:block before:h-3 before:sticky before:bg-white before:z-[2] before:top-0 before:rounded-b-lg;
 
     .p-dropdown-item {
       @apply px-4 py-2 transition text-body-2 outline-0 outline-none text-gray-90;
 
       &.p-highlight {
-        @apply bg-support-3 text-support-4;
-
-        &.p-focus {
-        }
+        @apply bg-support-3 text-primary;
       }
 
-      &:not(.p-highlight):not(.p-disabled) {
-        &.p-focus,
-        &:hover {
-          @apply bg-support-1;
-        }
+      &.p-focus {
+        @apply text-primary;
       }
     }
+  }
+}
 
-    .p-dropdown-item-group {
-      //margin: $submenuHeaderMargin;
-      //padding: $submenuHeaderPadding;
-      //color: $submenuHeaderTextColor;
-      //background: $submenuHeaderBg;
-      //font-weight: $submenuHeaderFontWeight;
-    }
+.p-dropdown-items-wrapper {
+  @apply overflow-auto rounded-lg;
+}
 
-    .p-dropdown-empty-message {
-      //padding: $inputListItemPadding;
-      //color: $inputListItemTextColor;
-      //background: $inputListItemBg;
-    }
-  }
+.p-dropdown-item {
+  @apply cursor-pointer whitespace-nowrap relative overflow-hidden flex items-center;
 }
+
+.p-dropdown-items {
+  @apply m-0 p-0 list-none;
+}
+
 .p-multiselect-label-container {
   @apply p-2;
 }

assets/css/scss/atoms/_form.scss

@@ -69,25 +69,25 @@
 }
 
 .p-float-label {
+  @apply block relative;
+
   label {
-    @apply left-4 text-support-3 bg-transparent transition-all duration-200;
+    @apply absolute top-1/2 -mt-2 pointer-events-none leading-none left-4 text-support-3 bg-transparent transition-all duration-200;
   }
 
-  input:focus,
-  input.p-filled,
-  .html-editor-container,
-  textarea:focus,
-  textarea.p-filled,
-  textarea,
-  .p-inputwrapper-focus,
-  .p-inputwrapper-filled {
-    ~ label {
-      @apply bg-white px-1 text-primary top-0 left-2 text-caption;
-      top: 0 !important;
-    }
+  &:has(input:focus) label,
+  &:has(input.p-filled) label,
+  &:has(input:-webkit-autofill) label,
+  &:has(textarea:focus) label,
+  &:has(textarea.p-filled) label,
+  &:has(.p-inputwrapper-focus) label,
+  &:has(.p-inputwrapper-filled) label,
+  &:has(.tox.tox-tinymce) label {
+    @apply top-0 left-2 text-caption px-1 bg-white text-primary z-[1];
   }
 
-  .html-editor-container > div {
+  .html-editor-container > div,
+  .tox.tox-tinymce {
     @apply pt-2 border-support-3 rounded-lg;
   }
 

assets/css/scss/atoms/_input_switch.scss

@@ -2,12 +2,11 @@
   @apply align-middle h-4 w-8;
 
   .p-inputswitch-input {
-    @apply appearance-none absolute top-0 left-0 w-full h-full p-0 m-0 opacity-0 outline-0 outline-none;
-    z-index: 1;
+    @apply appearance-none absolute top-0 left-0 w-full h-full p-0 m-0 opacity-0  z-[1] outline-0 outline-none rounded-full;
   }
 
   .p-inputswitch-slider {
-    @apply bg-gray-30 rounded-full transition-none
+    @apply bg-gray-30 rounded-full transition-none outline-transparent
       before:bg-white before:duration-200 before:h-3 before:left-0.5 before:-mt-1.5 before:rounded-full before:w-3;
   }
 
@@ -36,3 +35,13 @@
     @apply border-error;
   }
 }
+
+.p-inputswitch-input {
+  @apply cursor-pointer;
+}
+
+.p-inputswitch-slider {
+  @apply absolute cursor-pointer top-0 left-0 right-0 bottom-0 border border-transparent
+    before:absolute before:content-[""] before:top-1/2;
+}
+

assets/css/scss/atoms/_input_text.scss

@@ -1,8 +1,8 @@
 .p-inputtext {
-  @apply border border-support-3 px-4 py-3 text-body-2 bg-white rounded-lg text-gray-90 transition w-full duration-200
-    placeholder:text-support-3
-    hover:border-primary hover:text-gray-90 hover:outline-0 hover:outline-none
-    focus:border-primary focus:text-gray-90 hover:outline-0 hover:outline-none;
+  @apply border border-support-3 px-4 py-3 text-body-1 bg-white rounded-lg text-gray-90 transition w-full duration-200
+      placeholder:text-support-3
+    hover:border-primary hover:text-gray-90 hover:outline-0 hover:ring-0
+    focus:border-primary focus:text-gray-90 focus:outline-0 focus:ring-0;
 
   &.p-invalid.p-component {
     @apply border-error
@@ -18,17 +18,32 @@
   }
 }
 
-.p-input-icon-left > i:first-of-type {
-  //left: nth($inputPadding, 2);
-  //color: $inputIconColor;
+.p-icon-field {
+  @apply relative;
+
+  > .p-input-icon {
+    @apply absolute top-1/2 -mt-2;
+  }
 }
 
-.p-input-icon-left > .p-inputtext {
-  //padding-left: nth($inputPadding, 2) * 2 + $primeIconFontSize;
+.p-icon-field-left {
+  > .p-input-icon:first-of-type {
+    @apply left-3 text-primary;
+  }
+
+  > .p-inputtext {
+    @apply pl-9;
+  }
 }
 
-.p-input-icon-left.p-float-label > label {
-  //left: nth($inputPadding, 2) * 2 + $primeIconFontSize;
+.p-icon-field-right {
+  > .p-input-icon:first-of-type {
+    @apply right-3 text-primary;
+  }
+
+  > .p-inputtext {
+    @apply pr-9;
+  }
 }
 
 .p-input-icon-right {
@@ -42,16 +57,10 @@
   }
 }
 
-.p-inputtext-sm {
-  .p-inputtext {
-    //@include scaledFontSize($inputTextFontSize, $scaleSM);
-    //@include scaledPadding($inputPadding, $scaleSM);
-  }
+.p-inputnumber {
+  @apply inline-flex;
 }
 
-.p-inputtext-lg {
-  .p-inputtext {
-    //@include scaledFontSize($inputTextFontSize, $scaleLG);
-    //@include scaledPadding($inputPadding, $scaleLG);
-  }
-}
+.p-inputnumber-input {
+  @apply flex-1;
+}