From 210fd3f90eced06b59270378783d1541b5f7f7fd Mon Sep 17 00:00:00 2001
From: anatolykopyl <hi@kopyl.dev>
Date: Sun, 18 Jun 2023 20:29:31 +0300
Subject: [PATCH] Fix answer counting

---
 backend/index.js                                 |  5 ++---
 backend/names.js                                 | 11 +++++++++++
 backend/{names.json.example => names.js.example} |  2 +-
 frontend/src/views/Screen/Index.vue              |  2 ++
 4 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 backend/names.js
 rename backend/{names.json.example => names.js.example} (86%)

diff --git a/backend/index.js b/backend/index.js
index 5859a87..ca66733 100644
--- a/backend/index.js
+++ b/backend/index.js
@@ -8,7 +8,7 @@ import { createNanoEvents } from 'nanoevents';
 
 import "dotenv/config";
 
-import names from './names.json' assert { type: "json" };
+import names from './names'
 
 const app = express();
 
@@ -175,6 +175,7 @@ const client = new MongoClient(process.env.URI, { useUnifiedTopology: true });
     });
 
     players[req.body.data.username] = req.body.data.name;
+    answers += 1
     emitter.emit('answer', {
       username: req.body.data.username,
       selected: req.body.data.name
@@ -283,8 +284,6 @@ const client = new MongoClient(process.env.URI, { useUnifiedTopology: true });
 
       res.write(`data: ${JSON.stringify(data)}\nevent: answer\n\n`);
 
-      answers += 1
-
       if (answers === Object.keys(players).length) {
         Object.keys(players).forEach((key) => {
           if (card.name === players[key]) {
diff --git a/backend/names.js b/backend/names.js
new file mode 100644
index 0000000..ba9b445
--- /dev/null
+++ b/backend/names.js
@@ -0,0 +1,11 @@
+export default [
+  "Толя Копыл",
+  "Дмитрий Самойлов",
+  "Илья Усачев",
+  "Степан Якимушкин",
+  "Ваня Гребнев",
+  "Алексей Петров",
+  "Алексей Иванов",
+  "Глеб Гейнке",
+  "Иван Чех"
+]
\ No newline at end of file
diff --git a/backend/names.json.example b/backend/names.js.example
similarity index 86%
rename from backend/names.json.example
rename to backend/names.js.example
index 6217f03..2990be1 100644
--- a/backend/names.json.example
+++ b/backend/names.js.example
@@ -1,4 +1,4 @@
-[
+export default [
   "Участник Беседы 1",
   "Участник Беседы 2",
   "Участник Беседы 3"
diff --git a/frontend/src/views/Screen/Index.vue b/frontend/src/views/Screen/Index.vue
index 16ab8a0..f9c41c4 100644
--- a/frontend/src/views/Screen/Index.vue
+++ b/frontend/src/views/Screen/Index.vue
@@ -23,6 +23,7 @@
               {{ user.name }}
             </span>
             <span 
+              v-if="score[user.name]"
               class="score"
               :class="{
                 '-leader': leader === user.name
@@ -52,6 +53,7 @@
               {{ user.name }}
             </span>
             <span 
+              v-if="score[user.name]"
               class="score"
               :class="{
                 '-leader': leader === user.name