diff --git a/app/controllers/Exercise.php b/app/controllers/Exercise.php index 93374e9db6e54045c27564ddebfd36fc40eee13b..0f930734f075a5d0f55ff6ff1a03afba30f6fcbc 100644 --- a/app/controllers/Exercise.php +++ b/app/controllers/Exercise.php @@ -127,7 +127,8 @@ class Exercise extends Controller $query = $this->getQuery(); $data["score"] = -1; - if (isset($query["score"]) && isset($query["isDone"])) { + if (isset($query["name"]) && isset($query["score"]) && isset($query["isDone"])) { + $data["exe_name"] = $query["name"]; $data["score"] = $query["score"]; $data["isDone"] = $query["isDone"]; } diff --git a/app/views/question/index.php b/app/views/question/index.php index c65e67d75a743097d5463e3061f3ff8c7d7a90a8..5cdec55a1c790c758a42252713aba8ca1df87369 100644 --- a/app/views/question/index.php +++ b/app/views/question/index.php @@ -12,7 +12,7 @@ Question <?= $questionNumber ?> </h2> - <div class="question-text"> + <div class="question-text font-bold"> <?= $question['question'] ?> </div> <?php foreach ($question["options"] as $option): ?> diff --git a/app/views/result/index.php b/app/views/result/index.php index 4a4e756d6469dad5d3db7a087b39e4f9b8f3f6e0..f9e4e9e3685ae7b3d9794fb9203cbe556af79944 100644 --- a/app/views/result/index.php +++ b/app/views/result/index.php @@ -1,16 +1,26 @@ <div class="result"> <div class="container result-container"> - <h1 class="font-bold text-xl text-blue-purple-gradient result-text"> - Your Score: <?= $data['score'] ?> + <h1 class="text-xl result-header"> + Congratulations!<br>You have completed<br><span class="text-blue-purple-gradient"> + <?= $data['exe_name'] ?> + </span> </h1> - <? if ($data['isDone'] == "") : ?> - <div class="font-bold text-xl text-blue-purple-gradient result-text"> - Gems earned: +<?= $data['score'] ?> - </div> - <div class="font-bold text-xl text-blue-purple-gradient result-text"> - Your total gems: <?= $data['gems'] ?> - </div> - <? endif; ?> + <div class="result-content"> + <h1 class="font-bold"> + Your Score: + <span class="result-text"> <?= $data['score'] ?> </span> + </h1> + <? if ($data['isDone'] == ""): ?> + <div class="font-bold"> + Gems earned: <span class="result-text"> + + <?= $data['score'] ?> </span> + </div> + <div class="font-bold"> + Your total gems: + <span class="result-text"> <?= $data['gems'] ?> </span> + </div> + <? endif; ?> + </div> <div class="button-container"> <a href="/exercise" class="distinct-button submit-button">Back to Exercise</a> </div> diff --git a/public/css/question.css b/public/css/question.css index 1b37c9c3152689fd6f234a161aef28cf380046e5..5e054b3ffca43b55a65719b4e6253447ff278c7f 100644 --- a/public/css/question.css +++ b/public/css/question.css @@ -10,7 +10,7 @@ .question .question-container { display: flex; flex-direction: column; - gap: 50px; + gap: 40px; } .question .question-container h1 { @@ -23,6 +23,9 @@ .question-content .question-item { margin-bottom: 40px; + background: #ECECEC; + padding: 20px; + border-radius: 10px; } .question-content .question-item .question-header { @@ -117,9 +120,32 @@ .result .result-container { display: flex; flex-direction: column; - gap: 50px; } -.result .result-text { - text-align: center; +.result .result-header { + padding: 70px 5vw; + margin-bottom: 40px; + background: #ECECEC; + border-radius: 10px; +} + +.result .result-content { + margin: 0 5vw; + text-align: end; +} + +.result .result-content .result-text { + color: var(--orange); +} + +@media (max-width: 1000px) { + + .result .result-header { + padding: 50px 0; + text-align: center; + } + + .result .result-content { + text-align: center; + } } \ No newline at end of file