- [x] svg icon fix

- [x] capitalize user list dropdown - [x] date range widget pos fix - [x] no data component shdow added
younginnovations · Jul 12, 2023 · ad90356 · ad90356
1 parent 378c5e5
commit ad90356
Show file tree

Hide file tree

Showing 8 changed files with 399 additions and 389 deletions.
diff --git a/public/css/app.css b/public/css/app.css
diff --git a/public/js/app.js b/public/js/app.js
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,10 +1,10 @@
 {
-    "/js/app.js": "/js/app.js",
-    "/js/script.js": "/js/script.js",
-    "/js/webportal-script.js": "/js/webportal-script.js",
-    "/js/formbuilder.js": "/js/formbuilder.js",
-    "/manifest.js": "/manifest.js",
-    "/css/webportal-app.css": "/css/webportal-app.css",
-    "/css/app.css": "/css/app.css",
-    "/js/vendor.js": "/js/vendor.js"
+    "/js/app.js": "/js/app.js?id=0af3cb557ba008aede3c46d881ce8009",
+    "/js/script.js": "/js/script.js?id=4920eb85d84da1e87cb71769c04a12a2",
+    "/js/webportal-script.js": "/js/webportal-script.js?id=f9c23d4bccd261db9414465886315f45",
+    "/js/formbuilder.js": "/js/formbuilder.js?id=96f1b9dd5890b8ff09e613117dd94592",
+    "/manifest.js": "/manifest.js?id=3ed1124c8f4dcb98acc36de67cb80349",
+    "/css/webportal-app.css": "/css/webportal-app.css?id=4ac55927166e1d6989c6de4793690877",
+    "/css/app.css": "/css/app.css?id=0082c6439edd61c25d3759b69af30e94",
+    "/js/vendor.js": "/js/vendor.js?id=f9ea589d654a205711a655b5c2811269"
 }
diff --git a/resources/assets/images/svg/tick-outline.svg b/resources/assets/images/svg/tick-outline.svg
diff --git a/resources/assets/js/components/DateRangeWidget.vue b/resources/assets/js/components/DateRangeWidget.vue
@@ -427,16 +427,17 @@ const setSelectedPresentDayText = () => {
 };
 
 const customPosition = () => {
+  let leftPosition = 0;
+  if (dateRangeMain.value) {
+    leftPosition =
+      window.innerWidth - dateRangeMain.value?.getBoundingClientRect()?.right >
+      150
+        ? Number(dateRangeMain.value?.getBoundingClientRect().right) - 300
+        : Number(dateRangeMain.value?.getBoundingClientRect().right) - 420;
+  }
   return {
     top: Number(dateRangeMain.value?.getBoundingClientRect().bottom) + 20,
-    left: dateRangeMain.value
-      ? Number(dateRangeMain.value?.getBoundingClientRect().left) +
-        (window.innerWidth -
-          dateRangeMain.value?.getBoundingClientRect()?.right >
-        150
-          ? 140
-          : -90)
-      : 0,
+    left: leftPosition,
   };
 };
 

diff --git a/resources/assets/js/views/dashboard/DashboardListSection.vue b/resources/assets/js/views/dashboard/DashboardListSection.vue
@@ -688,6 +688,7 @@
                 currentView === 'publisher' &&
                 !Object.keys(completeNess).length
               "
+              class="text-center shadow-md"
             >
               <div class="p-10 text-center">No data found</div>
             </tbody>
@@ -699,6 +700,7 @@
                 !registrationType.length &&
                 currentView === 'publisher'
               "
+              class="text-center shadow-md"
             >
               <div class="p-10 text-center">No data found</div>
             </tbody>

diff --git a/resources/assets/js/views/user/UserListing.vue b/resources/assets/js/views/user/UserListing.vue
@@ -337,6 +337,16 @@
         <div
           class="flex h-[38px] w-full items-center justify-end gap-3 space-x-2 px-4 2xl:w-auto"
         >
+          <span>
+            <DateRangeWidget
+              :dropdown-range="dropdownRange"
+              :first-date="oldestDates"
+              :clear-date="clearDate"
+              @trigger-set-date-range="setDateRangeDate"
+              @trigger-set-date-type="setDateType"
+              @date-cleared="clearDate = false"
+            />
+          </span>
           <div class="open-text h-[38px]">
             <svg-vue
               class="absolute top-1/2 left-2 w-10 -translate-y-1/2 text-base"
@@ -348,17 +358,6 @@
               placeholder="Search for users"
             />
           </div>
-          <!-- need to add oldest date -->
-          <span>
-            <DateRangeWidget
-              :dropdown-range="dropdownRange"
-              :first-date="oldestDates"
-              :clear-date="clearDate"
-              @trigger-set-date-range="setDateRangeDate"
-              @trigger-set-date-type="setDateType"
-              @date-cleared="clearDate = false"
-            />
-          </span>
         </div>
       </div>
 
@@ -583,20 +582,20 @@
                   </p>
                 </div>
               </td>
-              <td class="flex justify-between">
-                <span class="... truncate">
-                  {{ user['email'] }}
-                </span>
+              <td class="flex space-x-2">
                 <span class="ms-1">
                   <svg-vue
-                    class="mt-1 cursor-pointer text-base text-[16px]"
+                    class="mt-1 cursor-pointer text-base"
                     :icon="
                       user['email_verified_at']
                         ? 'tick-outline'
                         : 'alert-outline'
                     "
                   />
                 </span>
+                <span class="... truncate">
+                  {{ user['email'] }}
+                </span>
               </td>
               <td v-if="userRole === 'superadmin' || userRole === 'iati_admin'">
                 <div class="ellipsis relative">

diff --git a/resources/assets/sass/vendor-overrides/multiselect.scss b/resources/assets/sass/vendor-overrides/multiselect.scss
@@ -21,6 +21,7 @@
 }
 .multiselect-search {
   cursor: pointer !important;
+  text-transform: uppercase !important;
 }
 .multiselect-multiple-label {
   position: relative;