diff --git a/website/client/src/components/tasks/modal-controls/lockableLabel.vue b/website/client/src/components/tasks/modal-controls/lockableLabel.vue index 7c3e5f012c..aa09a81da1 100644 --- a/website/client/src/components/tasks/modal-controls/lockableLabel.vue +++ b/website/client/src/components/tasks/modal-controls/lockableLabel.vue @@ -13,7 +13,6 @@ @@ -23,11 +22,11 @@ @import '~@/assets/scss/colors.scss'; label { - height: 1.5rem; font-size: 14px; font-weight: bold; line-height: 1.71; letter-spacing: normal; + margin: 0; } .gray-200 { diff --git a/website/client/src/components/tasks/taskModal.vue b/website/client/src/components/tasks/taskModal.vue index 7d50493b46..95c7d333c3 100644 --- a/website/client/src/components/tasks/taskModal.vue +++ b/website/client/src/components/tasks/taskModal.vue @@ -203,16 +203,15 @@ - + - + @@ -479,8 +478,7 @@ @@ -539,6 +537,31 @@ + + + {{ $t('taskAlias') }} + + + + + + + + @@ -882,6 +905,11 @@ height: 1rem; } + label { + display: inline-flex; + align-items: center; + } + .habit-option { &-container { min-width: 3rem; @@ -997,7 +1025,6 @@ import lockableLabel from '@/components/tasks/modal-controls/lockableLabel'; import syncTask from '../../mixins/syncTask'; -import informationIcon from '@/assets/svg/information.svg'; import positiveIcon from '@/assets/svg/positive.svg'; import negativeIcon from '@/assets/svg/negative.svg'; import streakIcon from '@/assets/svg/streak.svg'; @@ -1006,10 +1033,12 @@ import goldIcon from '@/assets/svg/gold.svg'; import chevronIcon from '@/assets/svg/chevron.svg'; import calendarIcon from '@/assets/svg/calendar.svg'; import gripIcon from '@/assets/svg/grip.svg'; +import InformationIcon from '@/components/ui/informationIcon.vue'; export default { components: { + InformationIcon, SelectMulti, Datepicker, checklist, @@ -1029,7 +1058,6 @@ export default { showAssignedSelect: false, newChecklistItem: null, icons: Object.freeze({ - information: informationIcon, negative: negativeIcon, positive: positiveIcon, destroy: deleteIcon, @@ -1064,25 +1092,23 @@ export default { dayMapping: 'constants.DAY_MAPPING', ATTRIBUTES: 'constants.ATTRIBUTES', }), - advancedSettingsAvailable () { - if ( - this.task.type === 'reward' - || this.task.type === 'todo' - || this.purpose === 'create' - || !this.isUserTask - ) { - return false; - } - - if (this.task.type === 'habit' - && !this.task.up - && !this.task.down - ) { - return false; - } - - return true; + // region advanced settings + advancedSettingsShowAdjustCounter () { + return this.task.type === 'habit' + && this.isUserTask && this.purpose === 'edit' && (this.task.up || this.task.down); }, + advancedSettingsShowRestoreStreak () { + return this.task.type === 'daily' && this.isUserTask && this.purpose === 'edit'; + }, + advancedSettingsShowTaskAlias () { + return this.isUserTask && this.user.preferences.developerMode; + }, + advancedSettingsAvailable () { + return this.advancedSettingsShowRestoreStreak + || this.advancedSettingsShowAdjustCounter + || this.advancedSettingsShowTaskAlias; + }, + // endregion advanced settings checklistEnabled () { return ['daily', 'todo'].indexOf(this.task.type) > -1 && !this.isOriginalChallengeTask; }, diff --git a/website/client/src/components/ui/informationIcon.vue b/website/client/src/components/ui/informationIcon.vue new file mode 100644 index 0000000000..75f5b7a00b --- /dev/null +++ b/website/client/src/components/ui/informationIcon.vue @@ -0,0 +1,41 @@ + + + + + + + + + + + + diff --git a/website/client/src/pages/settings/siteDataRows/developerModeRow.vue b/website/client/src/pages/settings/siteDataRows/developerModeRow.vue index f9db08443a..716b60bd13 100644 --- a/website/client/src/pages/settings/siteDataRows/developerModeRow.vue +++ b/website/client/src/pages/settings/siteDataRows/developerModeRow.vue @@ -1,12 +1,21 @@ - {{ $t("developerMode") }} + + {{ $t("developerMode") }} + + - Todo + @@ -14,20 +23,34 @@ diff --git a/website/client/src/pages/settings/siteDataRows/userIdRow.vue b/website/client/src/pages/settings/siteDataRows/userIdRow.vue index c9d965b1c2..b830215d26 100644 --- a/website/client/src/pages/settings/siteDataRows/userIdRow.vue +++ b/website/client/src/pages/settings/siteDataRows/userIdRow.vue @@ -1,7 +1,12 @@ - {{ $t("userId") }} + + {{ $t("userId") }} + {{ user.id }} @@ -25,8 +30,10 @@