From ded552f69820697c8a68b7eba3a9b30763511a87 Mon Sep 17 00:00:00 2001 From: Fuchs0101 Date: Mon, 2 Dec 2024 21:14:09 +0900 Subject: [PATCH 01/51] setup development environment with Docker Compose --- backend/Dockerfile | 9 ++++++++ backend/requirements.txt | 3 +++ compose.yml | 45 ++++++++++++++++++++++++++++++++++++++++ frontend/Dockerfile | 8 +++++++ frontend/package.json | 3 +++ 5 files changed, 68 insertions(+) create mode 100644 backend/Dockerfile create mode 100644 backend/requirements.txt create mode 100644 compose.yml create mode 100644 frontend/Dockerfile create mode 100644 frontend/package.json diff --git a/backend/Dockerfile b/backend/Dockerfile new file mode 100644 index 0000000..fb25ab0 --- /dev/null +++ b/backend/Dockerfile @@ -0,0 +1,9 @@ +FROM python:3.10 + +WORKDIR /app + +COPY requirements.txt ./ +RUN pip install --no-cache-dir -r requirements.txt + +COPY . . + diff --git a/backend/requirements.txt b/backend/requirements.txt new file mode 100644 index 0000000..a23a866 --- /dev/null +++ b/backend/requirements.txt @@ -0,0 +1,3 @@ +Flask==2.2.5 +boto3==1.26.145 +gunicorn==20.1.0 \ No newline at end of file diff --git a/compose.yml b/compose.yml new file mode 100644 index 0000000..17fdc1b --- /dev/null +++ b/compose.yml @@ -0,0 +1,45 @@ +services: + frontend: + build: ./frontend + container_name: frontend + ports: + - "3000:3000" + volumes: + - ./frontend:/app + environment: + - NODE_ENV=development + + backend: + build: ./backend + container_name: backend + ports: + - "5000:5000" + volumes: + - ./backend:/app + environment: + - FLASK_ENV=development + + dynamodb: + image: amazon/dynamodb-local + container_name: dynamodb + ports: + - "8000:8000" + volumes: + - dynamodb_data:/home/dynamodblocal/data + + minio: + image: minio/minio + container_name: minio + ports: + - "9000:9000" + - "9001:9001" + environment: + - MINIO_ROOT_USER=miniominio + - MINIO_ROOT_PASSWORD=miniominio + command: server --console-address ":9001" /data + volumes: + - minio_data:/data + +volumes: + dynamodb_data: + minio_data: \ No newline at end of file diff --git a/frontend/Dockerfile b/frontend/Dockerfile new file mode 100644 index 0000000..223797c --- /dev/null +++ b/frontend/Dockerfile @@ -0,0 +1,8 @@ +FROM node:18 + +WORKDIR /app + +COPY package*.json ./ +RUN npm install + +COPY . . diff --git a/frontend/package.json b/frontend/package.json new file mode 100644 index 0000000..544b7b4 --- /dev/null +++ b/frontend/package.json @@ -0,0 +1,3 @@ +{ + +} \ No newline at end of file From e0d2c4541f2eca5eff0257f811de004acd6ff2a2 Mon Sep 17 00:00:00 2001 From: Sairon <138011409+Yukkurisiteikitai@users.noreply.github.com> Date: Tue, 3 Dec 2024 15:26:39 +0900 Subject: [PATCH 02/51] refactor/display-Set --- frontend/game.js | 188 ++++++++++++++++++++++++++++++++++++++++++++ frontend/index.html | 51 ++++++++++++ frontend/style.css | 60 ++++++++++++++ 3 files changed, 299 insertions(+) create mode 100644 frontend/game.js create mode 100644 frontend/index.html create mode 100644 frontend/style.css diff --git a/frontend/game.js b/frontend/game.js new file mode 100644 index 0000000..2801f3b --- /dev/null +++ b/frontend/game.js @@ -0,0 +1,188 @@ +document.addEventListener("DOMContentLoaded", () => { + const homeScreen = document.getElementById("home"); + const quizScreen = document.getElementById("quiz"); + const resultScreen = document.getElementById("result"); + const menuScreen = document.getElementById("menu"); + + const startButton = document.getElementById("start-button"); + const createButton = document.getElementById("create-button"); + const playButton = document.getElementById("play-button"); + + const options = document.querySelectorAll(".selects"); + const nextButton = document.querySelector(".next-button"); + const quitButton = document.querySelector(".quit-button"); + + + + const statusText = document.querySelector(".status"); + const answerText = document.querySelector(".answer"); + + // クイズデータ + + + questions = [ + { + "question": "halejfalwjfwfioa", + "options": [ + "hewaj;foewifj;w", + "jfoiea;jfiwfo", + "hoieajf;fjwf", + "hioefj;aefiofe" + ], + "answer": "hfeafjaweo;fiw" + }, + { + "question": "別の質問例", + "options": ["選択肢1", "選択肢2", "選択肢3", "選択肢4"], + "answer": "正解" + } + ] + + function reqListener(){ + console.log(this.responseText); + } + + function LoadRequest(){ + console.log("hello"); + + const req = new XMLHttpRequest(); + // req.addEventListener("load",reqListener); + req.open("GET","http://127.0.0.1:2342/info/2") + // req.send(); + req.responseType = "json"; + req.onload = () => { + if(req.readyState == 4 && req.status == 200){ + const date = req.response; + console.log(date); + return date; + }else{ + console.log(`Error: ${req.status}`); + } + }; + return "Not Found"; + } + + + question = {} + + fetch('http://127.0.0.1:2342/info/2') + .then(res => res.json()) + .then(data => { + console.log(data[0]); + const question = data[0]; + const d = document.createElement('h1'); + d.innerText=question["questiondate"]; + document.body.appendChild(d) + }) + + +displayLoadRequest + //display + function displayLoadRequest(display) + { + /** + * That option discplayis + * @param display (string)第1引数のコメント + * [home],["quiz"],["menu"],["result"] + */ + quizScreen.classList.add("d-none"); + resultScreen.classList.add("d-none"); + menuScreen.classList.add("d-none"); + homeScreen.classList.add("d-none"); + if (display == "home") + { + homeScreen.classList.remove("d-none"); + } + else if (display == "quiz") + { + quizScreen.classList.remove("d-none"); + } + else if (display == "menu") + { + menuScreen.classList.remove("d-none"); + } + else if (display == "result") + { + resultScreen.classList.remove("d-none"); + } + } + + // 正解データ + const correctAnswer = "スイッチ"; + + // クイズ開始 + startButton.addEventListener("click", () => { + /* + homeScreen.classList.add("d-none"); + quizScreen.classList.remove("d-none"); + */ + displayLoadRequest("menu"); + }); + + + + // 回答選択 + options.forEach(option => { + option.addEventListener("click", (event) => { + const selectedAnswer = event.target.textContent; + + // 判定処理 + if (selectedAnswer === correctAnswer) + { + statusText.textContent = "正解"; + statusText.style.color = "#28a745"; + } + else + { + statusText.textContent = "不正解"; + statusText.style.color = "#dc3545"; + } + + answerText.textContent = correctAnswer; // 正解を表示 + + // 結果画面へ移動 + quizScreen.classList.add("d-none"); + resultScreen.classList.remove("d-none"); + }); + }); + + + function ScreenSet(switch_screen,screen) + { + console.log(screen,switch_screen); + if(switch_screen == true) + { + + screen.classList.remove("d-none"); + } + else if(switch_screen == false) + { + screen.classList.add("d-none"); + } + else + { + console.error("ScreenDon't set switch_screen"); + } + console.log(screen,switch_screen); + + } + + // 次の問題へ（ここでは単純にホーム画面に戻る処理） + nextButton.addEventListener("click", () => { + // resultScreen.classList.add("d-none"); + // menuScreen.classList.add("d-none"); + // homeScreen.classList.remove("d-none"); + ScreenSet(false,resultScreen); + ScreenSet(false,menuScreen); + ScreenSet(true,homeScreen); + }); + + // やめる（ホーム画面に戻る） + quitButton.addEventListener("click", () => { + resultScreen.classList.add("d-none"); + homeScreen.classList.remove("d-none"); + }); + + + }); + diff --git a/frontend/index.html b/frontend/index.html new file mode 100644 index 0000000..afdbfae --- /dev/null +++ b/frontend/index.html @@ -0,0 +1,51 @@ + + + + + + クイズアプリ + + + + + +
+

ミニラン

+ +
+ + +
+
+ + +
+
+ + +
+

クイズ

+

任天堂・・

+
+ + + + +
+
+ + +
+

正解

+

スイッチ

+
+ + +
+
+ + + + diff --git a/frontend/style.css b/frontend/style.css new file mode 100644 index 0000000..2c90a81 --- /dev/null +++ b/frontend/style.css @@ -0,0 +1,60 @@ +body { + font-family: 'Arial', sans-serif; + background-color: #f8f9fa; + margin: 0; + padding: 0; + display: flex; + justify-content: center; + align-items: center; + height: 100vh; + } + + .container { + max-width: 500px; + } + + .logo { + font-size: 2.5rem; + font-weight: bold; + margin-bottom: 20px; + } + + .title { + font-size: 1.8rem; + margin-bottom: 10px; + } + + .question { + font-size: 1.5rem; + margin: 20px 0; + } + + .question.h2{ + color: black; + } + + .options .btn { + width: 100%; + margin: 5px 0; + } + + .status { + font-size: 1.2rem; + color: #28a745; + } + + .answer { + font-size: 2rem; + font-weight: bold; + margin: 20px 0; + } + + .actions .btn { + width: 100%; + margin: 5px 0; + } + + .d-none { + display: none; + } + \ No newline at end of file From c295a6b98389a81928eecdc521495389e0232271 Mon Sep 17 00:00:00 2001 From: Sairon <138011409+Yukkurisiteikitai@users.noreply.github.com> Date: Tue, 3 Dec 2024 16:15:12 +0900 Subject: [PATCH 03/51] set GameMenu&GameKind --- frontend/game.js | 122 ++++++++++++++++++++++++-------------------- frontend/index.html | 14 +++-- 2 files changed, 78 insertions(+), 58 deletions(-) diff --git a/frontend/game.js b/frontend/game.js index 2801f3b..1389ae4 100644 --- a/frontend/game.js +++ b/frontend/game.js @@ -2,23 +2,29 @@ document.addEventListener("DOMContentLoaded", () => { const homeScreen = document.getElementById("home"); const quizScreen = document.getElementById("quiz"); const resultScreen = document.getElementById("result"); - const menuScreen = document.getElementById("menu"); + const gameModeScreen = document.getElementById("game-mode"); + const selectGameScreen = document.getElementById("SelctGameKind"); + const startButton = document.getElementById("start-button"); const createButton = document.getElementById("create-button"); const playButton = document.getElementById("play-button"); + + const options = document.querySelectorAll(".selects"); const nextButton = document.querySelector(".next-button"); const quitButton = document.querySelector(".quit-button"); + const gameKindOptions = document.querySelector(".gamekind-option"); + // const gameModeOptions = document.querySelector(".gamemodes-option"); const statusText = document.querySelector(".status"); const answerText = document.querySelector(".answer"); - // クイズデータ - + // ゲームデータ + let gameMode = "play"; questions = [ { @@ -38,56 +44,22 @@ document.addEventListener("DOMContentLoaded", () => { } ] - function reqListener(){ - console.log(this.responseText); - } - - function LoadRequest(){ - console.log("hello"); - - const req = new XMLHttpRequest(); - // req.addEventListener("load",reqListener); - req.open("GET","http://127.0.0.1:2342/info/2") - // req.send(); - req.responseType = "json"; - req.onload = () => { - if(req.readyState == 4 && req.status == 200){ - const date = req.response; - console.log(date); - return date; - }else{ - console.log(`Error: ${req.status}`); - } - }; - return "Not Found"; - } - - question = {} - - fetch('http://127.0.0.1:2342/info/2') - .then(res => res.json()) - .then(data => { - console.log(data[0]); - const question = data[0]; - const d = document.createElement('h1'); - d.innerText=question["questiondate"]; - document.body.appendChild(d) - }) - + -displayLoadRequest - //display + /** + * That option discplayis + * @param display (string)この引数にhome,quiz,result,game_select,game_modeなどをstringで入れると、 + * その名前のdisplayを表示する + */ function displayLoadRequest(display) { - /** - * That option discplayis - * @param display (string)第1引数のコメント - * [home],["quiz"],["menu"],["result"] - */ + + gameModeScreen.classList.add("d-none"); + selectGameScreen.classList.add("d-none"); quizScreen.classList.add("d-none"); resultScreen.classList.add("d-none"); - menuScreen.classList.add("d-none"); + // menuScreen.classList.add("d-none"); homeScreen.classList.add("d-none"); if (display == "home") { @@ -97,9 +69,13 @@ displayLoadRequest { quizScreen.classList.remove("d-none"); } - else if (display == "menu") + else if (display == "game_select") { - menuScreen.classList.remove("d-none"); + selectGameScreen.classList.remove("d-none"); + } + else if (display == "game_mode") + { + gameModeScreen.classList.remove("d-none"); } else if (display == "result") { @@ -107,18 +83,53 @@ displayLoadRequest } } + displayLoadRequest("home"); // 正解データ const correctAnswer = "スイッチ"; - - // クイズ開始 + + // ゲームモードへ行く startButton.addEventListener("click", () => { /* homeScreen.classList.add("d-none"); quizScreen.classList.remove("d-none"); */ - displayLoadRequest("menu"); + console.log("start"); + displayLoadRequest("game_mode"); + }); + + playButton.addEventListener("click",()=>{ + displayLoadRequest("game_select"); }); + //gameMode + options.forEach(option => { + option.addEventListener("click", (event) => { + const selectedAnswer = event.target.textContent; + + // 判定処理 + if (selectedAnswer === correctAnswer) + { + statusText.textContent = "正解"; + statusText.style.color = "#28a745"; + } + else + { + statusText.textContent = "不正解"; + statusText.style.color = "#dc3545"; + } + + answerText.textContent = correctAnswer; // 正解を表示 + + // 結果画面へ移動 + /* + quizScreen.classList.add("d-none"); + resultScreen.classList.remove("d-none"); + */ + displayLoadRequest("result"); + }); + }); + + // 回答選択 @@ -141,8 +152,11 @@ displayLoadRequest answerText.textContent = correctAnswer; // 正解を表示 // 結果画面へ移動 + /* quizScreen.classList.add("d-none"); resultScreen.classList.remove("d-none"); + */ + displayLoadRequest("result"); }); }); @@ -172,9 +186,7 @@ displayLoadRequest // resultScreen.classList.add("d-none"); // menuScreen.classList.add("d-none"); // homeScreen.classList.remove("d-none"); - ScreenSet(false,resultScreen); - ScreenSet(false,menuScreen); - ScreenSet(true,homeScreen); + displayLoadRequest("home"); }); // やめる（ホーム画面に戻る） diff --git a/frontend/index.html b/frontend/index.html index afdbfae..af266c7 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -14,9 +14,17 @@

ミニラン

- -
-
+ +
+
+ + + +
+
+ +
+
From d7a597736555e4b74b9f4acb2bba2ff1a03b6601 Mon Sep 17 00:00:00 2001 From: Sairon <138011409+Yukkurisiteikitai@users.noreply.github.com> Date: Wed, 4 Dec 2024 10:01:21 +0900 Subject: [PATCH 04/51] setREADME-template --- README.md | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6b828a7..c236ea1 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,17 @@ -# Mini-Run -aa \ No newline at end of file +# **「暇つぶし革命！遊びながら学び、作って解く新感覚ミニゲーム体験！」** +URL:https://test.croud + +## 実行方法 +``` +docker compose build +docker compose up +``` +URL("localhost:5000")に接続 + +## 使用技術 +|kind |version | +|:--|:--:| +|node.js |node:18 | +|Flask |2.2.5 | +|boto3 |1.26.145 | +|gunicorn |20.1.0 | \ No newline at end of file From df2a3167f5a0634ceb101fd966843c9d6ba7adef Mon Sep 17 00:00:00 2001 From: Sairon <138011409+Yukkurisiteikitai@users.noreply.github.com> Date: Wed, 4 Dec 2024 12:13:14 +0900 Subject: [PATCH 05/51] perf/mockup-quiz --- frontend/game.js | 76 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 51 insertions(+), 25 deletions(-) diff --git a/frontend/game.js b/frontend/game.js index 1389ae4..37dd079 100644 --- a/frontend/game.js +++ b/frontend/game.js @@ -15,17 +15,20 @@ document.addEventListener("DOMContentLoaded", () => { const options = document.querySelectorAll(".selects"); const nextButton = document.querySelector(".next-button"); const quitButton = document.querySelector(".quit-button"); - const gameKindOptions = document.querySelector(".gamekind-option"); + const gameKindOptions = document.querySelectorAll(".gamekind-option"); // const gameModeOptions = document.querySelector(".gamemodes-option"); - const statusText = document.querySelector(".status"); const answerText = document.querySelector(".answer"); // ゲームデータ let gameMode = "play"; + /* + * helloWOlffe + **/ + questions = [ { "question": "halejfalwjfwfioa", @@ -40,7 +43,7 @@ document.addEventListener("DOMContentLoaded", () => { { "question": "別の質問例", "options": ["選択肢1", "選択肢2", "選択肢3", "選択肢4"], - "answer": "正解" + "answer": "選択肢1" } ] @@ -93,7 +96,6 @@ document.addEventListener("DOMContentLoaded", () => { homeScreen.classList.add("d-none"); quizScreen.classList.remove("d-none"); */ - console.log("start"); displayLoadRequest("game_mode"); }); @@ -102,6 +104,11 @@ document.addEventListener("DOMContentLoaded", () => { }); //gameMode + + //quiz set + // console.log(questions[1]["options"][0]) + + //quiz game options.forEach(option => { option.addEventListener("click", (event) => { const selectedAnswer = event.target.textContent; @@ -128,7 +135,46 @@ document.addEventListener("DOMContentLoaded", () => { displayLoadRequest("result"); }); }); - + + console.log(gameKindOptions); + gameKindOptions.forEach(option => { + console.log(option); + option.addEventListener("click", (event) => { + const selectGameKind = event.target.textContent; + if (selectedAnswer == "クイズ"){ + displayLoadRequest("quiz"); + } + + }); + }); + + gameKindOptions.forEach(option => { + option.addEventListener("click", (event) => { + const selectedAnswer = event.target.textContent; + + // 判定処理 + if (selectedAnswer == "クイズ") + { + displayLoadRequest("quiz"); + statusText.textContent = "正解"; + statusText.style.color = "#28a745"; + } + else + { + statusText.textContent = "不正解"; + statusText.style.color = "#dc3545"; + } + + // answerText.textContent = correctAnswer; // 正解を表示 + + // 結果画面へ移動 + /* + quizScreen.classList.add("d-none"); + resultScreen.classList.remove("d-none"); + */ + // displayLoadRequest("result"); + }); + }); @@ -161,26 +207,6 @@ document.addEventListener("DOMContentLoaded", () => { }); - function ScreenSet(switch_screen,screen) - { - console.log(screen,switch_screen); - if(switch_screen == true) - { - - screen.classList.remove("d-none"); - } - else if(switch_screen == false) - { - screen.classList.add("d-none"); - } - else - { - console.error("ScreenDon't set switch_screen"); - } - console.log(screen,switch_screen); - - } - // 次の問題へ（ここでは単純にホーム画面に戻る処理） nextButton.addEventListener("click", () => { // resultScreen.classList.add("d-none"); From 0864746f85208bf228c5289debf0414d21108e1a Mon Sep 17 00:00:00 2001 From: Sairon <138011409+Yukkurisiteikitai@users.noreply.github.com> Date: Wed, 4 Dec 2024 12:40:25 +0900 Subject: [PATCH 06/51] peft/game-selectSystem --- frontend/game.js | 15 +++++++++++---- frontend/game.jsREADME.md | 12 ++++++++++++ 2 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 frontend/game.jsREADME.md diff --git a/frontend/game.js b/frontend/game.js index 37dd079..b3176a4 100644 --- a/frontend/game.js +++ b/frontend/game.js @@ -136,15 +136,22 @@ document.addEventListener("DOMContentLoaded", () => { }); }); + gamekind = { + "クイズ":"quiz", + "間違え探し":"different" + } + console.log(gameKindOptions); gameKindOptions.forEach(option => { console.log(option); - option.addEventListener("click", (event) => { + option.addEventListener("click", (event) => + { const selectGameKind = event.target.textContent; - if (selectedAnswer == "クイズ"){ - displayLoadRequest("quiz"); - } + if(gamekind[selectGameKind] != null){ + }else{ + console.error("selectGameKindOptionNothing"); + } }); }); diff --git a/frontend/game.jsREADME.md b/frontend/game.jsREADME.md new file mode 100644 index 0000000..c019c93 --- /dev/null +++ b/frontend/game.jsREADME.md @@ -0,0 +1,12 @@ +重要関数 +`displayLoadRequest` +どの画面を表示するかをstring側で受け取り。 +指定された画面を表示する. + +|key |場所 | +|:--|:--:| +|home |title画面 | +|quiz |クイズ(選択式) | +|game_mode |作成するのか遊ぶのかを選択する | +|game_select |ゲームの種類(クイズ、間違い探しなど)を選択する | +|result |リザルト(結果発表)画面 | From eea20c8b730bed89e705e5ed5dcba19bac72ca8d Mon Sep 17 00:00:00 2001 From: Sairon <138011409+Yukkurisiteikitai@users.noreply.github.com> Date: Wed, 4 Dec 2024 14:49:27 +0900 Subject: [PATCH 07/51] peft/quiz-question-easy --- frontend/game.js | 104 ++++++++++++++++---------------------- frontend/game.jsREADME.md | 1 - 2 files changed, 44 insertions(+), 61 deletions(-) diff --git a/frontend/game.js b/frontend/game.js index b3176a4..fd42a08 100644 --- a/frontend/game.js +++ b/frontend/game.js @@ -24,11 +24,13 @@ document.addEventListener("DOMContentLoaded", () => { // ゲームデータ let gameMode = "play"; - - /* - * helloWOlffe - **/ - + //ゲーム選択画面でそのままLoadingKeyに入れるようにするための対策 + gamekind = { + "クイズ":"quiz", + "間違え探し":"SerchDifferent", + "イントロドン":"introdon" + } + questions = [ { "question": "halejfalwjfwfioa", @@ -40,16 +42,15 @@ document.addEventListener("DOMContentLoaded", () => { ], "answer": "hfeafjaweo;fiw" }, + { "question": "別の質問例", "options": ["選択肢1", "選択肢2", "選択肢3", "選択肢4"], "answer": "選択肢1" - } + }, ] - - /** * That option discplayis * @param display (string)この引数にhome,quiz,result,game_select,game_modeなどをstringで入れると、 @@ -88,7 +89,7 @@ document.addEventListener("DOMContentLoaded", () => { displayLoadRequest("home"); // 正解データ - const correctAnswer = "スイッチ"; + let correctAnswer = "スイッチ"; // ゲームモードへ行く startButton.addEventListener("click", () => { @@ -105,11 +106,10 @@ document.addEventListener("DOMContentLoaded", () => { //gameMode - //quiz set - // console.log(questions[1]["options"][0]) - //quiz game + //クイズ options.forEach(option => { + console.log(option[0]); option.addEventListener("click", (event) => { const selectedAnswer = event.target.textContent; @@ -119,6 +119,8 @@ document.addEventListener("DOMContentLoaded", () => { statusText.textContent = "正解"; statusText.style.color = "#28a745"; } + + else { statusText.textContent = "不正解"; @@ -128,65 +130,55 @@ document.addEventListener("DOMContentLoaded", () => { answerText.textContent = correctAnswer; // 正解を表示 // 結果画面へ移動 - /* - quizScreen.classList.add("d-none"); - resultScreen.classList.remove("d-none"); - */ displayLoadRequest("result"); }); }); + + + //間違い探し - gamekind = { - "クイズ":"quiz", - "間違え探し":"different" - } + console.log(gameKindOptions); - gameKindOptions.forEach(option => { + gameKindOptions.forEach(option => + { console.log(option); option.addEventListener("click", (event) => { const selectGameKind = event.target.textContent; if(gamekind[selectGameKind] != null){ - - }else{ - console.error("selectGameKindOptionNothing"); - } - }); - }); - - gameKindOptions.forEach(option => { - option.addEventListener("click", (event) => { - const selectedAnswer = event.target.textContent; - - // 判定処理 - if (selectedAnswer == "クイズ") - { - displayLoadRequest("quiz"); - statusText.textContent = "正解"; - statusText.style.color = "#28a745"; + displayLoadRequest(gamekind[selectGameKind]); } + else { - statusText.textContent = "不正解"; - statusText.style.color = "#dc3545"; + console.error("selectGameKindOptionNothing"); } - - // answerText.textContent = correctAnswer; // 正解を表示 - - // 結果画面へ移動 - /* - quizScreen.classList.add("d-none"); - resultScreen.classList.remove("d-none"); - */ - // displayLoadRequest("result"); }); }); + /* + * 作る + * @param questions リスト + **/ + + q = ["hello","helntai","haefo;wj","jfo;ejfw"] + function quiz_set(questions,answer_number) + { + const quiz_contents = options.item(0).children; + for(var i = 0; i < 4;i++) + { + quiz_contents[i].textContent = questions[i]; + } + correctAnswer = questions[answer_number]; + } + + quiz_set(q,2); // 回答選択 - options.forEach(option => { + options.forEach(option => + { option.addEventListener("click", (event) => { const selectedAnswer = event.target.textContent; @@ -203,12 +195,8 @@ document.addEventListener("DOMContentLoaded", () => { } answerText.textContent = correctAnswer; // 正解を表示 - + // 結果画面へ移動 - /* - quizScreen.classList.add("d-none"); - resultScreen.classList.remove("d-none"); - */ displayLoadRequest("result"); }); }); @@ -216,16 +204,12 @@ document.addEventListener("DOMContentLoaded", () => { // 次の問題へ（ここでは単純にホーム画面に戻る処理） nextButton.addEventListener("click", () => { - // resultScreen.classList.add("d-none"); - // menuScreen.classList.add("d-none"); - // homeScreen.classList.remove("d-none"); displayLoadRequest("home"); }); // やめる（ホーム画面に戻る） quitButton.addEventListener("click", () => { - resultScreen.classList.add("d-none"); - homeScreen.classList.remove("d-none"); + displayLoadRequest("home"); }); diff --git a/frontend/game.jsREADME.md b/frontend/game.jsREADME.md index c019c93..264c0c9 100644 --- a/frontend/game.jsREADME.md +++ b/frontend/game.jsREADME.md @@ -1,4 +1,3 @@ -重要関数 `displayLoadRequest` どの画面を表示するかをstring側で受け取り。 指定された画面を表示する. From 10f8f0faa5c26d31e7363904c3342d83b4c1f6b0 Mon Sep 17 00:00:00 2001 From: Sairon <138011409+Yukkurisiteikitai@users.noreply.github.com> Date: Wed, 4 Dec 2024 15:07:32 +0900 Subject: [PATCH 08/51] perf/setQuiz-Question --- frontend/game.js | 62 +++++++++++++++++++++++++++------------------ frontend/index.html | 2 +- 2 files changed, 39 insertions(+), 25 deletions(-) diff --git a/frontend/game.js b/frontend/game.js index fd42a08..645efc7 100644 --- a/frontend/game.js +++ b/frontend/game.js @@ -10,13 +10,14 @@ document.addEventListener("DOMContentLoaded", () => { const createButton = document.getElementById("create-button"); const playButton = document.getElementById("play-button"); - - + + // quiz const options = document.querySelectorAll(".selects"); + const question = document.getElementById("question_text"); + const nextButton = document.querySelector(".next-button"); const quitButton = document.querySelector(".quit-button"); const gameKindOptions = document.querySelectorAll(".gamekind-option"); - // const gameModeOptions = document.querySelector(".gamemodes-option"); const statusText = document.querySelector(".status"); @@ -31,25 +32,30 @@ document.addEventListener("DOMContentLoaded", () => { "イントロドン":"introdon" } - questions = [ + + //クイズデータ + question_date = [ { "question": "halejfalwjfwfioa", - "options": [ + "selects": [ "hewaj;foewifj;w", "jfoiea;jfiwfo", "hoieajf;fjwf", "hioefj;aefiofe" ], - "answer": "hfeafjaweo;fiw" + "answer": 2 }, { "question": "別の質問例", - "options": ["選択肢1", "選択肢2", "選択肢3", "選択肢4"], - "answer": "選択肢1" + "selects": ["選択肢1", "選択肢2", "選択肢3", "選択肢4"], + "answer": 1 }, - ] - + ] + + // 正解データ + let correctAnswer = "スイッチ"; + /** * That option discplayis @@ -58,29 +64,33 @@ document.addEventListener("DOMContentLoaded", () => { */ function displayLoadRequest(display) { - gameModeScreen.classList.add("d-none"); selectGameScreen.classList.add("d-none"); quizScreen.classList.add("d-none"); resultScreen.classList.add("d-none"); - // menuScreen.classList.add("d-none"); homeScreen.classList.add("d-none"); + + if (display == "home") { homeScreen.classList.remove("d-none"); } + else if (display == "quiz") { quizScreen.classList.remove("d-none"); } + else if (display == "game_select") { selectGameScreen.classList.remove("d-none"); } + else if (display == "game_mode") { gameModeScreen.classList.remove("d-none"); } + else if (display == "result") { resultScreen.classList.remove("d-none"); @@ -88,8 +98,7 @@ document.addEventListener("DOMContentLoaded", () => { } displayLoadRequest("home"); - // 正解データ - let correctAnswer = "スイッチ"; + // ゲームモードへ行く startButton.addEventListener("click", () => { @@ -157,23 +166,28 @@ document.addEventListener("DOMContentLoaded", () => { }); }); - /* - * 作る - * @param questions リスト - **/ - - q = ["hello","helntai","haefo;wj","jfo;ejfw"] - function quiz_set(questions,answer_number) + /** + * 質問を書き込む + * @param question_text (string)質問文 + * @param selects (list-string)選択肢で表示するもの + * @param answer_number (int)selectsでの連番-何番目の選択肢を正解にするか、 + * その名前のdisplayを表示する + */ + function quiz_set(question_text,selects,answer_number) { + question.textContent = question_text; const quiz_contents = options.item(0).children; for(var i = 0; i < 4;i++) { - quiz_contents[i].textContent = questions[i]; + quiz_contents[i].textContent = selects[i]; } - correctAnswer = questions[answer_number]; + correctAnswer = selects[answer_number]; } - quiz_set(q,2); + //テスト用のプログラムを組み込んでいる + quiz_set(question_date[0]["question"], + question_date[0]["selects"], + question_date[0]["answer"]); // 回答選択 diff --git a/frontend/index.html b/frontend/index.html index af266c7..9a9c3f3 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -33,7 +33,7 @@

ミニラン

クイズ

-

任天堂・・

+

任天堂・・

From 7e47750bde9cc5fa90b5a190718b012557be6ac2 Mon Sep 17 00:00:00 2001 From: Sairon <138011409+Yukkurisiteikitai@users.noreply.github.com> Date: Thu, 5 Dec 2024 14:58:07 +0900 Subject: [PATCH 09/51] I Don't know What do division --- frontend/game.js | 143 ++++++++++++++++++----------------------- frontend/games/quiz.js | 60 +++++++++++++++++ 2 files changed, 124 insertions(+), 79 deletions(-) create mode 100644 frontend/games/quiz.js diff --git a/frontend/game.js b/frontend/game.js index 645efc7..ab54235 100644 --- a/frontend/game.js +++ b/frontend/game.js @@ -1,3 +1,6 @@ +const quiz_system = require("./games/quiz.js"); +console.log(quiz_system); + document.addEventListener("DOMContentLoaded", () => { const homeScreen = document.getElementById("home"); const quizScreen = document.getElementById("quiz"); @@ -9,20 +12,20 @@ document.addEventListener("DOMContentLoaded", () => { const startButton = document.getElementById("start-button"); const createButton = document.getElementById("create-button"); const playButton = document.getElementById("play-button"); - - - // quiz - const options = document.querySelectorAll(".selects"); - const question = document.getElementById("question_text"); - const nextButton = document.querySelector(".next-button"); const quitButton = document.querySelector(".quit-button"); + const gameKindOptions = document.querySelectorAll(".gamekind-option"); + // let quiz_system = new quiz(); + + const statusText = document.querySelector(".status"); const answerText = document.querySelector(".answer"); + + // ゲームデータ let gameMode = "play"; //ゲーム選択画面でそのままLoadingKeyに入れるようにするための対策 @@ -53,8 +56,6 @@ document.addEventListener("DOMContentLoaded", () => { }, ] - // 正解データ - let correctAnswer = "スイッチ"; /** @@ -97,15 +98,11 @@ document.addEventListener("DOMContentLoaded", () => { } } + displayLoadRequest("home"); - // ゲームモードへ行く startButton.addEventListener("click", () => { - /* - homeScreen.classList.add("d-none"); - quizScreen.classList.remove("d-none"); - */ displayLoadRequest("game_mode"); }); @@ -117,35 +114,38 @@ document.addEventListener("DOMContentLoaded", () => { //クイズ - options.forEach(option => { - console.log(option[0]); - option.addEventListener("click", (event) => { - const selectedAnswer = event.target.textContent; + // select_options.forEach(option => { + // console.log(option[0]); + // option.addEventListener("click", (event) => { + // const selectedAnswer = event.target.textContent; - // 判定処理 - if (selectedAnswer === correctAnswer) - { - statusText.textContent = "正解"; - statusText.style.color = "#28a745"; - } - - - else - { - statusText.textContent = "不正解"; - statusText.style.color = "#dc3545"; - } + // // 判定処理 + // if (selectedAnswer === correctAnswer) + // { + // statusText.textContent = "正解"; + // statusText.style.color = "#28a745"; + // } + + + // else + // { + // statusText.textContent = "不正解"; + // statusText.style.color = "#dc3545"; + // } - answerText.textContent = correctAnswer; // 正解を表示 + // answerText.textContent = correctAnswer; // 正解を表示 - // 結果画面へ移動 - displayLoadRequest("result"); - }); - }); + // // 結果画面へ移動 + // displayLoadRequest("result"); + // }); + // }); + // quit_system.quiz_set(question_date[0]["question"], + // question_date[0]["selects"], + // question_date[0]["answer"]); + + // quiz_system.quiz_SelectEvent(); - //間違い探し - console.log(gameKindOptions); @@ -155,6 +155,8 @@ document.addEventListener("DOMContentLoaded", () => { option.addEventListener("click", (event) => { const selectGameKind = event.target.textContent; + + //選択したボタンのtextCountentからと一致する名前のゲームのdivを表示する if(gamekind[selectGameKind] != null){ displayLoadRequest(gamekind[selectGameKind]); } @@ -166,54 +168,39 @@ document.addEventListener("DOMContentLoaded", () => { }); }); - /** - * 質問を書き込む - * @param question_text (string)質問文 - * @param selects (list-string)選択肢で表示するもの - * @param answer_number (int)selectsでの連番-何番目の選択肢を正解にするか、 - * その名前のdisplayを表示する - */ - function quiz_set(question_text,selects,answer_number) - { - question.textContent = question_text; - const quiz_contents = options.item(0).children; - for(var i = 0; i < 4;i++) - { - quiz_contents[i].textContent = selects[i]; - } - correctAnswer = selects[answer_number]; - } + + //テスト用のプログラムを組み込んでいる - quiz_set(question_date[0]["question"], + quiz_system.quiz_set(question_date[0]["question"], question_date[0]["selects"], question_date[0]["answer"]); - + quiz_system.quiz_SelectEvent(); // 回答選択 - options.forEach(option => - { - option.addEventListener("click", (event) => { - const selectedAnswer = event.target.textContent; + // select_options.forEach(option => + // { + // option.addEventListener("click", (event) => { + // const selectedAnswer = event.target.textContent; - // 判定処理 - if (selectedAnswer === correctAnswer) - { - statusText.textContent = "正解"; - statusText.style.color = "#28a745"; - } - else - { - statusText.textContent = "不正解"; - statusText.style.color = "#dc3545"; - } + // // 判定処理 + // if (selectedAnswer === correctAnswer) + // { + // statusText.textContent = "正解"; + // statusText.style.color = "#28a745"; + // } + // else + // { + // statusText.textContent = "不正解"; + // statusText.style.color = "#dc3545"; + // } - answerText.textContent = correctAnswer; // 正解を表示 + // answerText.textContent = correctAnswer; // 正解を表示 - // 結果画面へ移動 - displayLoadRequest("result"); - }); - }); + // // 結果画面へ移動 + // displayLoadRequest("result"); + // }); + // }); // 次の問題へ（ここでは単純にホーム画面に戻る処理） @@ -226,6 +213,4 @@ document.addEventListener("DOMContentLoaded", () => { displayLoadRequest("home"); }); - - }); - + }); \ No newline at end of file diff --git a/frontend/games/quiz.js b/frontend/games/quiz.js new file mode 100644 index 0000000..02f0ced --- /dev/null +++ b/frontend/games/quiz.js @@ -0,0 +1,60 @@ +// console.log("loadQuiz.js"); + + + +// quiz +const select_options = document.querySelectorAll(".selects"); +const question = document.getElementById("question_text"); +let correctAnswer = "start-answer"; + + + /** + * 質問を書き込む + * @param question_text (string)質問文 + * @param selects (list-string)選択肢で表示するもの + * @param answer_number (int)selectsでの連番-何番目の選択肢を正解にするか、 + * その名前のdisplayを表示する + */ + function quiz_set(question_text,selects,answer_number) + { + question.textContent = question_text; + const quiz_contents = select_options.item(0).children; + for(var i = 0; i < 4;i++) + { + quiz_contents[i].textContent = selects[i]; + } + correctAnswer = selects[answer_number]; + } + + + function quiz_SelectEvent() + { + select_options.forEach(option => + { + option.addEventListener("click", (event) => { + const selectedAnswer = event.target.textContent; + + // 判定処理 + if (selectedAnswer === correctAnswer) + { + statusText.textContent = "正解"; + statusText.style.color = "#28a745"; + } + else + { + statusText.textContent = "不正解"; + statusText.style.color = "#dc3545"; + } + + answerText.textContent = correctAnswer; // 正解を表示 + + // 結果画面へ移動 + displayLoadRequest("result"); + }); + }); + } + +export{ + quiz_SelectEvent, + quiz_set +} \ No newline at end of file From c0aa97fe6d290a98b778b99f9e2bf53a424fa1ad Mon Sep 17 00:00:00 2001 From: Fuchs0101 Date: Thu, 5 Dec 2024 20:42:31 +0900 Subject: [PATCH 10/51] implement base of backend application --- .gitignore | 6 +++++ backend/Dockerfile | 1 + backend/app.py | 26 ++++++++++++++++++ backend/config/config.py | 7 +++++ backend/config/logging.json | 38 +++++++++++++++++++++++++++ backend/controller/game_controller.py | 19 ++++++++++++++ backend/engine/dynamo_client.py | 24 +++++++++++++++++ backend/engine/s3_client.py | 0 backend/initialize_db.py | 21 +++++++++++++++ backend/logger.py | 14 ++++++++++ backend/model/games.py | 17 ++++++++++++ backend/requirements.txt | 3 ++- backend/router.py | 34 ++++++++++++++++++++++++ backend/service/game_service.py | 10 +++++++ backend/settings.py | 0 compose.yml | 23 +++++++++++++--- 16 files changed, 239 insertions(+), 4 deletions(-) create mode 100644 .gitignore create mode 100644 backend/app.py create mode 100644 backend/config/config.py create mode 100644 backend/config/logging.json create mode 100644 backend/controller/game_controller.py create mode 100644 backend/engine/dynamo_client.py create mode 100644 backend/engine/s3_client.py create mode 100644 backend/initialize_db.py create mode 100644 backend/logger.py create mode 100644 backend/model/games.py create mode 100644 backend/router.py create mode 100644 backend/service/game_service.py create mode 100644 backend/settings.py diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0b6b20a --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +# log files +backend/logs + +# environment informations and credentials +*.env +*.pyc \ No newline at end of file diff --git a/backend/Dockerfile b/backend/Dockerfile index fb25ab0..b0511f4 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -7,3 +7,4 @@ RUN pip install --no-cache-dir -r requirements.txt COPY . . +CMD ["flask", "run", "--host=0.0.0.0"] \ No newline at end of file diff --git a/backend/app.py b/backend/app.py new file mode 100644 index 0000000..b5f6b16 --- /dev/null +++ b/backend/app.py @@ -0,0 +1,26 @@ +from flask import Flask +from flask_cors import CORS +import router +from config import config + +def create_app(): + app = Flask(__name__) + + app.config.from_object(config.Config) + + app.register_blueprint(router.router) + + app.config['JSON_AS_ASCII'] = False #日本語文字化け対策 + app.config["JSON_SORT_KEYS"] = False #ソートをそのまま + CORS( + app, + resources = { + r"/api/*": {"origins": ["http://localhost", "http://localhost:3000"]} + } + ) + + return app + +if __name__ == "__main__": + app = create_app() + app.run(host='0.0.0.0', debug=True, port=5000, threaded=True, use_reloader=False) \ No newline at end of file diff --git a/backend/config/config.py b/backend/config/config.py new file mode 100644 index 0000000..dc64d31 --- /dev/null +++ b/backend/config/config.py @@ -0,0 +1,7 @@ +import os +from dataclasses import dataclass + +@dataclass +class Config: + DEBUG = os.getenv("DEBUG") + DATABASE_URI= "" diff --git a/backend/config/logging.json b/backend/config/logging.json new file mode 100644 index 0000000..2e66282 --- /dev/null +++ b/backend/config/logging.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "formatters": { + "default": { + "format": "[%(asctime)s] [%(levelname)s] : %(message)s" + } + }, + "loggers": { + "file": { + "handlers": ["file"], + "level": "WARN", + "qualname": "file", + "propagate": "no" + }, + "wsgi": { + "handlers": ["wsgi"], + "level": "WARN", + "qualname": "wsgi", + "propagate": "no" + } + }, + "handlers": { + "file": { + "class": "logging.handlers.TimedRotatingFileHandler", + "formatter": "default", + "filename": "./logs/application.log" + }, + "wsgi": { + "class": "logging.StreamHandler", + "stream": "ext://flask.logging.wsgi_errors_stream", + "formatter": "default" + } + }, + "root": { + "level": "WARN", + "handlers": ["file", "wsgi"] + } +} diff --git a/backend/controller/game_controller.py b/backend/controller/game_controller.py new file mode 100644 index 0000000..00db5ef --- /dev/null +++ b/backend/controller/game_controller.py @@ -0,0 +1,19 @@ +from flask import make_response, jsonify +from engine.dynamo_client import DynamoClient + +class GameController: + def __init__(self): + self.db_client = DynamoClient(table_name="game_table") + + def get_game_random(self): + response = self.db_client.get_random() + return make_response(jsonify({ + 'code': 200, + 'game': response + })) + + def create_quiz(self): + # TODO: バリデーションを実装 + if self.db_client.create_quiz(): + return make_response(jsonify({'code: 200'})) + # TODO: エラーハンドリングを実装 diff --git a/backend/engine/dynamo_client.py b/backend/engine/dynamo_client.py new file mode 100644 index 0000000..624e13f --- /dev/null +++ b/backend/engine/dynamo_client.py @@ -0,0 +1,24 @@ +import os +import boto3 +import random + +class DynamoClient: + def __init__(self, table_name: str) -> None: + self.db = boto3.client('dynamodb', endpoint_url=os.getenv("DYNAMO_ENDPOINT")) + self.table_name = table_name + + def get_all(self) -> list: + '''対象のテーブルからレコード全件を取得するメソッド + ''' + response = self.db.scan(TableName=self.table_name) + items = response.get('Items', []) + return items + + def get_random(self) -> None: + '''対象のテーブルからランダムに1件レコードを取得するメソッド + ''' + response_all = self.db.scan(TableName=self.table_name) + response_len = response_all['Count'] + random_key = random.randrange(response_len) + response = self.db.get_item(TableName=self.table_name, Key={"id": {"N": str(random_key)}}) + return response.get('Item', []) diff --git a/backend/engine/s3_client.py b/backend/engine/s3_client.py new file mode 100644 index 0000000..e69de29 diff --git a/backend/initialize_db.py b/backend/initialize_db.py new file mode 100644 index 0000000..a58d0f4 --- /dev/null +++ b/backend/initialize_db.py @@ -0,0 +1,21 @@ +import os +import boto3 + +dynamodb = boto3.client('dynamodb', endpoint_url=os.getenv("DYNAMO_ENDPOINT")) + +table_name = "game_table" + +def main(): + dynamodb.create_table( + TableName=table_name, + KeySchema=[ + {"AttributeName": "id", "KeyType": "HASH",}, + ], + AttributeDefinitions=[ + {"AttributeName": "id", "AttributeType": "N"}, + ], + BillingMode="PAY_PER_REQUEST", + ) + +if __name__ == "__main__": + main() \ No newline at end of file diff --git a/backend/logger.py b/backend/logger.py new file mode 100644 index 0000000..a948aa5 --- /dev/null +++ b/backend/logger.py @@ -0,0 +1,14 @@ +from flask import request, current_app +from functools import wraps + +def http_request_logging(f): + @wraps(f) + def decorated_function(*args, **kwargs): + logger = current_app.logger + try: + logger.info('%s - %s - %s - %s', request.remote_addr, request.method, request.url, request.query_string) + except Exception as e: + logger.exception(e) + pass + return f(*args, **kwargs) + return decorated_function diff --git a/backend/model/games.py b/backend/model/games.py new file mode 100644 index 0000000..892304d --- /dev/null +++ b/backend/model/games.py @@ -0,0 +1,17 @@ +class Quiz: + def __init__(self, id: int, question: str, selects: list, answer_idx: int, likes: int=0) -> None: + self.id = id + self.question = question + self.selects = selects + self.answer_idx = answer_idx + self.likes = likes + + # TODO: __repr__(self)をつくる + +class IntroDon: + def __init__(self, game_id: int, question: str, selects: list, answer: str, likes: int=0) -> None: + self.game_id = game_id + self.question = question + self.selects = selects + self.answer = answer + self.likes = likes \ No newline at end of file diff --git a/backend/requirements.txt b/backend/requirements.txt index a23a866..65bfbbf 100644 --- a/backend/requirements.txt +++ b/backend/requirements.txt @@ -1,3 +1,4 @@ Flask==2.2.5 boto3==1.26.145 -gunicorn==20.1.0 \ No newline at end of file +gunicorn==20.1.0 +flask_cors \ No newline at end of file diff --git a/backend/router.py b/backend/router.py new file mode 100644 index 0000000..679179c --- /dev/null +++ b/backend/router.py @@ -0,0 +1,34 @@ +from flask import Blueprint +from controller import game_controller +from logging import config +from json import load +import logger + +# Generate Router Instance +router = Blueprint('router', __name__) + +# Read Logging Configuration +with open("./config/logging.json", "r", encoding="utf-8") as f: + config.dictConfig(load(f)) + +@router.route("/", methods=['GET']) +@logger.http_request_logging +def hello_world(): + return "Hello World!!" + +@router.route("/api/play/random", methods=['GET']) +@logger.http_request_logging +def api_play_random(): + return game_controller.get_game_random() + +@router.route("/api/create/quiz", methods=['POST']) +@logger.http_request_logging +def api_create_quiz(): + return game_controller.create_quiz() + +@router.after_request +def after_request(response): + # response.headers.add('Access-Control-Allow-Origin', '*') + response.headers.add('Access-Control-Allow-Headers', 'Content-Type,Authorization') + response.headers.add('Access-Control-Allow-Methods', 'GET,PUT,POST,DELETE,OPTIONS') + return response diff --git a/backend/service/game_service.py b/backend/service/game_service.py new file mode 100644 index 0000000..941892c --- /dev/null +++ b/backend/service/game_service.py @@ -0,0 +1,10 @@ +from flask import make_response, jsonify + + +def get_game_logic(): + game = Game.get_game_list() + game_schema = GameSchema(many=True) + return make_response(jsonify({ + 'code': 200, + 'game': game + })) diff --git a/backend/settings.py b/backend/settings.py new file mode 100644 index 0000000..e69de29 diff --git a/compose.yml b/compose.yml index 17fdc1b..b6a7552 100644 --- a/compose.yml +++ b/compose.yml @@ -8,6 +8,8 @@ services: - ./frontend:/app environment: - NODE_ENV=development + depends_on: + - backend backend: build: ./backend @@ -16,16 +18,31 @@ services: - "5000:5000" volumes: - ./backend:/app - environment: - - FLASK_ENV=development + env_file: + - backend/.env + depends_on: + - dynamodb + - minio dynamodb: image: amazon/dynamodb-local container_name: dynamodb + user: root + command: -jar DynamoDBLocal.jar -sharedDb -dbPath /data ports: - "8000:8000" volumes: - - dynamodb_data:/home/dynamodblocal/data + - dynamodb_data:/data + + dynamodb-admin: + image: aaronshaf/dynamodb-admin:latest + container_name: dynamodb-admin + environment: + - DYNAMO_ENDPOINT=http://dynamodb:8000 + ports: + - 8001:8001 + depends_on: + - dynamodb minio: image: minio/minio From 0683e3db4e0d5038d882679d2252ff19a68c6044 Mon Sep 17 00:00:00 2001 From: Sairon <138011409+Yukkurisiteikitai@users.noreply.github.com> Date: Thu, 5 Dec 2024 20:54:58 +0900 Subject: [PATCH 11/51] setDifferentPoint --- frontend/differentPoint.html | 59 +++++++++++++++++++++++++++++++ frontend/game.js | 3 +- frontend/games/differentPoint.js | 48 +++++++++++++++++++++++++ frontend/thinks/differentpoint.md | 32 +++++++++++++++++ 4 files changed, 141 insertions(+), 1 deletion(-) create mode 100644 frontend/differentPoint.html create mode 100644 frontend/games/differentPoint.js create mode 100644 frontend/thinks/differentpoint.md diff --git a/frontend/differentPoint.html b/frontend/differentPoint.html new file mode 100644 index 0000000..9a9c3f3 --- /dev/null +++ b/frontend/differentPoint.html @@ -0,0 +1,59 @@ + + + + + + クイズアプリ + + + + + +
+

ミニラン

+ +
+ + +
+
+ + + +
+
+ +
+
+ + +
+
+ + +
+

クイズ

+

任天堂・・

+
+ + + + +
+
+ + +
+

正解

+

スイッチ

+
+ + +
+
+ + + + diff --git a/frontend/game.js b/frontend/game.js index ab54235..315b0b8 100644 --- a/frontend/game.js +++ b/frontend/game.js @@ -1,4 +1,5 @@ -const quiz_system = require("./games/quiz.js"); +// const quiz_system = require("./games/quiz.js"); + console.log(quiz_system); document.addEventListener("DOMContentLoaded", () => { diff --git a/frontend/games/differentPoint.js b/frontend/games/differentPoint.js new file mode 100644 index 0000000..6eb42e1 --- /dev/null +++ b/frontend/games/differentPoint.js @@ -0,0 +1,48 @@ + +//date +let questionDate = { + "ImageList":[], + "answer_map":"間違っている画像の部分を表示する用のマップ", + "lastTouchPos":[25.32, 3452.3] +} + + +class different_play{ + constructor(){ + //初期値 + this.ImageList = [] + this.answer_map = [] // ImageListから取得した画像からサイズを測定してそのサイズの二次元配列を作成する + + this.lastTouchPos = [0.0, 0.0] + } + +} + + +/** + *画像のどこをタップしたかを調べる処理 + */ + function GET_TouchImagePostion() + { + + } + + /** + * 正解の場所を描画する処理 + * @param ImageList 間違い探しで使う画像集(何枚使うかがわからなくなったため) + * @param answer_map 精密なマップ + */ + function Drow_ScuessImagePostion(ImageList, answer_map){ + + } + + + /** + * 正解の場所かどうかを判定する処理 + * @param touchPos 要素数2の1次元の配列 + * @param answer_map 違う場所を2次元配列で管理しているもの + */ + + function Check_TouchImagePostion_CorrectAnswer(){ + + } \ No newline at end of file diff --git a/frontend/thinks/differentpoint.md b/frontend/thinks/differentpoint.md new file mode 100644 index 0000000..1a22ca6 --- /dev/null +++ b/frontend/thinks/differentpoint.md @@ -0,0 +1,32 @@ +間違い探しの仕様 + +必要なもの + - 間違い探しの画像 + - 間違ってる部分のマップ(クリックした場所が間違っているかどうかを描画・判定する) + +処理 + + +Play + - GET_TouchImagePostion + 画像のどこをタップしたかを調べる処理 + + + - Drow_ScuessImagePostion + 正解の場所を描画する処理 + + + - Check_TouchImagePostion_CorrectAnswer + 正解の場所かどうかを判定する処理 + + +Make + - アップロードした画像を送信する + SendImage + + - アップロードした画像のプレビューを表示する + PreviewImage + + 挑戦 + プレービュー(テストプレー)できる状態 + TestPlay From e042088fcbb04272e466a8d294628e9e04d8fe44 Mon Sep 17 00:00:00 2001 From: nozo120 Date: Thu, 5 Dec 2024 21:40:35 +0900 Subject: [PATCH 12/51] Add intro quiz files (index.html, script.js,style.css) --- index.html | 30 +++++++++++ script.js | 147 +++++++++++++++++++++++++++++++++++++++++++++++++++++ style.css | 99 ++++++++++++++++++++++++++++++++++++ 3 files changed, 276 insertions(+) create mode 100644 index.html create mode 100644 script.js create mode 100644 style.css diff --git a/index.html b/index.html new file mode 100644 index 0000000..5d34cd7 --- /dev/null +++ b/index.html @@ -0,0 +1,30 @@ + + + + + + + イントロクイズ + + + +
+

制限時間は10秒！5回まで答えられるよ！

+
+

残り時間: 10秒

+

解答回数: 0/5

+ +
+ + +
+ + + + +
+
+ + + + diff --git a/script.js b/script.js new file mode 100644 index 0000000..d0dec9c --- /dev/null +++ b/script.js @@ -0,0 +1,147 @@ + +document.addEventListener('DOMContentLoaded', function () { + const startButton = document.getElementById('start-button'); + const submitButton = document.getElementById('submit-answer-button'); + const resultMessage = document.getElementById('result-message'); + const nextButton = document.getElementById('next-button'); + const answerInput = document.getElementById('answer-input'); + const timeLeftElement = document.getElementById('time-left'); + const answerCountElement = document.getElementById('answer-count'); + const maxAnswerCountElement = document.getElementById('max-answer-count'); + const infoText = document.getElementById('info-text'); + const button1 = document.getElementById('button1'); + const button2 = document.getElementById('button2'); + + const audio = new Audio('your-music-file.mp3'); + let timer; + let timeRemaining = 10; + let answerCount = 0; + const maxAnswerCount = 5; + let correctAnswer = "曲名"; + let quizFinished = false; + let answerEnabled = false; + + // 初期設定 + maxAnswerCountElement.textContent = maxAnswerCount; + answerInput.style.display = 'none'; + submitButton.style.display = 'none'; + submitButton.disabled = true; + + + startButton.addEventListener('click', function () { + audio.play(); + startButton.disabled = true; + startTimer(); + }); + + function startTimer() { + timer = setInterval(function () { + timeRemaining--; + timeLeftElement.textContent = timeRemaining; + + if (timeRemaining <= 0) { + clearInterval(timer); + endQuiz(false); + } + }, 1000); + } + + function resetButtons() { + button1.disabled = false; + button2.disabled = false; + button1.classList.remove('disabled'); + button2.classList.remove('disabled'); + button1.style.backgroundColor = '#4caf50'; + button2.style.backgroundColor = '#4caf50'; + } + + button1.addEventListener('click', function () { + enableAnswer(); + button1.disabled = true; + button2.classList.add('disabled'); + button2.style.backgroundColor = '#ccc'; + }); + + button2.addEventListener('click', function () { + enableAnswer(); + button2.disabled = true; + button1.classList.add('disabled'); + button1.style.backgroundColor = '#ccc'; + }); + + function enableAnswer() { + answerEnabled = true; + answerInput.style.display = 'block'; + submitButton.style.display = 'block'; + submitButton.disabled = false; + } + + submitButton.addEventListener('click', function () { + if (quizFinished || !answerEnabled) return; + + const userAnswer = answerInput.value.trim(); + answerCount++; + answerCountElement.textContent = answerCount; + + if (userAnswer.toLowerCase() === correctAnswer.toLowerCase()) { + endQuiz(true); + } else if (answerCount >= maxAnswerCount) { + endQuiz(false); + } else { + resultMessage.style.display = 'block'; + resultMessage.textContent = "×"; + resultMessage.className = 'incorrect'; + resetButtons(); // ボタンの状態をリセット + } + }); + + nextButton.addEventListener('click', function () { + window.location.href = 'next-page.html'; + }); + + function endQuiz(isCorrect) { + clearInterval(timer); + quizFinished = true; + + resultMessage.style.display = 'block'; + nextButton.style.display = 'block'; + + if (isCorrect) { + resultMessage.textContent = "〇"; + resultMessage.className = 'correct'; + } else { + resultMessage.textContent = "×"; + resultMessage.className = 'incorrect'; + } + + disableAllInputs(); + + // 解答入力と解答完了ボタンを無効化 + answerInput.disabled = true; + submitButton.disabled = true; + submitButton.classList.add('disabled'); + } + +function disableAllInputs() { + document.querySelectorAll('.answer-button').forEach(button => { + button.disabled = true; + button.classList.add('disabled'); + }); + + // 解答入力フィールドと解答完了ボタンを無効化 + answerInput.disabled = true; + submitButton.disabled = true; + submitButton.classList.add('disabled'); +} + +function enableAllInputs() { + document.querySelectorAll('.answer-button').forEach(button => { + button.disabled = false; + button.classList.remove('disabled'); + }); + // 解答完了ボタンも有効化 + submitButton.disabled = false; + submitButton.classList.remove('disabled'); + answerInput.disabled = false; +} +}) \ No newline at end of file diff --git a/style.css b/style.css new file mode 100644 index 0000000..bc42461 --- /dev/null +++ b/style.css @@ -0,0 +1,99 @@ + +/* 画面全体の中央揃え */ +body { + font-family: Arial, sans-serif; + display: flex; + justify-content: center; + align-items: center; + height: 100vh; + margin: 0; + background-color: #f0f0f0; +} + +#quiz-container { + text-align: center; + color: #333; + width: 100%; + max-width: 500px; /* 適切な幅を指定 */ +} + +#info-text { + font-size: 18px; + font-weight: bold; + margin-bottom: 20px; + color: #ff4081; +} + +button { + padding: 10px 20px; + margin: 10px 0; /* 垂直方向の間隔を調整 */ + font-size: 16px; + cursor: pointer; + border-radius: 5px; + border: none; + transition: background-color 0.3s ease; +} + +#start-button { + background-color: #ff4081; + color: white; +} + +.answer-button { + background-color: #4caf50; + color: white; +} + +button.disabled { + background-color: #ccc; + cursor: not-allowed; +} + +#answer-input { + padding: 10px; + font-size: 16px; + border-radius: 5px; + border: 1px solid #ddd; + margin-top: 10px; + width: calc(100% - 40px); /* 入力フィールドの幅調整 */ + box-sizing: border-box; + display: none; +} + +#submit-answer-button { + background-color: #00bcd4; /* 水色 */ + color: white; + padding: 10px 20px; + font-size: 16px; + border-radius: 5px; + border: none; + cursor: pointer; + margin-top: 10px; +} + +button.disabled, +#answer-input.disabled { + background-color: #ccc; /* 灰色 */ + cursor: not-allowed; + color: #666; +} + +#next-button { + background-color: #ff9800; /* オレンジ */ + color: white; + margin-top: 20px; +} + +#result-message { + font-size: 100px; + font-weight: bold; + margin: 20px; +} + +.correct { + color: blue; +} + +.incorrect { + color: red; +} From ec159e081634de7def817c99eeae11c89d5cbaab Mon Sep 17 00:00:00 2001 From: nozo120 Date: Thu, 5 Dec 2024 23:34:22 +0900 Subject: [PATCH 13/51] Add intro quiz frontend --- index2.html | 37 ++++++++++++++++++++++++++++++++ script2.js | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++ style2.css | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 159 insertions(+) create mode 100644 index2.html create mode 100644 script2.js create mode 100644 style2.css diff --git a/index2.html b/index2.html new file mode 100644 index 0000000..44a0389 --- /dev/null +++ b/index2.html @@ -0,0 +1,37 @@ + + + + + + + イントロドン作成 + + + +
+

イントロドン作成

+ + + + + +

+ + + + + +

+ + + + + + +
+ + + + + + diff --git a/script2.js b/script2.js new file mode 100644 index 0000000..0cfa32d --- /dev/null +++ b/script2.js @@ -0,0 +1,61 @@ +document.getElementById("create-button").addEventListener("click", function () { + const audioFile = document.getElementById("audio-upload").files[0]; + const answer = document.getElementById("answer-input").value; + + // 音声ファイルがない場合 + if (!audioFile) { + alert("音声ファイルを入力してください！"); + return; + } + + // 答えがない場合 + if (!answer) { + alert("答えを入力してください！"); + return; + } + + + // フォームデータの作成 + const formData = new FormData(); + formData.append("audio", audioFile); + formData.append("answer", answer); + + // データをバックエンドに送信 + fetch("YOUR_BACKEND_URL", { + method: "POST", + body: formData + }) + + + .then((response) => { + if (response.ok) { + document.getElementById("status-message").style.display = "block"; + } else { + alert("エラーが発生しました。再試行してください。"); + } + }) + .catch((error) => { + console.error("通信エラー:", error); + alert("通信エラーが発生しました。"); + }); +document.getElementById("audio-upload").addEventListener("change", toggleCreateButton); +document.getElementById("answer-input").addEventListener("input", toggleCreateButton); + +function toggleCreateButton() { + const audioFile = document.getElementById("audio-upload").files[0]; + const answer = document.getElementById("answer-input").value; + + const createButton = document.getElementById("create-button"); + + // 音声ファイルと答えが両方入力されている場合はボタンを有効化 + if (audioFile && answer) { + createButton.disabled = false; + } else { + createButton.disabled = true; + } +} + +// 初期状態でボタンを無効化しておく +toggleCreateButton(); + +}); diff --git a/style2.css b/style2.css new file mode 100644 index 0000000..7ab0e0c --- /dev/null +++ b/style2.css @@ -0,0 +1,61 @@ +/* 全体のスタイル */ +body { + font-family: 'Arial', sans-serif; + display: flex; + justify-content: center; + align-items: center; + height: 100vh; + margin: 0; + background-color: #fef5e7; /* 明るいクリーム色 */ +} + +/* コンテナのスタイル */ +#create-quiz-container { + text-align: center; + background-color: #ffffff; + border-radius: 15px; + box-shadow: 0 4px 10px rgba(0, 0, 0, 0.1); + padding: 30px; + width: 400px; +} + +/* タイトルのスタイル */ +h1 { + font-size: 24px; + color: #ff6f61; /* 明るいピンク */ + margin-bottom: 20px; +} + +/* ボタンスタイル */ +button { + padding: 10px 20px; + font-size: 16px; + border-radius: 5px; + border: none; + cursor: pointer; + margin: 10px 0; + background-color: #4caf50; /* 明るい緑 */ + color: white; + transition: background-color 0.3s ease, transform 0.2s ease; +} + +button:hover { + background-color: #45a049; /* 濃い緑 */ + transform: scale(1.05); +} + +/* 入力フィールドのスタイル */ +input[type="text"], input[type="file"] { + padding: 10px; + font-size: 16px; + border: 2px solid #ddd; + border-radius: 5px; + margin-bottom: 20px; + width: calc(100% - 20px); +} + +/* ステータスメッセージ */ +#status-message { + color: #4caf50; /* 成功メッセージの緑 */ + font-weight: bold; +} From 78ce24de9d342d88b7d01f124a72ec302127b998 Mon Sep 17 00:00:00 2001 From: nozo120 Date: Thu, 5 Dec 2024 23:37:52 +0900 Subject: [PATCH 14/51] Add intro quiz files (index.html) --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 5d34cd7..63cb66c 100644 --- a/index.html +++ b/index.html @@ -4,7 +4,7 @@ - イントロクイズ + イントロドン From 18268a387711559a646e0ebac27df4ce29e98369 Mon Sep 17 00:00:00 2001 From: Sairon <138011409+Yukkurisiteikitai@users.noreply.github.com> Date: Fri, 6 Dec 2024 11:50:33 +0900 Subject: [PATCH 15/51] future/set collision --- .gitignore | 1 + frontend/differentPoint.html | 70 ++++++-------- frontend/games/differentPoint.js | 153 +++++++++++++++++++++++-------- frontend/image/ban-1.png | Bin 0 -> 41952 bytes frontend/image/ban-2.png | Bin 0 -> 47045 bytes frontend/image/fabicon.ico | Bin 0 -> 489 bytes 6 files changed, 145 insertions(+), 79 deletions(-) create mode 100644 .gitignore create mode 100644 frontend/image/ban-1.png create mode 100644 frontend/image/ban-2.png create mode 100644 frontend/image/fabicon.ico diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..055ccbc --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +./frontend/thinks \ No newline at end of file diff --git a/frontend/differentPoint.html b/frontend/differentPoint.html index 9a9c3f3..7f1dc67 100644 --- a/frontend/differentPoint.html +++ b/frontend/differentPoint.html @@ -6,54 +6,40 @@ クイズアプリ + + - -
-

ミニラン

- -
- - -
-
- - - -
-
+ -
-
- - +
+

間違い探し

+
+

05/??

+ d-image-1 + d-image-2
- -
-

クイズ

-

任天堂・・

-
- - - - -
-
- - -
-

正解

-

スイッチ

-
- - -
-
- - + + diff --git a/frontend/games/differentPoint.js b/frontend/games/differentPoint.js index 6eb42e1..79a2c53 100644 --- a/frontend/games/differentPoint.js +++ b/frontend/games/differentPoint.js @@ -1,48 +1,127 @@ +const images_list = document.querySelectorAll('.different-image'); + + +const debug_log = { + "postion":false, + "isDevicePhone":false +} + +//アクセスしているのがスマホかPCかを確認する +function isSmartPhone() +{ + if (navigator.userAgent.match(/iPhone|Android.+Mobile/)) + { + console.log(`UserAgent${navigator.userAgent}, phone:True`); + return true; + } + + else + { + console.log(`UserAgent${navigator.userAgent},phone:False`); + return false; + } +} + + +const isUsePhone = isSmartPhone(); + + +//request-date + +/** + * @param ImageList srcに代入するためのURL-S3から引っ張ってくるためのキーを指定する + * @param answer_map src同士で異なった部分をマップとして保存し、それを + * @param lastTouchPos + */ + + -//date let questionDate = { "ImageList":[], - "answer_map":"間違っている画像の部分を表示する用のマップ", - "lastTouchPos":[25.32, 3452.3] + "answer_map":[[116,69],[42,51]], } +console.log(questionDate["answer_map"]); -class different_play{ - constructor(){ - //初期値 - this.ImageList = [] - this.answer_map = [] // ImageListから取得した画像からサイズを測定してそのサイズの二次元配列を作成する - - this.lastTouchPos = [0.0, 0.0] - } +let userDate = { + "lastTouchPos":[25.32, 3452.3], + "selectTouchPostions":[[2432,343],[2432,343]] +} + +//画像のどこをタップしたかを調べる処理 +images_list.forEach(image => +{ + image.addEventListener("click",(c)=> + { + console.log(c.offsetX,c.offsetY); + + userDate["lastTouchPos"][0] = c.offsetX; + userDate["lastTouchPos"][1] = c.offsetY; + + console.log( + Check_TouchImagePostion_CorrectAnswer( + userDate["lastTouchPos"], + questionDate["answer_map"], + 10 + ) + ); + }); +}); + + + +/** + * 正解の場所を描画する処理 + * @param ImageList 間違い探しで使う画像集(何枚使うかがわからなくなったため) + * @param answer_map 精密なマップ + */ +function Drow_ScuessImagePostion(ImageList, answer_map){ + } /** - *画像のどこをタップしたかを調べる処理 - */ - function GET_TouchImagePostion() - { - - } - - /** - * 正解の場所を描画する処理 - * @param ImageList 間違い探しで使う画像集(何枚使うかがわからなくなったため) - * @param answer_map 精密なマップ - */ - function Drow_ScuessImagePostion(ImageList, answer_map){ - - } - - - /** - * 正解の場所かどうかを判定する処理 - * @param touchPos 要素数2の1次元の配列 - * @param answer_map 違う場所を2次元配列で管理しているもの - */ - - function Check_TouchImagePostion_CorrectAnswer(){ - - } \ No newline at end of file + * 正解の場所かどうかを判定する処理 + * @param touchPos 要素数2の1次元の配列 + * @param answer_map 間違い場所を2次元配列で管理しているもの + * @param range どれくらいのpx誤差を許容するか? + */ +function Check_TouchImagePostion_CorrectAnswer(touchPos,answer_map,range){ + let isTouchAnswer = false; + answer_map.forEach(ans_map => { + isTouchAnswer = false; + + console.log(`Check_touchPosCorrectAnswer\n SelectPos-x:${touchPos[0]},y:${touchPos[1]} \n AnswerPos-x:${ans_map[0]}, y:${ans_map[1]} \n range:${range}`); + + + //0 = x座標 1 = y座標. + if(ans_map[0] == touchPos[0] && ans_map[1] == touchPos[1]) + { + + isTouchAnswer = true; + } + //範囲の中に収まってる + else if( + (ans_map[0]-range <= touchPos[0] && ans_map[0]+range >= touchPos[0]) && + (ans_map[1]-range <= touchPos[1] && ans_map[1]+range >= touchPos[1]) + ) + { + console.log(`answers \n +x${ans_map[0]+range},-x${ans_map[0]-range} \n +y${ans_map[1]+range},-y${ans_map[1]-range} \n`); + isTouchAnswer = true; + } + else{ + isTouchAnswer = false; + } + console.log(isTouchAnswer); + + + }) + + return isTouchAnswer; +} + + + + + \ No newline at end of file diff --git a/frontend/image/ban-1.png b/frontend/image/ban-1.png new file mode 100644 index 0000000000000000000000000000000000000000..6bbca84f7373d5fe9ef415132ae1ebc1c60f3293 GIT binary patch literal 41952 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 literal 0 HcmV?d00001 diff --git a/frontend/image/ban-2.png b/frontend/image/ban-2.png new file mode 100644 index 0000000000000000000000000000000000000000..4fbde366e026d43a6fd44c2d8ab4ad9e24177050 GIT binary patch literal 47045 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 fR$}(VX1?zMkv7^8`@IzQ00000NkvXXu0mjfN Date: Fri, 6 Dec 2024 12:20:29 +0900 Subject: [PATCH 16/51] fix/changeName-FindDifference.js --- frontend/differentPoint.html | 34 +++++++++++++------ .../{differentPoint.js => FindDifference.js} | 0 2 files changed, 24 insertions(+), 10 deletions(-) rename frontend/games/{differentPoint.js => FindDifference.js} (100%) diff --git a/frontend/differentPoint.html b/frontend/differentPoint.html index 7f1dc67..06b46d7 100644 --- a/frontend/differentPoint.html +++ b/frontend/differentPoint.html @@ -12,15 +12,29 @@ -
-

間違い探し

-
-

05/??

- d-image-1 - d-image-2 -
+
+
+

間違い探し

+
+

05/??

+ d-image-1 + d-image-2 +
+
+ + +
+
+
+

間違い探し

+
+ + + +
+
- - + diff --git a/frontend/games/differentPoint.js b/frontend/games/FindDifference.js similarity index 100% rename from frontend/games/differentPoint.js rename to frontend/games/FindDifference.js From 9b36bf40bd87f92db4303a4f2c50d76f1c12f862 Mon Sep 17 00:00:00 2001 From: Sairon <138011409+Yukkurisiteikitai@users.noreply.github.com> Date: Fri, 6 Dec 2024 15:53:30 +0900 Subject: [PATCH 17/51] bug/canvas-don'tLoadImageFile --- .gitignore | 3 +- frontend/differentPoint.html | 40 +- frontend/games/FindDifference.js | 153 ++++-- frontend/thinks/differentpoint.md | 3 + test.txt | 870 ++++++++++++++++++++++++++++++ 5 files changed, 1008 insertions(+), 61 deletions(-) create mode 100644 test.txt diff --git a/.gitignore b/.gitignore index 055ccbc..bf5e460 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -./frontend/thinks \ No newline at end of file +./frontend/thinks +*.DS_Store \ No newline at end of file diff --git a/frontend/differentPoint.html b/frontend/differentPoint.html index 06b46d7..3d760ff 100644 --- a/frontend/differentPoint.html +++ b/frontend/differentPoint.html @@ -17,24 +17,29 @@

間違い探し

05/??

- d-image-1 - d-image-2 + + +
- -
- +
+ +
-
+ +
+

間違い探し

- - - -
+ 画像1を選択 + 画像2を選択 + +
+
+ - + diff --git a/frontend/games/FindDifference.js b/frontend/games/FindDifference.js index 79a2c53..1de8389 100644 --- a/frontend/games/FindDifference.js +++ b/frontend/games/FindDifference.js @@ -6,6 +6,7 @@ const debug_log = { "isDevicePhone":false } + //アクセスしているのがスマホかPCかを確認する function isSmartPhone() { @@ -26,22 +27,52 @@ function isSmartPhone() const isUsePhone = isSmartPhone(); + + + //request-date /** * @param ImageList srcに代入するためのURL-S3から引っ張ってくるためのキーを指定する - * @param answer_map src同士で異なった部分をマップとして保存し、それを - * @param lastTouchPos + * @param answer_map クリックするとどこが間違ってるかを教えてくれる + * @param CorrectAnswer answer_mapの連番でどれが正解したかを保存する */ - - let questionDate = { "ImageList":[], "answer_map":[[116,69],[42,51]], + "CorrectAnswer":[false,false], } -console.log(questionDate["answer_map"]); + +const imgs = document.querySelectorAll(".imgs"); + +imgs.forEach(img =>{ + questionDate["ImageList"].push([img,img.naturalWidth,img.naturalHeight]); + +}) + +LoadImages(0,questionDate["ImageList"][0]); +LoadImages(1,questionDate["ImageList"][1]); + + + +console.log(questionDate["ImageList"]); + +// // 画像とCanvas要素を取得 +// const img = document.getElementById('sourceImage'); +// const canvas = document.getElementById('myCanvas'); +// const ctx = canvas.getContext('2d'); + +// // ボタンが押されたらCanvasに描画 +// document.getElementById('drawButton').addEventListener('click', () => { +// // 画像の幅と高さに合わせてCanvasサイズを設定 +// canvas.width = img.naturalWidth; // 元画像の幅 +// canvas.height = img.naturalHeight; // 元画像の高さ + +// // Canvasに画像を描画 +// ctx.drawImage(img, 0, 0, canvas.width, canvas.height); +// }); let userDate = { "lastTouchPos":[25.32, 3452.3], @@ -49,6 +80,53 @@ let userDate = { } +let userClick_history = []; +let canvas_history = [[],[]] +const canvas_images = document.querySelectorAll(".different-image"); + +/** + * 画像をロードする関数です。 + * @param images_number (int)連番の値 + * @param images_number ()連番の値 + */ +function LoadImages(images_number,LoadImage) +{ + // images_list[images_number].HTMLimages = LoadImage + var drowCTX = images_list[images_number].getContext('2d'); + + images_list[images_number].width = LoadImage[1].naturalWidth; // 元画像の幅 + images_list[images_number].height = LoadImage[2].naturalHeight; // 元画像の高さ + drowCTX.drawImage(LoadImage[0], 0, 0, LoadImage[1].naturalHeight, LoadImage[2].naturalHeight); +} + + +console.log(images_list[0]); + +/** + * 指定した場所を描画する処理 + * @param map 一次元の配列です{34,42}のような形式で送ってください + */ +function Drow_ScuessImagePostion(map){ + images_list.forEach(img =>{ + var drowCtx = img.getContext("2d"); + drowCtx.beginPath(); + drowCtx.arc(map[0], map[1], 2, 0, Math.PI * 2); + + drowCtx.fillStyle = 'red'; + if(Check_TouchImagePostion_CorrectAnswer([map[0],map[1]],questionDate["answer_map"],10)) + { + drowCtx.fillStyle = 'green'; + } + + drowCtx.fill(); + drowCtx.stroke(); + }) +} + + + + + //画像のどこをタップしたかを調べる処理 images_list.forEach(image => { @@ -56,31 +134,26 @@ images_list.forEach(image => { console.log(c.offsetX,c.offsetY); + userDate["lastTouchPos"][0] = c.offsetX; userDate["lastTouchPos"][1] = c.offsetY; - console.log( - Check_TouchImagePostion_CorrectAnswer( - userDate["lastTouchPos"], - questionDate["answer_map"], - 10 - ) - ); + Drow_ScuessImagePostion([c.offsetX,c.offsetY]); + if (debug_log["postion"] == true){ + console.log( + Check_TouchImagePostion_CorrectAnswer( + userDate["lastTouchPos"], + questionDate["answer_map"], + 10 + ) + + ); + } + }); }); - -/** - * 正解の場所を描画する処理 - * @param ImageList 間違い探しで使う画像集(何枚使うかがわからなくなったため) - * @param answer_map 精密なマップ - */ -function Drow_ScuessImagePostion(ImageList, answer_map){ - -} - - /** * 正解の場所かどうかを判定する処理 * @param touchPos 要素数2の1次元の配列 @@ -90,28 +163,23 @@ function Drow_ScuessImagePostion(ImageList, answer_map){ function Check_TouchImagePostion_CorrectAnswer(touchPos,answer_map,range){ let isTouchAnswer = false; answer_map.forEach(ans_map => { - isTouchAnswer = false; - + // isTouchAnswer = false; + console.log(`helloWOrld${ans_map}`) console.log(`Check_touchPosCorrectAnswer\n SelectPos-x:${touchPos[0]},y:${touchPos[1]} \n AnswerPos-x:${ans_map[0]}, y:${ans_map[1]} \n range:${range}`); - + //0 = x座標 1 = y座標. - if(ans_map[0] == touchPos[0] && ans_map[1] == touchPos[1]) - { - - isTouchAnswer = true; - } - //範囲の中に収まってる - else if( - (ans_map[0]-range <= touchPos[0] && ans_map[0]+range >= touchPos[0]) && - (ans_map[1]-range <= touchPos[1] && ans_map[1]+range >= touchPos[1]) + if ((ans_map[0]-range <= touchPos[0] && ans_map[0]+range >= touchPos[0]) && + (ans_map[1]-range <= touchPos[1] && ans_map[1]+range >= touchPos[1]) ) { console.log(`answers \n +x${ans_map[0]+range},-x${ans_map[0]-range} \n +y${ans_map[1]+range},-y${ans_map[1]-range} \n`); isTouchAnswer = true; } - else{ - isTouchAnswer = false; + + else + { + // isTouchAnswer = false; } console.log(isTouchAnswer); @@ -121,7 +189,10 @@ function Check_TouchImagePostion_CorrectAnswer(touchPos,answer_map,range){ return isTouchAnswer; } - - - - \ No newline at end of file +function Drow_CorrectAnswer(){ + questionDate["answer_map"].forEach(ans_map => { + console.log("\n==============================================\n"); + Drow_ScuessImagePostion(ans_map); + }) +} +Drow_CorrectAnswer(); \ No newline at end of file diff --git a/frontend/thinks/differentpoint.md b/frontend/thinks/differentpoint.md index 1a22ca6..fb50a3b 100644 --- a/frontend/thinks/differentpoint.md +++ b/frontend/thinks/differentpoint.md @@ -10,6 +10,9 @@ Play - GET_TouchImagePostion 画像のどこをタップしたかを調べる処理 + | + V + addEventlistenerに変更した - Drow_ScuessImagePostion diff --git a/test.txt b/test.txt new file mode 100644 index 0000000..4ddce9c --- /dev/null +++ b/test.txt @@ -0,0 +1,870 @@ +. +.. +.git +.gitignore +.mypy_cache +README.md +backend +compose.yml +frontend +temp.py +test.txt + +./.git: +. +.. +COMMIT_EDITMSG +FETCH_HEAD +HEAD +ORIG_HEAD +config +description +hooks +index +info +logs +objects +packed-refs +refs + +./.git/hooks: +. +.. +applypatch-msg.sample +commit-msg.sample +fsmonitor-watchman.sample +post-update.sample +pre-applypatch.sample +pre-commit.sample +pre-merge-commit.sample +pre-push.sample +pre-rebase.sample +pre-receive.sample +prepare-commit-msg.sample +push-to-checkout.sample +update.sample + +./.git/info: +. +.. +exclude + +./.git/logs: +. +.. +HEAD +refs + +./.git/logs/refs: +. +.. +heads +remotes + +./.git/logs/refs/heads: +. +.. +develop +division +future + +./.git/logs/refs/heads/division: +. +.. +gameSystemFile + +./.git/logs/refs/heads/future: +. +.. +setQuiz + +./.git/logs/refs/remotes: +. +.. +origin + +./.git/logs/refs/remotes/origin: +. +.. +HEAD +future + +./.git/logs/refs/remotes/origin/future: +. +.. +backend-base +setQuiz + +./.git/objects: +. +.. +00 +02 +05 +06 +08 +0b +10 +13 +18 +19 +1a +24 +26 +28 +2c +2e +30 +31 +37 +47 +4a +4f +52 +55 +57 +62 +64 +65 +67 +6b +6e +76 +78 +79 +7e +7f +81 +82 +83 +85 +89 +8a +8b +8d +90 +91 +93 +94 +97 +9a +a1 +a5 +a7 +a9 +ab +ac +af +b0 +b1 +b3 +b4 +b5 +b6 +b7 +ba +be +c0 +c1 +c2 +cb +cc +d4 +d7 +d8 +dc +de +df +e0 +ed +ee +f5 +fa +fd +ff +info +pack + +./.git/objects/00: +. +.. +1f25886b7af0d774051063edd08552ba96f9a9 +db5ef7b04fa7ba165dd34e977dc7915b66c1cf + +./.git/objects/02: +. +.. +f0ced09a96aba23f5b2ebc95924cf20cbc9b19 + +./.git/objects/05: +. +.. +2548b67e50198cb21dab2f63368cb659a58b0c +5ccbcc0ac85139ac9e49c0d5acb2f9e8f80ddf + +./.git/objects/06: +. +.. +83e3db4e0d5038d882679d2252ff19a68c6044 +b46d77bb72af1b38bfd00d797cde2616dfd32c + +./.git/objects/08: +. +.. +64746f85208bf228c5289debf0414d21108e1a + +./.git/objects/0b: +. +.. +27c19be1c0365fe152023548be2158f3127e8f +6b20a802b8cdc9e2962bf86f16f798376fe5bc + +./.git/objects/10: +. +.. +ba08e7359a566e810767b8335dc1835629d2b6 +f8f0faa5c26d31e7363904c3342d83b4c1f6b0 + +./.git/objects/13: +. +.. +89ae49f67a7f26ab5469b624b073754b56063b + +./.git/objects/18: +. +.. +268a387711559a646e0ebac27df4ce29e98369 + +./.git/objects/19: +. +.. +e8fa45302f089bc63579c393dacc6c6288b630 + +./.git/objects/1a: +. +.. +22ca6f8c39aef0366c91e1b7d3a63d6bc5480d +3b6ea59a40d4c26b79bf380523e78b8b3a0ecc + +./.git/objects/24: +. +.. +ecc328359d2d3b899c05106211e55317a4c7b0 + +./.git/objects/26: +. +.. +4c0c9b47e5be176f5b38049ff39e1163236518 + +./.git/objects/28: +. +.. +01f3be1d9494c6273534e54d7a4996c1ef4c53 + +./.git/objects/2c: +. +.. +90a81c6e4a26ebf8d203fc052392ce9c5562b1 + +./.git/objects/2e: +. +.. +66282e63c7b89013e6b5d36c11d84567a4e9b7 + +./.git/objects/30: +. +.. +860087c133dbec3f2e6b658bbec088dbc3a4f4 + +./.git/objects/31: +. +.. +5b0b8dfb93e73b6a6df18b529d9a4409801bc5 + +./.git/objects/37: +. +.. +ae094ef2bce72a4f983c77598468f7b9408ed5 +dd079d19cd06da209ad7dcae7240df63943ec9 + +./.git/objects/47: +. +.. +f4f2087cc6861b86be1938b5e3c99f23f04f05 + +./.git/objects/4a: +. +.. +6e00805b14ccd3e3852d5f26a9466edd81b6ae + +./.git/objects/4f: +. +.. +bde366e026d43a6fd44c2d8ab4ad9e24177050 + +./.git/objects/52: +. +.. +a96ee10001be474a05e45c98239d03d800ffcc + +./.git/objects/55: +. +.. +577401cd5d6e8331261c929e5bdbd941d9916f + +./.git/objects/57: +. +.. +e7aabb436ea6f61e7310f559dc491c448d9a9d + +./.git/objects/62: +. +.. +4e13f9262883ae822e2392c2188c7a70a2fc80 + +./.git/objects/64: +. +.. +5efc7a9f1244d4be93a4911363dd8659dbf2b0 + +./.git/objects/65: +. +.. +bfbbf240d68514568edbe85d7601abff920a39 + +./.git/objects/67: +. +.. +9179cc18ae13e76a3fc1be51fc32c026d4e563 + +./.git/objects/6b: +. +.. +bca84f7373d5fe9ef415132ae1ebc1c60f3293 + +./.git/objects/6e: +. +.. +1f230124b559b4ee039dfd6210aa30ec6444a6 +b42e1b66fc2c9c94faabe30796ec0002dd5be9 + +./.git/objects/76: +. +.. +0afd6da38dd3bbfeb9ebbfd3a9ef8480c11a4e + +./.git/objects/78: +. +.. +f8bb2d7ddcafe86160e33a56f5288d8455515e + +./.git/objects/79: +. +.. +a2c535a99eb6bed715787de623f56024713d7a + +./.git/objects/7e: +. +.. +47750bde9cc5fa90b5a190718b012557be6ac2 +f7401d14d3f474d48a58405a4a4946988cb06a + +./.git/objects/7f: +. +.. +1dc67509b4ace2d565b51fd451bdce2b971dda + +./.git/objects/81: +. +.. +325793127d44c5d34064b6a37a78cce50d117e + +./.git/objects/82: +. +.. +5e8007423c2e811493718e9ac3ae6ded0ce30d + +./.git/objects/83: +. +.. +88d9fc76d3ab9f8c75ec4f986c369b659d92c4 + +./.git/objects/85: +. +.. +44ff1841d9f559cda3b1a9b940fdb5ad399ede + +./.git/objects/89: +. +.. +2304da97df8c35d3a78d91ab4607d978ec3c57 + +./.git/objects/8a: +. +.. +4c9080e373a3ab4f7bbfe0dcbcaecef7ca9124 + +./.git/objects/8b: +. +.. +e5987bf0735cfc513a5b75e03e017198edbb80 + +./.git/objects/8d: +. +.. +72f4e95140e228f3eb2e4b3cfe1a339ff44b1f + +./.git/objects/90: +. +.. +dcedceba970395bbc09127357c98b2d058c43f + +./.git/objects/91: +. +.. +b3a2d77f3af5c222c4d7b2c5aeee36f3dad7a0 + +./.git/objects/93: +. +.. +7d92cc65c860a341596f0cfcdb52720d5982c0 + +./.git/objects/94: +. +.. +1892cd8119bc1f691db7316bf359fba036b1c7 + +./.git/objects/97: +. +.. +29fc4f3958b6d1da84fa21963162e41b727281 + +./.git/objects/9a: +. +.. +9c3f3292463a6245c5fb5be5ddeeaef46f45ed +b65aae942f8d969483b78fc890f0067d1efb60 + +./.git/objects/a1: +. +.. +3d65c67e24b0237a20f267d44dfdbc0418c90b + +./.git/objects/a5: +. +.. +0387feaf3dfe02d5ada4f06730b1401a46bba8 +8d0f4b9d2efaca2022057d029c75becca75406 + +./.git/objects/a7: +. +.. +d4d59eefcfbbb2528647ed64412be16adab167 + +./.git/objects/a9: +. +.. +48aa5e3fdccd314a37b837807c2323be86e3aa +c76281e6c0a75bbae08253ed0ba5cf86272810 + +./.git/objects/ab: +. +.. +5423543ef14f0b8147f7dc4545575bf995c631 + +./.git/objects/ac: +. +.. +87f7828ab32829572af3a4932fc3a77a95a7a6 + +./.git/objects/af: +. +.. +266c791ab5ceef5de2efda84ef74d637157514 +dbfae32df1382bcce0286094fef694ed304831 + +./.git/objects/b0: +. +.. +511f416a79d9979efc9f3eb76f7fac8891e248 + +./.git/objects/b1: +. +.. +6ec5c5577c37507ca3b69ab76253b26a6f63fb +83c68799d3cdeb2609995967d6ece08fa780fb + +./.git/objects/b3: +. +.. +176a4c3491263a52408ace68ae826a4ac7b695 + +./.git/objects/b4: +. +.. +3f168ad98a2b708e06f38e6f051fbb82c30f7a + +./.git/objects/b5: +. +.. +f6b169c9f7dd1680b556e5d09d469490b772c3 + +./.git/objects/b6: +. +.. +a75520a1e20b2cf69ca7289ad8f6467be3695c + +./.git/objects/b7: +. +.. +77b1fb2fb1fa2204a3231a9a681f69938b7c8e + +./.git/objects/ba: +. +.. +4d74bc65435685baf0888970d3011eccba9d9d + +./.git/objects/be: +. +.. +004386b9d13f8bdb966fd4f3df882da50a872f + +./.git/objects/c0: +. +.. +19c932ec5aab91680e488f3327aec272696c52 +aa97fe6d290a98b778b99f9e2bf53a424fa1ad + +./.git/objects/c1: +. +.. +2b6885f6e1fca076b7f77e78cbd5b0f8adc33b + +./.git/objects/c2: +. +.. +36ea10cd9a624ea0abc71995f38f8234f10cef +95a6b98389a81928eecdc521495389e0232271 + +./.git/objects/cb: +. +.. +03014fbf5470dac584f3ebb7b4de6aec9d31b0 + +./.git/objects/cc: +. +.. +c75e93a8dba45a1ba42d857f64b2cce649b42f + +./.git/objects/d4: +. +.. +fa0a98e5aae2cab9abae86ac611e7954067683 + +./.git/objects/d7: +. +.. +125ba82e2c53e511979909e4f1cbac92572cbc +a597736555e4b74b9f4acb2bba2ff1a03b6601 + +./.git/objects/d8: +. +.. +5e4eae37214f72db4bb745a83b2a3d73b67df4 + +./.git/objects/dc: +. +.. +64d31e35c2a2dbd7b9afb9e7e7749effcf56fa + +./.git/objects/de: +. +.. +1eac0da7a1bda0617744b9815abcf71740a896 + +./.git/objects/df: +. +.. +2a3167f5a0634ceb101fd966843c9d6ba7adef + +./.git/objects/e0: +. +.. +d2c4541f2eca5eff0257f811de004acd6ff2a2 + +./.git/objects/ed: +. +.. +377205b05bda4c5521a7ac1a160795cab16d14 + +./.git/objects/ee: +. +.. +a20c8b730bed89e705e5ed5dcba19bac72ca8d + +./.git/objects/f5: +. +.. +66e264d4a37fc2cb31613777846ef9d2c1ff66 + +./.git/objects/fa: +. +.. +c74855e4e0fddc9525a8d9842d5e7968c9ba4b + +./.git/objects/fd: +. +.. +42a08cc817e573c65e0e7f8a23366f517e16af + +./.git/objects/ff: +. +.. +c2432e5ed02544800e896fb88636a3982dc101 + +./.git/objects/info: +. +.. + +./.git/objects/pack: +. +.. +pack-a7f1da3635a81f4a305b6eca309a2248b62cab20.idx +pack-a7f1da3635a81f4a305b6eca309a2248b62cab20.pack + +./.git/refs: +. +.. +heads +remotes +tags + +./.git/refs/heads: +. +.. +develop +division +future + +./.git/refs/heads/division: +. +.. +gameSystemFile + +./.git/refs/heads/future: +. +.. +setQuiz + +./.git/refs/remotes: +. +.. +origin + +./.git/refs/remotes/origin: +. +.. +HEAD +future + +./.git/refs/remotes/origin/future: +. +.. +backend-base +setQuiz + +./.git/refs/tags: +. +.. + +./.mypy_cache: +. +.. +.gitignore +3.11 +CACHEDIR.TAG + +./.mypy_cache/3.11: +. +.. +@plugins_snapshot.json +_ast.data.json +_ast.meta.json +_codecs.data.json +_codecs.meta.json +_collections_abc.data.json +_collections_abc.meta.json +_typeshed +abc.data.json +abc.meta.json +builtins.data.json +builtins.meta.json +codecs.data.json +codecs.meta.json +collections +contextlib.data.json +contextlib.meta.json +dataclasses.data.json +dataclasses.meta.json +email +enum.data.json +enum.meta.json +genericpath.data.json +genericpath.meta.json +importlib +io.data.json +io.meta.json +os +pathlib.data.json +pathlib.meta.json +posixpath.data.json +posixpath.meta.json +re.data.json +re.meta.json +resource.data.json +resource.meta.json +sre_compile.data.json +sre_compile.meta.json +sre_constants.data.json +sre_constants.meta.json +sre_parse.data.json +sre_parse.meta.json +subprocess.data.json +subprocess.meta.json +sys +temp.data.json +temp.meta.json +types.data.json +types.meta.json +typing.data.json +typing.meta.json +typing_extensions.data.json +typing_extensions.meta.json +zipfile + +./.mypy_cache/3.11/_typeshed: +. +.. +__init__.data.json +__init__.meta.json +importlib.data.json +importlib.meta.json + +./.mypy_cache/3.11/collections: +. +.. +__init__.data.json +__init__.meta.json +abc.data.json +abc.meta.json + +./.mypy_cache/3.11/email: +. +.. +__init__.data.json +__init__.meta.json +_policybase.data.json +_policybase.meta.json +charset.data.json +charset.meta.json +contentmanager.data.json +contentmanager.meta.json +errors.data.json +errors.meta.json +header.data.json +header.meta.json +message.data.json +message.meta.json +policy.data.json +policy.meta.json + +./.mypy_cache/3.11/importlib: +. +.. +__init__.data.json +__init__.meta.json +_abc.data.json +_abc.meta.json +abc.data.json +abc.meta.json +machinery.data.json +machinery.meta.json +metadata +readers.data.json +readers.meta.json +resources + +./.mypy_cache/3.11/importlib/metadata: +. +.. +__init__.data.json +__init__.meta.json +_meta.data.json +_meta.meta.json + +./.mypy_cache/3.11/importlib/resources: +. +.. +__init__.data.json +__init__.meta.json +abc.data.json +abc.meta.json + +./.mypy_cache/3.11/os: +. +.. +__init__.data.json +__init__.meta.json +path.data.json +path.meta.json + +./.mypy_cache/3.11/sys: +. +.. +__init__.data.json +__init__.meta.json + +./.mypy_cache/3.11/zipfile: +. +.. +__init__.data.json +__init__.meta.json + +./backend: +. +.. +Dockerfile +requirements.txt + +./frontend: +. +.. +.DS_Store +Dockerfile +differentPoint.html +game.js +game.jsREADME.md +games +image +index.html +package.json +style.css +thinks + +./frontend/games: +. +.. +FindDifference.js +quiz.js + +./frontend/image: +. +.. +ban-1.png +ban-2.png +fabicon.ico + +./frontend/thinks: +. +.. +differentpoint.md From bcf46ede55867771f4959b57a1bf73c001fe5dfd Mon Sep 17 00:00:00 2001 From: nozo120 Date: Sat, 7 Dec 2024 11:56:49 +0900 Subject: [PATCH 18/51] =?UTF-8?q?=E3=83=95=E3=83=AD=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=82=A8=E3=83=B3=E3=83=89=E3=81=AE=E5=A4=89=E6=9B=B4=E3=82=92?= =?UTF-8?q?=E5=8A=A0=E3=81=88=E3=81=BE=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- merged_index.html | 75 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 merged_index.html diff --git a/merged_index.html b/merged_index.html new file mode 100644 index 0000000..aec47ae --- /dev/null +++ b/merged_index.html @@ -0,0 +1,75 @@ + + + + + + イントロドン + + イントロドン作成 + + + + + +
+

制限時間は10秒！5回まで答えられるよ！

+
+

残り時間: 10秒

+

解答回数: 0/5

+ +
+ + +
+ + + + +
+
+ +
+

イントロドン作成

+ + + + + +

+ + + + + +

+ + + + + + +
+ + + + + \ No newline at end of file From b63f04cc5b22ef839f0d03ff1209a4c3c3645be9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E8=A5=BF=E5=93=B2=E5=8F=B8?= Date: Sat, 7 Dec 2024 11:58:48 +0900 Subject: [PATCH 19/51] define create_quiz --- .DS_Store | Bin 0 -> 6148 bytes backend/.DS_Store | Bin 0 -> 6148 bytes backend/controller/game_controller.py | 33 ++++++++++++++++++++++---- compose.yml | 2 +- logs/application.log | 0 5 files changed, 29 insertions(+), 6 deletions(-) create mode 100644 .DS_Store create mode 100644 backend/.DS_Store create mode 100644 logs/application.log diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..4c17f83a5708e4caa5bcff15a7b8fef8bb1ca111 GIT binary patch literal 6148 zcmeHK&u`N(6n^dsNvV)}0BIMbNL;J34QF09jCiQEh6&ajP(a7?l6wCuUXCZ za8T$m1|%tcm8**+U(0qKP64OD|E2(cyB;MJ(*<49!uP8ZM0i_x0q^|OhT2+oGAV{h zuCu=-!#pd>ot^KZwpG7(-}61c>A#OYt4UPG<+$j^qqp2TQz}p9^*A}t29tj4(Mu)E zIFo~sCS>UVDevB7GF6kV8q2iM+{gs{hTrJ7wx`p*!~J%!d-QzP4yH#3hwb2CZ+|vx z_>Z4HJ3j4S=2udE)$=BSJxbd{i*vX^WkrK8(MaY>enNyq@n&vJ3}2A$Fg-cFBR13Tc_op(MT z@nePI>3Q%fI`He|@oT)+#qrT}w$TdM@4;_w^eWxroB~dPzfpkqhXBqPTC5D}tpkO= z0s!mi)`mL&G%zQy7+S0hA_5bJ3N%z(6UE#(#Odx84hO2fOYB6 z!W=LM{Myt<++a&g3d zySWh>>^0#`E-}TV#C<7oTY;NmMa_)Y7^|Yj9aJ=Za)-DUu8u-gN%K_FG}N03XSAqr z-%8w$vZhFh7o5=)kLu9~gH7vKhx6-iQj=i9OXj!1vD#~C#BI!}7?D3Ku0y@e|9Tzv zIK~auoRyU3ObgERmgA(jM_SU0-+6tLs)Xv4x{Y&FxATe}_AT5yjySA%CqC!dZDptG z-GUCtyej_~CywV;tXllg0q)rnyKRq_n*-*6Iq>O#ydNSa!8l;%QC}U*^awz#vsr^> z{q!eB(m;#@W**tXa9&FEQWuUGE}R^km-Buc_?bs9htrYSPZ-&S6N(E54;LvNF7{}- zIbaSH9oX{Kj_m)(U!VVrBCDAL=D@#lz}5Sw{T`PT_SVYcWUq~w&Y2{Hmw8kPv#=d& fLAK(3CJo+;q(F=VW**tXunz&X!7_8;R~`5Ofq2f| literal 0 HcmV?d00001 diff --git a/backend/controller/game_controller.py b/backend/controller/game_controller.py index 00db5ef..5c15c83 100644 --- a/backend/controller/game_controller.py +++ b/backend/controller/game_controller.py @@ -1,4 +1,4 @@ -from flask import make_response, jsonify +from flask import make_response, jsonify, request from engine.dynamo_client import DynamoClient class GameController: @@ -13,7 +13,30 @@ def get_game_random(self): })) def create_quiz(self): - # TODO: バリデーションを実装 - if self.db_client.create_quiz(): - return make_response(jsonify({'code: 200'})) - # TODO: エラーハンドリングを実装 + # リクエストデータを取得 + data = request.get_json() + question = data['questions'] + selects = data['selects'] + answer = data['answer'] + + # バリデーションを実装 + if not data or 'quiz_name' not in data or 'questions' not in data: + return make_response(jsonify({'code': 400, 'message': 'Invalid data'}), 400) + + # バリデーションを実装 + if not isinstance(question, str) or not question.strip(): + return make_response(jsonify({'code': 400, 'message': 'Invalid question'}), 400) + if not isinstance(selects, list) or len(selects) != 4: + return make_response(jsonify({'code': 400, 'message': 'Invalid selects'}), 400) + if not isinstance(answer, int) or not (0 <= answer <= 3): + return make_response(jsonify({'code': 400, 'message': 'Invalid answer'}), 400) + + # DBに保存 + try: + if self.db_client.create_quiz(data): + return make_response(jsonify({'code': 200, 'message': 'Quiz created successfully'}), 200) + else: + return make_response(jsonify({'code': 500, 'message': 'Failed to create quiz'}), 500) + except Exception as e: + # エラーハンドリングを実装 + return make_response(jsonify({'code': 500, 'message': str(e)}), 500) diff --git a/compose.yml b/compose.yml index b6a7552..3cae6f6 100644 --- a/compose.yml +++ b/compose.yml @@ -15,7 +15,7 @@ services: build: ./backend container_name: backend ports: - - "5000:5000" + - "5001:5001" volumes: - ./backend:/app env_file: diff --git a/logs/application.log b/logs/application.log new file mode 100644 index 0000000..e69de29 From d13ac05ca0c050b0e07bdc9ef691a289c5723686 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E8=A5=BF=E5=93=B2=E5=8F=B8?= Date: Sat, 7 Dec 2024 12:16:13 +0900 Subject: [PATCH 20/51] revise create_quiz --- backend/controller/game_controller.py | 14 +++++++++++++- backend/engine/dynamo_client.py | 12 ++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/backend/controller/game_controller.py b/backend/controller/game_controller.py index 5c15c83..a5d2730 100644 --- a/backend/controller/game_controller.py +++ b/backend/controller/game_controller.py @@ -23,7 +23,6 @@ def create_quiz(self): if not data or 'quiz_name' not in data or 'questions' not in data: return make_response(jsonify({'code': 400, 'message': 'Invalid data'}), 400) - # バリデーションを実装 if not isinstance(question, str) or not question.strip(): return make_response(jsonify({'code': 400, 'message': 'Invalid question'}), 400) if not isinstance(selects, list) or len(selects) != 4: @@ -40,3 +39,16 @@ def create_quiz(self): except Exception as e: # エラーハンドリングを実装 return make_response(jsonify({'code': 500, 'message': str(e)}), 500) + + def create_intro(self): + data = request.get_json() + if not data or 'intro_name' not in data or 'intro_text' not in data: + return make_response(jsonify({'code': 400, 'message': 'Invalid data'}), 400) + + try: + if self.db_client.create_intro(data): + return make_response(jsonify({'code': 200, 'message': 'Intro created successfully'}), 200) + else: + return make_response(jsonify({'code': 500, 'message': 'Failed to create intro'}), 500) + except Exception as e: + return make_response(jsonify({'code': 500, 'message': str(e)}), 500) diff --git a/backend/engine/dynamo_client.py b/backend/engine/dynamo_client.py index 624e13f..b4544a4 100644 --- a/backend/engine/dynamo_client.py +++ b/backend/engine/dynamo_client.py @@ -22,3 +22,15 @@ def get_random(self) -> None: random_key = random.randrange(response_len) response = self.db.get_item(TableName=self.table_name, Key={"id": {"N": str(random_key)}}) return response.get('Item', []) + + def create_quiz(self, data: dict) -> None: + '''対象のテーブルにクイズデータを登録するメソッド + ''' + client = boto3.client('dynamodb') # ここで良いかは不明 + response = client.put_item(TableName=self.table_name, Item={ + 'quiz_name': {'S': data['quiz_name']}, # quiz_nameではなくidか + 'questions': {'S': data['questions']}, + 'selects': {'L': [{'S': s} for s in data['selects']]}, + 'answer': {'N': str(data['answer'])} + }) + return True if response['ResponseMetadata']['HTTPStatusCode'] == 200 else False \ No newline at end of file From c5171c8c16b7da4f1a8ed5c0f866a5342ec1bc85 Mon Sep 17 00:00:00 2001 From: Sairon <138011409+Yukkurisiteikitai@users.noreply.github.com> Date: Sat, 7 Dec 2024 13:52:10 +0900 Subject: [PATCH 21/51] Load-Division --- backend/Dockerfile | 1 + backend/app.py | 26 ++ backend/config/config.py | 7 + backend/config/logging.json | 38 +++ backend/controller/game_controller.py | 19 ++ backend/engine/dynamo_client.py | 24 ++ backend/engine/s3_client.py | 0 backend/initialize_db.py | 21 ++ backend/logger.py | 14 + backend/model/games.py | 17 ++ backend/requirements.txt | 3 +- backend/router.py | 34 +++ backend/service/game_service.py | 10 + backend/settings.py | 0 frontend/app.py | 26 ++ frontend/differentPoint.html | 3 +- frontend/game.js | 369 ++++++++++++++++++++------ frontend/games/FindDifference.js | 28 +- frontend/games/introdon.js | 0 frontend/games/quiz.js | 2 +- frontend/index.html | 102 +++++-- make.css | 98 +++++++ play.css | 0 stylesheet.css | 0 24 files changed, 717 insertions(+), 125 deletions(-) create mode 100644 backend/app.py create mode 100644 backend/config/config.py create mode 100644 backend/config/logging.json create mode 100644 backend/controller/game_controller.py create mode 100644 backend/engine/dynamo_client.py create mode 100644 backend/engine/s3_client.py create mode 100644 backend/initialize_db.py create mode 100644 backend/logger.py create mode 100644 backend/model/games.py create mode 100644 backend/router.py create mode 100644 backend/service/game_service.py create mode 100644 backend/settings.py create mode 100644 frontend/app.py create mode 100644 frontend/games/introdon.js create mode 100644 make.css create mode 100644 play.css create mode 100644 stylesheet.css diff --git a/backend/Dockerfile b/backend/Dockerfile index fb25ab0..b0511f4 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -7,3 +7,4 @@ RUN pip install --no-cache-dir -r requirements.txt COPY . . +CMD ["flask", "run", "--host=0.0.0.0"] \ No newline at end of file diff --git a/backend/app.py b/backend/app.py new file mode 100644 index 0000000..b5f6b16 --- /dev/null +++ b/backend/app.py @@ -0,0 +1,26 @@ +from flask import Flask +from flask_cors import CORS +import router +from config import config + +def create_app(): + app = Flask(__name__) + + app.config.from_object(config.Config) + + app.register_blueprint(router.router) + + app.config['JSON_AS_ASCII'] = False #日本語文字化け対策 + app.config["JSON_SORT_KEYS"] = False #ソートをそのまま + CORS( + app, + resources = { + r"/api/*": {"origins": ["http://localhost", "http://localhost:3000"]} + } + ) + + return app + +if __name__ == "__main__": + app = create_app() + app.run(host='0.0.0.0', debug=True, port=5000, threaded=True, use_reloader=False) \ No newline at end of file diff --git a/backend/config/config.py b/backend/config/config.py new file mode 100644 index 0000000..dc64d31 --- /dev/null +++ b/backend/config/config.py @@ -0,0 +1,7 @@ +import os +from dataclasses import dataclass + +@dataclass +class Config: + DEBUG = os.getenv("DEBUG") + DATABASE_URI= "" diff --git a/backend/config/logging.json b/backend/config/logging.json new file mode 100644 index 0000000..2e66282 --- /dev/null +++ b/backend/config/logging.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "formatters": { + "default": { + "format": "[%(asctime)s] [%(levelname)s] : %(message)s" + } + }, + "loggers": { + "file": { + "handlers": ["file"], + "level": "WARN", + "qualname": "file", + "propagate": "no" + }, + "wsgi": { + "handlers": ["wsgi"], + "level": "WARN", + "qualname": "wsgi", + "propagate": "no" + } + }, + "handlers": { + "file": { + "class": "logging.handlers.TimedRotatingFileHandler", + "formatter": "default", + "filename": "./logs/application.log" + }, + "wsgi": { + "class": "logging.StreamHandler", + "stream": "ext://flask.logging.wsgi_errors_stream", + "formatter": "default" + } + }, + "root": { + "level": "WARN", + "handlers": ["file", "wsgi"] + } +} diff --git a/backend/controller/game_controller.py b/backend/controller/game_controller.py new file mode 100644 index 0000000..00db5ef --- /dev/null +++ b/backend/controller/game_controller.py @@ -0,0 +1,19 @@ +from flask import make_response, jsonify +from engine.dynamo_client import DynamoClient + +class GameController: + def __init__(self): + self.db_client = DynamoClient(table_name="game_table") + + def get_game_random(self): + response = self.db_client.get_random() + return make_response(jsonify({ + 'code': 200, + 'game': response + })) + + def create_quiz(self): + # TODO: バリデーションを実装 + if self.db_client.create_quiz(): + return make_response(jsonify({'code: 200'})) + # TODO: エラーハンドリングを実装 diff --git a/backend/engine/dynamo_client.py b/backend/engine/dynamo_client.py new file mode 100644 index 0000000..624e13f --- /dev/null +++ b/backend/engine/dynamo_client.py @@ -0,0 +1,24 @@ +import os +import boto3 +import random + +class DynamoClient: + def __init__(self, table_name: str) -> None: + self.db = boto3.client('dynamodb', endpoint_url=os.getenv("DYNAMO_ENDPOINT")) + self.table_name = table_name + + def get_all(self) -> list: + '''対象のテーブルからレコード全件を取得するメソッド + ''' + response = self.db.scan(TableName=self.table_name) + items = response.get('Items', []) + return items + + def get_random(self) -> None: + '''対象のテーブルからランダムに1件レコードを取得するメソッド + ''' + response_all = self.db.scan(TableName=self.table_name) + response_len = response_all['Count'] + random_key = random.randrange(response_len) + response = self.db.get_item(TableName=self.table_name, Key={"id": {"N": str(random_key)}}) + return response.get('Item', []) diff --git a/backend/engine/s3_client.py b/backend/engine/s3_client.py new file mode 100644 index 0000000..e69de29 diff --git a/backend/initialize_db.py b/backend/initialize_db.py new file mode 100644 index 0000000..a58d0f4 --- /dev/null +++ b/backend/initialize_db.py @@ -0,0 +1,21 @@ +import os +import boto3 + +dynamodb = boto3.client('dynamodb', endpoint_url=os.getenv("DYNAMO_ENDPOINT")) + +table_name = "game_table" + +def main(): + dynamodb.create_table( + TableName=table_name, + KeySchema=[ + {"AttributeName": "id", "KeyType": "HASH",}, + ], + AttributeDefinitions=[ + {"AttributeName": "id", "AttributeType": "N"}, + ], + BillingMode="PAY_PER_REQUEST", + ) + +if __name__ == "__main__": + main() \ No newline at end of file diff --git a/backend/logger.py b/backend/logger.py new file mode 100644 index 0000000..a948aa5 --- /dev/null +++ b/backend/logger.py @@ -0,0 +1,14 @@ +from flask import request, current_app +from functools import wraps + +def http_request_logging(f): + @wraps(f) + def decorated_function(*args, **kwargs): + logger = current_app.logger + try: + logger.info('%s - %s - %s - %s', request.remote_addr, request.method, request.url, request.query_string) + except Exception as e: + logger.exception(e) + pass + return f(*args, **kwargs) + return decorated_function diff --git a/backend/model/games.py b/backend/model/games.py new file mode 100644 index 0000000..892304d --- /dev/null +++ b/backend/model/games.py @@ -0,0 +1,17 @@ +class Quiz: + def __init__(self, id: int, question: str, selects: list, answer_idx: int, likes: int=0) -> None: + self.id = id + self.question = question + self.selects = selects + self.answer_idx = answer_idx + self.likes = likes + + # TODO: __repr__(self)をつくる + +class IntroDon: + def __init__(self, game_id: int, question: str, selects: list, answer: str, likes: int=0) -> None: + self.game_id = game_id + self.question = question + self.selects = selects + self.answer = answer + self.likes = likes \ No newline at end of file diff --git a/backend/requirements.txt b/backend/requirements.txt index a23a866..65bfbbf 100644 --- a/backend/requirements.txt +++ b/backend/requirements.txt @@ -1,3 +1,4 @@ Flask==2.2.5 boto3==1.26.145 -gunicorn==20.1.0 \ No newline at end of file +gunicorn==20.1.0 +flask_cors \ No newline at end of file diff --git a/backend/router.py b/backend/router.py new file mode 100644 index 0000000..679179c --- /dev/null +++ b/backend/router.py @@ -0,0 +1,34 @@ +from flask import Blueprint +from controller import game_controller +from logging import config +from json import load +import logger + +# Generate Router Instance +router = Blueprint('router', __name__) + +# Read Logging Configuration +with open("./config/logging.json", "r", encoding="utf-8") as f: + config.dictConfig(load(f)) + +@router.route("/", methods=['GET']) +@logger.http_request_logging +def hello_world(): + return "Hello World!!" + +@router.route("/api/play/random", methods=['GET']) +@logger.http_request_logging +def api_play_random(): + return game_controller.get_game_random() + +@router.route("/api/create/quiz", methods=['POST']) +@logger.http_request_logging +def api_create_quiz(): + return game_controller.create_quiz() + +@router.after_request +def after_request(response): + # response.headers.add('Access-Control-Allow-Origin', '*') + response.headers.add('Access-Control-Allow-Headers', 'Content-Type,Authorization') + response.headers.add('Access-Control-Allow-Methods', 'GET,PUT,POST,DELETE,OPTIONS') + return response diff --git a/backend/service/game_service.py b/backend/service/game_service.py new file mode 100644 index 0000000..941892c --- /dev/null +++ b/backend/service/game_service.py @@ -0,0 +1,10 @@ +from flask import make_response, jsonify + + +def get_game_logic(): + game = Game.get_game_list() + game_schema = GameSchema(many=True) + return make_response(jsonify({ + 'code': 200, + 'game': game + })) diff --git a/backend/settings.py b/backend/settings.py new file mode 100644 index 0000000..e69de29 diff --git a/frontend/app.py b/frontend/app.py new file mode 100644 index 0000000..275d795 --- /dev/null +++ b/frontend/app.py @@ -0,0 +1,26 @@ +from flask import Flask, render_template +from flask_cors import CORS + + +app = Flask(__name__) +# CORS(app,resources={r"/*":{"origins":"http://127.0.0.1:8030/"}}) + +CORS(app, resources={r"/*": { + "origins": ["http://127.0.0.1:8030", "https://example.com"], + "methods": ["GET", "POST"], + "allow_headers": [r"*"] +}}) + + +def viewPointMake(theme:str ,content:str): + # app.make + return (theme,content) + + + +@app.route("/") +def site_start(): + return render_template("index.html") + +if __name__ == "__main__": + app.run(host="0.0.0.0", port=8120, debug=False) \ No newline at end of file diff --git a/frontend/differentPoint.html b/frontend/differentPoint.html index 3d760ff..7cacb83 100644 --- a/frontend/differentPoint.html +++ b/frontend/differentPoint.html @@ -20,7 +20,7 @@

間違い探し

-
+
@@ -35,7 +35,6 @@

間違い探し

画像1を選択 画像2を選択 -
diff --git a/frontend/game.js b/frontend/game.js index 315b0b8..a21bf92 100644 --- a/frontend/game.js +++ b/frontend/game.js @@ -1,15 +1,15 @@ -// const quiz_system = require("./games/quiz.js"); +const homeScreen = document.getElementById("home"); +const quiz_Screen = document.getElementById("quiz-container"); +const differentPoint_Screen = document.getElementById("differentPoint-container"); +const introdon_Screen = document.getElementById("introDon-container"); -console.log(quiz_system); +const resultScreen = document.getElementById("result"); +const gameModeScreen = document.getElementById("game-mode"); +const selectGameScreen = document.getElementById("SelctGameKind"); -document.addEventListener("DOMContentLoaded", () => { - const homeScreen = document.getElementById("home"); - const quizScreen = document.getElementById("quiz"); - const resultScreen = document.getElementById("result"); - const gameModeScreen = document.getElementById("game-mode"); - const selectGameScreen = document.getElementById("SelctGameKind"); - + +document.addEventListener("DOMContentLoaded", () => { const startButton = document.getElementById("start-button"); const createButton = document.getElementById("create-button"); const playButton = document.getElementById("play-button"); @@ -18,21 +18,21 @@ document.addEventListener("DOMContentLoaded", () => { const gameKindOptions = document.querySelectorAll(".gamekind-option"); - // let quiz_system = new quiz(); + //game + quiz_select_options = document.querySelectorAll(".quiz_selects"); - const statusText = document.querySelector(".status"); const answerText = document.querySelector(".answer"); - - + + // ゲームデータ let gameMode = "play"; //ゲーム選択画面でそのままLoadingKeyに入れるようにするための対策 gamekind = { "クイズ":"quiz", - "間違え探し":"SerchDifferent", + "間違い探し":"differentPoint", "イントロドン":"introdon" } @@ -56,8 +56,7 @@ document.addEventListener("DOMContentLoaded", () => { "answer": 1 }, ] - - + /** * That option discplayis @@ -68,21 +67,37 @@ document.addEventListener("DOMContentLoaded", () => { { gameModeScreen.classList.add("d-none"); selectGameScreen.classList.add("d-none"); - quizScreen.classList.add("d-none"); + + quiz_Screen.classList.add("d-none"); + differentPoint_Screen.classList.add("d-none"); + introdon_Screen.classList.add("d-none"); + resultScreen.classList.add("d-none"); homeScreen.classList.add("d-none"); + console.log(`display:${display}`); if (display == "home") { homeScreen.classList.remove("d-none"); } + //game else if (display == "quiz") { - quizScreen.classList.remove("d-none"); + quiz_Screen.classList.remove("d-none"); + } + else if (display == "differentPoint") + { + differentPoint_Screen.classList.remove("d-none"); + } + else if (display == "introdon") + { + introdon_Screen.classList.remove("d-none"); } + + else if (display == "game_select") { selectGameScreen.classList.remove("d-none"); @@ -114,40 +129,254 @@ document.addEventListener("DOMContentLoaded", () => { //gameMode - //クイズ - // select_options.forEach(option => { - // console.log(option[0]); - // option.addEventListener("click", (event) => { - // const selectedAnswer = event.target.textContent; - - // // 判定処理 - // if (selectedAnswer === correctAnswer) - // { - // statusText.textContent = "正解"; - // statusText.style.color = "#28a745"; - // } - - - // else - // { - // statusText.textContent = "不正解"; - // statusText.style.color = "#dc3545"; - // } - - // answerText.textContent = correctAnswer; // 正解を表示 - - // // 結果画面へ移動 - // displayLoadRequest("result"); - // }); - // }); - // quit_system.quiz_set(question_date[0]["question"], - // question_date[0]["selects"], - // question_date[0]["answer"]); - - // quiz_system.quiz_SelectEvent(); + // ============================================================クイズ================================================================================ +//============================================================================================================================================ + + quiz_select_options.forEach(option => { + let faild = false; + console.log(option[0]); + option.addEventListener("click", (event) => { + const selectedAnswer = event.target.textContent; + // 判定処理 + if (selectedAnswer === correctAnswer) + { + event.target.style.color = "#28a745"; + } + + + else + { + console.log("不正解"); + event.target.style.color = "#dc3545"; + faild = true; + } + + // answerText.textContent = correctAnswer; // 正解を表示 + // 結果画面へ移動 + displayLoadRequest("result"); + }); + }); + + /** + * 質問を書き込む + * @param question_text (string)質問文 + * @param selects (list-string)選択肢で表示するもの + * @param answer_number (int)selectsでの連番-何番目の選択肢を正解にするか、 + * その名前のdisplayを表示する + */ + function quiz_set(question_text,selects,answer_number) + { + question_text.textContent = question_text; + const quiz_contents = quiz_select_options.item(0).children; + for(var i = 0; i < 4;i++) + { + quiz_contents[i].textContent = selects[i]; + } + correctAnswer = selects[answer_number]; + } + + quiz_set(question_date[0]["question"], + question_date[0]["selects"], + question_date[0]["answer"]); + + //================================================================================================================================================================ + + +//============================================================================================================================================ +//============================================================================================================================================ +//========================================間違い探し================================================================================ + + const images_list = document.querySelectorAll('.different-image'); + const debug_log = { + "postion":false, + "isDevicePhone":false + } + + //アクセスしているのがスマホかPCかを確認する + function isSmartPhone() + { + if (navigator.userAgent.match(/iPhone|Android.+Mobile/)) + { + console.log(`UserAgent${navigator.userAgent}, phone:True`); + return true; + } + + else + { + console.log(`UserAgent${navigator.userAgent},phone:False`); + return false; + } + } + + + const isUsePhone = isSmartPhone(); + + //request-date + + /** + * @param ImageList srcに代入するためのURL-S3から引っ張ってくるためのキーを指定する + * @param answer_map クリックするとどこが間違ってるかを教えてくれる + * @param CorrectAnswer answer_mapの連番でどれが正解したかを保存する + */ + + let questionDate = { + "ImageList":[], + "answer_map":[[116,69],[42,51]], + "CorrectAnswer":[false,false], + } + + + const imgs = document.querySelectorAll(".imgs"); + + imgs.forEach(img =>{ + questionDate["ImageList"].push([img.src,img.naturalWidth,img.naturalHeight]); + + }) + console.log(questionDate["ImageList"]); + LoadImages(0,questionDate["ImageList"][0]); + LoadImages(1,questionDate["ImageList"][1]); + + + + let userDate = { + "lastTouchPos":[25.32, 3452.3], + "selectTouchPostions":[[2432,343],[2432,343]] + } + + + let userClick_history = []; + let canvas_history = [[],[]] + const canvas_images = document.querySelectorAll(".different-image"); + + /** + * 画像をロードする関数です。 + * @param images_number (int)連番の値 + * @param images_number ()連番の値 + */ + function LoadImages(images_number,LoadImage) + { + // images_list[images_number].HTMLimages = LoadImage + var drowCTX = images_list[images_number].getContext('2d'); + var d_image = new Image(); + d_image.src = LoadImage[0]; + + images_list[images_number].width = LoadImage[1]; // 元画像の幅 + images_list[images_number].height = LoadImage[2]; // 元画像の高さ + console.log(`image:${LoadImage[0]}, dx:0, dy:0, Dwidth:${LoadImage[1]}, Dheight:${LoadImage[2]}`); + drowCTX.drawImage(d_image, 0, 0, LoadImage[1], LoadImage[2]); + + } + + + console.log(images_list[0]); + + /** + * 指定した場所を描画する処理 + * @param map 一次元の配列です{34,42}のような形式で送ってください + */ + function Drow_ScuessImagePostion(map){ + images_list.forEach(img =>{ + var drowCtx = img.getContext("2d"); + drowCtx.beginPath(); + drowCtx.arc(map[0], map[1], 2, 0, Math.PI * 2); + + drowCtx.fillStyle = 'red'; + if(Check_TouchImagePostion_CorrectAnswer([map[0],map[1]],questionDate["answer_map"],10)) + { + drowCtx.fillStyle = 'green'; + } + + drowCtx.fill(); + drowCtx.stroke(); + }) + } + + + + + + //画像のどこをタップしたかを調べる処理 + images_list.forEach(image => + { + image.addEventListener("click",(c)=> + { + console.log(c.offsetX,c.offsetY); + + + userDate["lastTouchPos"][0] = c.offsetX; + userDate["lastTouchPos"][1] = c.offsetY; + + Drow_ScuessImagePostion([c.offsetX,c.offsetY]); + if (debug_log["postion"] == true){ + console.log( + Check_TouchImagePostion_CorrectAnswer( + userDate["lastTouchPos"], + questionDate["answer_map"], + 10 + ) + + ); + } + + }); + }); + + + /** + * 正解の場所かどうかを判定する処理 + * @param touchPos 要素数2の1次元の配列 + * @param answer_map 間違い場所を2次元配列で管理しているもの + * @param range どれくらいのpx誤差を許容するか? + */ + function Check_TouchImagePostion_CorrectAnswer(touchPos,answer_map,range){ + let isTouchAnswer = false; + answer_map.forEach(ans_map => { + // isTouchAnswer = false; + console.log(`helloWOrld${ans_map}`) + console.log(`Check_touchPosCorrectAnswer\n SelectPos-x:${touchPos[0]},y:${touchPos[1]} \n AnswerPos-x:${ans_map[0]}, y:${ans_map[1]} \n range:${range}`); + + + //0 = x座標 1 = y座標. + if ((ans_map[0]-range <= touchPos[0] && ans_map[0]+range >= touchPos[0]) && + (ans_map[1]-range <= touchPos[1] && ans_map[1]+range >= touchPos[1]) + ) + { + console.log(`answers \n +x${ans_map[0]+range},-x${ans_map[0]-range} \n +y${ans_map[1]+range},-y${ans_map[1]-range} \n`); + isTouchAnswer = true; + } + + else + { + // isTouchAnswer = false; + } + console.log(isTouchAnswer); + + + }) + + return isTouchAnswer; + } + + + function Drow_CorrectAnswer(){ + questionDate["answer_map"].forEach(ans_map => { + console.log("\n==============================================\n"); + Drow_ScuessImagePostion(ans_map); + }) + } + Drow_CorrectAnswer(); + + + +//============================================================================================================================================ +//============================================================================================================================================ +//============================================================================================================================================ + + + console.log(gameKindOptions); gameKindOptions.forEach(option => @@ -164,49 +393,29 @@ document.addEventListener("DOMContentLoaded", () => { else { - console.error("selectGameKindOptionNothing"); + console.error(`selectGameKindOptionNothing ,date${selectGameKind}`); } }); + + }); - - //テスト用のプログラムを組み込んでいる - quiz_system.quiz_set(question_date[0]["question"], + quiz_set(question_date[0]["question"], question_date[0]["selects"], question_date[0]["answer"]); - - quiz_system.quiz_SelectEvent(); - // 回答選択 - // select_options.forEach(option => - // { - // option.addEventListener("click", (event) => { - // const selectedAnswer = event.target.textContent; - - // // 判定処理 - // if (selectedAnswer === correctAnswer) - // { - // statusText.textContent = "正解"; - // statusText.style.color = "#28a745"; - // } - // else - // { - // statusText.textContent = "不正解"; - // statusText.style.color = "#dc3545"; - // } - - // answerText.textContent = correctAnswer; // 正解を表示 - - // // 結果画面へ移動 - // displayLoadRequest("result"); - // }); - // }); - + + let quiz_number // 次の問題へ（ここでは単純にホーム画面に戻る処理） nextButton.addEventListener("click", () => { displayLoadRequest("home"); + + + quiz_set(question_date[0]["question"], + question_date[0]["selects"], + question_date[0]["answer"]); }); // やめる（ホーム画面に戻る） diff --git a/frontend/games/FindDifference.js b/frontend/games/FindDifference.js index 1de8389..0a596be 100644 --- a/frontend/games/FindDifference.js +++ b/frontend/games/FindDifference.js @@ -15,7 +15,7 @@ function isSmartPhone() console.log(`UserAgent${navigator.userAgent}, phone:True`); return true; } - + else { console.log(`UserAgent${navigator.userAgent},phone:False`); @@ -48,32 +48,15 @@ let questionDate = { const imgs = document.querySelectorAll(".imgs"); imgs.forEach(img =>{ - questionDate["ImageList"].push([img,img.naturalWidth,img.naturalHeight]); + questionDate["ImageList"].push([img.src,img.naturalWidth,img.naturalHeight]); }) - +console.log(questionDate["ImageList"]); LoadImages(0,questionDate["ImageList"][0]); LoadImages(1,questionDate["ImageList"][1]); -console.log(questionDate["ImageList"]); - -// // 画像とCanvas要素を取得 -// const img = document.getElementById('sourceImage'); -// const canvas = document.getElementById('myCanvas'); -// const ctx = canvas.getContext('2d'); - -// // ボタンが押されたらCanvasに描画 -// document.getElementById('drawButton').addEventListener('click', () => { -// // 画像の幅と高さに合わせてCanvasサイズを設定 -// canvas.width = img.naturalWidth; // 元画像の幅 -// canvas.height = img.naturalHeight; // 元画像の高さ - -// // Canvasに画像を描画 -// ctx.drawImage(img, 0, 0, canvas.width, canvas.height); -// }); - let userDate = { "lastTouchPos":[25.32, 3452.3], "selectTouchPostions":[[2432,343],[2432,343]] @@ -96,7 +79,7 @@ function LoadImages(images_number,LoadImage) images_list[images_number].width = LoadImage[1].naturalWidth; // 元画像の幅 images_list[images_number].height = LoadImage[2].naturalHeight; // 元画像の高さ - drowCTX.drawImage(LoadImage[0], 0, 0, LoadImage[1].naturalHeight, LoadImage[2].naturalHeight); + drowCTX.drawImage(LoadImage[0], 0, 0, LoadImage[1], LoadImage[2]); } @@ -195,4 +178,5 @@ function Drow_CorrectAnswer(){ Drow_ScuessImagePostion(ans_map); }) } -Drow_CorrectAnswer(); \ No newline at end of file +Drow_CorrectAnswer(); + diff --git a/frontend/games/introdon.js b/frontend/games/introdon.js new file mode 100644 index 0000000..e69de29 diff --git a/frontend/games/quiz.js b/frontend/games/quiz.js index 02f0ced..a949562 100644 --- a/frontend/games/quiz.js +++ b/frontend/games/quiz.js @@ -54,7 +54,7 @@ let correctAnswer = "start-answer"; }); } -export{ +export { quiz_SelectEvent, quiz_set } \ No newline at end of file diff --git a/frontend/index.html b/frontend/index.html index 9a9c3f3..465afcf 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -30,30 +30,94 @@

ミニラン

- -
-

クイズ

-

任天堂・・

-
- - - - + + + +
+ + +
+

間違い探し

+
+

05/??

+ + + + +
+ + +
+

クイズ

+

任天堂・・

+
+ + + + +
+
+ + +
+

制限時間は10秒！5回まで答えられるよ！

+
+

残り時間: 10秒

+

解答回数: 0/5

+ +
+ + +
+ + + + +
+
+ + + +
+
+ + +
+
+ + +
+ +
+ +
+ +
+
+

間違い探し

+
+ 画像1を選択 + 画像2を選択 +
+
+ +
+

クイズ

+
+ +
- -
-

正解

-

スイッチ

-
- -
- + + + + + + + diff --git a/make.css b/make.css new file mode 100644 index 0000000..5ca278a --- /dev/null +++ b/make.css @@ -0,0 +1,98 @@ +/* 画面全体の中央揃え */ +body { + font-family: Arial, sans-serif; + display: flex; + justify-content: center; + align-items: center; + height: 100vh; + margin: 0; + background-color: #f0f0f0; +} + +#quiz-container { + text-align: center; + color: #333; + width: 100%; + max-width: 500px; /* 適切な幅を指定 */ +} + +#info-text { + font-size: 18px; + font-weight: bold; + margin-bottom: 20px; + color: #ff4081; +} + +button { + padding: 10px 20px; + margin: 10px 0; /* 垂直方向の間隔を調整 */ + font-size: 16px; + cursor: pointer; + border-radius: 5px; + border: none; + transition: background-color 0.3s ease; +} + +#start-button { + background-color: #ff4081; + color: white; +} + +.answer-button { + background-color: #4caf50; + color: white; +} + +button.disabled { + background-color: #ccc; + cursor: not-allowed; +} + +#answer-input { + padding: 10px; + font-size: 16px; + border-radius: 5px; + border: 1px solid #ddd; + margin-top: 10px; + width: calc(100% - 40px); /* 入力フィールドの幅調整 */ + box-sizing: border-box; + display: none; +} + +#submit-answer-button { + background-color: #00bcd4; /* 水色 */ + color: white; + padding: 10px 20px; + font-size: 16px; + border-radius: 5px; + border: none; + cursor: pointer; + margin-top: 10px; +} + +button.disabled, +#answer-input.disabled { + background-color: #ccc; /* 灰色 */ + cursor: not-allowed; + color: #666; +} + +#next-button { + background-color: #ff9800; /* オレンジ */ + color: white; + margin-top: 20px; +} + +#result-message { + font-size: 100px; + font-weight: bold; + margin: 20px; +} + +.correct { + color: blue; +} + +.incorrect { + color: red; +} \ No newline at end of file diff --git a/play.css b/play.css new file mode 100644 index 0000000..e69de29 diff --git a/stylesheet.css b/stylesheet.css new file mode 100644 index 0000000..e69de29 From e5690cb9e5261c33932fc238026f796476c95170 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E8=A5=BF=E5=93=B2=E5=8F=B8?= Date: Sat, 7 Dec 2024 13:54:20 +0900 Subject: [PATCH 22/51] create_intro --- backend/controller/game_controller.py | 29 +++++++++++++++++++++++---- backend/engine/dynamo_client.py | 12 ++++++++--- backend/router.py | 10 +++++++++ compose.yml | 2 +- 4 files changed, 45 insertions(+), 8 deletions(-) diff --git a/backend/controller/game_controller.py b/backend/controller/game_controller.py index a5d2730..59e85d2 100644 --- a/backend/controller/game_controller.py +++ b/backend/controller/game_controller.py @@ -12,12 +12,17 @@ def get_game_random(self): 'game': response })) + def create_quiz(self): + # 必要な処理をここに記述 + return {"message": "Intro created successfully"} + def create_quiz(self): # リクエストデータを取得 data = request.get_json() question = data['questions'] selects = data['selects'] - answer = data['answer'] + answer = data['answer_idx'] + id = data['id'] # データベースを見て次のidを取得する # バリデーションを実装 if not data or 'quiz_name' not in data or 'questions' not in data: @@ -42,9 +47,20 @@ def create_quiz(self): def create_intro(self): data = request.get_json() - if not data or 'intro_name' not in data or 'intro_text' not in data: - return make_response(jsonify({'code': 400, 'message': 'Invalid data'}), 400) - + music_title_answer = data['music_title_answer'] + music_data = data['music_data']#musicのデータ本体 + id = data['id'] # データベースを見て次のidを取得する + + # バリデーションを実装 + #if not data or 'intro_name' not in data or 'intro_text' not in data: + # return make_response(jsonify({'code': 400, 'message': 'Invalid data'}), 400) + + if not isinstance(music_title_answer, str) or not music_title_answer.strip(): + return make_response(jsonify({'code': 400, 'message': 'Invalid music_title_answer'}), 400) + if not music_data: + return make_response(jsonify({'code': 400, 'message': 'Invalid music_data'}), 400) + + # DBに保存 try: if self.db_client.create_intro(data): return make_response(jsonify({'code': 200, 'message': 'Intro created successfully'}), 200) @@ -52,3 +68,8 @@ def create_intro(self): return make_response(jsonify({'code': 500, 'message': 'Failed to create intro'}), 500) except Exception as e: return make_response(jsonify({'code': 500, 'message': str(e)}), 500) + + def create_diffshot(self): + data = request.get_json() + music_title_answer = data['music_title_answer'] + music_data = data['music_data'] \ No newline at end of file diff --git a/backend/engine/dynamo_client.py b/backend/engine/dynamo_client.py index b4544a4..271aad0 100644 --- a/backend/engine/dynamo_client.py +++ b/backend/engine/dynamo_client.py @@ -28,9 +28,15 @@ def create_quiz(self, data: dict) -> None: ''' client = boto3.client('dynamodb') # ここで良いかは不明 response = client.put_item(TableName=self.table_name, Item={ - 'quiz_name': {'S': data['quiz_name']}, # quiz_nameではなくidか 'questions': {'S': data['questions']}, 'selects': {'L': [{'S': s} for s in data['selects']]}, - 'answer': {'N': str(data['answer'])} + 'answer_idx': {'N': str(data['answer'])}, + 'likes': {'N': '0'} }) - return True if response['ResponseMetadata']['HTTPStatusCode'] == 200 else False \ No newline at end of file + return True if response['ResponseMetadata']['HTTPStatusCode'] == 200 else False + + def create_intro(self, data: dict) -> None: + '''対象のテーブルにイントロデータを登録するメソッド + ''' + client = boto3.client('dynamodb') + \ No newline at end of file diff --git a/backend/router.py b/backend/router.py index 679179c..ba9b227 100644 --- a/backend/router.py +++ b/backend/router.py @@ -26,6 +26,16 @@ def api_play_random(): def api_create_quiz(): return game_controller.create_quiz() +@router.route("/api/create/intro", methods=['POST']) +@logger.http_request_logging +def api_create_intro(): + return game_controller.create_intro() + +@router.route("/api/create/diffshot", methods=['POST']) +@logger.http_request_logging +def api_create_diffshot(): + return game_controller.create_diffshot() + @router.after_request def after_request(response): # response.headers.add('Access-Control-Allow-Origin', '*') diff --git a/compose.yml b/compose.yml index 3cae6f6..5d99fb4 100644 --- a/compose.yml +++ b/compose.yml @@ -15,7 +15,7 @@ services: build: ./backend container_name: backend ports: - - "5001:5001" + - "5001:5000" volumes: - ./backend:/app env_file: From 856a18055ec3cf2611241921d8404e2e08e2824b Mon Sep 17 00:00:00 2001 From: nozo120 Date: Sat, 7 Dec 2024 14:24:56 +0900 Subject: [PATCH 23/51] =?UTF-8?q?=E3=83=95=E3=83=AD=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=82=A8=E3=83=B3=E3=83=89=E3=81=AE=E5=A4=89=E6=9B=B4=E3=82=92?= =?UTF-8?q?=E5=8A=A0=E3=81=88=E3=81=BE=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 2 +- index2.html | 9 +- merged_index.html | 51 ++++------- merged_script.js | 224 ++++++++++++++++++++++++++++++++++++++++++++++ merged_style.css | 118 ++++++++++++++++++++++++ style2.css | 1 + 6 files changed, 367 insertions(+), 38 deletions(-) create mode 100644 merged_script.js create mode 100644 merged_style.css diff --git a/index.html b/index.html index 63cb66c..a4af0a7 100644 --- a/index.html +++ b/index.html @@ -8,7 +8,7 @@ -
+

制限時間は10秒！5回まで答えられるよ！

残り時間: 10秒

diff --git a/index2.html b/index2.html index 44a0389..46e7271 100644 --- a/index2.html +++ b/index2.html @@ -5,7 +5,10 @@ イントロドン作成 - + + + +
@@ -30,8 +33,10 @@

イントロドン作成

- + + + diff --git a/merged_index.html b/merged_index.html index aec47ae..c43f825 100644 --- a/merged_index.html +++ b/merged_index.html @@ -4,20 +4,18 @@ イントロドン - - イントロドン作成 - + -
@@ -111,15 +109,26 @@

間違い探し

クイズ

- +
+

質問

+ + +

選択肢

+ + + + + +

回答

+ +
-
- +
diff --git a/frontend/style.css b/frontend/style.css index 2c90a81..4f32952 100644 --- a/frontend/style.css +++ b/frontend/style.css @@ -57,4 +57,104 @@ body { .d-none { display: none; } - \ No newline at end of file + + + body { + font-family: Arial, sans-serif; + display: flex; + justify-content: center; + align-items: center; + height: 100vh; + margin: 0; + background-color: #f0f0f0; +} + +#quiz-container { + text-align: center; + color: #333; + width: 100%; + max-width: 500px; /* 適切な幅を指定 */ +} + +#info-text { + font-size: 18px; + font-weight: bold; + margin-bottom: 20px; + color: #ff4081; +} + +button { + width: 120px; + height: 45px; + padding: 10px 20px; + margin: 10px 0; /* 垂直方向の間隔を調整 */ + font-size: 16px; + cursor: pointer; + border-radius: 5px; + border: none; + transition: background-color 0.3s ease; +} + +#start-button { + background-color: #ff4081; + color: white; +} + +.answer-button { + background-color: #4caf50; + color: white; +} + +button.disabled { + background-color: #ccc; + cursor: not-allowed; +} + +#answer-input { + padding: 10px; + font-size: 16px; + border-radius: 5px; + border: 1px solid #ddd; + margin-top: 10px; + width: calc(100% - 40px); /* 入力フィールドの幅調整 */ + box-sizing: border-box; + display: none; +} + +#submit-answer-button { + background-color: #00bcd4; /* 水色 */ + color: white; + padding: 10px 20px; + font-size: 16px; + border-radius: 5px; + border: none; + cursor: pointer; + margin-top: 10px; +} + +button.disabled, +#answer-input.disabled { + background-color: #ccc; /* 灰色 */ + cursor: not-allowed; + color: #666; +} + +#next-button { + background-color: #ff9800; /* オレンジ */ + color: white; + margin-top: 20px; +} + +#result-message { + font-size: 100px; + font-weight: bold; + margin: 20px; +} + +.correct { + color: blue; +} + +.incorrect { + color: red; +} From 90984cb756e3d93203df3e2ff5ddf9e1f0c34e70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E8=A5=BF=E5=93=B2=E5=8F=B8?= Date: Sat, 7 Dec 2024 16:13:25 +0900 Subject: [PATCH 26/51] create_quiz --- backend/controller/game_controller.py | 72 ++++++++++++++++++++------- backend/engine/dynamo_client.py | 18 ++++++- backend/router.py | 22 ++++++-- 3 files changed, 89 insertions(+), 23 deletions(-) diff --git a/backend/controller/game_controller.py b/backend/controller/game_controller.py index 59e85d2..3474ae4 100644 --- a/backend/controller/game_controller.py +++ b/backend/controller/game_controller.py @@ -1,5 +1,10 @@ from flask import make_response, jsonify, request from engine.dynamo_client import DynamoClient +import hashlib +#from werkzeug.utils import secure_filename +#from dynamo_client import save_file_metadata +#from s3_client import upload_to_s3 +#from dotenv import load_dotenv class GameController: def __init__(self): @@ -12,22 +17,16 @@ def get_game_random(self): 'game': response })) - def create_quiz(self): - # 必要な処理をここに記述 - return {"message": "Intro created successfully"} - def create_quiz(self): # リクエストデータを取得 data = request.get_json() - question = data['questions'] + question = data['question'] selects = data['selects'] - answer = data['answer_idx'] - id = data['id'] # データベースを見て次のidを取得する + answer = data['answer'] + id = 1 # データベースを見て次のidを取得する + data['id'] = id # バリデーションを実装 - if not data or 'quiz_name' not in data or 'questions' not in data: - return make_response(jsonify({'code': 400, 'message': 'Invalid data'}), 400) - if not isinstance(question, str) or not question.strip(): return make_response(jsonify({'code': 400, 'message': 'Invalid question'}), 400) if not isinstance(selects, list) or len(selects) != 4: @@ -48,13 +47,32 @@ def create_quiz(self): def create_intro(self): data = request.get_json() music_title_answer = data['music_title_answer'] - music_data = data['music_data']#musicのデータ本体 - id = data['id'] # データベースを見て次のidを取得する + #music_data = data['music_data'] # musicのデータ本体 + id = 1 # データベースを見て次のidを取得する + data['id'] = id + + if 'file' not in request.files: + return jsonify({"error": "No file part"}), 400 + + file = request.files['file'] + if file.filename == '': + return jsonify({"error": "No selected file"}), 400 + # ファイル名を安全にする + filename = secure_filename(file.filename) + # ファイル名のハッシュを生成 + file_hash = hashlib.sha256(filename.encode('utf-8')).hexdigest() + + try: + # S3にファイルをアップロード + upload_to_s3(file, file_hash, file.content_type) + # DynamoDBにメタデータを保存 + save_file_metadata(file_hash, filename) + return jsonify({"message": "File uploaded successfully", "file_hash": file_hash}), 200 + except Exception as e: + return jsonify({"error": str(e)}), 500 - # バリデーションを実装 - #if not data or 'intro_name' not in data or 'intro_text' not in data: - # return make_response(jsonify({'code': 400, 'message': 'Invalid data'}), 400) + # バリデーションを実装 if not isinstance(music_title_answer, str) or not music_title_answer.strip(): return make_response(jsonify({'code': 400, 'message': 'Invalid music_title_answer'}), 400) if not music_data: @@ -71,5 +89,25 @@ def create_intro(self): def create_diffshot(self): data = request.get_json() - music_title_answer = data['music_title_answer'] - music_data = data['music_data'] \ No newline at end of file + picture_data = data['picture_data'] + picture_data_answer = data['picture_data_answer'] + answer_points = data['answer_points'] + id = 1 # データベースを見て次のidを取得する + data['id'] = id + + # バリデーションを実装 + if not isinstance(picture_data, str) or not music_title_answer.strip(): + return make_response(jsonify({'code': 400, 'message': 'Invalid music_title_answer'}), 400) + if not music_data: + return make_response(jsonify({'code': 400, 'message': 'Invalid music_data'}), 400) + + + # DBに保存 + try: + if self.db_client.create_diffshot(data): + return make_response(jsonify({'code': 200, 'message': 'Diffshot created successfully'}), 200) + else: + return make_response(jsonify({'code': 500, 'message': 'Failed to create diffshot'}), 500) + except Exception as e: + return make_response(jsonify({'code': 500, 'message': str(e)}), 500) + \ No newline at end of file diff --git a/backend/engine/dynamo_client.py b/backend/engine/dynamo_client.py index 271aad0..aab9846 100644 --- a/backend/engine/dynamo_client.py +++ b/backend/engine/dynamo_client.py @@ -6,6 +6,9 @@ class DynamoClient: def __init__(self, table_name: str) -> None: self.db = boto3.client('dynamodb', endpoint_url=os.getenv("DYNAMO_ENDPOINT")) self.table_name = table_name + #self.db = boto3.resource('dynamodb', region_name=REGION_NAME) + #self.table_name = table_name or DYNAMODB_TABLE + #self.table = self.db.Table(self.table_name) def get_all(self) -> list: '''対象のテーブルからレコード全件を取得するメソッド @@ -28,7 +31,8 @@ def create_quiz(self, data: dict) -> None: ''' client = boto3.client('dynamodb') # ここで良いかは不明 response = client.put_item(TableName=self.table_name, Item={ - 'questions': {'S': data['questions']}, + 'id': {'N': str(data['id'])}, + 'question': {'S': data['question']}, 'selects': {'L': [{'S': s} for s in data['selects']]}, 'answer_idx': {'N': str(data['answer'])}, 'likes': {'N': '0'} @@ -39,4 +43,16 @@ def create_intro(self, data: dict) -> None: '''対象のテーブルにイントロデータを登録するメソッド ''' client = boto3.client('dynamodb') + response = client.put_item(TableName=self.table_name, Item={ + 'id': {'N': str(data['id'])}, + 'music_title_answer': {'S': data['music_title_answer']}, + 'music_data': {'B': data['music_data']}, + 'likes': {'N': '0'} + }) + + def create_diffshot(self, data: dict) -> None: + '''対象のテーブルにディフショットデータを登録するメソッド + ''' + client = boto3.client('dynamodb') + \ No newline at end of file diff --git a/backend/router.py b/backend/router.py index ba9b227..88abe63 100644 --- a/backend/router.py +++ b/backend/router.py @@ -1,11 +1,23 @@ from flask import Blueprint -from controller import game_controller +from controller.game_controller import GameController from logging import config from json import load import logger +import boto3 + +## クライアントの初期化 +#s3_client = boto3.client( +# "s3", +# aws_access_key_id=S3_ACCESS_KEY, +# aws_secret_access_key=S3_SECRET_KEY, +# endpoint_url=S3_ENDPOINT, # MinIOの場合 +#) +#dynamodb = boto3.resource("dynamodb", region_name=REGION_NAME) +#dynamodb_table = dynamodb.Table(DYNAMODB_TABLE) # Generate Router Instance router = Blueprint('router', __name__) +controller = GameController() # Read Logging Configuration with open("./config/logging.json", "r", encoding="utf-8") as f: @@ -19,22 +31,22 @@ def hello_world(): @router.route("/api/play/random", methods=['GET']) @logger.http_request_logging def api_play_random(): - return game_controller.get_game_random() + return controller.get_game_random() @router.route("/api/create/quiz", methods=['POST']) @logger.http_request_logging def api_create_quiz(): - return game_controller.create_quiz() + return controller.create_quiz() @router.route("/api/create/intro", methods=['POST']) @logger.http_request_logging def api_create_intro(): - return game_controller.create_intro() + return controller.create_intro() @router.route("/api/create/diffshot", methods=['POST']) @logger.http_request_logging def api_create_diffshot(): - return game_controller.create_diffshot() + return controller.create_diffshot() @router.after_request def after_request(response): From 547dc385597e73934a62ee33ef4360163b2c7d0a Mon Sep 17 00:00:00 2001 From: Fuchs0101 Date: Sat, 7 Dec 2024 16:17:30 +0900 Subject: [PATCH 27/51] =?UTF-8?q?DynamoDB=E3=81=A8=E3=81=AE=E7=B9=8B?= =?UTF-8?q?=E3=81=8E=E3=81=93=E3=81=BF=E3=82=92=E5=AE=9F=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 ++- backend/controller/game_controller.py | 2 +- backend/engine/dynamo_client.py | 8 ++++---- backend/router.py | 7 ++++--- compose.yml | 4 +--- frontend/Dockerfile | 10 ++-------- 6 files changed, 14 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 0b6b20a..cb52990 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ # log files -backend/logs +*.log.* +*.log # environment informations and credentials *.env diff --git a/backend/controller/game_controller.py b/backend/controller/game_controller.py index 00db5ef..24ecda9 100644 --- a/backend/controller/game_controller.py +++ b/backend/controller/game_controller.py @@ -3,7 +3,7 @@ class GameController: def __init__(self): - self.db_client = DynamoClient(table_name="game_table") + self.db_client = DynamoClient(table_name="minirun_game_table") def get_game_random(self): response = self.db_client.get_random() diff --git a/backend/engine/dynamo_client.py b/backend/engine/dynamo_client.py index 624e13f..2b7a0b8 100644 --- a/backend/engine/dynamo_client.py +++ b/backend/engine/dynamo_client.py @@ -4,7 +4,7 @@ class DynamoClient: def __init__(self, table_name: str) -> None: - self.db = boto3.client('dynamodb', endpoint_url=os.getenv("DYNAMO_ENDPOINT")) + self.db = boto3.client('dynamodb') self.table_name = table_name def get_all(self) -> list: @@ -18,7 +18,7 @@ def get_random(self) -> None: '''対象のテーブルからランダムに1件レコードを取得するメソッド ''' response_all = self.db.scan(TableName=self.table_name) - response_len = response_all['Count'] - random_key = random.randrange(response_len) + valid_keys = [item['id']['N'] for item in response_all['Items']] + random_key = random.choice(valid_keys) response = self.db.get_item(TableName=self.table_name, Key={"id": {"N": str(random_key)}}) - return response.get('Item', []) + return response.get('Item') diff --git a/backend/router.py b/backend/router.py index 679179c..9a4aaab 100644 --- a/backend/router.py +++ b/backend/router.py @@ -1,11 +1,12 @@ from flask import Blueprint -from controller import game_controller +from controller.game_controller import GameController from logging import config from json import load import logger # Generate Router Instance router = Blueprint('router', __name__) +controller = GameController() # Read Logging Configuration with open("./config/logging.json", "r", encoding="utf-8") as f: @@ -19,12 +20,12 @@ def hello_world(): @router.route("/api/play/random", methods=['GET']) @logger.http_request_logging def api_play_random(): - return game_controller.get_game_random() + return controller.get_game_random() @router.route("/api/create/quiz", methods=['POST']) @logger.http_request_logging def api_create_quiz(): - return game_controller.create_quiz() + return controller.create_quiz() @router.after_request def after_request(response): diff --git a/compose.yml b/compose.yml index b6a7552..22f3440 100644 --- a/compose.yml +++ b/compose.yml @@ -3,11 +3,9 @@ services: build: ./frontend container_name: frontend ports: - - "3000:3000" + - "8080:80" volumes: - ./frontend:/app - environment: - - NODE_ENV=development depends_on: - backend diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 223797c..6e8acef 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -1,8 +1,2 @@ -FROM node:18 - -WORKDIR /app - -COPY package*.json ./ -RUN npm install - -COPY . . +FROM nginx:alpine +COPY . /usr/share/nginx/html From dd61c715de570523ca37a3acea0293dee1c07265 Mon Sep 17 00:00:00 2001 From: nozo120 Date: Sat, 7 Dec 2024 16:18:51 +0900 Subject: [PATCH 28/51] =?UTF-8?q?=E3=83=95=E3=83=AD=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=82=A8=E3=83=B3=E3=83=89=E3=81=AE=E5=A4=89=E6=9B=B4=E3=82=92?= =?UTF-8?q?=E5=8A=A0=E3=81=88=E3=81=BE=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index2.html | 2 +- index3.html | 32 ++++++++++++++++++++++++++++++++ merged_index.html | 9 +++++++++ merged_script.js | 38 ++++++++++++++++++++++++++++++++++---- script3.js | 22 ++++++++++++++++++++++ style3.css | 37 +++++++++++++++++++++++++++++++++++++ 6 files changed, 135 insertions(+), 5 deletions(-) create mode 100644 index3.html create mode 100644 script3.js create mode 100644 style3.css diff --git a/index2.html b/index2.html index 46e7271..1a9188c 100644 --- a/index2.html +++ b/index2.html @@ -8,7 +8,7 @@ - +
diff --git a/index3.html b/index3.html new file mode 100644 index 0000000..5c57f6b --- /dev/null +++ b/index3.html @@ -0,0 +1,32 @@ + + + + + + ボタンで画面遷移 + + + +
+

ボタンで画面遷移

+
+ + + +
+
+ + + +
+
+ + + + diff --git a/merged_index.html b/merged_index.html index c43f825..604a7ef 100644 --- a/merged_index.html +++ b/merged_index.html @@ -11,6 +11,15 @@ + +
+ -
- - -
- - - - -
-
- - - - diff --git a/index2.html b/index2.html deleted file mode 100644 index 1a9188c..0000000 --- a/index2.html +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - イントロドン作成 - - - - - - -
-

イントロドン作成

- - - - - -

- - - - - -

- - - - - - -
- - - - - - - - diff --git a/script.js b/script.js deleted file mode 100644 index d0dec9c..0000000 --- a/script.js +++ /dev/null @@ -1,147 +0,0 @@ - -document.addEventListener('DOMContentLoaded', function () { - const startButton = document.getElementById('start-button'); - const submitButton = document.getElementById('submit-answer-button'); - const resultMessage = document.getElementById('result-message'); - const nextButton = document.getElementById('next-button'); - const answerInput = document.getElementById('answer-input'); - const timeLeftElement = document.getElementById('time-left'); - const answerCountElement = document.getElementById('answer-count'); - const maxAnswerCountElement = document.getElementById('max-answer-count'); - const infoText = document.getElementById('info-text'); - const button1 = document.getElementById('button1'); - const button2 = document.getElementById('button2'); - - const audio = new Audio('your-music-file.mp3'); - let timer; - let timeRemaining = 10; - let answerCount = 0; - const maxAnswerCount = 5; - let correctAnswer = "曲名"; - let quizFinished = false; - let answerEnabled = false; - - // 初期設定 - maxAnswerCountElement.textContent = maxAnswerCount; - answerInput.style.display = 'none'; - submitButton.style.display = 'none'; - submitButton.disabled = true; - - - startButton.addEventListener('click', function () { - audio.play(); - startButton.disabled = true; - startTimer(); - }); - - function startTimer() { - timer = setInterval(function () { - timeRemaining--; - timeLeftElement.textContent = timeRemaining; - - if (timeRemaining <= 0) { - clearInterval(timer); - endQuiz(false); - } - }, 1000); - } - - function resetButtons() { - button1.disabled = false; - button2.disabled = false; - button1.classList.remove('disabled'); - button2.classList.remove('disabled'); - button1.style.backgroundColor = '#4caf50'; - button2.style.backgroundColor = '#4caf50'; - } - - button1.addEventListener('click', function () { - enableAnswer(); - button1.disabled = true; - button2.classList.add('disabled'); - button2.style.backgroundColor = '#ccc'; - }); - - button2.addEventListener('click', function () { - enableAnswer(); - button2.disabled = true; - button1.classList.add('disabled'); - button1.style.backgroundColor = '#ccc'; - }); - - function enableAnswer() { - answerEnabled = true; - answerInput.style.display = 'block'; - submitButton.style.display = 'block'; - submitButton.disabled = false; - } - - submitButton.addEventListener('click', function () { - if (quizFinished || !answerEnabled) return; - - const userAnswer = answerInput.value.trim(); - answerCount++; - answerCountElement.textContent = answerCount; - - if (userAnswer.toLowerCase() === correctAnswer.toLowerCase()) { - endQuiz(true); - } else if (answerCount >= maxAnswerCount) { - endQuiz(false); - } else { - resultMessage.style.display = 'block'; - resultMessage.textContent = "×"; - resultMessage.className = 'incorrect'; - resetButtons(); // ボタンの状態をリセット - } - }); - - nextButton.addEventListener('click', function () { - window.location.href = 'next-page.html'; - }); - - function endQuiz(isCorrect) { - clearInterval(timer); - quizFinished = true; - - resultMessage.style.display = 'block'; - nextButton.style.display = 'block'; - - if (isCorrect) { - resultMessage.textContent = "〇"; - resultMessage.className = 'correct'; - } else { - resultMessage.textContent = "×"; - resultMessage.className = 'incorrect'; - } - - disableAllInputs(); - - // 解答入力と解答完了ボタンを無効化 - answerInput.disabled = true; - submitButton.disabled = true; - submitButton.classList.add('disabled'); - } - -function disableAllInputs() { - document.querySelectorAll('.answer-button').forEach(button => { - button.disabled = true; - button.classList.add('disabled'); - }); - - // 解答入力フィールドと解答完了ボタンを無効化 - answerInput.disabled = true; - submitButton.disabled = true; - submitButton.classList.add('disabled'); -} - -function enableAllInputs() { - document.querySelectorAll('.answer-button').forEach(button => { - button.disabled = false; - button.classList.remove('disabled'); - }); - // 解答完了ボタンも有効化 - submitButton.disabled = false; - submitButton.classList.remove('disabled'); - answerInput.disabled = false; -} -}) \ No newline at end of file diff --git a/script2.js b/script2.js deleted file mode 100644 index 0cfa32d..0000000 --- a/script2.js +++ /dev/null @@ -1,61 +0,0 @@ -document.getElementById("create-button").addEventListener("click", function () { - const audioFile = document.getElementById("audio-upload").files[0]; - const answer = document.getElementById("answer-input").value; - - // 音声ファイルがない場合 - if (!audioFile) { - alert("音声ファイルを入力してください！"); - return; - } - - // 答えがない場合 - if (!answer) { - alert("答えを入力してください！"); - return; - } - - - // フォームデータの作成 - const formData = new FormData(); - formData.append("audio", audioFile); - formData.append("answer", answer); - - // データをバックエンドに送信 - fetch("YOUR_BACKEND_URL", { - method: "POST", - body: formData - }) - - - .then((response) => { - if (response.ok) { - document.getElementById("status-message").style.display = "block"; - } else { - alert("エラーが発生しました。再試行してください。"); - } - }) - .catch((error) => { - console.error("通信エラー:", error); - alert("通信エラーが発生しました。"); - }); -document.getElementById("audio-upload").addEventListener("change", toggleCreateButton); -document.getElementById("answer-input").addEventListener("input", toggleCreateButton); - -function toggleCreateButton() { - const audioFile = document.getElementById("audio-upload").files[0]; - const answer = document.getElementById("answer-input").value; - - const createButton = document.getElementById("create-button"); - - // 音声ファイルと答えが両方入力されている場合はボタンを有効化 - if (audioFile && answer) { - createButton.disabled = false; - } else { - createButton.disabled = true; - } -} - -// 初期状態でボタンを無効化しておく -toggleCreateButton(); - -}); From ce2fcb781e214961fd337d057ba6cf7515f84ade Mon Sep 17 00:00:00 2001 From: nozo120 Date: Sat, 7 Dec 2024 17:40:47 +0900 Subject: [PATCH 31/51] =?UTF-8?q?=E3=83=95=E3=83=AD=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=82=A8=E3=83=B3=E3=83=89=E3=81=AE=E8=A1=A8=E7=A4=BA=E3=83=87?= =?UTF-8?q?=E3=82=B0=E3=83=AC=E3=82=92=E8=A7=A3=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- merged_index.html | 6 +----- merged_script.js | 33 ++++++--------------------------- 2 files changed, 7 insertions(+), 32 deletions(-) diff --git a/merged_index.html b/merged_index.html index 604a7ef..63b5dda 100644 --- a/merged_index.html +++ b/merged_index.html @@ -12,11 +12,7 @@ -
-
- + From 199cb4c4e008a5db6a68bb2879fed368df0f3593 Mon Sep 17 00:00:00 2001 From: tetsushi33 Date: Sat, 7 Dec 2024 18:33:45 +0900 Subject: [PATCH 35/51] define play_intro, play_diffshot temp --- backend/controller/game_controller.py | 49 +++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/backend/controller/game_controller.py b/backend/controller/game_controller.py index c70714a..7791008 100644 --- a/backend/controller/game_controller.py +++ b/backend/controller/game_controller.py @@ -145,3 +145,52 @@ def play_quiz(self): 'code': 500, 'message': str(e) }), 500) + + def play_intro(self): + try: + # データベースからランダムに問題を取得 + response = self.db_client.get_random() + if response: + intro_data = { + "music_title_answer": response.get('music_title_answer', {}).get('S', ''), + "music_data": response.get('music_data', {}).get('B', '') + } + return make_response(jsonify({ + 'code': 200, + 'game_content': intro_data + }), 200) + else: + return make_response(jsonify({ + 'code': 404, + 'message': 'No intro found' + }), 404) + except Exception as e: + return make_response(jsonify({ + 'code': 500, + 'message': str(e) + }), 500) + + def play_diffshot(self): + try: + # データベースからランダムに問題を取得 + response = self.db_client.get_random() + if response: + diffshot_data = { + "picture_data": response.get('picture_data', {}).get('S', ''), + "picture_data_answer": response.get('picture_data_answer', {}).get('S', ''), + "answer_points": response.get('answer_points', {}).get('L', []) + } + return make_response(jsonify({ + 'code': 200, + 'game_content': diffshot_data + }), 200) + else: + return make_response(jsonify({ + 'code': 404, + 'message': 'No diffshot found' + }), 404) + except Exception as e: + return make_response(jsonify({ + 'code': 500, + 'message': str(e) + }), 500) \ No newline at end of file From 7feb8433519666c474d6af9b5d794fce200a2e37 Mon Sep 17 00:00:00 2001 From: tetsushi33 Date: Sat, 7 Dec 2024 19:34:11 +0900 Subject: [PATCH 36/51] define play_intro --- backend/controller/game_controller.py | 15 +++++----- backend/engine/dynamo_client.py | 25 ++++++++++++++++ backend/engine/s3_client.py | 42 +++++++++++++++++++++++++++ 3 files changed, 75 insertions(+), 7 deletions(-) diff --git a/backend/controller/game_controller.py b/backend/controller/game_controller.py index 7791008..c9b2548 100644 --- a/backend/controller/game_controller.py +++ b/backend/controller/game_controller.py @@ -3,7 +3,7 @@ import hashlib #from werkzeug.utils import secure_filename #from dynamo_client import save_file_metadata -#from s3_client import upload_to_s3 +from s3_client import upload_to_s3 #from dotenv import load_dotenv @@ -58,8 +58,8 @@ def create_intro(self): data = request.get_json() music_title_answer = data['music_title_answer'] #music_data = data['music_data'] # musicのデータ本体 - id = 1 # データベースを見て次のidを取得する - data['id'] = id + last_id = self.get_last_id() + data['id'] = last_id + 1 if 'file' not in request.files: return jsonify({"error": "No file part"}), 400 @@ -68,7 +68,8 @@ def create_intro(self): if file.filename == '': return jsonify({"error": "No selected file"}), 400 # ファイル名を安全にする - filename = secure_filename(file.filename) + #filename = secure_filename(file.filename) + filename = file.filename # ファイル名のハッシュを生成 file_hash = hashlib.sha256(filename.encode('utf-8')).hexdigest() @@ -76,7 +77,7 @@ def create_intro(self): # S3にファイルをアップロード upload_to_s3(file, file_hash, file.content_type) # DynamoDBにメタデータを保存 - save_file_metadata(file_hash, filename) + self.db_client.save_file_metadata(data, file_hash, filename) return jsonify({"message": "File uploaded successfully", "file_hash": file_hash}), 200 except Exception as e: return jsonify({"error": str(e)}), 500 @@ -102,8 +103,8 @@ def create_diffshot(self): picture_data = data['picture_data'] picture_data_answer = data['picture_data_answer'] answer_points = data['answer_points'] - id = 1 # データベースを見て次のidを取得する - data['id'] = id + last_id = self.get_last_id() + data['id'] = last_id + 1 # バリデーションを実装 if not isinstance(picture_data, str) or not music_title_answer.strip(): diff --git a/backend/engine/dynamo_client.py b/backend/engine/dynamo_client.py index 133b758..e9586ae 100644 --- a/backend/engine/dynamo_client.py +++ b/backend/engine/dynamo_client.py @@ -53,6 +53,31 @@ def create_intro(self, data: dict) -> None: 'likes': {'N': '0'} }) + def save_file_metadata(self, data: dict, file_hash: str, original_name: str) -> bool: + """ + DynamoDBにファイルのメタデータを保存する関数 + + Args: + file_hash (str): ファイルのハッシュ値 + original_name (str): 元のファイル名 + + Returns: + bool: 成功した場合はTrue、失敗した場合はFalse + """ + try: + client = boto3.client('dynamodb') + # DynamoDBにデータを登録 + response = client.put_item(Item={ + 'id': {'N': str(data['id'])}, + 'file_hash': file_hash, + 'original_name': original_name + }) + return response.get('ResponseMetadata', {}).get('HTTPStatusCode') == 200 + except Exception as e: + print(f"Error saving file metadata to DynamoDB: {e}") + return False + + def create_diffshot(self, data: dict) -> None: '''対象のテーブルにディフショットデータを登録するメソッド ''' diff --git a/backend/engine/s3_client.py b/backend/engine/s3_client.py index e69de29..745019a 100644 --- a/backend/engine/s3_client.py +++ b/backend/engine/s3_client.py @@ -0,0 +1,42 @@ +import boto3 +import os +from dotenv import load_dotenv + +# .envファイルを読み込む +load_dotenv() + +# boto3クライアントの初期化 +s3_client = boto3.client( + "s3", + aws_access_key_id=os.getenv("S3_ACCESS_KEY"), + aws_secret_access_key=os.getenv("S3_SECRET_KEY"), + endpoint_url=os.getenv("S3_ENDPOINT") # MinIOを使用する場合に必要 +) + +def upload_to_s3(file, file_hash, content_type): + """ + S3にファイルをアップロードする関数 + + Args: + file: アップロードするファイルオブジェクト + file_hash: S3に保存するオブジェクトのキー（ユニークな名前） + content_type: ファイルのContent-Type + + Raises: + Exception: アップロードが失敗した場合 + """ + try: + # 環境変数からS3バケットを取得 + s3_bucket = os.getenv("S3_BUCKET") + + # S3にファイルをアップロード + s3_client.upload_fileobj( + file, + s3_bucket, + file_hash, # ファイル名の代わりにハッシュを使用 + ExtraArgs={"ContentType": content_type} + ) + print(f"File uploaded successfully to S3 with key: {file_hash}") + except Exception as e: + print(f"Error uploading file to S3: {e}") + raise e \ No newline at end of file From 3df4d1b885eb2619daf122c68f402c2d527311ef Mon Sep 17 00:00:00 2001 From: tetsushi33 Date: Sat, 7 Dec 2024 19:44:40 +0900 Subject: [PATCH 37/51] define play_intro --- backend/router.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/backend/router.py b/backend/router.py index 9395a97..68f6e80 100644 --- a/backend/router.py +++ b/backend/router.py @@ -53,6 +53,11 @@ def api_create_diffshot(): def api_play_quiz(): return controller.play_quiz() +@router.route("/api/play/intro", methods=['GET']) +@logger.http_request_logging +def api_play_intro(): + return controller.play_intro() + @router.after_request def after_request(response): From fbdc62c58e887b34fd97dc0bbb40cfca746ff0a3 Mon Sep 17 00:00:00 2001 From: Sairon <138011409+Yukkurisiteikitai@users.noreply.github.com> Date: Sat, 7 Dec 2024 20:38:48 +0900 Subject: [PATCH 38/51] add/XMLhttpRequest-GET-quiz-do --- backend/app.py | 4 +- frontend/game.js | 140 ++++++-- test.txt | 903 ++--------------------------------------------- 3 files changed, 150 insertions(+), 897 deletions(-) diff --git a/backend/app.py b/backend/app.py index b5f6b16..9178668 100644 --- a/backend/app.py +++ b/backend/app.py @@ -15,7 +15,7 @@ def create_app(): CORS( app, resources = { - r"/api/*": {"origins": ["http://localhost", "http://localhost:3000"]} + r"/api/*": {"origins": ["http://localhost", "http://localhost:3000","http://localhost:8032"]} } ) @@ -23,4 +23,4 @@ def create_app(): if __name__ == "__main__": app = create_app() - app.run(host='0.0.0.0', debug=True, port=5000, threaded=True, use_reloader=False) \ No newline at end of file + app.run(host='0.0.0.0', debug=True, port=5001, threaded=True, use_reloader=False) \ No newline at end of file diff --git a/frontend/game.js b/frontend/game.js index cab4084..bf75089 100644 --- a/frontend/game.js +++ b/frontend/game.js @@ -54,7 +54,7 @@ document.addEventListener("DOMContentLoaded", () => { //クイズデータ let question_date = [ { - "question": "次のうち、太陽系に存在する惑星はどれですか？", + "question": "次のうち、太陽fejfioewajf;owjfo;eiwajfoi;する惑星はどれですか？", "selects": [ "シリウス", "地球", @@ -74,6 +74,10 @@ document.addEventListener("DOMContentLoaded", () => { console.log(question_date); + function rd(max){ + return Math.floor(Math.random() * max) + } + console.log(rd(2)); /** * That option discplayis * @param display (string)この引数にhome,quiz,result,game_select,game_modeなどをstringで入れると、 @@ -205,28 +209,88 @@ document.addEventListener("DOMContentLoaded", () => { * "アンドロメダ", * "アルタイル" * ], - * "answer":2 + * "answer":2 * } */ - function load_QuizQuestion(){ - - } - function quiz_set(question_text,selects,answer_number){ - let date = { - "question": "次のうち、太陽系に存在する惑星はどれですか？", - "selects": [ - "シリウス", - "地球", - "アンドロメダ", - "アルタイル" - ], - "answer":2 + // async function load_QuizQuestion(url) { + // const get_url = url + "/api/play/random"; + // try { + // const request = await fetch(get_url, { + // method: "GET", + // headers: { + // "Content-Type": "application/json", + // }, + // }) + // .then(quizDate){ + // console.log() + // } + + // // ステータスコードのチェック + // if (!request.ok) { + // throw new Error(`レスポンスエラー: ステータス ${request.status}`); + // } + + // // JSON データを取得 + // const json_data = await request.json(); + // console.log("取得したクイズデータ:", json_data); + // return json_data; // データを返す + // } catch (error) { + // console.error("エラーが発生しました:", error); + // throw error; // 必要に応じてエラーを再スロー + // } + // } + + function load_QuizQuestion(url, callback) { + const get_url = url + "/api/play/random"; + const xhr = new XMLHttpRequest(); + + xhr.open("GET", get_url, true); + xhr.setRequestHeader("Content-Type", "application/json"); + + xhr.onreadystatechange = function () { + if (xhr.readyState === 4) { // 完了 + if (xhr.status >= 200 && xhr.status < 300) { + try { + const data = JSON.parse(xhr.responseText); + callback(null, data); // データをコールバックで返す + } catch (error) { + callback(error, null); + } + } else { + callback(new Error(`ステータスエラー: ${xhr.status}`), null); + } + } + }; + + xhr.onerror = function () { + callback(new Error("ネットワークエラー"), null); }; - // fetch("api/play/quiz",method("GET")){ + + xhr.send(); + } + + - // } - console.log(date); - } + + console.log("helloWorldejfo;iejfejf;oaewjgo;ifewjgo;wjgo;jeawgo;eajwgojeg;je\n"); + // console.log(load_QuizQuestion("http://172.23.0.5:5001")) + // function quiz_set(question_text,selects,answer_number){ + + // let date = { + // "question": "次のうち、太陽系に存在する惑星はどれですか？", + // "selects": [ + // "シリウス", + // "地球", + // "アンドロメダ", + // "アルタイル" + // ], + // "answer":2 + // }; + // fetch("api/play/quiz",method("GET")){ + + // } + // console.log(date); + // } /** * 質問を書き込む @@ -247,10 +311,36 @@ document.addEventListener("DOMContentLoaded", () => { correctAnswer = selects[answer_number]; } - quiz_set(question_date[0]["question"], + + function get_quiz_set(question_text,selects,answer_number) + { + console.log(`dateLoading-:-${typeof(question_text)}, \n ${selects}, \n ${answer_number}`); + quiz_qustion.textContent = question_text; + const quiz_contents = quiz_select_options.item(0).children; + for(var i = 0; i < 4;i++) + { + quiz_contents[i].textContent = selects[i]["S"]; + } + correctAnswer = selects[answer_number]; + } + + // 使用例 + load_QuizQuestion("http://localhost:5001", (error, data) => { + if (error) { + console.error("エラー:", error); + } else { + console.log("取得したクイズデータ:", data); + + get_quiz_set(data["game"]["question"]["S"],data["game"]["selects"]["L"],data["game"]["answer_idx"]["N"]); + } + }); + /*quiz_set(question_date[0]["question"], question_date[0]["selects"], - question_date[0]["answer"]); + question_date[0]["answer"]);*/ + // let get_question = load_QuizQuestion("http://localhost:5001"); + // console.log(get_question); + // get_quiz_set(get_question["game"]["question"],get_question["game"]["selects"]["L"],get_question["game"]["answer_idx"]["N"]); //================================================================================================================================================================ @@ -622,10 +712,10 @@ document.addEventListener("DOMContentLoaded", () => { }); - //テスト用のプログラムを組み込んでいる - quiz_set(question_date[0]["question"], - question_date[0]["selects"], - question_date[0]["answer"]); + // //テスト用のプログラムを組み込んでいる + // quiz_set(question_date[0]["question"], + // question_date[0]["selects"], + // question_date[0]["answer"]); let quiz_number diff --git a/test.txt b/test.txt index 4ddce9c..0da8f53 100644 --- a/test.txt +++ b/test.txt @@ -1,870 +1,33 @@ -. -.. -.git -.gitignore -.mypy_cache -README.md -backend -compose.yml -frontend -temp.py -test.txt - -./.git: -. -.. -COMMIT_EDITMSG -FETCH_HEAD -HEAD -ORIG_HEAD -config -description -hooks -index -info -logs -objects -packed-refs -refs - -./.git/hooks: -. -.. -applypatch-msg.sample -commit-msg.sample -fsmonitor-watchman.sample -post-update.sample -pre-applypatch.sample -pre-commit.sample -pre-merge-commit.sample -pre-push.sample -pre-rebase.sample -pre-receive.sample -prepare-commit-msg.sample -push-to-checkout.sample -update.sample - -./.git/info: -. -.. -exclude - -./.git/logs: -. -.. -HEAD -refs - -./.git/logs/refs: -. -.. -heads -remotes - -./.git/logs/refs/heads: -. -.. -develop -division -future - -./.git/logs/refs/heads/division: -. -.. -gameSystemFile - -./.git/logs/refs/heads/future: -. -.. -setQuiz - -./.git/logs/refs/remotes: -. -.. -origin - -./.git/logs/refs/remotes/origin: -. -.. -HEAD -future - -./.git/logs/refs/remotes/origin/future: -. -.. -backend-base -setQuiz - -./.git/objects: -. -.. -00 -02 -05 -06 -08 -0b -10 -13 -18 -19 -1a -24 -26 -28 -2c -2e -30 -31 -37 -47 -4a -4f -52 -55 -57 -62 -64 -65 -67 -6b -6e -76 -78 -79 -7e -7f -81 -82 -83 -85 -89 -8a -8b -8d -90 -91 -93 -94 -97 -9a -a1 -a5 -a7 -a9 -ab -ac -af -b0 -b1 -b3 -b4 -b5 -b6 -b7 -ba -be -c0 -c1 -c2 -cb -cc -d4 -d7 -d8 -dc -de -df -e0 -ed -ee -f5 -fa -fd -ff -info -pack - -./.git/objects/00: -. -.. -1f25886b7af0d774051063edd08552ba96f9a9 -db5ef7b04fa7ba165dd34e977dc7915b66c1cf - -./.git/objects/02: -. -.. -f0ced09a96aba23f5b2ebc95924cf20cbc9b19 - -./.git/objects/05: -. -.. -2548b67e50198cb21dab2f63368cb659a58b0c -5ccbcc0ac85139ac9e49c0d5acb2f9e8f80ddf - -./.git/objects/06: -. -.. -83e3db4e0d5038d882679d2252ff19a68c6044 -b46d77bb72af1b38bfd00d797cde2616dfd32c - -./.git/objects/08: -. -.. -64746f85208bf228c5289debf0414d21108e1a - -./.git/objects/0b: -. -.. -27c19be1c0365fe152023548be2158f3127e8f -6b20a802b8cdc9e2962bf86f16f798376fe5bc - -./.git/objects/10: -. -.. -ba08e7359a566e810767b8335dc1835629d2b6 -f8f0faa5c26d31e7363904c3342d83b4c1f6b0 - -./.git/objects/13: -. -.. -89ae49f67a7f26ab5469b624b073754b56063b - -./.git/objects/18: -. -.. -268a387711559a646e0ebac27df4ce29e98369 - -./.git/objects/19: -. -.. -e8fa45302f089bc63579c393dacc6c6288b630 - -./.git/objects/1a: -. -.. -22ca6f8c39aef0366c91e1b7d3a63d6bc5480d -3b6ea59a40d4c26b79bf380523e78b8b3a0ecc - -./.git/objects/24: -. -.. -ecc328359d2d3b899c05106211e55317a4c7b0 - -./.git/objects/26: -. -.. -4c0c9b47e5be176f5b38049ff39e1163236518 - -./.git/objects/28: -. -.. -01f3be1d9494c6273534e54d7a4996c1ef4c53 - -./.git/objects/2c: -. -.. -90a81c6e4a26ebf8d203fc052392ce9c5562b1 - -./.git/objects/2e: -. -.. -66282e63c7b89013e6b5d36c11d84567a4e9b7 - -./.git/objects/30: -. -.. -860087c133dbec3f2e6b658bbec088dbc3a4f4 - -./.git/objects/31: -. -.. -5b0b8dfb93e73b6a6df18b529d9a4409801bc5 - -./.git/objects/37: -. -.. -ae094ef2bce72a4f983c77598468f7b9408ed5 -dd079d19cd06da209ad7dcae7240df63943ec9 - -./.git/objects/47: -. -.. -f4f2087cc6861b86be1938b5e3c99f23f04f05 - -./.git/objects/4a: -. -.. -6e00805b14ccd3e3852d5f26a9466edd81b6ae - -./.git/objects/4f: -. -.. -bde366e026d43a6fd44c2d8ab4ad9e24177050 - -./.git/objects/52: -. -.. -a96ee10001be474a05e45c98239d03d800ffcc - -./.git/objects/55: -. -.. -577401cd5d6e8331261c929e5bdbd941d9916f - -./.git/objects/57: -. -.. -e7aabb436ea6f61e7310f559dc491c448d9a9d - -./.git/objects/62: -. -.. -4e13f9262883ae822e2392c2188c7a70a2fc80 - -./.git/objects/64: -. -.. -5efc7a9f1244d4be93a4911363dd8659dbf2b0 - -./.git/objects/65: -. -.. -bfbbf240d68514568edbe85d7601abff920a39 - -./.git/objects/67: -. -.. -9179cc18ae13e76a3fc1be51fc32c026d4e563 - -./.git/objects/6b: -. -.. -bca84f7373d5fe9ef415132ae1ebc1c60f3293 - -./.git/objects/6e: -. -.. -1f230124b559b4ee039dfd6210aa30ec6444a6 -b42e1b66fc2c9c94faabe30796ec0002dd5be9 - -./.git/objects/76: -. -.. -0afd6da38dd3bbfeb9ebbfd3a9ef8480c11a4e - -./.git/objects/78: -. -.. -f8bb2d7ddcafe86160e33a56f5288d8455515e - -./.git/objects/79: -. -.. -a2c535a99eb6bed715787de623f56024713d7a - -./.git/objects/7e: -. -.. -47750bde9cc5fa90b5a190718b012557be6ac2 -f7401d14d3f474d48a58405a4a4946988cb06a - -./.git/objects/7f: -. -.. -1dc67509b4ace2d565b51fd451bdce2b971dda - -./.git/objects/81: -. -.. -325793127d44c5d34064b6a37a78cce50d117e - -./.git/objects/82: -. -.. -5e8007423c2e811493718e9ac3ae6ded0ce30d - -./.git/objects/83: -. -.. -88d9fc76d3ab9f8c75ec4f986c369b659d92c4 - -./.git/objects/85: -. -.. -44ff1841d9f559cda3b1a9b940fdb5ad399ede - -./.git/objects/89: -. -.. -2304da97df8c35d3a78d91ab4607d978ec3c57 - -./.git/objects/8a: -. -.. -4c9080e373a3ab4f7bbfe0dcbcaecef7ca9124 - -./.git/objects/8b: -. -.. -e5987bf0735cfc513a5b75e03e017198edbb80 - -./.git/objects/8d: -. -.. -72f4e95140e228f3eb2e4b3cfe1a339ff44b1f - -./.git/objects/90: -. -.. -dcedceba970395bbc09127357c98b2d058c43f - -./.git/objects/91: -. -.. -b3a2d77f3af5c222c4d7b2c5aeee36f3dad7a0 - -./.git/objects/93: -. -.. -7d92cc65c860a341596f0cfcdb52720d5982c0 - -./.git/objects/94: -. -.. -1892cd8119bc1f691db7316bf359fba036b1c7 - -./.git/objects/97: -. -.. -29fc4f3958b6d1da84fa21963162e41b727281 - -./.git/objects/9a: -. -.. -9c3f3292463a6245c5fb5be5ddeeaef46f45ed -b65aae942f8d969483b78fc890f0067d1efb60 - -./.git/objects/a1: -. -.. -3d65c67e24b0237a20f267d44dfdbc0418c90b - -./.git/objects/a5: -. -.. -0387feaf3dfe02d5ada4f06730b1401a46bba8 -8d0f4b9d2efaca2022057d029c75becca75406 - -./.git/objects/a7: -. -.. -d4d59eefcfbbb2528647ed64412be16adab167 - -./.git/objects/a9: -. -.. -48aa5e3fdccd314a37b837807c2323be86e3aa -c76281e6c0a75bbae08253ed0ba5cf86272810 - -./.git/objects/ab: -. -.. -5423543ef14f0b8147f7dc4545575bf995c631 - -./.git/objects/ac: -. -.. -87f7828ab32829572af3a4932fc3a77a95a7a6 - -./.git/objects/af: -. -.. -266c791ab5ceef5de2efda84ef74d637157514 -dbfae32df1382bcce0286094fef694ed304831 - -./.git/objects/b0: -. -.. -511f416a79d9979efc9f3eb76f7fac8891e248 - -./.git/objects/b1: -. -.. -6ec5c5577c37507ca3b69ab76253b26a6f63fb -83c68799d3cdeb2609995967d6ece08fa780fb - -./.git/objects/b3: -. -.. -176a4c3491263a52408ace68ae826a4ac7b695 - -./.git/objects/b4: -. -.. -3f168ad98a2b708e06f38e6f051fbb82c30f7a - -./.git/objects/b5: -. -.. -f6b169c9f7dd1680b556e5d09d469490b772c3 - -./.git/objects/b6: -. -.. -a75520a1e20b2cf69ca7289ad8f6467be3695c - -./.git/objects/b7: -. -.. -77b1fb2fb1fa2204a3231a9a681f69938b7c8e - -./.git/objects/ba: -. -.. -4d74bc65435685baf0888970d3011eccba9d9d - -./.git/objects/be: -. -.. -004386b9d13f8bdb966fd4f3df882da50a872f - -./.git/objects/c0: -. -.. -19c932ec5aab91680e488f3327aec272696c52 -aa97fe6d290a98b778b99f9e2bf53a424fa1ad - -./.git/objects/c1: -. -.. -2b6885f6e1fca076b7f77e78cbd5b0f8adc33b - -./.git/objects/c2: -. -.. -36ea10cd9a624ea0abc71995f38f8234f10cef -95a6b98389a81928eecdc521495389e0232271 - -./.git/objects/cb: -. -.. -03014fbf5470dac584f3ebb7b4de6aec9d31b0 - -./.git/objects/cc: -. -.. -c75e93a8dba45a1ba42d857f64b2cce649b42f - -./.git/objects/d4: -. -.. -fa0a98e5aae2cab9abae86ac611e7954067683 - -./.git/objects/d7: -. -.. -125ba82e2c53e511979909e4f1cbac92572cbc -a597736555e4b74b9f4acb2bba2ff1a03b6601 - -./.git/objects/d8: -. -.. -5e4eae37214f72db4bb745a83b2a3d73b67df4 - -./.git/objects/dc: -. -.. -64d31e35c2a2dbd7b9afb9e7e7749effcf56fa - -./.git/objects/de: -. -.. -1eac0da7a1bda0617744b9815abcf71740a896 - -./.git/objects/df: -. -.. -2a3167f5a0634ceb101fd966843c9d6ba7adef - -./.git/objects/e0: -. -.. -d2c4541f2eca5eff0257f811de004acd6ff2a2 - -./.git/objects/ed: -. -.. -377205b05bda4c5521a7ac1a160795cab16d14 - -./.git/objects/ee: -. -.. -a20c8b730bed89e705e5ed5dcba19bac72ca8d - -./.git/objects/f5: -. -.. -66e264d4a37fc2cb31613777846ef9d2c1ff66 - -./.git/objects/fa: -. -.. -c74855e4e0fddc9525a8d9842d5e7968c9ba4b - -./.git/objects/fd: -. -.. -42a08cc817e573c65e0e7f8a23366f517e16af - -./.git/objects/ff: -. -.. -c2432e5ed02544800e896fb88636a3982dc101 - -./.git/objects/info: -. -.. - -./.git/objects/pack: -. -.. -pack-a7f1da3635a81f4a305b6eca309a2248b62cab20.idx -pack-a7f1da3635a81f4a305b6eca309a2248b62cab20.pack - -./.git/refs: -. -.. -heads -remotes -tags - -./.git/refs/heads: -. -.. -develop -division -future - -./.git/refs/heads/division: -. -.. -gameSystemFile - -./.git/refs/heads/future: -. -.. -setQuiz - -./.git/refs/remotes: -. -.. -origin - -./.git/refs/remotes/origin: -. -.. -HEAD -future - -./.git/refs/remotes/origin/future: -. -.. -backend-base -setQuiz - -./.git/refs/tags: -. -.. - -./.mypy_cache: -. -.. -.gitignore -3.11 -CACHEDIR.TAG - -./.mypy_cache/3.11: -. -.. -@plugins_snapshot.json -_ast.data.json -_ast.meta.json -_codecs.data.json -_codecs.meta.json -_collections_abc.data.json -_collections_abc.meta.json -_typeshed -abc.data.json -abc.meta.json -builtins.data.json -builtins.meta.json -codecs.data.json -codecs.meta.json -collections -contextlib.data.json -contextlib.meta.json -dataclasses.data.json -dataclasses.meta.json -email -enum.data.json -enum.meta.json -genericpath.data.json -genericpath.meta.json -importlib -io.data.json -io.meta.json -os -pathlib.data.json -pathlib.meta.json -posixpath.data.json -posixpath.meta.json -re.data.json -re.meta.json -resource.data.json -resource.meta.json -sre_compile.data.json -sre_compile.meta.json -sre_constants.data.json -sre_constants.meta.json -sre_parse.data.json -sre_parse.meta.json -subprocess.data.json -subprocess.meta.json -sys -temp.data.json -temp.meta.json -types.data.json -types.meta.json -typing.data.json -typing.meta.json -typing_extensions.data.json -typing_extensions.meta.json -zipfile - -./.mypy_cache/3.11/_typeshed: -. -.. -__init__.data.json -__init__.meta.json -importlib.data.json -importlib.meta.json - -./.mypy_cache/3.11/collections: -. -.. -__init__.data.json -__init__.meta.json -abc.data.json -abc.meta.json - -./.mypy_cache/3.11/email: -. -.. -__init__.data.json -__init__.meta.json -_policybase.data.json -_policybase.meta.json -charset.data.json -charset.meta.json -contentmanager.data.json -contentmanager.meta.json -errors.data.json -errors.meta.json -header.data.json -header.meta.json -message.data.json -message.meta.json -policy.data.json -policy.meta.json - -./.mypy_cache/3.11/importlib: -. -.. -__init__.data.json -__init__.meta.json -_abc.data.json -_abc.meta.json -abc.data.json -abc.meta.json -machinery.data.json -machinery.meta.json -metadata -readers.data.json -readers.meta.json -resources - -./.mypy_cache/3.11/importlib/metadata: -. -.. -__init__.data.json -__init__.meta.json -_meta.data.json -_meta.meta.json - -./.mypy_cache/3.11/importlib/resources: -. -.. -__init__.data.json -__init__.meta.json -abc.data.json -abc.meta.json - -./.mypy_cache/3.11/os: -. -.. -__init__.data.json -__init__.meta.json -path.data.json -path.meta.json - -./.mypy_cache/3.11/sys: -. -.. -__init__.data.json -__init__.meta.json - -./.mypy_cache/3.11/zipfile: -. -.. -__init__.data.json -__init__.meta.json - -./backend: -. -.. -Dockerfile -requirements.txt - -./frontend: -. -.. -.DS_Store -Dockerfile -differentPoint.html -game.js -game.jsREADME.md -games -image -index.html -package.json -style.css -thinks - -./frontend/games: -. -.. -FindDifference.js -quiz.js - -./frontend/image: -. -.. -ban-1.png -ban-2.png -fabicon.ico - -./frontend/thinks: -. -.. -differentpoint.md +{ + "code": 200, + "game": { + "question": { + "S": "次のうち、太陽系に存在する惑星はどれですか？" + }, + "likes": { + "N": "0" + }, + "answer_idx": { + "N": "2" + }, + "id": { + "N": "3" + }, + "selects": { + "L": [ + { + "S": "シリウス" + }, + { + "S": "地球" + }, + { + "S": "アンドロメダ" + }, + { + "S": "アルタイル" + } + ] + } + } +} From 4e37ed821231d1807e7ea75042bfaf877a0390bb Mon Sep 17 00:00:00 2001 From: tetsushi33 Date: Sat, 7 Dec 2024 20:58:10 +0900 Subject: [PATCH 39/51] define play_quiz --- backend/controller/game_controller.py | 9 +++-- backend/engine/dynamo_client.py | 47 +++++++++++++++++++++++++++ backend/engine/s3_client.py | 23 ++++++++++++- backend/router.py | 4 +-- 4 files changed, 78 insertions(+), 5 deletions(-) diff --git a/backend/controller/game_controller.py b/backend/controller/game_controller.py index c9b2548..266b1ae 100644 --- a/backend/controller/game_controller.py +++ b/backend/controller/game_controller.py @@ -122,10 +122,14 @@ def create_diffshot(self): except Exception as e: return make_response(jsonify({'code': 500, 'message': str(e)}), 500) + + def play_quiz(self): try: + data = request.get_json() # データベースからランダムに問題を取得 - response = self.db_client.get_random() + #response = self.db_client.get_random() + response = self.db_client.get_random_2(genre="quiz") if response: quiz_data = { "question": response.get('question', {}).get('S', ''), @@ -151,10 +155,11 @@ def play_intro(self): try: # データベースからランダムに問題を取得 response = self.db_client.get_random() + #response = self.db_client.get_random_2() if response: intro_data = { "music_title_answer": response.get('music_title_answer', {}).get('S', ''), - "music_data": response.get('music_data', {}).get('B', '') + #"music_data": response.get('music_data', {}).get('B', '') } return make_response(jsonify({ 'code': 200, diff --git a/backend/engine/dynamo_client.py b/backend/engine/dynamo_client.py index e9586ae..664668b 100644 --- a/backend/engine/dynamo_client.py +++ b/backend/engine/dynamo_client.py @@ -25,6 +25,53 @@ def get_random(self) -> None: random_key = random.choice(valid_keys) response = self.db.get_item(TableName=self.table_name, Key={"id": {"N": str(random_key)}}) return response.get('Item') + + def get_random_2(self, genre: str) -> None: + '''指定されたジャンルの中からランダムに1件レコードを取得するメソッド''' + # 指定されたジャンルのアイテムをスキャン + response_all = self.db.scan( + TableName=self.table_name, + FilterExpression="genre = :genre", + ExpressionAttributeValues={":genre": {"S": genre}} + ) + items = response_all.get('Items', []) + if not items: + return None + + if genre == "quiz": + # 有効なキーを取得 + valid_keys = [item['id']['N'] for item in items] + random_key = random.choice(valid_keys) + # 選択肢をシャッフル + selects = selected_item['selects']['L'] + random.shuffle(selects) + # ランダムに選ばれたキーのアイテムを取得 + response = self.db.get_item(TableName=self.table_name, Key={"id": {"N": str(random_key)}}) + return response.get('Item') + if genre == "introdon": + # "introdon" 用の特別な処理 + selected_item = random.choice(items) + + # 音声データのハッシュ値と元の名前を取得 + file_hash = selected_item['file_hash']['S'] + original_name = selected_item['original_name']['S'] + + # 必要に応じて他の処理を追加可能 + return { + "file_hash": file_hash, + "original_name": original_name, + } + + + + # 有効なキーを取得 + valid_keys = [item['id']['N'] for item in items] + random_key = random.choice(valid_keys) + + # ランダムに選ばれたキーのアイテムを取得 + response = self.db.get_item(TableName=self.table_name, Key={"id": {"N": str(random_key)}}) + return response.get('Item') + def scan(self, **kwargs): return self.db.scan(**kwargs) diff --git a/backend/engine/s3_client.py b/backend/engine/s3_client.py index 745019a..01c17ae 100644 --- a/backend/engine/s3_client.py +++ b/backend/engine/s3_client.py @@ -39,4 +39,25 @@ def upload_to_s3(file, file_hash, content_type): print(f"File uploaded successfully to S3 with key: {file_hash}") except Exception as e: print(f"Error uploading file to S3: {e}") - raise e \ No newline at end of file + raise e + +def get_s3_file_url(file_key: str) -> str: + """ + S3のファイルにアクセスするための署名付きURLを生成する関数 + + Args: + file_key (str): S3に格納されているオブジェクトのキー + + Returns: + str: 署名付きURL + """ + try: + url = s3_client.generate_presigned_url( + 'get_object', + Params={'Bucket': os.getenv("S3_BUCKET"), 'Key': file_key}, + ExpiresIn=3600 # URLの有効期限（秒単位） + ) + return url + except Exception as e: + print(f"Error generating S3 presigned URL: {e}") + return "" \ No newline at end of file diff --git a/backend/router.py b/backend/router.py index 68f6e80..3391bec 100644 --- a/backend/router.py +++ b/backend/router.py @@ -30,8 +30,8 @@ def hello_world(): @router.route("/api/play/random", methods=['GET']) @logger.http_request_logging -def api_play_random(): - return controller.get_game_random() +def api_play_random_quiz(): + return controller.get_quiz_random() @router.route("/api/create/quiz", methods=['POST']) @logger.http_request_logging From faa6ea87404d257fa72f82555841bbfd4cd56d70 Mon Sep 17 00:00:00 2001 From: Sairon <138011409+Yukkurisiteikitai@users.noreply.github.com> Date: Sat, 7 Dec 2024 21:07:50 +0900 Subject: [PATCH 40/51] changeCreateD-none --- frontend/game.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/frontend/game.js b/frontend/game.js index bf75089..372b8d0 100644 --- a/frontend/game.js +++ b/frontend/game.js @@ -2,6 +2,8 @@ const homeScreen = document.getElementById("home"); const quiz_Screen = document.getElementById("quiz-container"); const differentPoint_Screen = document.getElementById("differentPoint-container"); const introdon_Screen = document.getElementById("introDon-container"); +const createModeScreen = document.getElementById(""); +const playModeScreen = document.getElementById(""); const resultScreen = document.getElementById("result"); const gameModeScreen = document.getElementById("game-mode"); @@ -30,6 +32,9 @@ document.addEventListener("DOMContentLoaded", () => { // ゲームデータ let gameMode = "play"; + + createButton.addEventListener("click") + //ゲーム選択画面でそのままLoadingKeyに入れるようにするための対策 const gamekind = { "クイズ":"quiz", @@ -37,6 +42,7 @@ document.addEventListener("DOMContentLoaded", () => { "イントロドン":"introdon" } + //bug const gameSetting = { "create":{ "クイズ":"quiz", @@ -482,7 +488,7 @@ document.addEventListener("DOMContentLoaded", () => { }); }); - + /** * 正解の場所かどうかを判定する処理 * @param touchPos 要素数2の1次元の配列 From 731e36df87a8024ec385dfd0ef7ff1d870400839 Mon Sep 17 00:00:00 2001 From: tetsushi33 Date: Sat, 7 Dec 2024 21:16:03 +0900 Subject: [PATCH 41/51] define play_quiz --- backend/controller/game_controller.py | 4 ++-- backend/engine/dynamo_client.py | 15 +++++---------- backend/router.py | 2 +- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/backend/controller/game_controller.py b/backend/controller/game_controller.py index 266b1ae..6943dfc 100644 --- a/backend/controller/game_controller.py +++ b/backend/controller/game_controller.py @@ -154,8 +154,8 @@ def play_quiz(self): def play_intro(self): try: # データベースからランダムに問題を取得 - response = self.db_client.get_random() - #response = self.db_client.get_random_2() + #response = self.db_client.get_random() + response = self.db_client.get_random_2(genre="introdon") if response: intro_data = { "music_title_answer": response.get('music_title_answer', {}).get('S', ''), diff --git a/backend/engine/dynamo_client.py b/backend/engine/dynamo_client.py index 664668b..9b5a400 100644 --- a/backend/engine/dynamo_client.py +++ b/backend/engine/dynamo_client.py @@ -34,22 +34,17 @@ def get_random_2(self, genre: str) -> None: FilterExpression="genre = :genre", ExpressionAttributeValues={":genre": {"S": genre}} ) - items = response_all.get('Items', []) - if not items: - return None - + if genre == "quiz": # 有効なキーを取得 - valid_keys = [item['id']['N'] for item in items] + valid_keys = [item['id']['N'] for item in response_all['Items']] random_key = random.choice(valid_keys) - # 選択肢をシャッフル - selects = selected_item['selects']['L'] - random.shuffle(selects) - # ランダムに選ばれたキーのアイテムを取得 response = self.db.get_item(TableName=self.table_name, Key={"id": {"N": str(random_key)}}) return response.get('Item') if genre == "introdon": - # "introdon" 用の特別な処理 + # 有効なキーを取得 + valid_keys = [item['id']['N'] for item in items] + random_key = random.choice(valid_keys) selected_item = random.choice(items) # 音声データのハッシュ値と元の名前を取得 diff --git a/backend/router.py b/backend/router.py index 3391bec..23ff225 100644 --- a/backend/router.py +++ b/backend/router.py @@ -31,7 +31,7 @@ def hello_world(): @router.route("/api/play/random", methods=['GET']) @logger.http_request_logging def api_play_random_quiz(): - return controller.get_quiz_random() + return controller.get_game_random() @router.route("/api/create/quiz", methods=['POST']) @logger.http_request_logging From 5960876fb078f99633a123d3f462fb76a0e69e3e Mon Sep 17 00:00:00 2001 From: nozo120 Date: Sat, 7 Dec 2024 21:37:52 +0900 Subject: [PATCH 42/51] =?UTF-8?q?=E3=83=95=E3=83=AD=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=82=A8=E3=83=B3=E3=83=89=E3=81=AE=E5=A4=89=E6=9B=B4=E3=82=92?= =?UTF-8?q?=E5=8A=A0=E3=81=88=E3=81=BE=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/router.py | 2 +- frontend/game.js | 78 ++++++++++++++++++++++++++++++++++++++++++++- frontend/index.html | 40 ++++++++++++----------- index.html | 30 +++++++++++++++++ 4 files changed, 130 insertions(+), 20 deletions(-) create mode 100644 index.html diff --git a/backend/router.py b/backend/router.py index 71dcb0a..33dd937 100644 --- a/backend/router.py +++ b/backend/router.py @@ -51,7 +51,7 @@ def api_create_diffshot(): @router.after_request def after_request(response): - # response.headers.add('Access-Control-Allow-Origin', '*') + response.headers.add('Access-Control-Allow-Origin', '*') response.headers.add('Access-Control-Allow-Headers', 'Content-Type,Authorization') response.headers.add('Access-Control-Allow-Methods', 'GET,PUT,POST,DELETE,OPTIONS') return response diff --git a/frontend/game.js b/frontend/game.js index d9f7f7e..ea4969f 100644 --- a/frontend/game.js +++ b/frontend/game.js @@ -2,19 +2,23 @@ const homeScreen = document.getElementById("home"); const quiz_Screen = document.getElementById("quiz-container"); const differentPoint_Screen = document.getElementById("differentPoint-container"); const introdon_Screen = document.getElementById("introDon-container"); +const createScreen = document.getElementById("create-mode"); const resultScreen = document.getElementById("result"); const gameModeScreen = document.getElementById("game-mode"); const selectGameScreen = document.getElementById("SelctGameKind"); +const createQuizScreen = document.getElementById("create_quizScreen"); document.addEventListener("DOMContentLoaded", () => { const startButton = document.getElementById("start-button"); + const createButton = document.getElementById("create-button"); const playButton = document.getElementById("play-button"); const nextButton = document.querySelector(".next-button"); const quitButton = document.querySelector(".quit-button"); + const gameKindOptions = document.querySelectorAll(".gamekind-option"); @@ -30,6 +34,10 @@ document.addEventListener("DOMContentLoaded", () => { // ゲームデータ let gameMode = "play"; + + createButton.addEventListener("click",()=>{ + gameMode="create"; + }) //ゲーム選択画面でそのままLoadingKeyに入れるようにするための対策 const gamekind = { "クイズ":"quiz", @@ -81,6 +89,10 @@ document.addEventListener("DOMContentLoaded", () => { */ function displayLoadRequest(display) { + if(gameMode == "create"){ + createScreen.classList.remove("d-none"); + } + gameModeScreen.classList.add("d-none"); selectGameScreen.classList.add("d-none"); @@ -90,6 +102,8 @@ document.addEventListener("DOMContentLoaded", () => { resultScreen.classList.add("d-none"); homeScreen.classList.add("d-none"); + create_quizScreen.classList.add("d-none"); + console.log(`display:${display}`); @@ -115,6 +129,9 @@ document.addEventListener("DOMContentLoaded", () => { //gameCreate else if (display == "create_quiz") { + + createQuizScreen.classList.remove("d-none"); + } @@ -136,6 +153,7 @@ document.addEventListener("DOMContentLoaded", () => { else if (display == "game_select") { selectGameScreen.classList.remove("d-none"); + displayLoadRequest("create_quiz") } else if (display == "game_mode") @@ -148,6 +166,7 @@ document.addEventListener("DOMContentLoaded", () => { resultScreen.classList.remove("d-none"); } } + displayLoadRequest("home"); @@ -161,6 +180,10 @@ document.addEventListener("DOMContentLoaded", () => { displayLoadRequest("game_select"); }); + createButton.addEventListener('click', function () { + displayLoadRequest("create_quiz"); + }); + //gameMode @@ -627,4 +650,57 @@ document.addEventListener("DOMContentLoaded", () => { displayLoadRequest("home"); }); - }); \ No newline at end of file + + document.getElementById("submit_quiz").addEventListener("click", async function () { + // フォームからデータを取得 + const question = document.getElementById("quiz_question").value; + const options = [ + document.getElementById("option_1").value, + document.getElementById("option_2").value, + document.getElementById("option_3").value, + document.getElementById("option_4").value, + ]; + const answer = parseInt(document.getElementById("quiz_answer").value, 10); + + // 入力チェック + if (!question || options.some(option => !option) || isNaN(answer) || answer < 1 || answer > 4) { + alert("すべてのフィールドを正しく入力してください。"); + return; + } + + // クイズデータを表示（または送信） + const quizData = { + question: question, + selects: options, + answer_idx: answer, + }; + + // クイズデータをサーバーに送信 + try { + const response = await fetch('http://localhost:5001/api/create/quiz', { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + body: JSON.stringify(quizData), + }); + + if (!response.ok) { + throw new Error('Failed to fetch'); + } + + console.log(await response.json()); + } catch (error) { + console.error(error); + }; + + + console.log("クイズデータ:", quizData); + alert("クイズが作成されました！"); + + }); + + }); + + + \ No newline at end of file diff --git a/frontend/index.html b/frontend/index.html index 81079cc..5c801b2 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -106,24 +106,28 @@

間違い探し

-
-

クイズ

-
-
-

質問

- - -

選択肢

- - - - - -

回答

- -
-
+
+

クイズ作成

+
+
+ + +
+
+ + + + + +
+
+ + +
+ +
+ @@ -132,7 +136,7 @@

クイズ

- + diff --git a/index.html b/index.html new file mode 100644 index 0000000..a4af0a7 --- /dev/null +++ b/index.html @@ -0,0 +1,30 @@ + + + + + + + イントロドン + + + +
+

制限時間は10秒！5回まで答えられるよ！

+
+

残り時間: 10秒

+

解答回数: 0/5

+ +
+ + +
+ + + + +
+
+ + + + From 9411b92b86108877d24223a911f0110eebee29f0 Mon Sep 17 00:00:00 2001 From: tetsushi33 Date: Sat, 7 Dec 2024 21:45:55 +0900 Subject: [PATCH 43/51] define play_quiz --- backend/controller/game_controller.py | 2 +- backend/engine/dynamo_client.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/controller/game_controller.py b/backend/controller/game_controller.py index 6943dfc..e242d52 100644 --- a/backend/controller/game_controller.py +++ b/backend/controller/game_controller.py @@ -3,7 +3,7 @@ import hashlib #from werkzeug.utils import secure_filename #from dynamo_client import save_file_metadata -from s3_client import upload_to_s3 +from engine.s3_client import upload_to_s3 #from dotenv import load_dotenv diff --git a/backend/engine/dynamo_client.py b/backend/engine/dynamo_client.py index 9b5a400..bcc611e 100644 --- a/backend/engine/dynamo_client.py +++ b/backend/engine/dynamo_client.py @@ -43,7 +43,7 @@ def get_random_2(self, genre: str) -> None: return response.get('Item') if genre == "introdon": # 有効なキーを取得 - valid_keys = [item['id']['N'] for item in items] + valid_keys = [item['id']['N'] for item in response_all['Items']] random_key = random.choice(valid_keys) selected_item = random.choice(items) From 2a4c6e79aba7c3102d8890cf88dcc78d03e0ed25 Mon Sep 17 00:00:00 2001 From: Fuchs0101 Date: Sat, 7 Dec 2024 22:56:55 +0900 Subject: [PATCH 44/51] =?UTF-8?q?=E3=83=95=E3=83=AD=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=81=8B=E3=82=89=E3=81=AE=E3=82=AF=E3=82=A4=E3=82=BA=E5=8F=96?= =?UTF-8?q?=E5=BE=97=E5=87=A6=E7=90=86=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/controller/game_controller.py | 1 - backend/requirements.txt | 3 +- backend/router.py | 2 +- frontend/game.js | 159 ++++++++++++++++++++++++-- frontend/index.html | 2 +- 5 files changed, 155 insertions(+), 12 deletions(-) diff --git a/backend/controller/game_controller.py b/backend/controller/game_controller.py index e242d52..e6e6bae 100644 --- a/backend/controller/game_controller.py +++ b/backend/controller/game_controller.py @@ -126,7 +126,6 @@ def create_diffshot(self): def play_quiz(self): try: - data = request.get_json() # データベースからランダムに問題を取得 #response = self.db_client.get_random() response = self.db_client.get_random_2(genre="quiz") diff --git a/backend/requirements.txt b/backend/requirements.txt index 65bfbbf..f4589fa 100644 --- a/backend/requirements.txt +++ b/backend/requirements.txt @@ -1,4 +1,5 @@ Flask==2.2.5 boto3==1.26.145 gunicorn==20.1.0 -flask_cors \ No newline at end of file +flask_cors +python-dotenv \ No newline at end of file diff --git a/backend/router.py b/backend/router.py index 23ff225..e35f9a2 100644 --- a/backend/router.py +++ b/backend/router.py @@ -61,7 +61,7 @@ def api_play_intro(): @router.after_request def after_request(response): - # response.headers.add('Access-Control-Allow-Origin', '*') + response.headers.add('Access-Control-Allow-Origin', '*') response.headers.add('Access-Control-Allow-Headers', 'Content-Type,Authorization') response.headers.add('Access-Control-Allow-Methods', 'GET,PUT,POST,DELETE,OPTIONS') return response diff --git a/frontend/game.js b/frontend/game.js index 94c34cc..ceaf7cd 100644 --- a/frontend/game.js +++ b/frontend/game.js @@ -2,6 +2,8 @@ const homeScreen = document.getElementById("home"); const quiz_Screen = document.getElementById("quiz-container"); const differentPoint_Screen = document.getElementById("differentPoint-container"); const introdon_Screen = document.getElementById("introDon-container"); +const createModeScreen = document.getElementById("create_quiz"); +const playModeScreen = document.getElementById("play-mode"); const resultScreen = document.getElementById("result"); const gameModeScreen = document.getElementById("game-mode"); @@ -30,6 +32,14 @@ document.addEventListener("DOMContentLoaded", () => { // ゲームデータ let gameMode = "play"; + + createButton.addEventListener("click",()=>{ + gameMode = "create"; + }); + playButton.addEventListener("click",()=>{ + gameMode = "play"; + }); + //ゲーム選択画面でそのままLoadingKeyに入れるようにするための対策 const gamekind = { "クイズ":"quiz", @@ -37,6 +47,7 @@ document.addEventListener("DOMContentLoaded", () => { "イントロドン":"introdon" } + //bug const gameSetting = { "create":{ "クイズ":"quiz", @@ -54,7 +65,7 @@ document.addEventListener("DOMContentLoaded", () => { //クイズデータ let question_date = [ { - "question": "次のうち、太陽系に存在する惑星はどれですか？", + "question": "次のうち、太陽fejfioewajf;owjfo;eiwajfoi;する惑星はどれですか？", "selects": [ "シリウス", "地球", @@ -74,6 +85,10 @@ document.addEventListener("DOMContentLoaded", () => { console.log(question_date); + function rd(max){ + return Math.floor(Math.random() * max) + } + console.log(rd(2)); /** * That option discplayis * @param display (string)この引数にhome,quiz,result,game_select,game_modeなどをstringで入れると、 @@ -81,6 +96,15 @@ document.addEventListener("DOMContentLoaded", () => { */ function displayLoadRequest(display) { + + createModeScreen.classList.add("d-none"); + playModeScreen.classList.add("d-none"); + if(gameMode == "create"){ + createModeScreen.classList.remove("d-none"); + }else if (gameMode == "play"){ + playModeScreen.classList.remove("d-none"); + } + gameModeScreen.classList.add("d-none"); selectGameScreen.classList.add("d-none"); @@ -195,6 +219,99 @@ document.addEventListener("DOMContentLoaded", () => { }); }); + /** + * 返り値 + * { + * "question": "次のうち、太陽系に存在する惑星はどれですか？", + * "selects": [ + * "シリウス", + * "地球", + * "アンドロメダ", + * "アルタイル" + * ], + * "answer":2 + * } + */ + // async function load_QuizQuestion(url) { + // const get_url = url + "/api/play/random"; + // try { + // const request = await fetch(get_url, { + // method: "GET", + // headers: { + // "Content-Type": "application/json", + // }, + // }) + // .then(quizDate){ + // console.log() + // } + + // // ステータスコードのチェック + // if (!request.ok) { + // throw new Error(`レスポンスエラー: ステータス ${request.status}`); + // } + + // // JSON データを取得 + // const json_data = await request.json(); + // console.log("取得したクイズデータ:", json_data); + // return json_data; // データを返す + // } catch (error) { + // console.error("エラーが発生しました:", error); + // throw error; // 必要に応じてエラーを再スロー + // } + // } + + function load_QuizQuestion(url, callback) { + const get_url = url + "/api/play/quiz"; + const xhr = new XMLHttpRequest(); + + xhr.open("GET", get_url, true); + xhr.setRequestHeader("Content-Type", "application/json"); + + xhr.onreadystatechange = function () { + if (xhr.readyState === 4) { // 完了 + if (xhr.status >= 200 && xhr.status < 300) { + try { + const data = JSON.parse(xhr.responseText); + callback(null, data); // データをコールバックで返す + } catch (error) { + callback(error, null); + } + } else { + callback(new Error(`ステータスエラー: ${xhr.status}`), null); + } + } + }; + + xhr.onerror = function () { + callback(new Error("ネットワークエラー"), null); + }; + + xhr.send(); + } + + + + + console.log("helloWorldejfo;iejfejf;oaewjgo;ifewjgo;wjgo;jeawgo;eajwgojeg;je\n"); + // console.log(load_QuizQuestion("http://172.23.0.5:5001")) + // function quiz_set(question_text,selects,answer_number){ + + // let date = { + // "question": "次のうち、太陽系に存在する惑星はどれですか？", + // "selects": [ + // "シリウス", + // "地球", + // "アンドロメダ", + // "アルタイル" + // ], + // "answer":2 + // }; + // fetch("api/play/quiz",method("GET")){ + + // } + // console.log(date); + // } + /** * 質問を書き込む * @param question_text { string } 質問文 @@ -214,10 +331,36 @@ document.addEventListener("DOMContentLoaded", () => { correctAnswer = selects[answer_number]; } - quiz_set(question_date[0]["question"], + + function get_quiz_set(question_text,selects,answer_number) + { + console.log(`dateLoading-:-${typeof(question_text)}, \n ${selects}, \n ${answer_number}`); + quiz_qustion.textContent = question_text; + const quiz_contents = quiz_select_options.item(0).children; + for(var i = 0; i < 4;i++) + { + quiz_contents[i].textContent = selects[i]["S"]; + } + correctAnswer = selects[answer_number]; + } + + // 使用例 + load_QuizQuestion("http://localhost:5001", (error, data) => { + if (error) { + console.error("エラー:", error); + } else { + console.log("取得したクイズデータ:", data); + + get_quiz_set(data["game"]["question"]["S"],data["game"]["selects"]["L"],data["game"]["answer_idx"]["N"]); + } + }); + /*quiz_set(question_date[0]["question"], question_date[0]["selects"], - question_date[0]["answer"]); + question_date[0]["answer"]);*/ + // let get_question = load_QuizQuestion("http://localhost:5001"); + // console.log(get_question); + // get_quiz_set(get_question["game"]["question"],get_question["game"]["selects"]["L"],get_question["game"]["answer_idx"]["N"]); //================================================================================================================================================================ @@ -359,7 +502,7 @@ document.addEventListener("DOMContentLoaded", () => { }); }); - + /** * 正解の場所かどうかを判定する処理 * @param touchPos 要素数2の1次元の配列 @@ -589,10 +732,10 @@ document.addEventListener("DOMContentLoaded", () => { }); - //テスト用のプログラムを組み込んでいる - quiz_set(question_date[0]["question"], - question_date[0]["selects"], - question_date[0]["answer"]); + // //テスト用のプログラムを組み込んでいる + // quiz_set(question_date[0]["question"], + // question_date[0]["selects"], + // question_date[0]["answer"]); let quiz_number diff --git a/frontend/index.html b/frontend/index.html index 81079cc..02242e3 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -132,7 +132,7 @@

クイズ

- + From 0cacacb6ae3e3920d9be583910b2a3d01db1c2fc Mon Sep 17 00:00:00 2001 From: tetsushi33 Date: Sun, 8 Dec 2024 02:18:50 +0900 Subject: [PATCH 45/51] define play_search_diff, create_search_diff --- backend/controller/game_controller.py | 97 ++++++++++++---- backend/engine/dynamo_client.py | 88 ++++++++++----- backend/engine/s3_client.py | 156 +++++++++++++++++--------- backend/router.py | 11 +- 4 files changed, 248 insertions(+), 104 deletions(-) diff --git a/backend/controller/game_controller.py b/backend/controller/game_controller.py index e6e6bae..5a7aed2 100644 --- a/backend/controller/game_controller.py +++ b/backend/controller/game_controller.py @@ -1,16 +1,15 @@ from flask import make_response, jsonify, request from engine.dynamo_client import DynamoClient import hashlib +from engine.s3_client import S3Client #from werkzeug.utils import secure_filename -#from dynamo_client import save_file_metadata -from engine.s3_client import upload_to_s3 -#from dotenv import load_dotenv class GameController: def __init__(self): self.table_name = "minirun_game_table" self.db_client = DynamoClient(table_name="minirun_game_table") + self.s3_client = S3Client() # S3専用クラスを利用 def get_game_random(self): response = self.db_client.get_random() @@ -98,30 +97,45 @@ def create_intro(self): except Exception as e: return make_response(jsonify({'code': 500, 'message': str(e)}), 500) - def create_diffshot(self): - data = request.get_json() - picture_data = data['picture_data'] - picture_data_answer = data['picture_data_answer'] - answer_points = data['answer_points'] - last_id = self.get_last_id() - data['id'] = last_id + 1 + def create_search_diff(self): + try: + # フォームデータとファイルを取得 + images = request.files.getlist('images') # 画像ファイルのリスト + answer_idx = request.form.get('answer_idx') # 正解の番号(request.filesを操作した後にrequest.get_json()を使用するとエラーが発生する可能性があるらしい) - # バリデーションを実装 - if not isinstance(picture_data, str) or not music_title_answer.strip(): - return make_response(jsonify({'code': 400, 'message': 'Invalid music_title_answer'}), 400) - if not music_data: - return make_response(jsonify({'code': 400, 'message': 'Invalid music_data'}), 400) + # バリデーションチェック + if not images or len(images) != 9: + return make_response(jsonify({'code': 400, 'message': 'Invalid images list'}), 400) + if answer_idx is None or not answer_idx.isdigit() or not (0 <= int(answer_idx) < 9): + return make_response(jsonify({'code': 400, 'message': 'Invalid correct index'}), 400) + answer_idx = int(answer_idx) - # DBに保存 - try: - if self.db_client.create_diffshot(data): - return make_response(jsonify({'code': 200, 'message': 'Diffshot created successfully'}), 200) + # 画像ファイルをS3に保存 + image_hashes = [] + for image in images: + #filename = secure_filename(image.filename) + filename = image.filename + file_hash = hashlib.sha256(filename.encode('utf-8')).hexdigest() + # S3にアップロード + self.s3_client.upload_fileobj(image, file_hash) + image_hashes.append(file_hash) + + # DynamoDBに保存するデータを作成 + data_to_save = { + 'id': self.get_last_id() + 1, # 新しいID + 'genre': 'search_diff', # ジャンルを指定 + 'image_hashes': image_hashes, # 画像ハッシュリスト + 'answer_idx': answer_idx # 正解のインデックス + } + + # データベースに保存 + if self.db_client.create_search_diff(data_to_save): + return make_response(jsonify({'code': 200, 'message': 'Search diff created successfully'}), 200) else: - return make_response(jsonify({'code': 500, 'message': 'Failed to create diffshot'}), 500) + return make_response(jsonify({'code': 500, 'message': 'Failed to create search diff'}), 500) except Exception as e: return make_response(jsonify({'code': 500, 'message': str(e)}), 500) - def play_quiz(self): @@ -175,6 +189,47 @@ def play_intro(self): 'message': str(e) }), 500) + def play_search_diff(self): + try: + # データベースからランダムに問題を取得 + response = self.db_client.get_random_2(genre="search_diff") + if response: + # ハッシュ値リストを取得 + image_hashes = response.get("image_hashes", []) + answer_idx = response.get("answer_idx", -1) + # ハッシュ値を元にS3から画像データを取得 + image_data_list = [] + for image_hash in image_hashes: + try: + image_data = self.s3_client.get_s3_file_data(image_hash) + image_data_list.append(image_data) + except Exception as s3_error: + print(f"Error getting image data from S3: {e}") + return make_response(jsonify({ + 'code': 500, + 'message': f"Failed to retrieve image for hash: {image_hash}" + }), 500) + + search_diff_data = { + "images": image_data_list, # 画像データリスト + "answer_idx": answer_idx + } + return make_response(jsonify({ + 'code': 200, + 'game_content': search_diff_data + }), 200) + else: + return make_response(jsonify({ + 'code': 404, + 'message': 'No search_diff found' + }), 404) + except Exception as e: + return make_response(jsonify({ + 'code': 500, + 'message': str(e) + }), 500) + + def play_diffshot(self): try: # データベースからランダムに問題を取得 diff --git a/backend/engine/dynamo_client.py b/backend/engine/dynamo_client.py index bcc611e..8881be3 100644 --- a/backend/engine/dynamo_client.py +++ b/backend/engine/dynamo_client.py @@ -20,11 +20,16 @@ def get_all(self) -> list: def get_random(self) -> None: '''対象のテーブルからランダムに1件レコードを取得するメソッド ''' - response_all = self.db.scan(TableName=self.table_name) - valid_keys = [item['id']['N'] for item in response_all['Items']] - random_key = random.choice(valid_keys) - response = self.db.get_item(TableName=self.table_name, Key={"id": {"N": str(random_key)}}) - return response.get('Item') + try: + response_all = self.db.scan(TableName=self.table_name) + items = response_all.get('Items', []) + if not items: + return None + random_item = random.choice(items) + return random_item + except Exception as e: + print(f"Error retrieving random item: {e}") + return None def get_random_2(self, genre: str) -> None: '''指定されたジャンルの中からランダムに1件レコードを取得するメソッド''' @@ -34,7 +39,9 @@ def get_random_2(self, genre: str) -> None: FilterExpression="genre = :genre", ExpressionAttributeValues={":genre": {"S": genre}} ) - + items = response_all.get('Items', []) + if not items: + return None if genre == "quiz": # 有効なキーを取得 valid_keys = [item['id']['N'] for item in response_all['Items']] @@ -56,16 +63,19 @@ def get_random_2(self, genre: str) -> None: "file_hash": file_hash, "original_name": original_name, } + if genre == "search_diff": + selected_item = random.choice(items) + # 画像データのハッシュリストと正解インデックスを取得 + image_hashes = [hash_item["S"] for hash_item in selected_item['image_hashes']['L']] + answer_idx = int(selected_item['answer_idx']['N']) - - - # 有効なキーを取得 - valid_keys = [item['id']['N'] for item in items] - random_key = random.choice(valid_keys) - - # ランダムに選ばれたキーのアイテムを取得 - response = self.db.get_item(TableName=self.table_name, Key={"id": {"N": str(random_key)}}) - return response.get('Item') + # 必要なデータを返す + return { + "image_hashes": image_hashes, + "answer_idx": answer_idx + } + else: + return None def scan(self, **kwargs): @@ -74,15 +84,18 @@ def scan(self, **kwargs): def create_quiz(self, data: dict) -> None: '''対象のテーブルにクイズデータを登録するメソッド ''' - client = boto3.client('dynamodb') # ここで良いかは不明 - response = client.put_item(TableName=self.table_name, Item={ - 'id': {'N': str(data['id'])}, - 'question': {'S': data['question']}, - 'selects': {'L': [{'S': s} for s in data['selects']]}, - 'answer_idx': {'N': str(data['answer_idx'])}, - 'likes': {'N': '0'} - }) - return True if response['ResponseMetadata']['HTTPStatusCode'] == 200 else False + try: + response = self.db.put_item(TableName=self.table_name, Item={ + 'id': {'N': str(data['id'])}, + 'question': {'S': data['question']}, + 'selects': {'L': [{'S': s} for s in data['selects']]}, + 'answer_idx': {'N': str(data['answer_idx'])}, + 'likes': {'N': '0'} + }) + return True if response['ResponseMetadata']['HTTPStatusCode'] == 200 else False + except Exception as e: + print(f"Error saving data to DynamoDB: {e}") + return False def create_intro(self, data: dict) -> None: '''対象のテーブルにイントロデータを登録するメソッド @@ -120,11 +133,28 @@ def save_file_metadata(self, data: dict, file_hash: str, original_name: str) -> return False - def create_diffshot(self, data: dict) -> None: - '''対象のテーブルにディフショットデータを登録するメソッド - ''' - client = boto3.client('dynamodb') - ## 未 + def create_search_diff(self, data: dict) -> bool: + """ + DynamoDBに間違い画像選択ゲームのデータを保存する + """ + try: + item = { + 'id': {'N': str(data['id'])}, + 'genre': {'S': data['genre']}, + 'image_hashes': {'L': [{'S': hash} for hash in data['image_hashes']]}, + 'answer_idx': {'N': str(data['answer_idx'])}, + 'likes': {'N': '0'} # 初期値として0を設定 + } + response = self.db.put_item( + TableName=self.table_name, + #Item=data + Item=item + ) + # ステータスコードが200であれば成功 + return response['ResponseMetadata']['HTTPStatusCode'] == 200 + except Exception as e: + print(f"Error saving data to DynamoDB: {e}") + return False diff --git a/backend/engine/s3_client.py b/backend/engine/s3_client.py index 01c17ae..5ea2e81 100644 --- a/backend/engine/s3_client.py +++ b/backend/engine/s3_client.py @@ -5,59 +5,113 @@ # .envファイルを読み込む load_dotenv() -# boto3クライアントの初期化 -s3_client = boto3.client( - "s3", - aws_access_key_id=os.getenv("S3_ACCESS_KEY"), - aws_secret_access_key=os.getenv("S3_SECRET_KEY"), - endpoint_url=os.getenv("S3_ENDPOINT") # MinIOを使用する場合に必要 -) -def upload_to_s3(file, file_hash, content_type): - """ - S3にファイルをアップロードする関数 - - Args: - file: アップロードするファイルオブジェクト - file_hash: S3に保存するオブジェクトのキー（ユニークな名前） - content_type: ファイルのContent-Type +class S3Client: + def __init__(self): + """ + S3クライアントを初期化し、バケット名を設定 + """ + self.s3_client = boto3.client( + "s3", + #aws_access_key_id=os.getenv("S3_ACCESS_KEY"), + #aws_secret_access_key=os.getenv("S3_SECRET_KEY"), + #endpoint_url=os.getenv("S3_ENDPOINT") # 必要に応じて指定（MinIOやローカルS3の場合） + ) + self.bucket_name = os.getenv("S3_BUCKET") # 環境変数からバケット名を取得 - Raises: - Exception: アップロードが失敗した場合 - """ - try: - # 環境変数からS3バケットを取得 - s3_bucket = os.getenv("S3_BUCKET") + def upload_fileobj(self, file, file_key): + """ + S3にファイルをアップロードするメソッド - # S3にファイルをアップロード - s3_client.upload_fileobj( - file, - s3_bucket, - file_hash, # ファイル名の代わりにハッシュを使用 - ExtraArgs={"ContentType": content_type} - ) - print(f"File uploaded successfully to S3 with key: {file_hash}") - except Exception as e: - print(f"Error uploading file to S3: {e}") - raise e - -def get_s3_file_url(file_key: str) -> str: - """ - S3のファイルにアクセスするための署名付きURLを生成する関数 + Args: + file: アップロードするファイルオブジェクト + file_key: S3に保存するオブジェクトのキー - Args: - file_key (str): S3に格納されているオブジェクトのキー + Raises: + Exception: アップロード失敗時に例外を発生 + """ + try: + self.s3_client.upload_fileobj( + file, + self.bucket_name, # バケット名は内部で指定 + file_key, + ExtraArgs={'ContentType': file.content_type} # MIMEタイプを指定 + ) + print(f"Uploaded {file_key} to {self.bucket_name}") + except Exception as e: + print(f"Failed to upload file: {e}") + raise e - Returns: - str: 署名付きURL - """ - try: - url = s3_client.generate_presigned_url( - 'get_object', - Params={'Bucket': os.getenv("S3_BUCKET"), 'Key': file_key}, - ExpiresIn=3600 # URLの有効期限（秒単位） - ) - return url - except Exception as e: - print(f"Error generating S3 presigned URL: {e}") - return "" \ No newline at end of file +## boto3クライアントの初期化 +#s3_client = boto3.client( +# "s3", +# #aws_access_key_id=os.getenv("S3_ACCESS_KEY"), +# #aws_secret_access_key=os.getenv("S3_SECRET_KEY"), +# #endpoint_url=os.getenv("S3_ENDPOINT") # ローカル時のみ +#) +# +#def upload_to_s3(file, file_hash, content_type): +# """ +# S3にファイルをアップロードする関数 +# +# Args: +# file: アップロードするファイルオブジェクト +# file_hash: S3に保存するオブジェクトのキー（ユニークな名前） +# content_type: ファイルのContent-Type +# +# Raises: +# Exception: アップロードが失敗した場合 +# """ +# try: +# # 環境変数からS3バケットを取得 +# s3_bucket = os.getenv("S3_BUCKET") +# +# # S3にファイルをアップロード +# s3_client.upload_fileobj( +# file, +# s3_bucket, +# file_hash, # ファイル名の代わりにハッシュを使用 +# ExtraArgs={"ContentType": content_type} +# ) +# print(f"File uploaded successfully to S3 with key: {file_hash}") +# except Exception as e: +# print(f"Error uploading file to S3: {e}") +# raise e +# +#def get_s3_file_url(file_key: str) -> str: +# """ +# S3のファイルにアクセスするための署名付きURLを生成する関数 +# +# Args: +# file_key (str): S3に格納されているオブジェクトのキー +# +# Returns: +# str: 署名付きURL +# """ +# try: +# url = s3_client.generate_presigned_url( +# 'get_object', +# Params={'Bucket': os.getenv("S3_BUCKET"), 'Key': file_key}, +# ExpiresIn=3600 # URLの有効期限（秒単位） +# ) +# return url +# except Exception as e: +# print(f"Error generating S3 presigned URL: {e}") +# return "" +# +#def upload_fileobj(self, file, bucket_name, file_hash): +# """ +# S3にファイルをアップロードする +# """ +# try: +# self.s3_client.upload_fileobj( +# file, +# bucket_name, +# file_hash, +# ExtraArgs={'ContentType': file.content_type} +# ) +# print(f"Uploaded {file_hash} to {bucket_name}") +# except Exception as e: +# print(f"Failed to upload file: {e}") +# raise e +# \ No newline at end of file diff --git a/backend/router.py b/backend/router.py index e35f9a2..4b696ee 100644 --- a/backend/router.py +++ b/backend/router.py @@ -43,10 +43,10 @@ def api_create_quiz(): def api_create_intro(): return controller.create_intro() -@router.route("/api/create/diffshot", methods=['POST']) +@router.route("/api/create/searchdiff", methods=['POST']) @logger.http_request_logging -def api_create_diffshot(): - return controller.create_diffshot() +def api_create_search_diff(): + return controller.create_search_diff() @router.route("/api/play/quiz", methods=['GET']) @logger.http_request_logging @@ -58,6 +58,11 @@ def api_play_quiz(): def api_play_intro(): return controller.play_intro() +@router.route("/api/play/searchdiff", methods=['GET']) +@logger.http_request_logging +def api_play_search_diff(): + return controller.play_search_diff() + @router.after_request def after_request(response): From c63b6603ff1f17156c422a7cdf02e3b2274842ab Mon Sep 17 00:00:00 2001 From: Fuchs0101 Date: Sun, 8 Dec 2024 03:16:47 +0900 Subject: [PATCH 46/51] =?UTF-8?q?=E3=82=AF=E3=82=A4=E3=82=BA=E3=83=97?= =?UTF-8?q?=E3=83=AC=E3=82=A4=E7=94=BB=E9=9D=A2=E3=81=8C=E5=8B=95=E4=BD=9C?= =?UTF-8?q?=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/game.js | 235 +++++++++++--------------------------------- frontend/index.html | 11 ++- 2 files changed, 66 insertions(+), 180 deletions(-) diff --git a/frontend/game.js b/frontend/game.js index ceaf7cd..bc967b9 100644 --- a/frontend/game.js +++ b/frontend/game.js @@ -20,9 +20,10 @@ document.addEventListener("DOMContentLoaded", () => { const gameKindOptions = document.querySelectorAll(".gamekind-option"); - //game + //quiz const quiz_select_options = document.querySelectorAll(".quiz_selects"); const quiz_qustion = document.getElementById("question_text"); + const quiz_result = document.getElementById("quiz-judge"); const statusText = document.querySelector(".status"); const answerText = document.querySelector(".answer"); @@ -61,28 +62,48 @@ document.addEventListener("DOMContentLoaded", () => { } } - - //クイズデータ - let question_date = [ - { - "question": "次のうち、太陽fejfioewajf;owjfo;eiwajfoi;する惑星はどれですか？", - "selects": [ - "シリウス", - "地球", - "アンドロメダ", - "アルタイル" - ], - "answer": 2 - }, - { - "question": "別の質問例", - "selects": ["選択肢1", "選択肢2", "選択肢3", "選択肢4"], - "answer": 1 - }, - ] - let correctAnswer = "nullHello"; - console.log(question_date); + + function loadQuizQuestion(url, callback) { + const getUrl = url + "/api/play/quiz"; + + fetch(getUrl, { + method: "GET", + }) + .then(response => { + if (!response.ok) { + throw new Error(`ステータスエラー: ${response.status}`); + } + return response.json(); // JSONを解析 + }) + .then(data => { + callback(null, data); // データをコールバックで返す + }) + .catch(error => { + callback(error, null); // エラーをコールバックで返す + }); + } + + + + /** + * 質問を書き込む + * @param question_text { string } 質問文 + * @param selects (list-string)選択肢で表示するもの + * @param answer_number (int)selectsでの連番-何番目の選択肢を正解にするか、 + * その名前のdisplayを表示する + */ + + function set_quiz(question_text,selects,answer_number) + { + quiz_qustion.textContent = question_text; + const quiz_contents = quiz_select_options.item(0).children; + for(var i = 0; i < 4;i++) + { + quiz_contents[i].textContent = selects[i]; + } + correctAnswer = selects[answer_number]; + } function rd(max){ @@ -125,7 +146,18 @@ document.addEventListener("DOMContentLoaded", () => { //game-play else if (display == "quiz") { + loadQuizQuestion("http://localhost:5001", (error, data) => { + if (error) { + console.error("エラー:", error); + } else { + console.log("取得したクイズデータ:", data); + + set_quiz(data["game_content"]["question"],data["game_content"]["selects"],data["game_content"]["answer_idx"]); + } + }); quiz_Screen.classList.remove("d-none"); + + } else if (display == "differentPoint") { @@ -192,7 +224,6 @@ document.addEventListener("DOMContentLoaded", () => { //============================================================================================================================================ quiz_select_options.forEach(option => { - let faild = false; console.log(option[0]); option.addEventListener("click", (event) => { const selectedAnswer = event.target.textContent; @@ -200,15 +231,17 @@ document.addEventListener("DOMContentLoaded", () => { // 判定処理 if (selectedAnswer === correctAnswer) { - event.target.style.color = "#28a745"; + console.log("正解"); + quiz_result.textContent = "正解！" + quiz_result.style.color = "#28a745"; } else { console.log("不正解"); - event.target.style.color = "#dc3545"; - faild = true; + quiz_result.textContent = "残念、不正解…" + quiz_result.style.color = "#dc3545"; } @@ -218,150 +251,6 @@ document.addEventListener("DOMContentLoaded", () => { displayLoadRequest("result"); }); }); - - /** - * 返り値 - * { - * "question": "次のうち、太陽系に存在する惑星はどれですか？", - * "selects": [ - * "シリウス", - * "地球", - * "アンドロメダ", - * "アルタイル" - * ], - * "answer":2 - * } - */ - // async function load_QuizQuestion(url) { - // const get_url = url + "/api/play/random"; - // try { - // const request = await fetch(get_url, { - // method: "GET", - // headers: { - // "Content-Type": "application/json", - // }, - // }) - // .then(quizDate){ - // console.log() - // } - - // // ステータスコードのチェック - // if (!request.ok) { - // throw new Error(`レスポンスエラー: ステータス ${request.status}`); - // } - - // // JSON データを取得 - // const json_data = await request.json(); - // console.log("取得したクイズデータ:", json_data); - // return json_data; // データを返す - // } catch (error) { - // console.error("エラーが発生しました:", error); - // throw error; // 必要に応じてエラーを再スロー - // } - // } - - function load_QuizQuestion(url, callback) { - const get_url = url + "/api/play/quiz"; - const xhr = new XMLHttpRequest(); - - xhr.open("GET", get_url, true); - xhr.setRequestHeader("Content-Type", "application/json"); - - xhr.onreadystatechange = function () { - if (xhr.readyState === 4) { // 完了 - if (xhr.status >= 200 && xhr.status < 300) { - try { - const data = JSON.parse(xhr.responseText); - callback(null, data); // データをコールバックで返す - } catch (error) { - callback(error, null); - } - } else { - callback(new Error(`ステータスエラー: ${xhr.status}`), null); - } - } - }; - - xhr.onerror = function () { - callback(new Error("ネットワークエラー"), null); - }; - - xhr.send(); - } - - - - - console.log("helloWorldejfo;iejfejf;oaewjgo;ifewjgo;wjgo;jeawgo;eajwgojeg;je\n"); - // console.log(load_QuizQuestion("http://172.23.0.5:5001")) - // function quiz_set(question_text,selects,answer_number){ - - // let date = { - // "question": "次のうち、太陽系に存在する惑星はどれですか？", - // "selects": [ - // "シリウス", - // "地球", - // "アンドロメダ", - // "アルタイル" - // ], - // "answer":2 - // }; - // fetch("api/play/quiz",method("GET")){ - - // } - // console.log(date); - // } - - /** - * 質問を書き込む - * @param question_text { string } 質問文 - * @param selects (list-string)選択肢で表示するもの - * @param answer_number (int)selectsでの連番-何番目の選択肢を正解にするか、 - * その名前のdisplayを表示する - */ - function quiz_set(question_text,selects,answer_number) - { - console.log(`dateLoading-:-${typeof(question_text)}, \n ${selects}, \n ${answer_number}`); - quiz_qustion.textContent = question_text; - const quiz_contents = quiz_select_options.item(0).children; - for(var i = 0; i < 4;i++) - { - quiz_contents[i].textContent = selects[i]; - } - correctAnswer = selects[answer_number]; - } - - - function get_quiz_set(question_text,selects,answer_number) - { - console.log(`dateLoading-:-${typeof(question_text)}, \n ${selects}, \n ${answer_number}`); - quiz_qustion.textContent = question_text; - const quiz_contents = quiz_select_options.item(0).children; - for(var i = 0; i < 4;i++) - { - quiz_contents[i].textContent = selects[i]["S"]; - } - correctAnswer = selects[answer_number]; - } - - // 使用例 - load_QuizQuestion("http://localhost:5001", (error, data) => { - if (error) { - console.error("エラー:", error); - } else { - console.log("取得したクイズデータ:", data); - - get_quiz_set(data["game"]["question"]["S"],data["game"]["selects"]["L"],data["game"]["answer_idx"]["N"]); - } - }); - /*quiz_set(question_date[0]["question"], - question_date[0]["selects"], - question_date[0]["answer"]);*/ - - // let get_question = load_QuizQuestion("http://localhost:5001"); - // console.log(get_question); - // get_quiz_set(get_question["game"]["question"],get_question["game"]["selects"]["L"],get_question["game"]["answer_idx"]["N"]); - //================================================================================================================================================================ //============================================================================================================================================ @@ -741,11 +630,7 @@ document.addEventListener("DOMContentLoaded", () => { let quiz_number // 次の問題へ（ここでは単純にホーム画面に戻る処理） nextButton.addEventListener("click", () => { - displayLoadRequest("home"); - - quiz_set(question_date[0]["question"], - question_date[0]["selects"], - question_date[0]["answer"]); + displayLoadRequest("quiz"); }); // やめる（ホーム画面に戻る） diff --git a/frontend/index.html b/frontend/index.html index 02242e3..8c950bf 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -50,12 +50,12 @@

間違い探し

クイズ

-

任天堂・・

+

- - - - + + + +
@@ -79,6 +79,7 @@

クイズ

+

From af25618d8b2342735bb1f127dfa867b933903ab8 Mon Sep 17 00:00:00 2001 From: tetsushi33 Date: Sun, 8 Dec 2024 03:18:33 +0900 Subject: [PATCH 47/51] define create_search_diff, play_search_diff, others --- backend/controller/game_controller.py | 14 ++++---- backend/engine/dynamo_client.py | 49 +++++++++++++-------------- 2 files changed, 31 insertions(+), 32 deletions(-) diff --git a/backend/controller/game_controller.py b/backend/controller/game_controller.py index 5a7aed2..55c415d 100644 --- a/backend/controller/game_controller.py +++ b/backend/controller/game_controller.py @@ -31,9 +31,11 @@ def create_quiz(self): data = request.get_json() question = data['question'] selects = data['selects'] - answer_idx = data['answer_idx'] + answer_idx = data['answer_idx'] - 1 + data['answer_idx'] = answer_idx - 1 last_id = self.get_last_id() data['id'] = last_id + 1 + data['genre'] = 'quiz' # バリデーションを実装 if not isinstance(question, str) or not question.strip(): @@ -106,10 +108,10 @@ def create_search_diff(self): # バリデーションチェック if not images or len(images) != 9: return make_response(jsonify({'code': 400, 'message': 'Invalid images list'}), 400) - if answer_idx is None or not answer_idx.isdigit() or not (0 <= int(answer_idx) < 9): + if answer_idx is None or not answer_idx.isdigit() or not (0 <= int(answer_idx) - 1 < 9): return make_response(jsonify({'code': 400, 'message': 'Invalid correct index'}), 400) - answer_idx = int(answer_idx) + answer_idx = int(answer_idx) - 1 # 画像ファイルをS3に保存 image_hashes = [] @@ -145,9 +147,9 @@ def play_quiz(self): response = self.db_client.get_random_2(genre="quiz") if response: quiz_data = { - "question": response.get('question', {}).get('S', ''), - "selects": [select.get('S', '') for select in response.get('selects', {}).get('L', [])], - "answer_idx": int(response.get('answer_idx', {}).get('N', -1)) + "question": response.get('question', {}).get('S', ''), + "selects": [select.get('S', '') for select in response.get('selects', {}).get('L', [])], + "answer_idx": int(response.get('answer_idx', {}).get('N', -1)) } return make_response(jsonify({ 'code': 200, diff --git a/backend/engine/dynamo_client.py b/backend/engine/dynamo_client.py index 8881be3..61d3801 100644 --- a/backend/engine/dynamo_client.py +++ b/backend/engine/dynamo_client.py @@ -108,31 +108,6 @@ def create_intro(self, data: dict) -> None: 'likes': {'N': '0'} }) - def save_file_metadata(self, data: dict, file_hash: str, original_name: str) -> bool: - """ - DynamoDBにファイルのメタデータを保存する関数 - - Args: - file_hash (str): ファイルのハッシュ値 - original_name (str): 元のファイル名 - - Returns: - bool: 成功した場合はTrue、失敗した場合はFalse - """ - try: - client = boto3.client('dynamodb') - # DynamoDBにデータを登録 - response = client.put_item(Item={ - 'id': {'N': str(data['id'])}, - 'file_hash': file_hash, - 'original_name': original_name - }) - return response.get('ResponseMetadata', {}).get('HTTPStatusCode') == 200 - except Exception as e: - print(f"Error saving file metadata to DynamoDB: {e}") - return False - - def create_search_diff(self, data: dict) -> bool: """ DynamoDBに間違い画像選択ゲームのデータを保存する @@ -156,6 +131,28 @@ def create_search_diff(self, data: dict) -> bool: print(f"Error saving data to DynamoDB: {e}") return False - + def save_file_metadata(self, data: dict, file_hash: str, original_name: str) -> bool: + """ + DynamoDBにファイルのメタデータを保存する関数 + + Args: + file_hash (str): ファイルのハッシュ値 + original_name (str): 元のファイル名 + + Returns: + bool: 成功した場合はTrue、失敗した場合はFalse + """ + try: + client = boto3.client('dynamodb') + # DynamoDBにデータを登録 + response = client.put_item(Item={ + 'id': {'N': str(data['id'])}, + 'file_hash': file_hash, + 'original_name': original_name + }) + return response.get('ResponseMetadata', {}).get('HTTPStatusCode') == 200 + except Exception as e: + print(f"Error saving file metadata to DynamoDB: {e}") + return False From 67df3b4c3214f52b73ba18e2b46c06875edba9bb Mon Sep 17 00:00:00 2001 From: Fuchs0101 Date: Sun, 8 Dec 2024 03:39:46 +0900 Subject: [PATCH 48/51] =?UTF-8?q?=E3=83=90=E3=82=B0=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/game.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/game.js b/frontend/game.js index 140412b..5a78840 100644 --- a/frontend/game.js +++ b/frontend/game.js @@ -121,7 +121,7 @@ document.addEventListener("DOMContentLoaded", () => { function displayLoadRequest(display) { - createModeScreen.classList.add("d-none"); + createScreen.classList.add("d-none"); playScreen.classList.add("d-none"); if(gameMode == "create"){ createScreen.classList.remove("d-none"); From d1795115a6efda831f1e1b7b53937819a49bdf53 Mon Sep 17 00:00:00 2001 From: tetsushi33 Date: Sun, 8 Dec 2024 04:09:32 +0900 Subject: [PATCH 49/51] =?UTF-8?q?create=5Fquiz=E3=81=AB'genre':=20{'S':=20?= =?UTF-8?q?'quiz'}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/controller/game_controller.py | 3 ++- backend/engine/dynamo_client.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/backend/controller/game_controller.py b/backend/controller/game_controller.py index e6e6bae..c90824c 100644 --- a/backend/controller/game_controller.py +++ b/backend/controller/game_controller.py @@ -32,7 +32,8 @@ def create_quiz(self): data = request.get_json() question = data['question'] selects = data['selects'] - answer_idx = data['answer_idx'] + answer_idx = data['answer_idx'] - 1 + data['answer_idx'] = answer_idx - 1 last_id = self.get_last_id() data['id'] = last_id + 1 diff --git a/backend/engine/dynamo_client.py b/backend/engine/dynamo_client.py index bcc611e..120d68e 100644 --- a/backend/engine/dynamo_client.py +++ b/backend/engine/dynamo_client.py @@ -80,7 +80,8 @@ def create_quiz(self, data: dict) -> None: 'question': {'S': data['question']}, 'selects': {'L': [{'S': s} for s in data['selects']]}, 'answer_idx': {'N': str(data['answer_idx'])}, - 'likes': {'N': '0'} + 'likes': {'N': '0'}, + 'genre': {'S': 'quiz'} }) return True if response['ResponseMetadata']['HTTPStatusCode'] == 200 else False From 381b99ecd429ec38ba20e45af2a97837dcc3b377 Mon Sep 17 00:00:00 2001 From: tetsushi33 Date: Sun, 8 Dec 2024 04:13:11 +0900 Subject: [PATCH 50/51] =?UTF-8?q?answer=5Fidx=E3=82=92-1=E3=80=81'genre':?= =?UTF-8?q?=20{'S':=20'quiz'}=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/controller/game_controller.py | 1 - backend/engine/dynamo_client.py | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/controller/game_controller.py b/backend/controller/game_controller.py index 55c415d..454f980 100644 --- a/backend/controller/game_controller.py +++ b/backend/controller/game_controller.py @@ -35,7 +35,6 @@ def create_quiz(self): data['answer_idx'] = answer_idx - 1 last_id = self.get_last_id() data['id'] = last_id + 1 - data['genre'] = 'quiz' # バリデーションを実装 if not isinstance(question, str) or not question.strip(): diff --git a/backend/engine/dynamo_client.py b/backend/engine/dynamo_client.py index 61d3801..bff642f 100644 --- a/backend/engine/dynamo_client.py +++ b/backend/engine/dynamo_client.py @@ -90,7 +90,8 @@ def create_quiz(self, data: dict) -> None: 'question': {'S': data['question']}, 'selects': {'L': [{'S': s} for s in data['selects']]}, 'answer_idx': {'N': str(data['answer_idx'])}, - 'likes': {'N': '0'} + 'likes': {'N': '0'}, + 'genre': {'S': 'quiz'} }) return True if response['ResponseMetadata']['HTTPStatusCode'] == 200 else False except Exception as e: From c6def86ad3f37d52d4a4a569fbcc62c5537e72c1 Mon Sep 17 00:00:00 2001 From: Fuchs0101 Date: Sun, 8 Dec 2024 12:07:22 +0900 Subject: [PATCH 51/51] =?UTF-8?q?=E3=83=87=E3=82=B0=E3=83=AC=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/game.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/frontend/game.js b/frontend/game.js index 5a78840..82c11fc 100644 --- a/frontend/game.js +++ b/frontend/game.js @@ -151,6 +151,7 @@ document.addEventListener("DOMContentLoaded", () => { //game-play else if (display == "quiz") { + loadQuizQuestion("http://localhost:5001", (error, data) => { if (error) { console.error("エラー:", error); @@ -200,7 +201,6 @@ document.addEventListener("DOMContentLoaded", () => { else if (display == "game_select") { selectGameScreen.classList.remove("d-none"); - displayLoadRequest("create_quiz") } else if (display == "game_mode") @@ -224,10 +224,12 @@ document.addEventListener("DOMContentLoaded", () => { }); playButton.addEventListener("click",()=>{ + console.log("呼ばれてる１") displayLoadRequest("game_select"); }); - createButton.addEventListener('click', function () { + createButton.addEventListener('click',()=>{ + console.log("呼ばれてる２") displayLoadRequest("create_quiz"); });