Merge pull request #29 from NethServer/remove-old-lib-dependency

package.json

@@ -47,8 +47,7 @@
   },
   "dependencies": {
     "@headlessui/vue": "^1.7.16",
-    "@nethesis/vue-components": "^0.4.0",
-    "@nethserver/vue-tailwind-lib": "^0.1.1",
+    "@nethesis/vue-components": "^0.16.0",
     "axios": "^1.6.2",
     "pinia": "^2.1.7",
     "vue": "^3.3.7"

src/assets/main.css

@@ -6,10 +6,14 @@
 
 @layer base {
   html {
-    @apply overflow-x-hidden text-gray-900 dark:text-gray-50;
+    @apply overflow-x-hidden;
   }
 }
 
+body {
+  @apply bg-gray-50 text-sm text-gray-700 dark:bg-gray-900 dark:text-gray-100;
+}
+
 .h1 {
   @apply text-2xl font-medium;
 }

src/components/CreateGroupDrawer.vue

@@ -7,7 +7,7 @@ import {
   type NeComboboxOption,
   NeSkeleton,
   NeTextInput
-} from '@nethserver/vue-tailwind-lib'
+} from '@nethesis/vue-components'
 import { useUsers } from '@/composables/useUsers'
 import axios from 'axios'
 

src/components/CreateUserDrawer.vue

@@ -1,14 +1,15 @@
 <script lang="ts" setup>
 import SideDrawer from '@/components/SideDrawer.vue'
 import {
+  NeInlineNotification,
+  NeSkeleton,
   NeButton,
   NeCombobox,
   type NeComboboxOption,
   NeFormItemLabel,
   NeTextInput,
   NeToggle
-} from '@nethserver/vue-tailwind-lib'
-import { NeInlineNotification, NeSkeleton } from '@nethesis/vue-components'
+} from '@nethesis/vue-components'
 import { computed, ref, watch } from 'vue'
 import axios from 'axios'
 import type { BaseResponse } from '@/lib/axiosHelpers'

src/components/DeleteGroupModal.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { NeInlineNotification, NeModal } from '@nethserver/vue-tailwind-lib'
+import { NeInlineNotification, NeModal } from '@nethesis/vue-components'
 import type { Group } from '@/composables/useGroups'
 import axios from 'axios'
 import { ref } from 'vue'
@@ -47,6 +47,7 @@ function deleteGroup() {
     primary-button-kind="danger"
     :primary-button-loading="loading"
     :primary-button-disabled="loading"
+    :close-aria-label="$t('close')"
     @primary-click="deleteGroup"
     @close="handleClose"
   >

src/components/DeleteUserModal.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { NeInlineNotification, NeModal } from '@nethserver/vue-tailwind-lib'
+import { NeInlineNotification, NeModal } from '@nethesis/vue-components'
 import type { User } from '@/composables/useUsers'
 import { ref, watch } from 'vue'
 import axios from 'axios'
@@ -57,6 +57,7 @@ function deleteUser() {
     primary-button-kind="danger"
     :primary-button-loading="loading"
     :primary-button-disabled="loading"
+    :close-aria-label="$t('close')"
     @primary-click="deleteUser"
     @close="handleClose"
   >

src/components/EditGroupDrawer.vue

@@ -3,13 +3,13 @@ import SideDrawer from '@/components/SideDrawer.vue'
 import type { Group } from '@/composables/useGroups'
 import { ref, watch } from 'vue'
 import {
+  NeSkeleton,
   NeButton,
   NeCombobox,
   type NeComboboxOption,
   NeInlineNotification,
   NeTextInput
-} from '@nethserver/vue-tailwind-lib'
-import { NeSkeleton } from '@nethesis/vue-components'
+} from '@nethesis/vue-components'
 import { useUsers } from '@/composables/useUsers'
 import axios from 'axios'
 

src/components/EditUserDrawer.vue

@@ -1,16 +1,17 @@
 <script lang="ts" setup>
 import type { UserList } from '@/components/UserList.vue'
 import { computed, ref, watch } from 'vue'
+import { useGroups } from '@/composables/useGroups'
 import {
+  NeInlineNotification,
+  NeSkeleton,
   NeButton,
   NeCombobox,
   type NeComboboxOption,
   NeFormItemLabel,
   NeTextInput,
   NeToggle
-} from '@nethserver/vue-tailwind-lib'
-import { useGroups } from '@/composables/useGroups'
-import { NeInlineNotification, NeSkeleton } from '@nethesis/vue-components'
+} from '@nethesis/vue-components'
 import type { BaseResponse } from '@/lib/axiosHelpers'
 import axios from 'axios'
 import SideDrawer from '@/components/SideDrawer.vue'

src/components/EditUserPasswordDrawer.vue

@@ -2,12 +2,11 @@
 import type { User } from '@/composables/useUsers'
 import { ref, watch } from 'vue'
 import SideDrawer from '@/components/SideDrawer.vue'
-import { NeButton, NeTextInput } from '@nethserver/vue-tailwind-lib'
 import { MessageBag } from '@/lib/validation'
 import { useI18n } from 'vue-i18n'
 import axios from 'axios'
 import type { BaseResponse } from '@/lib/axiosHelpers'
