diff --git a/package-lock.json b/package-lock.json index 88c8b1e8..ca36f1ca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "mavedb-ui", - "version": "2023.5.1", + "version": "2024.1.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "mavedb-ui", - "version": "2023.5.1", + "version": "2024.1.0", "dependencies": { "@fontsource/raleway": "^5.0.16", "axios": "^1.6.2", @@ -41,7 +41,7 @@ "pluralize": "^8.0.0", "primeflex": "^3.3.1", "primeicons": "^6.0.1", - "primevue": "3.32.2", + "primevue": "3.52.0", "universal-base64url": "~1.1.0", "uuid": "^9.0.1", "vee-validate": "^4.12.2", @@ -3545,9 +3545,9 @@ "integrity": "sha512-KDeO94CbWI4pKsPnYpA1FPjo79EsY9I+M8ywoPBSf9XMXoe/0crjbUK7jcQEDHuc0ZMRIZsxH3TYLv4TUtHmAA==" }, "node_modules/primevue": { - "version": "3.32.2", - "resolved": "https://registry.npmjs.org/primevue/-/primevue-3.32.2.tgz", - "integrity": "sha512-BEDhIb+VqfjjIF9+G+dCRsE542afz5Xl01XHbViYR13T7ZreBMWsPcJCCTyKzouwJHr6HTskJXJnrkTmOI1vKg==", + "version": "3.52.0", + "resolved": "https://registry.npmjs.org/primevue/-/primevue-3.52.0.tgz", + "integrity": "sha512-HLOVP5YI0ArFKUhIyfZsWmTNMaBYNCBWC/3DYvdd/Po4LY5/WXf7yIYvArE2q/3OuwSXJXvjlR8UNQeJYRSQog==", "peerDependencies": { "vue": "^3.0.0" } diff --git a/package.json b/package.json index db994206..cbfb6f10 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "pluralize": "^8.0.0", "primeflex": "^3.3.1", "primeicons": "^6.0.1", - "primevue": "3.32.2", + "primevue": "3.52.0", "universal-base64url": "~1.1.0", "uuid": "^9.0.1", "vee-validate": "^4.12.2", diff --git a/src/assets/app.css b/src/assets/app.css index aeecd9d1..6dd206b7 100644 --- a/src/assets/app.css +++ b/src/assets/app.css @@ -23,3 +23,7 @@ body .p-inputtext { body .p-button { min-width: 10px; } + +.p-badge { + text-align: center; +} \ No newline at end of file diff --git a/src/assets/forms.css b/src/assets/forms.css index 86b98581..80686fde 100644 --- a/src/assets/forms.css +++ b/src/assets/forms.css @@ -1,7 +1,3 @@ -.field { - margin: 10px 0; -} - /* Field types */ .field:deep(.p-chips) { diff --git a/src/components/common/EmailPrompt.vue b/src/components/common/EmailPrompt.vue index 4cfc95b9..75796951 100644 --- a/src/components/common/EmailPrompt.vue +++ b/src/components/common/EmailPrompt.vue @@ -7,7 +7,7 @@
{{ emailValidationError }}
- +
diff --git a/src/components/layout/Toolbar.vue b/src/components/layout/Toolbar.vue index 551980f5..869e16f1 100644 --- a/src/components/layout/Toolbar.vue +++ b/src/components/layout/Toolbar.vue @@ -18,6 +18,19 @@ + @@ -76,35 +89,35 @@ export default { menuItems: function() { return [{ label: 'Dashboard', - to: '/dashboard', + route: '/dashboard', available: ({authenticated}) => authenticated }, { label: 'Home', - to: '/' + route: '/' }, { label: 'Search', - to: '/search' + route: '/search', }, { label: 'Documentation', - to: '/docs' + route: '/docs' }, { label: 'New experiment', - to: '/create-experiment', + route: '/create-experiment', available: ({authenticated}) => authenticated }, { label: 'New score set', - to: '/create-score-set', + route: '/create-score-set', available: ({authenticated}) => authenticated }, { label: 'Users', - to: '/users', + route: '/users', available: ({roles}) => roles.includes('admin') }, { label: this.userName, icon:'pi pi-fw pi-user', items:[{ label: 'Settings', - to: '/settings', + route: '/settings', available: ({authenticated}) => authenticated }, { label: 'Sign out', @@ -127,7 +140,6 @@ export default { }, filterAvailableMenuItems(menuItems) { - const self = this return menuItems.map((item) => { if (item.items) { let newSubitems = this.filterAvailableMenuItems(item.items) diff --git a/src/components/screens/ExperimentEditor.vue b/src/components/screens/ExperimentEditor.vue index 5d62b204..edbdeaa0 100644 --- a/src/components/screens/ExperimentEditor.vue +++ b/src/components/screens/ExperimentEditor.vue @@ -106,7 +106,7 @@