Merge pull request #1804 from UNC-Libraries/cropping-report-2

BXC-4686 & BXC-4687 - Add cropping report and API
UNC-Libraries · Oct 2, 2024 · 15a75b4 · 15a75b4
2 parents 41b8356 + bf7c5fa
commit 15a75b4
Show file tree

Hide file tree

Showing 15 changed files with 874 additions and 184 deletions.
diff --git a/static/css/admin/cdradmin.css b/static/css/admin/cdradmin.css
@@ -660,12 +660,14 @@ div.in-admin-iframe,
 	min-width: 400px;
 }
 
-#chompb-projects_filter {
+#chompb-projects_filter,
+#vue-cdr-admin-app .dataTables_filter {
 	text-align: right;
 }
 
-#chompb-projects_filter input {
-	max-width: 350px;
+#chompb-projects_filter input,
+#vue-cdr-admin-app .dataTables_filter input {
+	max-width: 250px;
 }
 
 #chompb-preingest-ui table td a {
@@ -676,18 +678,25 @@ div.in-admin-iframe,
 #chompb-preingest-ui table td:last-child {
 	padding-right: 0;
 }
-#chompb-projects_wrapper .is-half {
+#chompb-projects_wrapper .is-half,
+#vue-cdr-admin-app .dataTables_wrapper .is-half {
 	margin: 25px auto;
 }
 
-#chompb-projects_length label {
-    vertical-align: bottom;
+#chompb-projects_length label,
+#vue-cdr-admin-app .dataTables_length label {
+    vertical-align: middle;
 }
 
-#chompb-projects_paginate .pagination-list {
+#chompb-projects_paginate .pagination-list,
+#vue-cdr-admin-app .pagination-list {
 	justify-content: flex-end;
 }
 
+#vue-cdr-admin-app {
+	margin: 15px 20px;
+}
+
 @media (max-width: 768px) {
 	#chompb-projects_filter {
 		text-align: left;

diff --git a/static/js/admin/vue-cdr-admin/package-lock.json b/static/js/admin/vue-cdr-admin/package-lock.json
diff --git a/static/js/admin/vue-cdr-admin/package.json b/static/js/admin/vue-cdr-admin/package.json
@@ -9,25 +9,27 @@
     "test": "jest"
   },
   "dependencies": {
-    "axios": "^1.7.4",
-    "datatables.net": "^1.13.8",
-    "datatables.net-bm": "^1.13.8",
-    "datatables.net-vue3": "^2.1.3",
+    "axios": "^1.7.7",
+    "datatables.net": "^2.1.6",
+    "datatables.net-bm": "^2.1.6",
+    "datatables.net-searchpanes-bm": "^2.3.2",
+    "datatables.net-select-bm": "^2.1.0",
+    "datatables.net-vue3": "^3.0.2",
     "date-fns": "^3.6.0",
     "lodash.clonedeep": "^4.5.0",
     "lodash.findindex": "^4.6.0",
     "lodash.isempty": "^4.4.0",
     "pinia": "^2.2.2",
-    "vue": "^3.4.38",
-    "vue-router": "^4.4.3"
+    "vue": "^3.5.6",
+    "vue-router": "^4.4.5"
   },
   "devDependencies": {
     "@babel/plugin-transform-runtime": "^7.24.7",
     "@babel/preset-env": "^7.25.3",
     "@pinia/testing": "0.1.5",
     "@testing-library/jest-dom": "^6.4.8",
     "@vitejs/plugin-vue": "^4.6.2",
-    "@vue/compiler-sfc": "^3.4.38",
+    "@vue/compiler-sfc": "^3.5.6",
     "@vue/test-utils": "2.4.6",
     "@vue/vue3-jest": "^29.2.6",
     "babel-jest": "^29.7.0",

diff --git a/static/js/admin/vue-cdr-admin/src/App.vue b/static/js/admin/vue-cdr-admin/src/App.vue
@@ -1,5 +1,5 @@
 <template>
-    <div id="permissions-app">
+    <div id="vue-cdr-admin-app">
         <router-view/>
     </div>
 </template>
diff --git a/static/js/admin/vue-cdr-admin/src/assets/common-styles.css b/static/js/admin/vue-cdr-admin/src/assets/common-styles.css
@@ -215,4 +215,10 @@
 
 .slide-enter, .slide-leave-to {
     max-height: 0
+}
+
+.pull-right,
+.buttons.pull-right {
+    display: flex;
+    justify-content: flex-end;
 }