-import { NeInlineNotification, NeSkeleton } from '@nethesis/vue-components'
+import { NeInlineNotification, NeSkeleton, NeButton, NeTextInput } from '@nethesis/vue-components'
 import PasswordRequirementList from '@/components/PasswordRequirementList.vue'
 import { usePasswordPolicy } from '@/composables/usePasswordPolicy'
 

src/components/GroupsList.vue

@@ -1,7 +1,6 @@
 <script lang="ts" setup>
 import { faEdit, faPlusCircle } from '@fortawesome/free-solid-svg-icons'
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
-import { NeButton, NeDropdown } from '@nethserver/vue-tailwind-lib'
 import {
   NeSkeleton,
   NeInlineNotification,
@@ -10,7 +9,9 @@ import {
   NeTableHeadCell,
   NeTableRow,
   NeTableBody,
-  NeTableCell
+  NeTableCell,
+  NeButton,
+  NeDropdown
 } from '@nethesis/vue-components'
 import { type Group, useGroups } from '@/composables/useGroups'
 import { ref } from 'vue'

src/components/SideDrawer.vue

@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
 import { faX } from '@fortawesome/free-solid-svg-icons'
-import { NeButton } from '@nethserver/vue-tailwind-lib'
+import { NeButton } from '@nethesis/vue-components'
 import { Dialog, DialogPanel, TransitionChild, TransitionRoot } from '@headlessui/vue'
 
 defineProps<{

src/components/UserList.vue

@@ -5,13 +5,6 @@ import {
   faEdit,
   faPlusCircle
 } from '@fortawesome/free-solid-svg-icons'
-import {
-  NeButton,
-  type NeComboboxOption,
-  NeDropdown,
-  NeInlineNotification,
-  NeSkeleton
-} from '@nethserver/vue-tailwind-lib'
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
 import { type User, useUsers } from '@/composables/useUsers'
 import { useGroups } from '@/composables/useGroups'
@@ -22,7 +15,12 @@ import {
   NeTableCell,
   NeTableHead,
   NeTableHeadCell,
-  NeTableRow
+  NeTableRow,
+  NeButton,
+  type NeComboboxOption,
+  NeDropdown,
+  NeInlineNotification,
+  NeSkeleton
 } from '@nethesis/vue-components'
 import DeleteUserModal from '@/components/DeleteUserModal.vue'
 import { useI18n } from 'vue-i18n'

src/composables/useUsers.ts

@@ -1,6 +1,6 @@
 import { computed, ref } from 'vue'
 import axios from 'axios'
-import type { NeComboboxOption } from '@nethserver/vue-tailwind-lib'
+import type { NeComboboxOption } from '@nethesis/vue-components'
 
 export interface User {
   display_name: string

src/i18n/en-US.json

@@ -3,6 +3,7 @@
     "Network shared folders": "Network shared folders",
     "edit": "Edit",
     "save": "Save",
+    "close": "Close",
     "errors": {
         "generic": "Error",
         "connection_aborted": "Couldn't connect to the server",

src/views/BaseTemplate.vue

@@ -8,7 +8,7 @@ import SidebarMenu from '@/components/SidebarMenu.vue'
 import { useRouter } from 'vue-router'
 import { faBars, faXmark } from '@fortawesome/free-solid-svg-icons'
 import { ref } from 'vue'
-import { NeButton } from '@nethserver/vue-tailwind-lib'
+import { NeButton } from '@nethesis/vue-components'
 import NotificationHandler from '@/components/NotificationHandler.vue'
 import { useConfig } from '@/stores/config'
 

src/views/LoginView.vue

@@ -1,6 +1,5 @@
 <script lang="ts" setup>
-import { NeButton, NeCheckbox, NeTextInput } from '@nethserver/vue-tailwind-lib'
-import { NeInlineNotification } from '@nethesis/vue-components'
+import { NeInlineNotification, NeButton, NeCheckbox, NeTextInput } from '@nethesis/vue-components'
 import { ref } from 'vue'
 import { useAuth } from '@/composables/useAuth'
 import axios from 'axios'

src/views/UserAccount.vue

@@ -1,6 +1,5 @@
 <script lang="ts" setup>
-import { NeButton, NeTextInput } from '@nethserver/vue-tailwind-lib'
-import { NeInlineNotification, NeSkeleton } from '@nethesis/vue-components'
+import { NeInlineNotification, NeSkeleton, NeButton, NeTextInput } from '@nethesis/vue-components'
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
 import { faSave } from '@fortawesome/free-solid-svg-icons'
 import { ref } from 'vue'

src/views/UserManager.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { NeTabs } from '@nethserver/vue-tailwind-lib'
+import { NeTabs } from '@nethesis/vue-components'
 import { ref } from 'vue'
 import ContentPage from '@/components/ContentPage.vue'
 import GroupsList from '@/components/GroupsList.vue'

tailwind.config.ts

@@ -7,7 +7,6 @@ export default {
   content: [
     './index.html',
     './src/**/*.{vue,js,ts,jsx,tsx}',
-    './node_modules/@nethserver/vue-tailwind-lib/dist/vue-tailwind-lib.es.js',
     './node_modules/@nethesis/vue-components/dist/**/*.js'
   ],
   theme: {