js refactor

Leantime · Dec 2, 2024 · ace344f · ace344f
1 parent 3b8ecbf
commit ace344f
Show file tree

Hide file tree

Showing 15 changed files with 500 additions and 494 deletions.
diff --git a/.babelrc b/.babelrc
diff --git a/app/Domain/Calendar/Js/calendarController.js → ...Domain/Calendar/Js/calendarController.mjs b/app/Domain/Calendar/Js/calendarController.js → ...Domain/Calendar/Js/calendarController.mjs
@@ -571,3 +571,5 @@ export const calendarController = {
     initEventDatepickers: initEventDatepickers,
     initWidgetCalendar: initWidgetCalendar
 };
+
+export default calendarController;
diff --git a/app/Domain/Calendar/Templates/showMyCalendar.blade.php b/app/Domain/Calendar/Templates/showMyCalendar.blade.php
@@ -130,48 +130,46 @@ class="right"
 
 <script type="module">
 
-    import "@mix('js/Domain/Calendar/Js/calendarController.js')";
-
-    jQuery(document).ready(function() {
-
-        var eventSources = [];
-
-        var events = {events: [
-                    <?php foreach ($tpl->get('calendar') as $calendar) : ?>
-                {
-                    title: <?php echo json_encode($calendar['title']); ?>,
-
-                    start: new Date(<?php echo format($calendar['dateFrom'])->jsTimestamp() ?>),
-                        <?php if (isset($calendar['dateTo'])) : ?>
-                    end: new Date(<?php echo format($calendar['dateTo'])->jsTimestamp() ?>),
-                    <?php endif; ?>
-                        <?php if ((isset($calendar['allDay']) && $calendar['allDay'] === true)) : ?>
-                    allDay: true,
-                    <?php else : ?>
-                    allDay: false,
-                    <?php endif; ?>
-                    entityId: <?php echo $calendar['id'] ?>,
-                        <?php if (isset($calendar['eventType']) && $calendar['eventType'] == 'calendar') : ?>
-                    url: '<?=CURRENT_URL ?>#/calendar/editEvent/<?php echo $calendar['id'] ?>',
-                    backgroundColor: '<?= $calendar['backgroundColor'] ?? "var(--accent2)" ?>',
-                    borderColor: '<?= $calendar['borderColor'] ?? "var(--accent2)" ?>',
-                    entityType: "event",
-                    <?php else : ?>
-                    url: '<?=CURRENT_URL ?>#/tickets/showTicket/<?php echo $calendar['id'] ?>?projectId=<?php echo $calendar['projectId'] ?>',
-                    backgroundColor: '<?= $calendar['backgroundColor'] ?? "var(--accent2)" ?>',
-                    borderColor: '<?= $calendar['borderColor'] ?? "var(--accent2)" ?>',
-                    entityType: "ticket",
-                    <?php endif; ?>
-                },
-                <?php endforeach; ?>
-            ]};
-
-        eventSources.push(events);
-
-        <?php
-        $externalCalendars = $tpl->get("externalCalendars");
-
-        foreach ($externalCalendars as $externalCalendar) { ?>
+    leantime.moduleLoader.load("@mix('js/Domain/Calendar/Js/calendarController')").then(function(module){
+
+            var eventSources = [];
+
+            var events = {events: [
+                        <?php foreach ($tpl->get('calendar') as $calendar) : ?>
+                    {
+                        title: <?php echo json_encode($calendar['title']); ?>,
+
+                        start: new Date(<?php echo format($calendar['dateFrom'])->jsTimestamp() ?>),
+                            <?php if (isset($calendar['dateTo'])) : ?>
+                        end: new Date(<?php echo format($calendar['dateTo'])->jsTimestamp() ?>),
+                        <?php endif; ?>
+                            <?php if ((isset($calendar['allDay']) && $calendar['allDay'] === true)) : ?>
+                        allDay: true,
+                        <?php else : ?>
+                        allDay: false,
+                        <?php endif; ?>
+                        entityId: <?php echo $calendar['id'] ?>,
+                            <?php if (isset($calendar['eventType']) && $calendar['eventType'] == 'calendar') : ?>
+                        url: '<?=CURRENT_URL ?>#/calendar/editEvent/<?php echo $calendar['id'] ?>',
+                        backgroundColor: '<?= $calendar['backgroundColor'] ?? "var(--accent2)" ?>',
+                        borderColor: '<?= $calendar['borderColor'] ?? "var(--accent2)" ?>',
+                        entityType: "event",
+                        <?php else : ?>
+                        url: '<?=CURRENT_URL ?>#/tickets/showTicket/<?php echo $calendar['id'] ?>?projectId=<?php echo $calendar['projectId'] ?>',
+                        backgroundColor: '<?= $calendar['backgroundColor'] ?? "var(--accent2)" ?>',
+                        borderColor: '<?= $calendar['borderColor'] ?? "var(--accent2)" ?>',
+                        entityType: "ticket",
+                        <?php endif; ?>
+                    },
+                    <?php endforeach; ?>
+                ]};
+
+            eventSources.push(events);
+
+            <?php
+            $externalCalendars = $tpl->get("externalCalendars");
+
+            foreach ($externalCalendars as $externalCalendar) { ?>
             eventSources.push(
                 {
                     url: '{{ BASE_URL }}/calendar/externalCal/<?=$externalCalendar['id'] ?>',
@@ -181,16 +179,14 @@ class="right"
                 }
             );
 
-        <?php } ?>
-
+            <?php } ?>
 
             calendarController.initShowMyCalendar(
                 document.getElementById('calendar'),
                 eventSources,
                 '<?=session("usersettings.submenuToggle.myCalendarView") ?>'
             );
-        });
-
+    });
 
 </script>
 

