From 494f32c3e3f68334199846049ee4f12cecb1e011 Mon Sep 17 00:00:00 2001 From: negue Date: Wed, 21 Dec 2022 00:55:31 +0100 Subject: [PATCH] Class Setting --- .../src/pages/settings/generalSettings.vue | 9 +- .../inlineSettings/audioThemeSetting.vue | 12 +- .../settings/inlineSettings/classSetting.vue | 129 +++++++++++------- 3 files changed, 88 insertions(+), 62 deletions(-) diff --git a/website/client/src/pages/settings/generalSettings.vue b/website/client/src/pages/settings/generalSettings.vue index bca7f2a564..6ac8cfeb15 100644 --- a/website/client/src/pages/settings/generalSettings.vue +++ b/website/client/src/pages/settings/generalSettings.vue @@ -35,6 +35,10 @@ TODO + + + +

@@ -46,6 +50,10 @@ + + + + @@ -62,7 +70,6 @@ - Change Class TODO diff --git a/website/client/src/pages/settings/inlineSettings/audioThemeSetting.vue b/website/client/src/pages/settings/inlineSettings/audioThemeSetting.vue index 16d6a18e0d..0fd7f895f5 100644 --- a/website/client/src/pages/settings/inlineSettings/audioThemeSetting.vue +++ b/website/client/src/pages/settings/inlineSettings/audioThemeSetting.vue @@ -155,24 +155,14 @@ export default { mounted () { this.resetControls(); this.previousValue = this.currentAudioTheme; - this.themeSelected = this.currentAudioTheme; }, methods: { - changeFormat (e) { - this.selectedFormat = e; - this.modalValuesChanged(); - }, - async changeFormatAndClose () { - this.user.preferences.dateFormat = this.selectedFormat; - await this.setUserPreference('dateFormat'); - this.closeModal(); - }, /** * is a callback from the {InlineSettingMixin} * do not remove */ resetControls () { - this.selectedFormat = this.previousValue; + this.themeSelected = this.currentAudioTheme; }, changeAudioThemeTemporary ($event) { this.user.preferences.sound = $event; diff --git a/website/client/src/pages/settings/inlineSettings/classSetting.vue b/website/client/src/pages/settings/inlineSettings/classSetting.vue index bbbd77bf5b..0ef82aed96 100644 --- a/website/client/src/pages/settings/inlineSettings/classSetting.vue +++ b/website/client/src/pages/settings/inlineSettings/classSetting.vue @@ -7,7 +7,19 @@ {{ $t("changeClassSetting") }} - TODO current class +
+ + + + {{ $t(selectedClass) }} + +
{{ $t(classType) }} + +
+ +
@@ -62,9 +85,9 @@ @@ -118,6 +141,8 @@ input { } .class-card { + position: relative; + height: 96px; width: 96px; min-width: 96px; @@ -130,6 +155,17 @@ input { flex-direction: column; justify-content: center; align-items: center; + + cursor: pointer; + + &:hover { + box-shadow: 0 3px 6px 0 rgba($black, 0.16), 0 3px 6px 0 rgba($black, 0.24); + border: solid 1px $purple-400; + } + + &.selected { + border: solid 1px $green-100; + } } .healer { @@ -155,6 +191,31 @@ input { text-align: center; } +.selected-badge { + position: absolute; + bottom: -1rem; + + width: 24px; + height: 24px; + + padding: 4px; + box-shadow: 0 1px 3px 0 rgba($black, 0.12), 0 1px 2px 0 rgba($black, 0.24); + background-color: $green-50; + border-radius: 1rem; + + color: $white; +} + +.class-value { + display: flex; + align-items: center; + + .label { + font-weight: bold; + line-height: 1.71; + } +} +