chore(front): refactor admin manage library pages

front/src/components/manage/ChannelsTable.vue

@@ -10,7 +10,6 @@ import { useI18n } from 'vue-i18n'
 import axios from 'axios'
 
 import ActionTable from '~/components/common/ActionTable.vue'
-import Pagination from '~/components/vui/Pagination.vue'
 
 import useSmartSearch from '~/composables/navigation/useSmartSearch'
 import useSharedLabels from '~/composables/locale/useSharedLabels'
@@ -18,6 +17,12 @@ import useOrdering from '~/composables/navigation/useOrdering'
 import useErrorHandler from '~/composables/useErrorHandler'
 import usePage from '~/composables/navigation/usePage'
 
+import Layout from '~/components/ui/Layout.vue'
+import Spacer from '~/components/ui/Spacer.vue'
+import Input from '~/components/ui/Input.vue'
+import Loader from '~/components/ui/Loader.vue'
+import Pagination from '~/components/ui/Pagination.vue'
+
 interface Props extends SmartSearchProps, OrderingProps {
   filters?: object
 
@@ -88,22 +93,24 @@ const labels = computed(() => ({
 </script>
 
 <template>
-  <div>
   <div class="ui inline form">
     <div class="fields">
       <div class="ui six wide field">
-          <label for="channel-search">{{ t('components.manage.ChannelsTable.label.search') }}</label>
         <form @submit.prevent="query = search.value">
-            <input
+          <Input
             id="channel-search"
             ref="search"
             name="search"
-              type="text"
+            search
-              :value="query"
+            :label="t('components.manage.ChannelsTable.label.search')"
+            v-model="query"
             :placeholder="labels.searchPlaceholder"
-            >
+          />
         </form>
       </div>
+      <Spacer :size="16" />
+      <Layout flex>
+        <Spacer grow />
         <div class="field">
           <label for="channel-category">{{ t('components.manage.ChannelsTable.label.category') }}</label>
           <select
@@ -157,15 +164,10 @@ const labels = computed(() => ({
             </option>
           </select>
         </div>
+      </Layout>
     </div>
   </div>
-    <div class="dimmable">
+  <Loader v-if="isLoading" />
-      <div
-        v-if="isLoading"
-        class="ui active inverted dimmer"
-      >
-        <div class="ui loader" />
-      </div>
   <action-table
     v-if="result"
     :objects-data="result"
@@ -246,19 +248,15 @@ const labels = computed(() => ({
       </td>
     </template>
   </action-table>
-    </div>
   <div>
-      <pagination
+    <Pagination
       v-if="result && result.count > paginateBy"
-        v-model:current="page"
+      v-model:page="page"
-        :compact="true"
+      :pages="Math.ceil(result.count / paginateBy)"
-        :paginate-by="paginateBy"
-        :total="result.count"
     />
 
     <span v-if="result && result.results.length > 0">
       {{ t('components.manage.ChannelsTable.pagination.results', {start: ((page-1) * paginateBy) + 1, end: ((page-1) * paginateBy) + result.results.length, total: result.count}) }}
     </span>
   </div>
-  </div>
 </template>

front/src/components/manage/library/AlbumsTable.vue

@@ -10,7 +10,6 @@ import { useI18n } from 'vue-i18n'
 import axios from 'axios'
 
 import ActionTable from '~/components/common/ActionTable.vue'
-import Pagination from '~/components/vui/Pagination.vue'
 
 import useSmartSearch from '~/composables/navigation/useSmartSearch'
 import useSharedLabels from '~/composables/locale/useSharedLabels'
@@ -18,6 +17,12 @@ import useOrdering from '~/composables/navigation/useOrdering'
 import useErrorHandler from '~/composables/useErrorHandler'
 import usePage from '~/composables/navigation/usePage'
 
+import Layout from '~/components/ui/Layout.vue'
+import Spacer from '~/components/ui/Spacer.vue'
+import Input from '~/components/ui/Input.vue'
+import Loader from '~/components/ui/Loader.vue'
+import Pagination from '~/components/ui/Pagination.vue'
+
 interface Props extends SmartSearchProps, OrderingProps {
   filters?: object
 
@@ -100,22 +105,24 @@ const labels = computed(() => ({
 </script>
 
 <template>
-  <div>
   <div class="ui inline form">
     <div class="fields">
       <div class="ui six wide field">
-          <label for="albums-search">{{ t('components.manage.library.AlbumsTable.label.search') }}</label>
         <form @submit.prevent="query = search.value">
-            <input
+          <Input
             id="albums-search"
             ref="search"
             name="search"
-              type="text"
+            search
-              :value="query"
+            :label="t('components.manage.library.AlbumsTable.label.search')"
+            v-model="query"
             :placeholder="labels.searchPlaceholder"
-            >
+          />
         </form>
       </div>
+      <Spacer :size="16" />
+      <Layout flex>
+        <Spacer grow />
         <div class="field">
           <label for="albums-ordering">{{ t('components.manage.library.AlbumsTable.ordering.label') }}</label>
           <select
@@ -146,15 +153,10 @@ const labels = computed(() => ({
             </option>
           </select>
         </div>
+      </Layout>
     </div>
   </div>
-    <div class="dimmable">
+  <Loader v-if="isLoading" />
-      <div
-        v-if="isLoading"
-        class="ui active inverted dimmer"
-      >
-        <div class="ui loader" />
-      </div>
   <action-table
     v-if="result"
     :objects-data="result"
@@ -242,19 +244,13 @@ const labels = computed(() => ({
       </td>
     </template>
   </action-table>
-    </div>
+  <Pagination
-    <div>
-      <pagination
     v-if="result && result.count > paginateBy"
-        v-model:current="page"
+    v-model:page="page"
-        :compact="true"
+    :pages="Math.ceil(result.count / paginateBy)"
-        :paginate-by="paginateBy"
-        :total="result.count"
   />
 
   <span v-if="result && result.results.length > 0">
     {{ t('components.manage.library.AlbumsTable.pagination.results', {start: ((page-1) * paginateBy) + 1, end: ((page-1) * paginateBy) + result.results.length, total: result.count}) }}
   </span>
-    </div>
-  </div>
 </template>

front/src/components/manage/library/ArtistsTable.vue

@@ -10,7 +10,6 @@ import { useI18n } from 'vue-i18n'
 import axios from 'axios'
 
 import ActionTable from '~/components/common/ActionTable.vue'
-import Pagination from '~/components/vui/Pagination.vue'
 
 import useSmartSearch from '~/composables/navigation/useSmartSearch'
 import useSharedLabels from '~/composables/locale/useSharedLabels'
@@ -18,6 +17,12 @@ import useOrdering from '~/composables/navigation/useOrdering'
 import useErrorHandler from '~/composables/useErrorHandler'
 import usePage from '~/composables/navigation/usePage'
 
+import Layout from '~/components/ui/Layout.vue'
+import Spacer from '~/components/ui/Spacer.vue'
+import Input from '~/components/ui/Input.vue'
+import Loader from '~/components/ui/Loader.vue'
+import Pagination from '~/components/ui/Pagination.vue'
+
 interface Props extends SmartSearchProps, OrderingProps {
   filters?: object
 
@@ -104,22 +109,24 @@ const getUrl = (artist: { channel?: number; id: number }) => {
 </script>
 
 <template>
-  <div>
   <div class="ui inline form">
     <div class="fields">
       <div class="ui six wide field">
-          <label for="artists-serarch">{{ t('components.manage.library.ArtistsTable.label.search') }}</label>
         <form @submit.prevent="query = search.value">
-            <input
+          <Input
             id="artists-search"
             ref="search"
             name="search"
-              type="text"
+            search
-              :value="query"
+            :label="t('components.manage.library.ArtistsTable.label.search')"
+            v-model="query"
             :placeholder="labels.searchPlaceholder"
-            >
+          />
         </form>
       </div>
+      <Spacer :size="16" />
+      <Layout flex>
+        <Spacer grow />
         <div class="field">
           <label for="artists-category">{{ t('components.manage.library.ArtistsTable.label.category') }}</label>
           <select
@@ -173,15 +180,10 @@ const getUrl = (artist: { channel?: number; id: number }) => {
             </option>
           </select>
         </div>
+      </Layout>
     </div>
   </div>
-    <div class="dimmable">
+  <Loader v-if="isLoading" />
-      <div
-        v-if="isLoading"
-        class="ui active inverted dimmer"
-      >
-        <div class="ui loader" />
-      </div>
   <action-table
     v-if="result"
     :objects-data="result"
@@ -248,19 +250,13 @@ const getUrl = (artist: { channel?: number; id: number }) => {
       </td>
     </template>
   </action-table>
-    </div>
+  <Pagination
-    <div>
-      <pagination
     v-if="result && result.count > paginateBy"
-        v-model:current="page"
+    v-model:page="page"
-        :compact="true"
+    :pages="Math.ceil(result.count / paginateBy)"
-        :paginate-by="paginateBy"
-        :total="result.count"
   />
 
   <span v-if="result && result.results.length > 0">
     {{ t('components.manage.library.ArtistsTable.pagination.results', {start: ((page-1) * paginateBy) + 1, end: ((page-1) * paginateBy) + result.results.length, total: result.count}) }}
   </span>
-    </div>
-  </div>
 </template>

front/src/components/manage/library/EditsCardList.vue

@@ -12,7 +12,6 @@ import { uniq } from 'lodash-es'
 
 import axios from 'axios'
 
-import Pagination from '~/components/vui/Pagination.vue'
 import EditCard from '~/components/library/EditCard.vue'
 
 import useEditConfigs from '~/composables/moderation/useEditConfigs'
@@ -22,6 +21,13 @@ import useOrdering from '~/composables/navigation/useOrdering'
 import useErrorHandler from '~/composables/useErrorHandler'
 import usePage from '~/composables/navigation/usePage'
 
+import Layout from '~/components/ui/Layout.vue'
+import Section from '~/components/ui/Section.vue'
+import Spacer from '~/components/ui/Spacer.vue'
+import Input from '~/components/ui/Input.vue'
+import Loader from '~/components/ui/Loader.vue'
+import Pagination from '~/components/ui/Pagination.vue'
+
 interface Props extends SmartSearchProps, OrderingProps {
   filters?: object
 
@@ -159,28 +165,36 @@ const getCurrentState = (target?: StateTarget): ReviewState => {
 </script>
 
 <template>
-  <div class="ui text container">
   <slot />
   <div class="ui inline form">
     <div class="fields">
       <div class="ui field">
-          <label for="search-edits">{{ t('components.manage.library.EditsCardList.label.search') }}</label>
         <form @submit.prevent="query = search.value">
-            <input
+          <Input
+            search
             id="search-edits"
             ref="search"
             name="search"
-              type="text"
+            v-model="query"
-              :value="query"
+            :label="t('components.manage.library.EditsCardList.label.search')"
+            autofocus
             :placeholder="labels.searchPlaceholder"
-            >
+          />
         </form>
       </div>
-        <div class="field">
+      <Spacer :size="16" />
-          <label for="edit-status">{{ t('components.manage.library.EditsCardList.label.status') }}</label>
+      <Layout flex>
+        <Spacer grow />
+        <Layout
+          stack
+          no-gap
+          label
+          for="edit-status"
+        >
+          <span class="label">{{ t('components.manage.library.EditsCardList.label.status') }}</span>
           <select
             id="edit-status"
-            class="ui dropdown"
+            class="dropdown"
             :value="getTokenValue('is_approved', '')"
             @change="addSearchToken('is_approved', ($event.target as HTMLSelectElement).value)"
           >
@@ -197,7 +211,7 @@ const getCurrentState = (target?: StateTarget): ReviewState => {
               {{ t('components.manage.library.EditsCardList.option.rejected') }}
             </option>
           </select>
-        </div>
+        </Layout>
         <div class="field">
           <label for="edit-ordering">{{ t('components.manage.library.EditsCardList.ordering.label') }}</label>
           <select
@@ -229,16 +243,14 @@ const getCurrentState = (target?: StateTarget): ReviewState => {
             </option>
           </select>
         </div>
+      </Layout>
     </div>
   </div>
-    <div class="dimmable">
+  <Loader v-if="isLoading" />
-      <div
+  <Section
-        v-if="isLoading"
+    v-else-if="(result?.count ?? 0) > 0"
-        class="ui active inverted dimmer"
+    small-items
   >
-        <div class="ui loader" />
-      </div>
-      <div v-else-if="(result?.count ?? 0) > 0">
     <edit-card
       v-for="obj in result?.results ?? []"
       :key="obj.uuid"
@@ -247,26 +259,19 @@ const getCurrentState = (target?: StateTarget): ReviewState => {
       @deleted="handle('delete', obj.uuid, false)"
       @approved="handle('approved', obj.uuid, $event)"
     />
-      </div>
+  </Section>
   <empty-state
     v-else
     :refresh="true"
     @refresh="fetchData()"
   />
-    </div>
+  <Pagination
-    <div class="ui hidden divider" />
-    <div>
-      <pagination
   v-if="result && result.count > paginateBy"
-        v-model:current="page"
+  v-model:page="page"
-        :compact="true"
+  :pages="Math.ceil(result.count / paginateBy)"
-        :paginate-by="paginateBy"
-        :total="result.count"
   />
 
   <span v-if="result && result.results.length > 0">
     {{ t('components.manage.library.EditsCardList.pagination.results', {start: ((page-1) * paginateBy) + 1, end: ((page-1) * paginateBy) + result.results.length, total: result.count}) }}
   </span>
-    </div>
-  </div>
 </template>

front/src/components/manage/library/LibrariesTable.vue

@@ -10,7 +10,6 @@ import { useI18n } from 'vue-i18n'
 
 import axios from 'axios'
 import ActionTable from '~/components/common/ActionTable.vue'
-import Pagination from '~/components/vui/Pagination.vue'
 
 import useSharedLabels from '~/composables/locale/useSharedLabels'
 import useSmartSearch from '~/composables/navigation/useSmartSearch'
@@ -18,6 +17,12 @@ import useOrdering from '~/composables/navigation/useOrdering'
 import useErrorHandler from '~/composables/useErrorHandler'
 import usePage from '~/composables/navigation/usePage'
 
+import Layout from '~/components/ui/Layout.vue'
+import Spacer from '~/components/ui/Spacer.vue'
+import Input from '~/components/ui/Input.vue'
+import Loader from '~/components/ui/Loader.vue'
+import Pagination from '~/components/ui/Pagination.vue'
+
 interface Props extends SmartSearchProps, OrderingProps {
   filters?: object
 
@@ -103,22 +108,24 @@ const getPrivacyLevelChoice = (privacyLevel: PrivacyLevel) => {
 </script>
 
 <template>
-  <div>
   <div class="ui inline form">
     <div class="fields">
       <div class="ui six wide field">
-          <label for="libraries-search">{{ t('components.manage.library.LibrariesTable.label.search') }}</label>
         <form @submit.prevent="query = search.value">
-            <input
+          <Input
             id="libraries-search"
             ref="search"
             name="search"
-              type="text"
+            search
-              :value="query"
+            :label="t('components.manage.library.LibrariesTable.label.search')"
+            v-model="query"
             :placeholder="labels.searchPlaceholder"
-            >
+          />
         </form>
       </div>
+      <Spacer :size="16" />
+      <Layout flex>
+        <Spacer grow />
         <div class="field">
           <label for="libraries-visibility">{{ t('components.manage.library.LibrariesTable.label.visibility') }}</label>
           <select
@@ -172,15 +179,10 @@ const getPrivacyLevelChoice = (privacyLevel: PrivacyLevel) => {
             </option>
           </select>
         </div>
+      </Layout>
     </div>
   </div>
-    <div class="dimmable">
+  <Loader v-if="isLoading" />
-      <div
-        v-if="isLoading"
-        class="ui active inverted dimmer"
-      >
-        <div class="ui loader" />
-      </div>
   <action-table
     v-if="result"
     :objects-data="result"
@@ -272,19 +274,13 @@ const getPrivacyLevelChoice = (privacyLevel: PrivacyLevel) => {
       </td>
     </template>
   </action-table>
-    </div>
+  <Pagination
-    <div>
-      <pagination
     v-if="result && result.count > paginateBy"
-        v-model:current="page"
+    v-model:page="page"
-        :compact="true"
+    :pages="Math.ceil(result.count / paginateBy)"
-        :paginate-by="paginateBy"
-        :total="result.count"
   />
 
   <span v-if="result && result.results.length > 0">
     {{ t('components.manage.library.LibrariesTable.pagination.results', {start: ((page-1) * paginateBy) + 1, end: ((page-1) * paginateBy) + result.results.length, total: result.count}) }}
   </span>
-    </div>
-  </div>
 </template>

front/src/components/manage/library/TagsTable.vue

@@ -12,7 +12,6 @@ import axios from 'axios'
 
 import ImportStatusModal from '~/components/library/ImportStatusModal.vue'
 import ActionTable from '~/components/common/ActionTable.vue'
-import Pagination from '~/components/vui/Pagination.vue'
 
 import useSharedLabels from '~/composables/locale/useSharedLabels'
 import useSmartSearch from '~/composables/navigation/useSmartSearch'
@@ -20,6 +19,12 @@ import useOrdering from '~/composables/navigation/useOrdering'
 import useErrorHandler from '~/composables/useErrorHandler'
 import usePage from '~/composables/navigation/usePage'
 
+import Layout from '~/components/ui/Layout.vue'
+import Spacer from '~/components/ui/Spacer.vue'
+import Input from '~/components/ui/Input.vue'
+import Loader from '~/components/ui/Loader.vue'
+import Pagination from '~/components/ui/Pagination.vue'
+
 interface Props extends SmartSearchProps, OrderingProps {
   filters?: object
 
@@ -105,22 +110,24 @@ const showUploadDetailModal = ref(false)
 </script>
 
 <template>
-  <div>
   <div class="ui inline form">
     <div class="fields">
       <div class="ui six wide field">
-          <label for="tags-search">{{ t('components.manage.library.TagsTable.label.search') }}</label>
         <form @submit.prevent="query = search.value">
-            <input
+          <Input
             id="tags-search"
             ref="search"
             name="search"
-              type="text"
+            search
-              :value="query"
+            :label="t('components.manage.library.TagsTable.label.search')"
+            v-model="query"
             :placeholder="labels.searchPlaceholder"
-            >
+          />
         </form>
       </div>
+      <Spacer :size="16" />
+      <Layout flex>
+        <Spacer grow />
         <div class="field">
           <label for="tags-ordering">{{ t('components.manage.library.TagsTable.ordering.label') }}</label>
           <select
@@ -152,6 +159,7 @@ const showUploadDetailModal = ref(false)
             </option>
           </select>
         </div>
+      </Layout>
     </div>
   </div>
   <import-status-modal
@@ -159,13 +167,7 @@ const showUploadDetailModal = ref(false)
     v-model:show="showUploadDetailModal"
     :upload="detailedUpload"
   />
-    <div class="dimmable">
+  <Loader v-if="isLoading" />
-      <div
-        v-if="isLoading"
-        class="ui active inverted dimmer"
-      >
-        <div class="ui loader" />
-      </div>
   <action-table
     v-if="result"
     :objects-data="result"
@@ -214,19 +216,13 @@ const showUploadDetailModal = ref(false)
       </td>
     </template>
   </action-table>
-    </div>
+    <Pagination
-    <div>
-      <pagination
       v-if="result && result.count > paginateBy"
-        v-model:current="page"
+      v-model:page="page"
-        :compact="true"
+      :pages="Math.ceil(result.count / paginateBy)"
-        :paginate-by="paginateBy"
-        :total="result.count"
     />
 
     <span v-if="result && result.results.length > 0">
       {{ t('components.manage.library.TagsTable.pagination.results', {start: ((page-1) * paginateBy) + 1, end: ((page-1) * paginateBy) + result.results.length, total: result.count}) }}
     </span>
-    </div>
-  </div>
 </template>

front/src/components/manage/library/TracksTable.vue

@@ -11,13 +11,18 @@ import axios from 'axios'
 
 import useSharedLabels from '~/composables/locale/useSharedLabels'
 import ActionTable from '~/components/common/ActionTable.vue'
-import Pagination from '~/components/vui/Pagination.vue'
 
 import useSmartSearch from '~/composables/navigation/useSmartSearch'
 import useOrdering from '~/composables/navigation/useOrdering'
 import useErrorHandler from '~/composables/useErrorHandler'
 import usePage from '~/composables/navigation/usePage'
 
+import Layout from '~/components/ui/Layout.vue'
+import Spacer from '~/components/ui/Spacer.vue'
+import Input from '~/components/ui/Input.vue'
+import Loader from '~/components/ui/Loader.vue'
+import Pagination from '~/components/ui/Pagination.vue'
+
 interface Props extends SmartSearchProps, OrderingProps {
   filters?: object
 
@@ -97,22 +102,24 @@ const labels = computed(() => ({
 </script>
 
 <template>
-  <div>
   <div class="ui inline form">
     <div class="fields">
       <div class="ui six wide field">
-          <label for="tracks-search">{{ t('components.manage.library.TracksTable.label.search') }}</label>
         <form @submit.prevent="query = search.value">
-            <input
+          <Input
             id="tracks-search"
             ref="search"
             name="search"
-              type="text"
+            search
-              :value="query"
+            :label="t('components.manage.library.TracksTable.label.search')"
+            v-model="query"
             :placeholder="labels.searchPlaceholder"
-            >
+          />
         </form>
       </div>
+      <Spacer :size="16" />
+      <Layout flex>
+        <Spacer grow />
         <div class="field">
           <label for="tracks-ordering">{{ t('components.manage.library.TracksTable.ordering.label') }}</label>
           <select
@@ -144,15 +151,10 @@ const labels = computed(() => ({
             </option>
           </select>
         </div>
+      </Layout>
     </div>
   </div>
-    <div class="dimmable">
+  <Loader v-if="isLoading" />
-      <div
-        v-if="isLoading"
-        class="ui active inverted dimmer"
-      >
-        <div class="ui loader" />
-      </div>
   <action-table
     v-if="result"
     :objects-data="result"
@@ -252,19 +254,15 @@ const labels = computed(() => ({
       </td>
     </template>
   </action-table>
-    </div>
   <div>
-      <pagination
+    <Pagination
       v-if="result && result.count > paginateBy"
-        v-model:current="page"
+      v-model:page="page"
-        :compact="true"
+      :pages="Math.ceil(result.count / paginateBy)"
-        :paginate-by="paginateBy"
-        :total="result.count"
     />
 
     <span v-if="result && result.results.length > 0">
       {{ t('components.manage.library.TracksTable.pagination.results', {start: ((page-1) * paginateBy) + 1, end: ((page-1) * paginateBy) + result.results.length, total: result.count}) }}
     </span>
   </div>
-  </div>
 </template>

front/src/components/manage/library/UploadsTable.vue

@@ -13,8 +13,6 @@ import axios from 'axios'
 
 import ImportStatusModal from '~/components/library/ImportStatusModal.vue'
 import ActionTable from '~/components/common/ActionTable.vue'
-import Pagination from '~/components/vui/Pagination.vue'
-import Button from '~/components/ui/Button.vue'
 
 import useSmartSearch from '~/composables/navigation/useSmartSearch'
 import useSharedLabels from '~/composables/locale/useSharedLabels'
@@ -22,6 +20,13 @@ import useOrdering from '~/composables/navigation/useOrdering'
 import useErrorHandler from '~/composables/useErrorHandler'
 import usePage from '~/composables/navigation/usePage'
 
+import Layout from '~/components/ui/Layout.vue'
+import Spacer from '~/components/ui/Spacer.vue'
+import Button from '~/components/ui/Button.vue'
+import Input from '~/components/ui/Input.vue'
+import Loader from '~/components/ui/Loader.vue'
+import Pagination from '~/components/ui/Pagination.vue'
+
 interface Props extends SmartSearchProps, OrderingProps {
   filters?: object
 
@@ -120,22 +125,24 @@ const getPrivacyLevelChoice = (privacyLevel: PrivacyLevel) => {
 </script>
 
 <template>
-  <div>
   <div class="ui inline form">
     <div class="fields">
       <div class="ui six wide field">
-          <label for="uploads-search">{{ t('components.manage.library.UploadsTable.label.search') }}</label>
         <form @submit.prevent="query = search.value">
-            <input
+          <Input
             id="uploads-search"
             ref="search"
             name="search"
-              type="text"
+            search
-              :value="query"
+            :label="t('components.manage.library.UploadsTable.label.search')"
+            v-model="query"
             :placeholder="labels.searchPlaceholder"
-            >
+          />
         </form>
       </div>
+      <Spacer :size="16" />
+      <Layout flex>
+        <Spacer grow />
         <div class="field">
           <label for="uploads-visibility">{{ t('components.manage.library.UploadsTable.label.visibility') }}</label>
           <select
@@ -214,6 +221,7 @@ const getPrivacyLevelChoice = (privacyLevel: PrivacyLevel) => {
             </option>
           </select>
         </div>
+      </Layout>
     </div>
   </div>
   <!-- TODO (wvffle): Check if :upload shouldn't be v-model:upload -->
@@ -222,13 +230,7 @@ const getPrivacyLevelChoice = (privacyLevel: PrivacyLevel) => {
     v-model:show="showUploadDetailModal"
     :upload="detailedUpload"
   />
-    <div class="dimmable">
+  <Loader v-if="isLoading" />
-      <div
-        v-if="isLoading"
-        class="ui active inverted dimmer"
-      >
-        <div class="ui loader" />
-      </div>
   <action-table
     v-if="result"
     :objects-data="result"
@@ -362,19 +364,13 @@ const getPrivacyLevelChoice = (privacyLevel: PrivacyLevel) => {
       </td>
     </template>
   </action-table>
-    </div>
+    <Pagination
-    <div>
-      <pagination
       v-if="result && result.count > paginateBy"
-        v-model:current="page"
+      v-model:page="page"
-        :compact="true"
+      :pages="Math.ceil(result.count / paginateBy)"
-        :paginate-by="paginateBy"
-        :total="result.count"
     />
 
     <span v-if="result && result.results.length > 0">
       {{ t('components.manage.library.UploadsTable.pagination.results', {start: ((page-1) * paginateBy) + 1, end: ((page-1) * paginateBy) + result.results.length, total: result.count}) }}
     </span>
-    </div>
-  </div>
 </template>

front/src/views/admin/library/Base.vue

@@ -1,73 +1,62 @@
 <script setup lang="ts">
 import { computed } from 'vue'
 import { useI18n } from 'vue-i18n'
+import { useRoute } from 'vue-router'
+
+import Layout from '~/components/ui/Layout.vue'
+import Tabs from '~/components/ui/Tabs.vue'
+import Tab from '~/components/ui/Tab.vue'
 
 const { t } = useI18n()
 const labels = computed(() => ({
   title: t('views.admin.library.Base.title'),
   secondaryMenu: t('views.admin.library.Base.menu.secondary')
 }))
+
+const route = useRoute()
 </script>
 
 <template>
-  <div
+  <Layout
     v-title="labels.title"
-    class="main page-admin-library"
+    main
+    stack
+    class="page-admin-library"
   >
-    <nav
+    <Tabs>
-      class="ui secondary pointing menu"
+      <Tab
-      role="navigation"
+        :title="t('views.admin.library.Base.link.edits')"
-      :aria-label="labels.secondaryMenu"
-    >
-      <router-link
-        class="ui item"
         :to="{name: 'manage.library.edits'}"
-      >
+      />
-        {{ t('views.admin.library.Base.link.edits') }}
+      <Tab
-      </router-link>
+        :title="t('views.admin.library.Base.link.channels')"
-      <router-link
-        class="ui item"
         :to="{name: 'manage.channels'}"
-      >
+      />
-        {{ t('views.admin.library.Base.link.channels') }}
+      <Tab
-      </router-link>
+        :title="t('views.admin.library.Base.link.artists')"
-      <router-link
-        class="ui item"
         :to="{name: 'manage.library.artists'}"
-      >
+      />
-        {{ t('views.admin.library.Base.link.artists') }}
+      <Tab
-      </router-link>
+        :title="t('views.admin.library.Base.link.albums')"
-      <router-link
-        class="ui item"
         :to="{name: 'manage.library.albums'}"
-      >
+      />
-        {{ t('views.admin.library.Base.link.albums') }}
+      <Tab
-      </router-link>
+        :title="t('views.admin.library.Base.link.tracks')"
-      <router-link
-        class="ui item"
         :to="{name: 'manage.library.tracks'}"
-      >
+      />
-        {{ t('views.admin.library.Base.link.tracks') }}
+      <Tab
-      </router-link>
+        :title="t('views.admin.library.Base.link.libraries')"
-      <router-link
-        class="ui item"
         :to="{name: 'manage.library.libraries'}"
-      >
+      />
-        {{ t('views.admin.library.Base.link.libraries') }}
+      <Tab
-      </router-link>
+        :title="t('views.admin.library.Base.link.uploads')"
-      <router-link
-        class="ui item"
         :to="{name: 'manage.library.uploads'}"
-      >
+      />
-        {{ t('views.admin.library.Base.link.uploads') }}
+      <Tab
-      </router-link>
+        :title="t('views.admin.library.Base.link.tags')"
-      <router-link
-        class="ui item"
         :to="{name: 'manage.library.tags'}"
-      >
+      />
-        {{ t('views.admin.library.Base.link.tags') }}
+    </Tabs>
-      </router-link>
+    <router-view :key="route.fullPath" />
-    </nav>
+  </Layout>
-    <router-view :key="$route.fullPath" />
-  </div>
 </template>

front/src/views/admin/library/EditsList.vue

@@ -4,6 +4,8 @@ import { computed } from 'vue'
 
 import EditsCardList from '~/components/manage/library/EditsCardList.vue'
 
+import Header from '~/components/ui/Header.vue'
+
 interface Props {
   defaultQuery?: string
 }
@@ -19,16 +21,13 @@ const labels = computed(() => ({
 </script>
 
 <template>
-  <main v-title="labels.title">
+  <Header
-    <section class="ui vertical stripe segment">
+    align-left
+    no-items
+    :h1="t('views.admin.library.EditsList.header.edits')"
+  />
   <edits-card-list
     :update-url="true"
     :default-query="defaultQuery"
-      >
+  />
-        <h2 class="ui header">
-          {{ t('views.admin.library.EditsList.header.edits') }}
-        </h2>
-      </edits-card-list>
-    </section>
-  </main>
 </template>