diff --git a/frontend/babel.config.js b/frontend/babel.config.js deleted file mode 100644 index e955840..0000000 --- a/frontend/babel.config.js +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = { - presets: [ - '@vue/cli-plugin-babel/preset' - ] -} diff --git a/frontend/package.json b/frontend/package.json index 463658c..f69d1ba 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -34,10 +34,9 @@ "plugin:vue/vue3-recommended", "eslint:recommended" ], - "parserOptions": { - "parser": "babel-eslint" - }, - "rules": {} + "rules": { + "vue/multi-word-component-names": 0 + } }, "browserslist": [ "> 1%", diff --git a/frontend/src/views/Game/List.vue b/frontend/src/views/Game/List.vue index 81ecea3..091074c 100644 --- a/frontend/src/views/Game/List.vue +++ b/frontend/src/views/Game/List.vue @@ -3,13 +3,13 @@ class="answers" > {{ name }} diff --git a/frontend/src/views/Screen/Index.vue b/frontend/src/views/Screen/Index.vue index ae1c38c..16ab8a0 100644 --- a/frontend/src/views/Screen/Index.vue +++ b/frontend/src/views/Screen/Index.vue @@ -10,31 +10,55 @@
-

Не ответили

+

+ Не ответили +

-

Ответили

+

+ Ответили +

@@ -67,6 +91,7 @@ const card = ref() const users = ref([]) const correctAnswer = ref() const loading = ref() +const score = ref({}) async function getCard() { loading.value = true @@ -93,6 +118,12 @@ const unansweredPlayers = computed(() => { return users.value.filter((user) => !user.selected) }) +const leader = computed(() => { + return Object.keys(score.value).sort((a, b) => { + return score.value[a] - score.value[b] + })[0] +}) + addAnswerListener((data) => { users.value = users.value.map((user) => { if (user.name === data.username) { @@ -117,6 +148,7 @@ addUserlistListener((data) => { addRevealListener((data) => { correctAnswer.value = data.correctAnswer + score.value = data.score setTimeout(() => { getCard() @@ -191,6 +223,12 @@ onMounted(() => { border-right: 1px dashed var(--clr-text); } +.user { + display: flex; + align-items: center; + gap: 8px; +} + .user.-correct { color: green; } @@ -199,6 +237,24 @@ onMounted(() => { color: red; } +.score { + display: flex; + align-items: center; + justify-content: center; + font-weight: 700; + font-size: 12px; + width: 16px; + height: 16px; + border-radius: 64px; + border: 2px solid var(--clr-text); + background: var(--clr-bg); + color: var(--clr-text); + + &.-leader { + background: var(--clr-accent); + } +} + .usersTitle { margin: 0; }