another commit for Vue3 upgrade, pretty much there now

CogStack · Nov 21, 2024 · 5b70bbc · 5b70bbc
1 parent 9ead5e3
commit 5b70bbc
Show file tree

Hide file tree

Showing 6 changed files with 442 additions and 335 deletions.
diff --git a/webapp/frontend2/src/assets/main.css b/webapp/frontend2/src/assets/main.css
@@ -11,4 +11,22 @@ body > div {
 body {
   font-family: inherit;
   font-size: 1rem;
+}
+
+.v-table > .v-table__wrapper > table > tbody > tr > td,
+.v-table > .v-table__wrapper > table > tbody > tr > th,
+.v-table > .v-table__wrapper > table > thead > tr > td,
+.v-table > .v-table__wrapper > table > thead > tr > th,
+.v-table > .v-table__wrapper > table > tfoot > tr > td,
+.v-table > .v-table__wrapper > table > tfoot > tr > th {
+  padding: 0 4px;
+}
+
+.v-table--density-default {
+  --v-table-header-height: 42px !important;
+  --v-table-row-height: 32px !important;
+}
+
+.v-data-table tbody tr:nth-of-type(even) {
+  background-color: rgba(0, 0, 0, .03);
 }
diff --git a/webapp/frontend2/src/components/common/Modal.vue b/webapp/frontend2/src/components/common/Modal.vue
@@ -44,6 +44,8 @@ export default {
 <style lang="scss">
 .close {
   opacity: 0.5;
+  float: right;
+  font-size: 1.5rem;
 
   :hover {
     opacity: 0.75;
@@ -94,10 +96,6 @@ export default {
   margin-left: 0;
 }
 
-.modal-header .close {
-  float: right;
-}
-
 .modal-body {
   margin: 20px 0;
   overflow-y: auto;

diff --git a/webapp/frontend2/src/components/common/ProjectList.vue b/webapp/frontend2/src/components/common/ProjectList.vue
@@ -194,16 +194,16 @@ export default {
       projects: {
         headers: [
           { value: 'locked', title: ''},
-          { value: 'id', title: 'ID', sortable: true },
-          { value: 'name', title: 'Title', sortable: true },
+          { value: 'id', title: 'ID' },
+          { value: 'name', title: 'Title' },
           { value: 'description', title: 'Description' },
-          { value: 'create_time', title: 'Create Time', sortable: true },
-          { value: 'last_modified', title: 'Last Modified', sortable: true },
+          { value: 'create_time', title: 'Create Time',},
+          { value: 'last_modified', title: 'Last Modified' },
           { value: 'cuis', title: 'Concepts' },
           { value: 'require_entity_validation', title: 'Annotate / Validate' },
-          { value: 'status', title: 'Status', sortable: true },
-          { value: 'progress', title: 'Progress', formatter: this.progressFormatter },
-          { value: 'anno_class', title: 'Annotation Classification', sortable: true },
+          { value: 'status', title: 'Status' },
+          { value: 'progress', title: 'Progress' },
+          { value: 'anno_class', title: 'Annotation Classification' },
           { value: 'cdb_search_filter', title: 'Concepts Imported' },
           { value: 'model_loaded', title: 'Model Loaded' },
           { value: 'metrics', title: 'Metrics' },

diff --git a/webapp/frontend2/src/views/ConceptDatabase.vue b/webapp/frontend2/src/views/ConceptDatabase.vue
@@ -43,8 +43,9 @@
           <span v-if="!exportingFilter">Export Filter</span>
           <font-awesome-icon v-if="exportingFilter" icon="spinner" spin size="xs" />
         </button>
-        <b-tooltip target="export-filter-btn" triggers="hover" container="concept-filter"
-                   title="Calculate all child concepts and download as a .json file - to upload into a Trainer project"></b-tooltip>
+        <v-tooltip>
+          Calculate all child concepts and download as a .json file - to upload into a Trainer project
+        </v-tooltip>
       </div>
     </div>
     <div class="view-port">