- added own provider for drive methods

- renamed middleware Role and Can to role_middleware and can_middleware
- added some typing for inertia vue3 components
- npm updates

resources/js/Components/Admin/Pagination.vue

@@ -1,6 +1,5 @@
-<script setup>
+<script lang="ts" setup>
 import { Link } from '@inertiajs/vue3';
-import { stardust } from '@eidellev/adonis-stardust/client';
 import { computed } from 'vue';
 
 const props = defineProps({
@@ -29,17 +28,15 @@ const props = defineProps({
 // null
 // total:
 // 19
-const nextPageLink = computed(() => {
-    let url = new URL(document.location);
-    url.searchParams.set('page', props.data.currentPage + 1);
+const calculateNextPageLink = computed(() => {
+    let url = new URL(document.location.href);
+    url.searchParams.set('page', String(props.data.currentPage + 1));
     return url.href;
-    // return url + '&page=' + (Number(props.data.currentPage) + 1);
 });
-const prevPageLink = computed(() => {
-    let url = new URL(document.location);
-    url.searchParams.set('page', props.data.currentPage - 1);
+const calculatePrevPageLink = computed(() => {
+    let url = new URL(document.location.href);
+    url.searchParams.set('page', String(props.data.currentPage - 1));
     return url.href;
-    // return url + '&page=' + (props.data.currentPage - 1);
 });
 const toPage = computed(() => {
     let currentPage = props.data.currentPage;
@@ -58,54 +55,26 @@ const fromPage = computed(() => {
 });
 </script>
 
-<!-- currentPage:
-1
-firstPage:
-1
-firstPageUrl:
-'/?page=1'
-lastPage:
-3
-lastPageUrl:
-'/?page=3'
-nextPageUrl:
-'/?page=2'
-perPage:
-5
-previousPageUrl:
-null
-total:
-15 -->
-
 <template>
     <!-- <nav v-if="data.links.length > 3" -->
-    <nav v-if="data.total > 3" role="navigation" aria-label="Pagination Navigation" class="flex items-center justify-between">
+    <nav v-if="data.total > 3" role="navigation" aria-label="Pagination Navigation"
+        class="flex items-center justify-between">
         <div class="flex justify-between flex-1 sm:hidden">
-            <span
-                v-if="data.currentPage <= 1"
-                class="relative inline-flex items-center px-4 py-2 text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5 rounded-md"
-            >
+            <span v-if="data.currentPage <= 1"
+                class="relative inline-flex items-center px-4 py-2 text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5 rounded-md">
                 Previous
             </span>
-            <Link
-                v-else
-                :href="data.previousPageUrl"
-                class="relative inline-flex items-center px-4 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 leading-5 rounded-md hover:text-gray-500 focus:outline-none focus:ring ring-gray-300 focus:border-blue-300 active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150"
-            >
-                Previous
+            <Link v-else :href="data.previousPageUrl"
+                class="relative inline-flex items-center px-4 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 leading-5 rounded-md hover:text-gray-500 focus:outline-none focus:ring ring-gray-300 focus:border-blue-300 active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150">
+            Previous
             </Link>
 
-            <Link
-                v-if="data.currentPage < data.lastPage"
-                :href="data.nextPageUrl"
-                class="relative inline-flex items-center px-4 py-2 ml-3 text-sm font-medium text-gray-700 bg-white border border-gray-300 leading-5 rounded-md hover:text-gray-500 focus:outline-none focus:ring ring-gray-300 focus:border-blue-300 active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150"
-            >
-                Next
+            <Link v-if="data.currentPage < data.lastPage" :href="data.nextPageUrl"
+                class="relative inline-flex items-center px-4 py-2 ml-3 text-sm font-medium text-gray-700 bg-white border border-gray-300 leading-5 rounded-md hover:text-gray-500 focus:outline-none focus:ring ring-gray-300 focus:border-blue-300 active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150">
+            Next
             </Link>
-            <span
-                v-else
-                class="relative inline-flex items-center px-4 py-2 ml-3 text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5 rounded-md"
-            >
+            <span v-else
+                class="relative inline-flex items-center px-4 py-2 ml-3 text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5 rounded-md">
                 Next
             </span>
         </div>
@@ -128,33 +97,24 @@ total:
                     <span v-if="props.data.currentPage <= 1" aria-disabled="true" aria-label="Previous">
                         <span
                             class="relative inline-flex items-center px-2 py-2 text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default rounded-l-md leading-5"
-                            aria-hidden="true"
-                        >
+                            aria-hidden="true">
                             <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
-                                <path
-                                    fill-rule="evenodd"
+                                <path fill-rule="evenodd"
                                     d="M12.707 5.293a1 1 0 010 1.414L9.414 10l3.293 3.293a1 1 0 01-1.414 1.414l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 0z"
-                                    clip-rule="evenodd"
-                                />
+                                    clip-rule="evenodd" />
                             </svg>
                         </span>
                     </span>
 
                     <!-- <Link v-else :href="data.previousPageUrl" rel="prev" -->
-                    <Link
-                        v-else
-                        :href="prevPageLink"
-                        rel="prev"
+                    <Link v-else :href="calculatePrevPageLink" rel="prev"
                         class="relative inline-flex items-center px-2 py-2 text-sm font-medium text-gray-500 bg-white border border-gray-300 rounded-l-md leading-5 hover:text-gray-400 focus:z-10 focus:outline-none focus:ring ring-gray-300 focus:border-blue-300 active:bg-gray-100 active:text-gray-500 transition ease-in-out duration-150"
-                        aria-label="Previous"
-                    >
-                        <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
-                            <path
-                                fill-rule="evenodd"
-                                d="M12.707 5.293a1 1 0 010 1.414L9.414 10l3.293 3.293a1 1 0 01-1.414 1.414l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 0z"
-                                clip-rule="evenodd"
-                            />
-                        </svg>
+                        aria-label="Previous">
+                    <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
+                        <path fill-rule="evenodd"
+                            d="M12.707 5.293a1 1 0 010 1.414L9.414 10l3.293 3.293a1 1 0 01-1.414 1.414l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 0z"
+                            clip-rule="evenodd" />
+                    </svg>
                     </Link>
 
                     <!-- <template v-for="(link, key) in data.links">
@@ -169,35 +129,26 @@ total:
 
                             <Link v-else :key="`link-${key}`" :href="link.url" v-html="link.label" class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-700 bg-white border border-gray-300 leading-5 hover:text-gray-500 focus:z-10 focus:outline-none focus:ring ring-gray-300 focus:border-blue-300 active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150" aria-label="`Go to page ${link.label}`" />
                         </template>
-                    </template> -->
+</template> -->
 
-                    <Link
-                        v-if="props.data.currentPage < props.data.lastPage"
-                        :href="nextPageLink"
-                        rel="next"
+                    <Link v-if="props.data.currentPage < props.data.lastPage" :href="calculateNextPageLink" rel="next"
                         class="relative inline-flex items-center px-2 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 rounded-r-md leading-5 hover:text-gray-400 focus:z-10 focus:outline-none focus:ring ring-gray-300 focus:border-blue-300 active:bg-gray-100 active:text-gray-500 transition ease-in-out duration-150"
-                        aria-label="Next"
-                    >
-                        <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
-                            <path
-                                fill-rule="evenodd"
-                                d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z"
-                                clip-rule="evenodd"
-                            />
-                        </svg>
+                        aria-label="Next">
+                    <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
+                        <path fill-rule="evenodd"
+                            d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z"
+                            clip-rule="evenodd" />
+                    </svg>
                     </Link>
                     <!-- else disabled link -->
                     <span v-else aria-disabled="true" aria-label="Next">
                         <span
                             class="relative inline-flex items-center px-2 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default rounded-r-md leading-5"
-                            aria-hidden="true"
-                        >
+                            aria-hidden="true">
                             <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
-                                <path
-                                    fill-rule="evenodd"
+                                <path fill-rule="evenodd"
                                     d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z"
-                                    clip-rule="evenodd"
-                                />
+                                    clip-rule="evenodd" />
                             </svg>
                         </span>
                     </span>

resources/js/Components/AsideMenuItem.vue

@@ -1,9 +1,9 @@
 <script lang="ts" setup>
-import { ref, computed, ComputedRef } from 'vue';
+import { computed, ComputedRef } from 'vue';
 import { Link, usePage } from '@inertiajs/vue3';
 // import { Link } from '@inertiajs/inertia-vue3';
 
-import { StyleService } from '@/Stores/style';
+import { StyleService } from '@/Stores/style.service';
 import { mdiMinus, mdiPlus } from '@mdi/js';
 import { getButtonColor } from '@/colors.js';
 import BaseIcon from '@/Components/BaseIcon.vue';

resources/js/Components/AsideMenuLayer.vue

@@ -5,7 +5,7 @@ import { stardust } from '@eidellev/adonis-stardust/client';
 import { mdiLogout, mdiClose } from '@mdi/js';
 import { computed } from 'vue';
 import { LayoutService } from '@/Stores/layout';
-import { StyleService } from '@/Stores/style';
+import { StyleService } from '@/Stores/style.service';
 import AsideMenuList from '@/Components/AsideMenuList.vue';
 import AsideMenuItem from '@/Components/AsideMenuItem.vue';
 import BaseIcon from '@/Components/BaseIcon.vue';

resources/js/Components/FormValidationErrors.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { computed, defineProps } from 'vue';
+import { computed } from 'vue';
 import { usePage } from '@inertiajs/vue3';
 import NotificationBarInCard from '@/Components/NotificationBarInCard.vue';
 

resources/js/Components/Header.vue

@@ -1,16 +1,16 @@
 <template>
     <div class="bg-slate-100 py-3 px-6 flex justify-between items-center mb-6">
         <div class="flex items-center space-x-6">
-            <h3 class="font-bold">AdonisJS InertiaJS Example</h3>
+            <h3 class="font-bold">TethysCloud Errors</h3>
             <nav class="flex items-center text-sm">
-                <Link href="/app">Home</Link>
+                <Link href="/apps/dashboard">Home</Link>
             </nav>
         </div>
 
-        <div class="flex items-center space-x-6 text-sm">
+        <!-- <div class="flex items-center space-x-6 text-sm">
             <Link href="/app/login">Login</Link>
             <Link href="/app/register">Register</Link>
-        </div>
+        </div> -->
     </div>
 </template>
 

resources/js/Components/Map/Control.ts

@@ -1,6 +1,7 @@
 // import * as util from '../core/utilities';
 import { EventEmitter } from './EventEmitter.js';
-import type { Map } from 'leaflet/src/map/index';
+import type { Map } from 'leaflet/src/map/index.js';
+// import type { Map } from 'leaflet';
 
 export abstract class Control<T> extends EventEmitter<T> {
     // @section
@@ -8,7 +9,7 @@ export abstract class Control<T> extends EventEmitter<T> {
     public options = {
         position: 'topright',
     };
-    protected _map;
+    protected _map: Map;
     protected _container;
 
     // constructor(defaults?) {
@@ -28,7 +29,7 @@ export abstract class Control<T> extends EventEmitter<T> {
         return this._container;
     }
 
-    public abstract onRemove(map): void;
+    public abstract onRemove(map: Map): void;
 
     public abstract onAdd(map: any): HTMLElement;
 
@@ -51,7 +52,7 @@ export abstract class Control<T> extends EventEmitter<T> {
         return this;
     }
 
-    public removeFrom(map) {
+    public removeFrom(map: Map) {
         let pos = this.getPosition();
         let corner = map._controlCorners[pos];
 

resources/js/Components/NavBar.vue

@@ -6,8 +6,7 @@ import { ComputedRef } from 'vue';
 
 import { computed, ref } from 'vue';
 import { containerMaxW } from '@/config.js';
-// import { MainService } from '@/Stores/main.js';
-import { StyleService } from '@/Stores/style';
+import { StyleService } from '@/Stores/style.service';
 import { LayoutService } from '@/Stores/layout';
 import {
     mdiForwardburger,
@@ -15,14 +14,12 @@ import {
     mdiClose,
     mdiDotsVertical,
     mdiMenu,
-    // mdiClockOutline,
     mdiCloudDownloadOutline,
     mdiCloud,
     mdiCrop,
     mdiAccountCog,
     mdiFormatListGroup,
     mdiFormatListNumbered,
-    // mdiEmail,
     mdiLogout,
     mdiGithub,
     mdiThemeLightDark,
@@ -46,9 +43,6 @@ import FirstrunWizard from '@/Components/FirstrunWizard/FirstrunWizard.vue'
 // import SwapHorizontal from 'vue-material-design-icons/SwapHorizontal.vue'
 // import AccountGroup from 'vue-material-design-icons/AccountGroup.vue'
 
-// const mainStore = MainService();
-// const userName = computed(() =>mainStore.userName);
-
 const styleService = StyleService();
 const props = defineProps({
     showBurger: {
@@ -205,4 +199,4 @@ const showAbout = async () => {
             </div>
         </div>
     </nav>
-</template>
+</template>

resources/js/Components/NavBarItem.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { StyleService } from '@/Stores/style';
+import { StyleService } from '@/Stores/style.service';
 // import { Link } from '@inertiajs/vue3'
 import { Link } from '@inertiajs/vue3';
 import { computed } from 'vue';

resources/js/Components/NavBarMenu.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { StyleService } from '@/Stores/style';
+import { StyleService } from '@/Stores/style.service';
 import { computed, ref, onMounted, onBeforeUnmount } from 'vue';
 import { mdiChevronUp, mdiChevronDown } from '@mdi/js';
 import NavBarItem from '@/Components/NavBarItem.vue';
@@ -48,4 +48,4 @@ onBeforeUnmount(() => {
             <slot name="dropdown" />
         </div>
     </NavBarItem>
-</template>
+</template>

resources/js/Components/OverlayLayer.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { StyleService } from '@/Stores/style';
+import { StyleService } from '@/Stores/style.service';
 
 defineProps({
     zIndex: {
@@ -42,4 +42,4 @@ const styleStore = StyleService();
             <slot />
         </transition>
     </div>
-</template>
+</template>

resources/js/Components/SectionFullScreen.vue

@@ -1,6 +1,6 @@
 <script setup>
 import { computed } from 'vue';
-import { StyleService } from '@/Stores/style';
+import { StyleService } from '@/Stores/style.service';
 import { gradientBgPurplePink, gradientBgDark, gradientBgPinkRed, gradientBgGreenBlue } from '@/colors';
 
 const props = defineProps({
@@ -35,4 +35,4 @@ const colorClass = computed(() => {
     <div class="mx-auto md:h-screen flex flex-col justify-center items-center px-6 pt-8 pt:mt-0" :class="colorClass">
         <slot card-class="w-11/12 md:w-7/12 lg:w-6/12 xl:w-4/12 shadow-2xl" />
     </div>
-</template>
+</template>

resources/js/Components/TableKeywords.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed, ref } from 'vue';
 // import { MainService } from '@/Stores/main';
-import { StyleService } from '@/Stores/style';
+import { StyleService } from '@/Stores/style.service';
 import { mdiTrashCan } from '@mdi/js';
 // import CardBoxModal from '@/Components/CardBoxModal.vue';
 // import TableCheckboxCell from '@/Components/TableCheckboxCell.vue';
@@ -204,4 +204,4 @@ const removeItem = (key) => {
 tr:nth-child(od) {    
     background: white;
 } */
-</style>
+</style>

resources/js/Components/TablePersons.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed, ref } from 'vue';
 // import { MainService } from '@/Stores/main';
-import { StyleService } from '@/Stores/style';
+import { StyleService } from '@/Stores/style.service';
 import { mdiTrashCan } from '@mdi/js';
 import { mdiDragVariant } from '@mdi/js';
 import BaseIcon from '@/Components/BaseIcon.vue';
@@ -223,4 +223,4 @@ const removeAuthor = (key) => {
             <small>Page {{ currentPageHuman }} of {{ numPages }}</small>
         </BaseLevel> -->
     </div>
-</template>
+</template>

resources/js/Components/TableSampleClients.vue

@@ -1,7 +1,7 @@
 <script setup>
 import { computed, ref } from 'vue';
 import { MainService } from '@/Stores/main';
-import { StyleService } from '@/Stores/style';
+import { StyleService } from '@/Stores/style.service';
 import { mdiEye, mdiTrashCan } from '@mdi/js';
 import CardBoxModal from '@/Components/CardBoxModal.vue';
 import TableCheckboxCell from '@/Components/TableCheckboxCell.vue';
@@ -143,4 +143,4 @@ const checked = (isChecked, client) => {
             <small>Page {{ currentPageHuman }} of {{ numPages }}</small>
         </BaseLevel>
     </div>
-</template>
+</template>