From 58da4c08a0481cfbf1ae61a4f8d107d1b4d7e93d Mon Sep 17 00:00:00 2001
From: zevav <zev@averba.ch>
Date: Mon, 15 Jun 2020 01:11:24 +0200
Subject: [PATCH] fixed a few bugs

---
 package.json                  |  2 +-
 src/App.svelte                |  2 --
 src/components/Problem.svelte | 17 +++++++++++------
 src/config.js                 |  2 +-
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 60956e9..9a9cb85 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "binary-quiz-frontend",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "author": "Zev Averbach <zev@averba.ch> (https://averba.ch)",
   "license": "MIT",
   "scripts": {
diff --git a/src/App.svelte b/src/App.svelte
index b4db6e8..279f64d 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -1,13 +1,11 @@
 <script>
     import Inputs from "./components/Inputs.svelte";
     import Quiz from "./components/Quiz.svelte";
-    import Tally from "./components/Tally.svelte";
     import {activeQuiz} from './stores'
 </script>
 <main style="margin: 2em;">
     <h1>Binary Quiz!</h1>
     {#if ($activeQuiz)}
-        <Tally />
         <Quiz />
     {:else}
         <Inputs />
diff --git a/src/components/Problem.svelte b/src/components/Problem.svelte
index c7d3d19..3e5ed19 100644
--- a/src/components/Problem.svelte
+++ b/src/components/Problem.svelte
@@ -1,20 +1,21 @@
 <script>
     import {checkAnswer} from "../problems";
-    import { bits, activeProblemIndex, tally, num_problems, activeQuiz } from '../stores'
+    import {bits, activeProblemIndex, tally, num_problems, activeQuiz} from '../stores'
+    import Tally from "./Tally.svelte";
+
     export let problem
     let displaySummary = false
     let solution
-    let submitted = false
     let class_ = ""
 
     const check = () => {
         if (checkAnswer(solution, problem)) {
-            submitted = true
+            tally.update(() => $tally + 1)
             if ($num_problems === $activeProblemIndex + 1) {
                 displaySummary = true
+            } else {
+                activeProblemIndex.update(() => $activeProblemIndex + 1)
             }
-            activeProblemIndex.update(() => $activeProblemIndex + 1)
-            tally.update(() => $tally + 1)
         } else {
             class_ = "incorrect"
         }
@@ -22,17 +23,21 @@
     }
 
     const reset = () => {
+        activeProblemIndex.update(() => 0)
+        tally.update(() => 0)
         activeQuiz.update(() => false)
         bits.update(() => null)
         num_problems.update(() => null)
+        displaySummary = false
     }
 
 </script>
 
 {#if displaySummary}
     <div>Congratulations, you've completed {$num_problems} {$bits}-bit problems!</div>
-    <div><a on:click={reset}>Go back to home screen.</a></div>
+    <a href="#" on:click={reset}>Go back to home screen.</a>
 {:else}
+    <Tally />
     <form on:submit|preventDefault={check} class="{class_} problem">
         <label>
            {problem} =
diff --git a/src/config.js b/src/config.js
index fcd45ae..5fd44dc 100644
--- a/src/config.js
+++ b/src/config.js
@@ -1,6 +1,6 @@
 export const MIN_BITS = 3
 export const MAX_BITS = 16
-export const MIN_PROBLEMS = 1
+export const MIN_PROBLEMS = 2
 export const MAX_PROBLEMS = 99
 export const MAX_DIGITS_PROBLEMS = MAX_PROBLEMS.toString().length
 export const MAX_DIGITS_BITS = MAX_BITS.toString().length