diff --git a/app/Domain/Dashboard/Templates/home.blade.php b/app/Domain/Dashboard/Templates/home.blade.php
@@ -38,23 +38,19 @@
 
 <script type="module">
 
-@dispatchEvent('scripts.afterOpen')
+    leantime.moduleLoader.load("@mix('/js/Domain/Widgets/Js/widgetController')").then(()=>
+        widgetController.initGrid()
+    );
 
-import "@mix('/js/Domain/Widgets/Js/widgetController.js')"
-import "@mix('/js/Domain/Help/Js/helperController.js')"
-
-
-jQuery(document).ready(function() {
-
-    widgetController.initGrid();
 
     @if($completedOnboarding === false)
-        helperController.firstLoginModal();
+        leantime.moduleLoader.load("@mix('/js/Domain/Help/Js/helperController')").then(()=>
+            helperController.firstLoginModal()
+        );
     @endif
 
     @php(session(["usersettings.modals.homeDashboardTour" => 1]));
 
-});
 </script>
 
 @endsection
diff --git a/app/Domain/Menu/Templates/includes/projectSelector.blade.php b/app/Domain/Menu/Templates/includes/projectSelector.blade.php
@@ -20,7 +20,7 @@ class="bigProjectSelector {{ $menuType == 'project' ? 'active' : '' }}"
         <i class="fa fa-caret-down" aria-hidden="true"></i>
     </x-slot:labelText>
     <x-slot:card-content>
-        <div class="projectselector" id="mainProjectSelector">
+        <div class="projectselector w-96 h-fit" id="mainProjectSelector">
             @include('menu::includes.projectSelectorDropdown', [])
         </div>
     </x-slot:card-content>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -64,6 +64,7 @@
   },
   "devDependencies": {
     "@babel/eslint-parser": "^7.22.15",
+    "@babel/plugin-proposal-unicode-property-regex": "^7.18.6",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/preset-env": "^7.26.0",
     "@tailwindcss/nesting": "^0.0.0-insiders.565cd3e",