Merge branch 'main' into 2023-11-07-sort-currency

monicahq · Nov 7, 2023 · 4c762a0 · 4c762a0
2 parents cce4f8e + acc73ed
commit 4c762a0
Show file tree

Hide file tree

Showing 7 changed files with 472 additions and 357 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/public/vendor/telescope/app-dark.css b/public/vendor/telescope/app-dark.css
diff --git a/public/vendor/telescope/app.css b/public/vendor/telescope/app.css
diff --git a/public/vendor/telescope/app.js b/public/vendor/telescope/app.js
diff --git a/public/vendor/telescope/mix-manifest.json b/public/vendor/telescope/mix-manifest.json
@@ -1,5 +1,5 @@
 {
-    "/app.js": "/app.js?id=32e4311235d3e2c0508cd4267558b319",
-    "/app-dark.css": "/app-dark.css?id=a9022d8e130bf3ec3a93350be9bf858e",
-    "/app.css": "/app.css?id=b89676ee10846bfd767c6836074db724"
+    "/app.js": "/app.js?id=140ed4bc5b10bc99492b97668c59272d",
+    "/app-dark.css": "/app-dark.css?id=b11fa9a28e9d3aeb8c92986f319b3c44",
+    "/app.css": "/app.css?id=b3ccfbe68f24cff776f83faa8dead721"
 }
diff --git a/resources/js/Shared/Form/TextArea.vue b/resources/js/Shared/Form/TextArea.vue
@@ -102,12 +102,18 @@ defineExpose({
 </script>
 
 <template>
-  <div class="mb3">
-    <label v-if="label" class="mb-2 block text-sm dark:text-gray-100" :for="id">
+  <div class="mb-3">
+    <label v-if="label" class="mb-2 block relative text-sm dark:text-gray-100" :for="id">
       {{ label }}
       <span v-if="!required" class="optional-badge rounded px-[3px] py-px text-xs">
         {{ $t('optional') }}
       </span>
+
+      <span
+        v-if="maxlength && displayMaxLength"
+        class="length absolute end-0 top-0 rounded px-1 py-[3px] text-xs dark:text-gray-100">
+        {{ charactersLeft }}
+      </span>
     </label>
 
     <div class="relative">
@@ -125,11 +131,6 @@ defineExpose({
         @keydown.esc="sendEscKey"
         @focus="showMaxLength"
         @blur="displayMaxLength = false" />
-      <span
-        v-if="maxlength && displayMaxLength"
-        class="length absolute end-2.5 top-2.5 rounded px-1 py-[3px] text-xs dark:text-gray-100">
-        {{ charactersLeft }}
-      </span>
     </div>
     <p v-if="markdown" class="rounded-b-lg bg-slate-100 px-3 py-2 text-xs dark:bg-slate-900">
       <span>{{ $t('We support Markdown to format the text (bold, lists, headings, etc…).') }}</span>

diff --git a/resources/js/Shared/Modules/Notes.vue b/resources/js/Shared/Modules/Notes.vue
@@ -48,6 +48,7 @@
           :rows="10"
           :required="true"
           :maxlength="65535"
+          :markdown="true"
           :textarea-class="'block w-full mb-3'" />
 
         <!-- title -->
@@ -184,6 +185,7 @@
               :rows="10"
               :required="true"
               :maxlength="65535"
+              :markdown="true"
               :textarea-class="'block w-full mb-3'" />
 
             <!-- title -->