From f2401192edc61421aa88f744fc1ec51dec904a56 Mon Sep 17 00:00:00 2001
From: Petar Hristov <hristov@itc.rwth-aachen.de>
Date: Thu, 2 Jun 2022 14:56:45 +0200
Subject: [PATCH] Fix: minor fixes
---
src/modules/user/pages/UserProfile.vue | 20 +++++++++++++++----
.../user/pages/components/AccessToken.vue | 4 +++-
src/plugins/deprecated/_custom.css | 18 ++++++++---------
3 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/src/modules/user/pages/UserProfile.vue b/src/modules/user/pages/UserProfile.vue
index e3a48092..0d03f860 100644
--- a/src/modules/user/pages/UserProfile.vue
+++ b/src/modules/user/pages/UserProfile.vue
@@ -103,7 +103,7 @@
id="Email"
v-model="$v.form.emailAddress.$model"
:state="
- $v.form.emailAddress.$dirty || !form.emailAddress
+ $v.form.emailAddress.$dirty || !profileForm.form.emailAddress
? !$v.form.emailAddress.$invalid
: null
"
@@ -265,7 +265,11 @@
? profileForm.form.language.id
: false
"
- :state="form.language && form.language.id ? null : false"
+ :state="
+ profileForm.form.language && profileForm.form.language.id
+ ? null
+ : false
+ "
:options="languages"
name="radios-stacked"
text-field="displayName"
@@ -374,7 +378,16 @@ export default defineComponent({
will enable proper typings in the code
*/
const profileForm = reactive({
- form: {} as UserObject,
+ form: {
+ title: "",
+ givenname: "",
+ surname: "",
+ emailAddress: "",
+ organization: "",
+ institute: "",
+ disciplines: [] as DisciplineObject[],
+ language: {} as LanguageObject,
+ } as UserObject,
});
const profileRules = {
form: {
@@ -399,7 +412,6 @@ export default defineComponent({
savingProfile: false,
currentUserComponent: "UserProfileComponent",
disciplineLabel: "displayNameEn",
- // form: {} as UserObject,
selectedExternalOrganization: null as Record<string, unknown> | null,
queryTimer: 0,
loadingOrganizations: false,
diff --git a/src/modules/user/pages/components/AccessToken.vue b/src/modules/user/pages/components/AccessToken.vue
index 2121f64b..cf00c639 100644
--- a/src/modules/user/pages/components/AccessToken.vue
+++ b/src/modules/user/pages/components/AccessToken.vue
@@ -8,10 +8,12 @@
>
<div class="create-modal-content">
<b-input-group id="tokenButtonGroup" style="width: 100%">
- <b-form-input
+ <b-form-textarea
id="accessToken"
v-model="$v.token.AccessToken.$model"
:readonly="true"
+ rows="7"
+ no-resize
/>
<b-input-group-append>
<b-button
diff --git a/src/plugins/deprecated/_custom.css b/src/plugins/deprecated/_custom.css
index 2b69513e..33c4c6f1 100644
--- a/src/plugins/deprecated/_custom.css
+++ b/src/plugins/deprecated/_custom.css
@@ -1,5 +1,5 @@
.multiselect__placeholder {
- color: var(--gray);
+ color: var(--gray) !important;
/* Value taken from bootstrap */
font-size: 1rem;
/* All bellow is to center the gray placeholder vertically */
@@ -13,13 +13,13 @@
.multiselect__option--highlight {
/* Color for when an option IS NOT selected and hovered on */
- background: var(--primary);
+ background: var(--primary) !important;
}
.multiselect__option--selected.multiselect__option--highlight,
.multiselect__option--highlight:after {
/* Color for when an option IS selected and hovered on */
- background: var(--primary);
+ background: var(--primary) !important;
}
.multiselect__input,
@@ -46,29 +46,29 @@
}
.multiselect__tag {
- background: var(--primary);
- color: var(--white);
+ background: var(--primary) !important;
+ color: var(--white) !important;
margin-bottom: 0px;
margin-right: 5px;
}
.multiselect__tag-icon:after {
- color: var(--secondary);
+ color: var(--secondary) !important;
}
.multiselect__spinner:before,
.multiselect__spinner:after {
- border-color: var(--primary) transparent transparent;
+ border-color: var(--primary) transparent transparent !important;
}
.multiselect__tag-icon:focus,
.multiselect__tag-icon:hover {
- background: transparent;
+ background: transparent !important;
}
.multiselect__tag-icon:focus:after,
.multiselect__tag-icon:hover:after {
- color: var(--white);
+ color: var(--white) !important;
}
.multiselect--disabled {
--
GitLab