From 3dc0efe5eb75d82b26b1866d2f8ba35c794feed5 Mon Sep 17 00:00:00 2001
From: Antti Pilto <antti.pilto@student.oulu.fi>
Date: Sat, 13 Aug 2016 20:36:33 +0300
Subject: [PATCH] release

---
 src/components/App/App.jsx                    |  2 ++
 src/components/Footer/Footer.jsx              | 31 +++++++++++++++++++
 src/components/Footer/Footer.scss             | 12 +++++++
 src/components/Game/Game.jsx                  |  1 -
 src/components/Game/Game.scss                 |  0
 .../GameContainer/GameContainer.jsx           |  2 +-
 src/data/quizSettings.js                      |  8 ++---
 7 files changed, 50 insertions(+), 6 deletions(-)
 create mode 100644 src/components/Footer/Footer.jsx
 create mode 100644 src/components/Footer/Footer.scss
 delete mode 100644 src/components/Game/Game.scss

diff --git a/src/components/App/App.jsx b/src/components/App/App.jsx
index e6bb4e1..2b70ea9 100644
--- a/src/components/App/App.jsx
+++ b/src/components/App/App.jsx
@@ -2,6 +2,7 @@ import React, { Component } from 'react';
 import './App.scss';
 import Navbar from '../Navbar/Navbar';
 import GameContainer from '../GameContainer/GameContainer';
+import Footer from '../Footer/Footer';
 import { removeHash } from '../../data/helperFuncs';
 
 const options = {};
@@ -40,6 +41,7 @@ class App extends Component {
                         />
                     </div>
                 </div>
+                <Footer />
             </div>
         )
     }
diff --git a/src/components/Footer/Footer.jsx b/src/components/Footer/Footer.jsx
new file mode 100644
index 0000000..5c29078
--- /dev/null
+++ b/src/components/Footer/Footer.jsx
@@ -0,0 +1,31 @@
+import React, { Component } from 'react';
+import './Footer.scss';
+
+class Footer extends Component {
+    render() {
+        return (
+            <div className="container footer">
+                <div className="col-xs-12">
+                    <h4>New version!</h4>
+                    <p>
+                        Here we are finally with a new version of Kana Quiz.
+                        This app doesn't require flash anymore, and should work great with mobile phones and tablets.
+                        Note that this is still a beta version, so there may be a few quirks. I would love to hear
+                        your thoughts, so if you'd like, be sure to shoot me some feedback using {' '}
+                        <a href="https://goo.gl/forms/BwtgpkYjT1iyH8uE3">this form</a>! {' '}
+                        If you for some reason want to use the old version, it's still available <a href="http://simplemedia.org/kana/flash/">here</a>.
+                    </p>
+
+                    <h4>How to use</h4>
+                    <p>Kana refers to the two syllabic writing systems used in Japanese: <a href="http://en.wikipedia.org/wiki/Kana" title="Read more at wikipedia">Hiragana and Katakana</a>.</p>
+                    <p>There is no "the right way" to use Kana Quiz.
+                    If you are a beginner, you might want to start by choosing the first two groups (a -&gt; ko) of hiragana. Once you manage to pass the last stage, add in one or two more groups. Aim for the perfection - you want to be answering quickly. To learn the characters in the beginning just enter false answers and it'll tell you what the correct answer was.</p>
+                    <p>Have fun!</p>
+                    <div className="copyright">&copy; <a href="http://simplemedia.org/">Antti Pilto</a> 2016</div>
+                </div>
+            </div>
+        )
+    }
+}
+
+export default Footer;
\ No newline at end of file
diff --git a/src/components/Footer/Footer.scss b/src/components/Footer/Footer.scss
new file mode 100644
index 0000000..e8b6274
--- /dev/null
+++ b/src/components/Footer/Footer.scss
@@ -0,0 +1,12 @@
+.footer {
+    color: #777;
+    font-size: 0.9em;
+    line-height: 1.8em;
+    h4 {
+        margin-top: 20px;
+        color: #d9534f;
+    }
+    a {
+        text-decoration: underline;
+    }
+}
diff --git a/src/components/Game/Game.jsx b/src/components/Game/Game.jsx
index 715e4a5..1f413c0 100644
--- a/src/components/Game/Game.jsx
+++ b/src/components/Game/Game.jsx
@@ -1,6 +1,5 @@
 import React, { Component } from 'react';
 import { kanaDictionary } from '../../data/kanaDictionary';
-import './Game.scss';
 import ShowStage from './ShowStage';
 import Question from './Question';
 
diff --git a/src/components/Game/Game.scss b/src/components/Game/Game.scss
deleted file mode 100644
index e69de29..0000000
diff --git a/src/components/GameContainer/GameContainer.jsx b/src/components/GameContainer/GameContainer.jsx
index c7ba1da..013d84b 100644
--- a/src/components/GameContainer/GameContainer.jsx
+++ b/src/components/GameContainer/GameContainer.jsx
@@ -10,7 +10,7 @@ class GameContainer extends Component {
         this.state = {
             stage:1,
             isLocked: false,
-            decidedGroups: ['h_group3']
+            decidedGroups: ['h_group1']
         }
         this.stageUp = this.stageUp.bind(this);
         this.lockStage = this.lockStage.bind(this);
diff --git a/src/data/quizSettings.js b/src/data/quizSettings.js
index 69f81e8..8557a09 100644
--- a/src/data/quizSettings.js
+++ b/src/data/quizSettings.js
@@ -1,8 +1,8 @@
 export const quizSettings = {
     stageLength : {
-        1: 10,
-        2: 10,
-        3: 10,
-        4: 10
+        1: 20,
+        2: 20,
+        3: 20,
+        4: 20
     }
 };
\ No newline at end of file