From d7de398c8a21c9dbb0e669b0636ddbd4c21ebce2 Mon Sep 17 00:00:00 2001
From: pavkahanov <pavkahanov@neos1.com>
Date: Mon, 18 Nov 2019 13:10:29 +0700
Subject: [PATCH 01/11] header impprovements

---
 src/assets/images/navlink-indicator.svg  |  7 +++++++
 src/components/Header/Header.scss        | 14 ++++++++++++++
 src/components/Header/HeaderNav/index.js |  2 +-
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 src/assets/images/navlink-indicator.svg

diff --git a/src/assets/images/navlink-indicator.svg b/src/assets/images/navlink-indicator.svg
new file mode 100644
index 00000000..f34bbdc7
--- /dev/null
+++ b/src/assets/images/navlink-indicator.svg
@@ -0,0 +1,7 @@
+<svg width="27" height="12" viewBox="0 0 27 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+<line y1="-0.5" x2="12" y2="-0.5" transform="matrix(-4.37114e-08 -1 -1 4.37114e-08 13 12)" stroke="#808080"/>
+<line y1="-0.5" x2="8" y2="-0.5" transform="matrix(4.37114e-08 -1 -1 -4.37114e-08 20 12)" stroke="#808080"/>
+<line y1="-0.5" x2="5" y2="-0.5" transform="matrix(4.37114e-08 -1 -1 -4.37114e-08 26 12)" stroke="#808080"/>
+<line y1="-0.5" x2="5" y2="-0.5" transform="matrix(4.37114e-08 -1 -1 -4.37114e-08 0 12)" stroke="#808080"/>
+<line y1="-0.5" x2="8" y2="-0.5" transform="matrix(4.37114e-08 -1 -1 -4.37114e-08 7 12)" stroke="#808080"/>
+</svg>
diff --git a/src/components/Header/Header.scss b/src/components/Header/Header.scss
index 95f2e9a5..3521d83e 100644
--- a/src/components/Header/Header.scss
+++ b/src/components/Header/Header.scss
@@ -28,10 +28,24 @@
     transform: translate(-50%, -50%);
   }
   &__link {
+    position: relative;
     margin: 0 30px;
     transition: .2s linear;
     &.active{
       font-weight: bold;
+      &:before, &:after {
+        position: absolute;
+        left: 50%;
+        transform: translateX(-50%);
+        content: url('../../assets/images/navlink-indicator.svg');
+      }
+      &:before {
+        bottom: 100%;
+      }
+      &:after {
+        top: 100%;
+        transform: translateX(-50%) rotate(180deg);
+      }
     } 
   }
   .lang {
diff --git a/src/components/Header/HeaderNav/index.js b/src/components/Header/HeaderNav/index.js
index 00e959bc..feaf8154 100644
--- a/src/components/Header/HeaderNav/index.js
+++ b/src/components/Header/HeaderNav/index.js
@@ -3,7 +3,7 @@ import { NavLink } from 'react-router-dom';
 
 const HeaderNav = () => (
   <nav className="header__nav">
-    <NavLink className="header__link" to="/votings">Голосования</NavLink>
+    <NavLink className="header__link active" to="/votings">Голосования</NavLink>
     /
     <NavLink className="header__link" to="/questions">Вопросы</NavLink>
     /

From 716d117654762d529e90008b26d143e4ac783cd7 Mon Sep 17 00:00:00 2001
From: pavkahanov <pavkahanov@neos1.com>
Date: Mon, 18 Nov 2019 17:37:51 +0700
Subject: [PATCH 02/11] Small fixes

---
 src/components/Button/Button.scss       | 2 +-
 src/components/Container/Container.scss | 6 +++++-
 src/components/Container/index.js       | 8 ++++++--
 src/components/Header/Header.scss       | 2 +-
 src/components/Icons/index.js           | 9 +++++++++
 5 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/components/Button/Button.scss b/src/components/Button/Button.scss
index 41f0a9e3..b57e5879 100644
--- a/src/components/Button/Button.scss
+++ b/src/components/Button/Button.scss
@@ -1,7 +1,7 @@
 @import "../../assets/styles/partials/variables";
 
 .btn {
-  padding: 14px 0;
+  padding: 14px 10px;
   text-decoration: none;
   border: none;
   border-radius: 2px;
diff --git a/src/components/Container/Container.scss b/src/components/Container/Container.scss
index 632cd7be..b1580d48 100644
--- a/src/components/Container/Container.scss
+++ b/src/components/Container/Container.scss
@@ -1,7 +1,11 @@
 .container {
   position: relative;
+  top: 55px;
   width: 100%;
   max-width: 1120px;
-  height: 100vh;
+  height: calc(100vh - 110px);
   margin: 0 auto;
+  &--small {
+    max-width: 845px;
+  }
 }
diff --git a/src/components/Container/index.js b/src/components/Container/index.js
index 05e8d913..483eaf16 100644
--- a/src/components/Container/index.js
+++ b/src/components/Container/index.js
@@ -2,13 +2,17 @@ import React from 'react';
 import propTypes from 'prop-types';
 import styles from './Container.scss';
 
-const Container = ({ children }) => (
-  <div className={styles.container}>
+const Container = ({ children, className }) => (
+  <div className={`${styles.container} ${className}`}>
     {children}
   </div>
 );
 
 Container.propTypes = {
   children: propTypes.node.isRequired,
+  className: propTypes.string,
+};
+Container.defaultProps = {
+  className: '',
 };
 export default Container;
diff --git a/src/components/Header/Header.scss b/src/components/Header/Header.scss
index 3521d83e..91f3ac55 100644
--- a/src/components/Header/Header.scss
+++ b/src/components/Header/Header.scss
@@ -1,7 +1,7 @@
 @import '../../assets/styles/partials/variables';
 
 .header {
-  position: absolute;
+  position: relative;
   top: 30px;
   left: 50%;
   z-index: 2;
diff --git a/src/components/Icons/index.js b/src/components/Icons/index.js
index ffdcfdf6..c9687a97 100644
--- a/src/components/Icons/index.js
+++ b/src/components/Icons/index.js
@@ -322,3 +322,12 @@ export const QuestionUploadingIcon = () => (
     <path d="M3.1167 41.1257C3.0446 41.1257 2.96961 41.1132 2.89751 41.0876C2.55559 40.9667 2.3771 40.5915 2.49855 40.2502C2.96064 38.9421 4.20398 38.0635 5.59153 38.0635C6.9794 38.0635 8.22306 38.9421 8.68515 40.2509C8.8066 40.5928 8.62683 40.9674 8.28555 41.0876C7.94299 41.2103 7.56902 41.0299 7.44885 40.688C7.17038 39.9038 6.42502 39.376 5.59153 39.376C4.75868 39.376 4.01332 39.9038 3.73485 40.6886C3.63967 40.9578 3.38716 41.1257 3.1167 41.1257Z" fill="black" />
   </svg>
 );
+
+export const StartIcon = () => (
+  <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <g opacity="0.7">
+      <path d="M16.0002 29.3332C23.364 29.3332 29.3335 23.3636 29.3335 15.9998C29.3335 8.63604 23.364 2.6665 16.0002 2.6665C8.63637 2.6665 2.66683 8.63604 2.66683 15.9998C2.66683 23.3636 8.63637 29.3332 16.0002 29.3332Z" stroke="black" strokeLinecap="round" strokeLinejoin="round" />
+      <path d="M13.3332 10.6665L21.3332 15.9998L13.3332 21.3332V10.6665Z" stroke="black" strokeLinecap="round" strokeLinejoin="round" />
+    </g>
+  </svg>
+);

From 2ba365528a724aad546f6217ebe1e5c84d6d2d0b Mon Sep 17 00:00:00 2001
From: pavkahanov <pavkahanov@neos1.com>
Date: Mon, 18 Nov 2019 18:00:10 +0700
Subject: [PATCH 03/11] created question and questions wrapper components

---
 src/components/Questions/index.js             |  7 +++
 .../QuestionsWrapper/Question/Question.js     | 31 ++++++++++
 .../QuestionsWrapper/Question/Question.scss   | 52 ++++++++++++++++
 .../QuestionsWrapper/Questions.scss           | 29 +++++++++
 .../QuestionsWrapper/Questions.stories.js     | 11 ++++
 src/components/QuestionsWrapper/index.js      | 59 +++++++++++++++++++
 6 files changed, 189 insertions(+)
 create mode 100644 src/components/Questions/index.js
 create mode 100644 src/components/QuestionsWrapper/Question/Question.js
 create mode 100644 src/components/QuestionsWrapper/Question/Question.scss
 create mode 100644 src/components/QuestionsWrapper/Questions.scss
 create mode 100644 src/components/QuestionsWrapper/Questions.stories.js
 create mode 100644 src/components/QuestionsWrapper/index.js

diff --git a/src/components/Questions/index.js b/src/components/Questions/index.js
new file mode 100644
index 00000000..bb7e0ea0
--- /dev/null
+++ b/src/components/Questions/index.js
@@ -0,0 +1,7 @@
+import React from 'react';
+import QuestionsWrapper from '../QuestionsWrapper';
+
+const Questions = () => (
+  <QuestionsWrapper />
+);
+export default Questions;
diff --git a/src/components/QuestionsWrapper/Question/Question.js b/src/components/QuestionsWrapper/Question/Question.js
new file mode 100644
index 00000000..4f14cb98
--- /dev/null
+++ b/src/components/QuestionsWrapper/Question/Question.js
@@ -0,0 +1,31 @@
+import React from 'react';
+import { StartIcon } from '../../Icons';
+
+import styles from './Question.scss';
+
+const Question = () => (
+  <div className={styles.question}>
+    <div className={styles.question__left}>
+      <p className={styles.question__id}>#1</p>
+      <p className={styles.question__caption}>Я очень люблю писать рыбные заголовки</p>
+      <p className={styles.question__description}>
+        {`Иногда описания могут не влазить, потому что для важных вопросов 
+          нужно много описать, чтобы даже дурак все понял и принял правильное 
+          решение, тогда делаем что то типо того, ща еще чуть чуть чтобы прям
+          забить строчку эту и еще чуть чуть.`}
+      </p>
+    </div>
+    <div className={styles.question__right}>
+      <div className={styles.question__start}>
+        <p className={styles['question__start-icon']}>
+          <StartIcon />
+        </p>
+        <p className={styles['question__start-label']}>
+          Начать новое голосование
+        </p>
+      </div>
+    </div>
+  </div>
+);
+
+export default Question;
diff --git a/src/components/QuestionsWrapper/Question/Question.scss b/src/components/QuestionsWrapper/Question/Question.scss
new file mode 100644
index 00000000..9f10e19c
--- /dev/null
+++ b/src/components/QuestionsWrapper/Question/Question.scss
@@ -0,0 +1,52 @@
+@import '../../../assets/styles/partials/variables';
+.question {
+  display: flex;
+  flex-flow: row nowrap;
+  align-items: center;
+  justify-content: start;
+  height: 125px;
+  background-color: $white;
+  border: 1px solid $lightGrey;
+  &__left {
+    align-self: flex-start;
+    width: 80%;
+    height: 100%;
+    padding: 5px 30px;
+    border-right: 1px solid $lightGrey;
+    cursor: pointer;
+  }
+  &__right {
+    width: 20%;
+    text-align: center;
+  }
+  &__id {
+    color: $lightGrey;
+    font-size: 11px;
+  }
+  &__caption {
+    max-width: 70%;
+    margin: 10px 0 15px;
+    font-weight: 700;
+    font-size: 18px;
+  }
+  &__description {
+    max-width: 70%;
+    font-size: 11px;
+  }
+  &__start {
+    width: 50%;
+    margin: 0 auto;
+    &-icon {
+      cursor: pointer;
+      svg {
+        width: 30px;
+        height: 30px;
+      }
+    }
+    &-label {
+      margin-top: 10px;
+      color: $primary;
+      font-size: 11px;
+    }
+  }
+} 
\ No newline at end of file
diff --git a/src/components/QuestionsWrapper/Questions.scss b/src/components/QuestionsWrapper/Questions.scss
new file mode 100644
index 00000000..063026d2
--- /dev/null
+++ b/src/components/QuestionsWrapper/Questions.scss
@@ -0,0 +1,29 @@
+.questions {
+  margin: 0 auto;
+  &__head {
+    display: flex;
+    flex-flow: row nowrap;
+    justify-content: space-between;
+    margin-bottom: 30px;
+    &-create {
+      display: flex;
+      flex-flow: row nowrap;
+      align-items: center;
+      justify-content: space-between;
+      width: 45%;
+    }
+    &-filters {
+      display: inline-block;
+      width:25%;
+      .dropdown {
+        width: 100%;
+      }
+    }
+  }
+  &__wrapper {
+    display: grid;
+    grid-template-columns:1fr;
+    row-gap: 10px;
+    overflow-y: a;
+  }
+}
\ No newline at end of file
diff --git a/src/components/QuestionsWrapper/Questions.stories.js b/src/components/QuestionsWrapper/Questions.stories.js
new file mode 100644
index 00000000..953f6d92
--- /dev/null
+++ b/src/components/QuestionsWrapper/Questions.stories.js
@@ -0,0 +1,11 @@
+import React from 'react';
+import QuestionsWrapper from '.';
+import Question from './Question/Question';
+
+export default ({ title: 'Questions' });
+
+export const Wrapper = () => (
+  <QuestionsWrapper />
+);
+
+export const defaultQuestion = () => <Question />;
diff --git a/src/components/QuestionsWrapper/index.js b/src/components/QuestionsWrapper/index.js
new file mode 100644
index 00000000..bd19fc58
--- /dev/null
+++ b/src/components/QuestionsWrapper/index.js
@@ -0,0 +1,59 @@
+import React, { Component } from 'react';
+import Container from '../Container';
+import { IconButton } from '../Button';
+import { CreateToken } from '../Icons';
+import Question from './Question/Question';
+import styles from './Questions.scss';
+import SimpleDropdown from '../SimpleDropdown';
+
+class QuestionsWrapper extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {};
+  }
+
+  render() {
+    const options = [{
+      label: '1',
+      value: '1',
+    }, {
+      label: '1',
+      value: '1',
+    }, {
+      label: '1',
+      value: '1',
+    }];
+    return (
+      <Container className="container--small">
+        <div className={styles.questions}>
+          <div className={styles.questions__head}>
+            <div className={styles['questions__head-create']}>
+              <IconButton className="btn--white">
+                <CreateToken />
+              Создать группу вопросов
+              </IconButton>
+              <IconButton className="btn--white">
+                <CreateToken />
+              Создать вопрос
+              </IconButton>
+            </div>
+            <div className={styles['questions__head-filters']}>
+              <SimpleDropdown
+                options={options}
+              />
+            </div>
+          </div>
+          <div className={styles.questions__wrapper}>
+            <Question />
+            <Question />
+            <Question />
+            <Question />
+            <Question />
+          </div>
+        </div>
+      </Container>
+    );
+  }
+}
+
+export default QuestionsWrapper;

From db45c8825294ebc7356482978fd1d14473d4516b Mon Sep 17 00:00:00 2001
From: pavkahanov <pavkahanov@neos1.com>
Date: Mon, 18 Nov 2019 18:00:58 +0700
Subject: [PATCH 04/11] Created simpleDropdown

---
 src/components/DropdownOption/index.js |   3 +-
 src/components/SimpleDropdown/index.js | 111 +++++++++++++++++++++++++
 2 files changed, 113 insertions(+), 1 deletion(-)
 create mode 100644 src/components/SimpleDropdown/index.js

diff --git a/src/components/DropdownOption/index.js b/src/components/DropdownOption/index.js
index 3d7a790d..31704490 100644
--- a/src/components/DropdownOption/index.js
+++ b/src/components/DropdownOption/index.js
@@ -27,9 +27,10 @@ DropdownOption.propTypes = {
   value: propTypes.string.isRequired,
   label: propTypes.string.isRequired,
   select: propTypes.func.isRequired,
-  subOption: propTypes.string.isRequired,
+  subOption: propTypes.string,
 };
 DropdownOption.defaultProps = {
+  subOption: '',
 };
 
 
diff --git a/src/components/SimpleDropdown/index.js b/src/components/SimpleDropdown/index.js
new file mode 100644
index 00000000..4279bf0a
--- /dev/null
+++ b/src/components/SimpleDropdown/index.js
@@ -0,0 +1,111 @@
+import React, { Component } from 'react';
+import propTypes from 'prop-types';
+import { DropdownArrow } from '../Icons';
+import styles from '../Dropdown/Dropdown.scss';
+import DropdownOption from '../DropdownOption';
+
+class SimpleDropdown extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      opened: false,
+      selectedValue: '',
+      selectedLabel: '',
+    };
+    this.setWrapperRef = this.setWrapperRef.bind(this);
+    this.handleClickOutside = this.handleClickOutside.bind(this);
+  }
+
+  componentDidMount() {
+    document.addEventListener('mousedown', this.handleClickOutside);
+  }
+
+  componentWillUnmount() {
+    document.addEventListener('mousedown', this.handleClickOutside);
+  }
+
+  setWrapperRef(node) {
+    this.wrapperRef = node;
+  }
+
+
+  toggleOptions = () => {
+    const { opened } = this.state;
+    this.setState({ opened: !opened });
+  }
+
+  closeOptions = () => {
+    this.setState({ opened: false });
+  }
+
+
+  handleSelect = (selected) => {
+    const { onSelect } = this.props;
+    this.setState({
+      selectedLabel: selected,
+      selectedValue: selected,
+    });
+    onSelect(selected);
+    this.toggleOptions();
+  }
+
+
+  handleClickOutside(event) {
+    if (this.wrapperRef && !this.wrapperRef.contains(event.target)) {
+      this.closeOptions();
+    }
+  }
+
+
+  render() {
+    const {
+      children, options,
+    } = this.props;
+    const { opened, selectedLabel, selectedValue } = this.state;
+
+    const getOptions = options.map((option) => (
+      <DropdownOption
+        key={`dropdown-${option.label}`}
+        label={option.label}
+        value={option.label}
+        select={this.handleSelect}
+      />
+    ));
+    // eslint-disable-next-line no-console
+
+
+    return (
+      <div className={`${styles.dropdown} ${opened ? 'dropdown--opened' : ''}`} ref={this.setWrapperRef}>
+        <input type="hidden" />
+        <button type="button" className="dropdown__head" onKeyDown={this.toggleOptions} onClick={this.toggleOptions}>
+          {children ? <span className="dropdown__icon">{children}</span> : ''}
+          <span className="dropdown__selected" data-value={selectedValue}>
+            {selectedLabel || 'Выберите' }
+            <span className="dropdown__arrow">
+              <DropdownArrow />
+            </span>
+          </span>
+          <div className="dropdown__head-line" />
+        </button>
+        <div className="dropdown__options">
+          {getOptions}
+        </div>
+      </div>
+    );
+  }
+}
+
+SimpleDropdown.propTypes = {
+  children: propTypes.element,
+  options: propTypes.arrayOf(propTypes.object).isRequired,
+  // eslint-disable-next-line react/forbid-prop-types
+  onSelect: propTypes.func,
+  // eslint-disable-next-line react/forbid-prop-types
+
+};
+SimpleDropdown.defaultProps = {
+  children: '',
+  onSelect: () => false,
+};
+
+export default SimpleDropdown;

From c75a971f13845d430efecd632e9d74992cb5abcf Mon Sep 17 00:00:00 2001
From: pavkahanov <pavkahanov@neos1.com>
Date: Tue, 19 Nov 2019 13:23:36 +0700
Subject: [PATCH 05/11] Small fix for filter block

---
 src/components/QuestionsWrapper/Questions.scss | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/QuestionsWrapper/Questions.scss b/src/components/QuestionsWrapper/Questions.scss
index 063026d2..010b7ea5 100644
--- a/src/components/QuestionsWrapper/Questions.scss
+++ b/src/components/QuestionsWrapper/Questions.scss
@@ -13,8 +13,10 @@
       width: 45%;
     }
     &-filters {
-      display: inline-block;
-      width:25%;
+      display: flex;
+      flex-flow: row nowrap;
+      align-items: center;
+      width: 25%;
       .dropdown {
         width: 100%;
       }

From 7720610fb35350f54c6c7af2b5a85ec4431c18f9 Mon Sep 17 00:00:00 2001
From: pavkahanov <pavkahanov@neos1.com>
Date: Mon, 2 Dec 2019 10:29:42 +0700
Subject: [PATCH 06/11] Every question have a route

---
 .../QuestionsWrapper/Question/Question.js     | 24 ++++++++++++-------
 src/components/QuestionsWrapper/index.js      | 11 +++++----
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/components/QuestionsWrapper/Question/Question.js b/src/components/QuestionsWrapper/Question/Question.js
index 4f14cb98..d460c7f1 100644
--- a/src/components/QuestionsWrapper/Question/Question.js
+++ b/src/components/QuestionsWrapper/Question/Question.js
@@ -1,20 +1,24 @@
 import React from 'react';
+import propTypes from 'prop-types';
+import { NavLink } from 'react-router-dom';
 import { StartIcon } from '../../Icons';
 
 import styles from './Question.scss';
 
-const Question = () => (
+const Question = ({ id }) => (
   <div className={styles.question}>
-    <div className={styles.question__left}>
-      <p className={styles.question__id}>#1</p>
-      <p className={styles.question__caption}>Я очень люблю писать рыбные заголовки</p>
-      <p className={styles.question__description}>
-        {`Иногда описания могут не влазить, потому что для важных вопросов 
+    <NavLink className={styles.question__left} to={`/question/${id}`}>
+      <div>
+        <p className={styles.question__id}>{`#${id}`}</p>
+        <p className={styles.question__caption}>Я очень люблю писать рыбные заголовки</p>
+        <p className={styles.question__description}>
+          {`Иногда описания могут не влазить, потому что для важных вопросов 
           нужно много описать, чтобы даже дурак все понял и принял правильное 
           решение, тогда делаем что то типо того, ща еще чуть чуть чтобы прям
           забить строчку эту и еще чуть чуть.`}
-      </p>
-    </div>
+        </p>
+      </div>
+    </NavLink>
     <div className={styles.question__right}>
       <div className={styles.question__start}>
         <p className={styles['question__start-icon']}>
@@ -28,4 +32,8 @@ const Question = () => (
   </div>
 );
 
+Question.propTypes = {
+  id: propTypes.number.isRequired,
+};
+
 export default Question;
diff --git a/src/components/QuestionsWrapper/index.js b/src/components/QuestionsWrapper/index.js
index bd19fc58..b75fe6e5 100644
--- a/src/components/QuestionsWrapper/index.js
+++ b/src/components/QuestionsWrapper/index.js
@@ -23,6 +23,7 @@ class QuestionsWrapper extends Component {
       label: '1',
       value: '1',
     }];
+    const questions = [1, 2, 3, 4, 5, 6, 7, 8, 9];
     return (
       <Container className="container--small">
         <div className={styles.questions}>
@@ -44,11 +45,11 @@ class QuestionsWrapper extends Component {
             </div>
           </div>
           <div className={styles.questions__wrapper}>
-            <Question />
-            <Question />
-            <Question />
-            <Question />
-            <Question />
+            {
+              questions.map((id) => (
+                <Question id={id} />
+              ))
+            }
           </div>
         </div>
       </Container>

From 0da90166bb747943ae553278a62692576e7d74a6 Mon Sep 17 00:00:00 2001
From: pavkahanov <pavkahanov@neos1.com>
Date: Tue, 3 Dec 2019 16:37:30 +0700
Subject: [PATCH 07/11] Questions list, single question and footer

---
 src/components/Footer/Footer.scss             | 34 +++++++
 src/components/Footer/index.js                | 15 +++
 src/components/Icons/entities/GithubIcon.js   |  8 ++
 src/components/Icons/entities/StartIcon.js    | 12 +++
 src/components/Icons/index.js                 |  4 +
 .../Questions/FullQuestion/index.js           | 31 ++++++
 .../Question/Question.scss                    | 40 +++++++-
 src/components/Questions/Question/index.js    | 98 +++++++++++++++++++
 .../Questions.scss                            | 15 ++-
 .../Questions.stories.js                      |  6 +-
 src/components/Questions/index.js             | 62 +++++++++++-
 .../QuestionsWrapper/Question/Question.js     | 39 --------
 src/components/QuestionsWrapper/index.js      | 60 ------------
 src/components/Router/SimpleRouter.js         |  7 +-
 src/components/SimpleDropdown/index.js        |  4 +-
 15 files changed, 320 insertions(+), 115 deletions(-)
 create mode 100644 src/components/Footer/Footer.scss
 create mode 100644 src/components/Footer/index.js
 create mode 100644 src/components/Icons/entities/GithubIcon.js
 create mode 100644 src/components/Icons/entities/StartIcon.js
 create mode 100644 src/components/Questions/FullQuestion/index.js
 rename src/components/{QuestionsWrapper => Questions}/Question/Question.scss (56%)
 create mode 100644 src/components/Questions/Question/index.js
 rename src/components/{QuestionsWrapper => Questions}/Questions.scss (68%)
 rename src/components/{QuestionsWrapper => Questions}/Questions.stories.js (60%)
 delete mode 100644 src/components/QuestionsWrapper/Question/Question.js
 delete mode 100644 src/components/QuestionsWrapper/index.js

diff --git a/src/components/Footer/Footer.scss b/src/components/Footer/Footer.scss
new file mode 100644
index 00000000..19351ba7
--- /dev/null
+++ b/src/components/Footer/Footer.scss
@@ -0,0 +1,34 @@
+@import '../../assets/styles/partials/variables';
+
+.footer {
+  padding: 15px 0;
+  a {
+    display: flex;
+    flex-flow: row nowrap;
+    align-items: center;
+    justify-content: center;
+    color: $border;
+    font-size: 11px;
+    text-align: center;
+    svg {
+      path {
+        transition: .2s;
+      }
+    }
+    span {
+      margin-left: 10px;
+      transition: .2s;
+    }
+    &:hover{ 
+      svg {
+        path {
+          opacity: 1;
+          fill: $primary;
+        }
+      }
+      span {
+        color: $primary;
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/components/Footer/index.js b/src/components/Footer/index.js
new file mode 100644
index 00000000..82109b80
--- /dev/null
+++ b/src/components/Footer/index.js
@@ -0,0 +1,15 @@
+import React from 'react';
+import { GithubIcon } from '../Icons';
+
+import styles from './Footer.scss';
+
+const Footer = () => (
+  <footer className={styles.footer}>
+    <a href="/">
+      <GithubIcon />
+      <span>GitHub</span>
+    </a>
+  </footer>
+);
+
+export default Footer;
diff --git a/src/components/Icons/entities/GithubIcon.js b/src/components/Icons/entities/GithubIcon.js
new file mode 100644
index 00000000..f6f0d017
--- /dev/null
+++ b/src/components/Icons/entities/GithubIcon.js
@@ -0,0 +1,8 @@
+import React from 'react';
+
+const GithubIcon = () => (
+  <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path opacity="0.2" d="M8.00007 0C3.58233 0 0 3.67232 0 8.20254C0 11.8266 2.29226 14.9013 5.47093 15.9859C5.87075 16.0618 6.01754 15.808 6.01754 15.5913C6.01754 15.3957 6.01012 14.7496 6.00667 14.0642C3.78105 14.5604 3.31141 13.0964 3.31141 13.0964C2.9475 12.1483 2.42315 11.8962 2.42315 11.8962C1.6973 11.3871 2.47786 11.3975 2.47786 11.3975C3.28121 11.4554 3.70421 12.2428 3.70421 12.2428C4.41774 13.4968 5.57572 13.1343 6.03224 12.9247C6.10404 12.3945 6.31137 12.0327 6.54016 11.8279C4.76324 11.6204 2.8953 10.9171 2.8953 7.77413C2.8953 6.8786 3.20782 6.14688 3.71958 5.57245C3.63651 5.36585 3.36268 4.53158 3.79708 3.40174C3.79708 3.40174 4.46887 3.18129 5.99766 4.24253C6.63581 4.06079 7.32019 3.96965 8.00007 3.96652C8.67994 3.96965 9.36485 4.06079 10.0042 4.24253C11.5311 3.18129 12.202 3.40174 12.202 3.40174C12.6375 4.53158 12.3635 5.36585 12.2804 5.57245C12.7934 6.14688 13.1038 6.8786 13.1038 7.77413C13.1038 10.9246 11.2323 11.6183 9.45083 11.8213C9.73778 12.0759 9.99346 12.5751 9.99346 13.3403C9.99346 14.4378 9.98419 15.3211 9.98419 15.5913C9.98419 15.8096 10.1282 16.0654 10.5337 15.9848C13.7107 14.899 16 11.8254 16 8.20254C16 3.67232 12.4182 0 8.00007 0Z" fill="black" />
+  </svg>
+);
+export default GithubIcon;
diff --git a/src/components/Icons/entities/StartIcon.js b/src/components/Icons/entities/StartIcon.js
new file mode 100644
index 00000000..699eba1b
--- /dev/null
+++ b/src/components/Icons/entities/StartIcon.js
@@ -0,0 +1,12 @@
+import React from 'react';
+
+const StartIcon = () => (
+  <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <g opacity="0.7">
+      <path d="M16.0002 29.3332C23.364 29.3332 29.3335 23.3636 29.3335 15.9998C29.3335 8.63604 23.364 2.6665 16.0002 2.6665C8.63637 2.6665 2.66683 8.63604 2.66683 15.9998C2.66683 23.3636 8.63637 29.3332 16.0002 29.3332Z" stroke="black" strokeLinecap="round" strokeLinejoin="round" />
+      <path d="M13.3332 10.6665L21.3332 15.9998L13.3332 21.3332V10.6665Z" stroke="black" strokeLinecap="round" strokeLinejoin="round" />
+    </g>
+  </svg>
+);
+
+export default StartIcon;
diff --git a/src/components/Icons/index.js b/src/components/Icons/index.js
index a8335074..819aa576 100644
--- a/src/components/Icons/index.js
+++ b/src/components/Icons/index.js
@@ -22,6 +22,8 @@ import TokenName from './entities/TokenNameIcon';
 import TxHashIcon from './entities/TxHashIcon';
 import TxRecieptIcon from './entities/TxRecieptIcon';
 import VerifyIcon from './entities/VerifyIcon';
+import StartIcon from './entities/StartIcon';
+import GithubIcon from './entities/GithubIcon';
 
 export {
   AddIcon,
@@ -48,4 +50,6 @@ export {
   TxHashIcon,
   TxRecieptIcon,
   VerifyIcon,
+  StartIcon,
+  GithubIcon,
 };
diff --git a/src/components/Questions/FullQuestion/index.js b/src/components/Questions/FullQuestion/index.js
new file mode 100644
index 00000000..06346985
--- /dev/null
+++ b/src/components/Questions/FullQuestion/index.js
@@ -0,0 +1,31 @@
+import React from 'react';
+import { useHistory, useParams } from 'react-router-dom';
+import Container from '../../Container';
+import Question from '../Question';
+import Button from '../../Button/Button';
+
+import styles from '../Questions.scss';
+
+
+const FullQuestion = () => {
+  const { id } = useParams();
+  const { goBack } = useHistory();
+  return (
+    <Container className="container--small">
+      <div className={styles.questions}>
+        <div className={styles.questions__head}>
+          <div className={styles['questions__head-create']}>
+            <Button theme="white" onClick={goBack}>
+              Назад
+            </Button>
+          </div>
+        </div>
+        <div className={styles.questions__wrapper}>
+          <Question id={id} extended />
+        </div>
+      </div>
+    </Container>
+  );
+};
+
+export default FullQuestion;
diff --git a/src/components/QuestionsWrapper/Question/Question.scss b/src/components/Questions/Question/Question.scss
similarity index 56%
rename from src/components/QuestionsWrapper/Question/Question.scss
rename to src/components/Questions/Question/Question.scss
index 9f10e19c..dbd46411 100644
--- a/src/components/QuestionsWrapper/Question/Question.scss
+++ b/src/components/Questions/Question/Question.scss
@@ -1,17 +1,28 @@
 @import '../../../assets/styles/partials/variables';
 .question {
   display: flex;
-  flex-flow: row nowrap;
+  flex-flow: row wrap;
   align-items: center;
   justify-content: start;
   height: 125px;
   background-color: $white;
   border: 1px solid $lightGrey;
+  &--extended {
+    align-items: flex-start;
+    height: auto;
+    .question__left {
+      width: 70%;
+      border: none;
+    }
+    .question__right {
+      padding-top: 28px;
+    }
+  }
   &__left {
     align-self: flex-start;
     width: 80%;
     height: 100%;
-    padding: 5px 30px;
+    padding: 10px 30px;
     border-right: 1px solid $lightGrey;
     cursor: pointer;
   }
@@ -25,7 +36,7 @@
   }
   &__caption {
     max-width: 70%;
-    margin: 10px 0 15px;
+    margin: 5px 0 10px;
     font-weight: 700;
     font-size: 18px;
   }
@@ -49,4 +60,27 @@
       font-size: 11px;
     }
   }
+  &__parameter {
+    margin: 10px 0;
+    text-align: left;
+    &-heading {
+      font-weight: 700;
+      font-size: 14px;
+      text-align: left;
+    }
+    &-label {
+      margin-bottom: 5px;
+      color: $primary;
+      font-size: 11px;
+    }
+    &-text {
+      color: $border;
+      font-size: 11px;
+    }
+  }
+  &__formula {
+    padding: 10px 30px 30px;
+    color: $border;
+    font-size: 11px;
+  }
 } 
\ No newline at end of file
diff --git a/src/components/Questions/Question/index.js b/src/components/Questions/Question/index.js
new file mode 100644
index 00000000..51415ce2
--- /dev/null
+++ b/src/components/Questions/Question/index.js
@@ -0,0 +1,98 @@
+import React from 'react';
+import propTypes from 'prop-types';
+import { NavLink } from 'react-router-dom';
+import { StartIcon } from '../../Icons';
+
+import styles from './Question.scss';
+
+const startBlock = () => (
+  <div className={styles.question__right}>
+    <div className={styles.question__start}>
+      <p className={styles['question__start-icon']}>
+        <StartIcon />
+      </p>
+      <p className={styles['question__start-label']}>
+      Начать новое голосование
+      </p>
+    </div>
+  </div>
+);
+
+const ParametersBlock = () => (
+  <div className={styles.question__right}>
+    <p className={styles['question__parameter-heading']}>Параметры</p>
+    <div className={styles.question__parameter}>
+      <p className={styles['question__parameter-label']}>Дата применения</p>
+      <p className={styles['question__parameter-text']}>
+      старое
+      </p>
+    </div>
+    <div className={styles.question__parameter}>
+      <p className={styles['question__parameter-label']}>Дата применения</p>
+      <p className={styles['question__parameter-text']}>
+      Начать
+      </p>
+    </div>
+    <div className={styles.question__parameter}>
+      <p className={styles['question__parameter-label']}>Дата применения</p>
+      <p className={styles['question__parameter-text']}>голосование</p>
+    </div>
+  </div>
+);
+
+const ShortDescription = () => (
+  <p className={styles.question__description}>
+    {`Иногда описания могут не влазить, потому что для важных вопросов 
+    нужно много описать, чтобы даже дурак все понял и принял правильное 
+    решение, тогда делаем что то типо того, ща еще чуть чуть чтобы прям
+    забить строчку эту и еще чуть чуть.`}
+  </p>
+);
+
+const FullDescription = () => (
+  <p className={styles.question__description}>
+    {`Иногда описания могут не влазить, потому что для важных вопросов 
+    нужно много описать, чтобы даже дурак все понял и принял правильное 
+    решение, тогда делаем что то типо того, ща еще чуть чуть чтобы прям
+    забить строчку эту и еще чуть чуть.`}
+    {`Иногда описания могут не влазить, потому что для важных вопросов 
+    нужно много описать, чтобы даже дурак все понял и принял правильное 
+    решение, тогда делаем что то типо того, ща еще чуть чуть чтобы прям
+    забить строчку эту и еще чуть чуть.`}
+    {`Иногда описания могут не влазить, потому что для важных вопросов 
+    нужно много описать, чтобы даже дурак все понял и принял правильное 
+    решение, тогда делаем что то типо того, ща еще чуть чуть чтобы прям
+    забить строчку эту и еще чуть чуть.`}
+  </p>
+);
+
+const FormulaBlock = () => (
+  <p className={styles.question__formula}>
+    Формула голосования: (group (0xD490af05Bf82eF6C6BA034B22D18c39B5D52Cc54)→condition (quorum=20%))
+  </p>
+);
+
+const Question = ({ id, extended }) => (
+  <div className={`${styles.question} ${extended ? styles['question--extended'] : ''}`}>
+    <NavLink className={styles.question__left} to={`/question/${id}`}>
+      <div>
+        <p className={styles.question__id}>{`#${id}`}</p>
+        <p className={styles.question__caption}>Я очень люблю писать рыбные заголовки</p>
+        {extended ? FullDescription() : ShortDescription()}
+      </div>
+    </NavLink>
+    {extended ? ParametersBlock() : startBlock()}
+    {extended ? FormulaBlock() : null}
+  </div>
+);
+
+Question.propTypes = {
+  id: propTypes.number.isRequired,
+  extended: propTypes.bool,
+};
+Question.defaultProps = {
+  extended: false,
+};
+
+
+export default Question;
diff --git a/src/components/QuestionsWrapper/Questions.scss b/src/components/Questions/Questions.scss
similarity index 68%
rename from src/components/QuestionsWrapper/Questions.scss
rename to src/components/Questions/Questions.scss
index 010b7ea5..be4cf472 100644
--- a/src/components/QuestionsWrapper/Questions.scss
+++ b/src/components/Questions/Questions.scss
@@ -1,3 +1,4 @@
+@import '../../assets/styles/partials/variables'; 
 .questions {
   margin: 0 auto;
   &__head {
@@ -11,6 +12,18 @@
       align-items: center;
       justify-content: space-between;
       width: 45%;
+      .btn {
+        svg {
+          path { 
+            fill: $white;
+          }
+        }
+        &:active {
+          path {
+            stroke: $white;
+          }
+        }
+      }
     }
     &-filters {
       display: flex;
@@ -26,6 +39,6 @@
     display: grid;
     grid-template-columns:1fr;
     row-gap: 10px;
-    overflow-y: a;
+    margin-bottom: 30px;
   }
 }
\ No newline at end of file
diff --git a/src/components/QuestionsWrapper/Questions.stories.js b/src/components/Questions/Questions.stories.js
similarity index 60%
rename from src/components/QuestionsWrapper/Questions.stories.js
rename to src/components/Questions/Questions.stories.js
index 953f6d92..4505c281 100644
--- a/src/components/QuestionsWrapper/Questions.stories.js
+++ b/src/components/Questions/Questions.stories.js
@@ -1,11 +1,11 @@
 import React from 'react';
-import QuestionsWrapper from '.';
-import Question from './Question/Question';
+import Questions from '.';
+import Question from './ShortQuestion';
 
 export default ({ title: 'Questions' });
 
 export const Wrapper = () => (
-  <QuestionsWrapper />
+  <Questions />
 );
 
 export const defaultQuestion = () => <Question />;
diff --git a/src/components/Questions/index.js b/src/components/Questions/index.js
index bb7e0ea0..4b8e2c50 100644
--- a/src/components/Questions/index.js
+++ b/src/components/Questions/index.js
@@ -1,7 +1,59 @@
-import React from 'react';
-import QuestionsWrapper from '../QuestionsWrapper';
+import React, { Component } from 'react';
+import Container from '../Container';
+import Button from '../Button/Button';
+import { CreateToken } from '../Icons';
+import Question from './Question';
+import styles from './Questions.scss';
+import SimpleDropdown from '../SimpleDropdown';
+import Footer from '../Footer';
 
-const Questions = () => (
-  <QuestionsWrapper />
-);
+class Questions extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {};
+  }
+
+  render() {
+    const options = [{
+      label: '1',
+      value: '1',
+    }, {
+      label: '2',
+      value: '2',
+    }, {
+      label: '3',
+      value: '3',
+    }];
+    const questions = [1, 2, 3, 4, 5, 6, 7, 8, 9];
+    return (
+      <Container className="container--small">
+        <div className={styles.questions}>
+          <div className={styles.questions__head}>
+            <div className={styles['questions__head-create']}>
+              <Button theme="white" icon={<CreateToken />}>
+              Создать группу вопросов
+              </Button>
+              <Button theme="white" icon={<CreateToken />}>
+              Создать вопрос
+              </Button>
+            </div>
+            <div className={styles['questions__head-filters']}>
+              <SimpleDropdown
+                options={options}
+              />
+            </div>
+          </div>
+          <div className={styles.questions__wrapper}>
+            {
+              questions.map((id) => (
+                <Question id={id} />
+              ))
+            }
+          </div>
+        </div>
+        <Footer />
+      </Container>
+    );
+  }
+}
 export default Questions;
diff --git a/src/components/QuestionsWrapper/Question/Question.js b/src/components/QuestionsWrapper/Question/Question.js
deleted file mode 100644
index d460c7f1..00000000
--- a/src/components/QuestionsWrapper/Question/Question.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import React from 'react';
-import propTypes from 'prop-types';
-import { NavLink } from 'react-router-dom';
-import { StartIcon } from '../../Icons';
-
-import styles from './Question.scss';
-
-const Question = ({ id }) => (
-  <div className={styles.question}>
-    <NavLink className={styles.question__left} to={`/question/${id}`}>
-      <div>
-        <p className={styles.question__id}>{`#${id}`}</p>
-        <p className={styles.question__caption}>Я очень люблю писать рыбные заголовки</p>
-        <p className={styles.question__description}>
-          {`Иногда описания могут не влазить, потому что для важных вопросов 
-          нужно много описать, чтобы даже дурак все понял и принял правильное 
-          решение, тогда делаем что то типо того, ща еще чуть чуть чтобы прям
-          забить строчку эту и еще чуть чуть.`}
-        </p>
-      </div>
-    </NavLink>
-    <div className={styles.question__right}>
-      <div className={styles.question__start}>
-        <p className={styles['question__start-icon']}>
-          <StartIcon />
-        </p>
-        <p className={styles['question__start-label']}>
-          Начать новое голосование
-        </p>
-      </div>
-    </div>
-  </div>
-);
-
-Question.propTypes = {
-  id: propTypes.number.isRequired,
-};
-
-export default Question;
diff --git a/src/components/QuestionsWrapper/index.js b/src/components/QuestionsWrapper/index.js
deleted file mode 100644
index b75fe6e5..00000000
--- a/src/components/QuestionsWrapper/index.js
+++ /dev/null
@@ -1,60 +0,0 @@
-import React, { Component } from 'react';
-import Container from '../Container';
-import { IconButton } from '../Button';
-import { CreateToken } from '../Icons';
-import Question from './Question/Question';
-import styles from './Questions.scss';
-import SimpleDropdown from '../SimpleDropdown';
-
-class QuestionsWrapper extends Component {
-  constructor(props) {
-    super(props);
-    this.state = {};
-  }
-
-  render() {
-    const options = [{
-      label: '1',
-      value: '1',
-    }, {
-      label: '1',
-      value: '1',
-    }, {
-      label: '1',
-      value: '1',
-    }];
-    const questions = [1, 2, 3, 4, 5, 6, 7, 8, 9];
-    return (
-      <Container className="container--small">
-        <div className={styles.questions}>
-          <div className={styles.questions__head}>
-            <div className={styles['questions__head-create']}>
-              <IconButton className="btn--white">
-                <CreateToken />
-              Создать группу вопросов
-              </IconButton>
-              <IconButton className="btn--white">
-                <CreateToken />
-              Создать вопрос
-              </IconButton>
-            </div>
-            <div className={styles['questions__head-filters']}>
-              <SimpleDropdown
-                options={options}
-              />
-            </div>
-          </div>
-          <div className={styles.questions__wrapper}>
-            {
-              questions.map((id) => (
-                <Question id={id} />
-              ))
-            }
-          </div>
-        </div>
-      </Container>
-    );
-  }
-}
-
-export default QuestionsWrapper;
diff --git a/src/components/Router/SimpleRouter.js b/src/components/Router/SimpleRouter.js
index 92eea738..65373a94 100644
--- a/src/components/Router/SimpleRouter.js
+++ b/src/components/Router/SimpleRouter.js
@@ -2,7 +2,7 @@ import React from 'react';
 import {
   MemoryRouter, Route, Switch,
 } from 'react-router-dom';
-import Login from '../Login';
+// import Login from '../Login';
 import CreateWallet from '../CreateWallet';
 import InputSeed from '../InputSeed';
 import ShowSeed from '../ShowSeed';
@@ -16,12 +16,14 @@ import ProjectUploading from '../ProjectUploading';
 import CreationAlert from '../CreationAlert';
 import DisplayUserInfo from '../DisplayUserInfo';
 import Header from '../Header';
+import Questions from '../Questions';
+import FullQuestion from '../Questions/FullQuestion';
 
 const SimpleRouter = () => (
   <MemoryRouter>
     <Header />
     <Switch>
-      <Route path="/" exact component={Login} />
+      <Route path="/" exact component={Questions} />
       <Route path="/create" exact component={CreateWallet} />
       <Route path="/showSeed" exact component={ShowSeed} />
       <Route path="/checkSeed" exact component={() => (<InputSeed recover={false} />)} />
@@ -38,6 +40,7 @@ const SimpleRouter = () => (
       <Route path="/createWithoutTokens" exact component={CreateNewProjectWithoutTokens} />
       <Route path="/uploadWithExistingTokens" exact component={() => (<ProjectUploading newTokens={false} />)} />
       <Route path="/uploadWithNewTokens" exact component={() => (<ProjectUploading newTokens />)} />
+      <Route path="/question/:id" exact component={FullQuestion} />
     </Switch>
   </MemoryRouter>
 );
diff --git a/src/components/SimpleDropdown/index.js b/src/components/SimpleDropdown/index.js
index 4279bf0a..28636a72 100644
--- a/src/components/SimpleDropdown/index.js
+++ b/src/components/SimpleDropdown/index.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import propTypes from 'prop-types';
-import { DropdownArrow } from '../Icons';
+import { DropdownArrowIcon } from '../Icons';
 import styles from '../Dropdown/Dropdown.scss';
 import DropdownOption from '../DropdownOption';
 
@@ -82,7 +82,7 @@ class SimpleDropdown extends Component {
           <span className="dropdown__selected" data-value={selectedValue}>
             {selectedLabel || 'Выберите' }
             <span className="dropdown__arrow">
-              <DropdownArrow />
+              <DropdownArrowIcon />
             </span>
           </span>
           <div className="dropdown__head-line" />

From 35a1c136a228db528951d8eacd675919abfbfee6 Mon Sep 17 00:00:00 2001
From: pavkahanov <pavkahanov@neos1.com>
Date: Wed, 4 Dec 2019 18:37:01 +0700
Subject: [PATCH 08/11] Continue uploading questions after app closing

---
 .../CreateNewProjectWithTokens/index.js       |  2 +-
 .../CreateNewProjectWithoutTokens/index.js    |  2 +-
 src/components/ProjectList/index.js           | 36 +++++++++++++++-
 src/components/ProjectUploading/index.js      | 43 ++++++++++++++++---
 src/components/Router/SimpleRouter.js         |  9 ++--
 src/config.json                               |  8 ++++
 .../ContractService/ContractService.js        |  9 ++--
 src/stores/AppStore/AppStore.js               | 25 +++++++++++
 src/stores/UserStore/UserStore.js             |  1 +
 9 files changed, 117 insertions(+), 18 deletions(-)

diff --git a/src/components/CreateNewProjectWithTokens/index.js b/src/components/CreateNewProjectWithTokens/index.js
index 1bdf36f5..f21b8cd1 100644
--- a/src/components/CreateNewProjectWithTokens/index.js
+++ b/src/components/CreateNewProjectWithTokens/index.js
@@ -149,7 +149,7 @@ class CreateNewProjectWithTokens extends Component {
   render() {
     const { steps } = this;
     const { currentStep, indicatorStep } = this.state;
-    if (currentStep === steps.uploading) return <Redirect to="/uploadWithExistingTokens" />;
+    if (currentStep === steps.uploading) return <Redirect to="/uploadProject" />;
     return (
       <Container>
         <div className={styles.form}>
diff --git a/src/components/CreateNewProjectWithoutTokens/index.js b/src/components/CreateNewProjectWithoutTokens/index.js
index cc2286a7..cb371f0a 100644
--- a/src/components/CreateNewProjectWithoutTokens/index.js
+++ b/src/components/CreateNewProjectWithoutTokens/index.js
@@ -181,7 +181,7 @@ class CreateNewProjectWithoutTokens extends Component {
 
   render() {
     const { currentStep, indicatorStep } = this.state;
-    if (currentStep === 'uploading') return <Redirect to="/uploadWithNewTokens" />;
+    if (currentStep === 'uploading') return <Redirect to="/uploadProject" />;
     return (
       <Container>
         <div className={styles.form}>
diff --git a/src/components/ProjectList/index.js b/src/components/ProjectList/index.js
index 08f606f2..beeea7b4 100644
--- a/src/components/ProjectList/index.js
+++ b/src/components/ProjectList/index.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import propTypes from 'prop-types';
-import { NavLink } from 'react-router-dom';
+import { NavLink, Redirect } from 'react-router-dom';
 import { inject, observer } from 'mobx-react';
 import { withTranslation } from 'react-i18next';
 import Button from '../Button/Button';
@@ -17,7 +17,10 @@ import styles from '../Login/Login.scss';
 class ProjectList extends Component {
   constructor(props) {
     super(props);
-    this.state = {};
+    this.state = {
+      redirectToProject: false,
+      redirectToUploading: false,
+    };
   }
 
   componentDidMount() {
@@ -25,16 +28,42 @@ class ProjectList extends Component {
     appStore.readProjectList();
   }
 
+  gotoProject = (address) => {
+    const { appStore } = this.props;
+    appStore.gotoProject(address);
+    this.setState({ redirectToProject: true });
+  }
+
+  startUploading = (address) => {
+    const { appStore } = this.props;
+    appStore.setProjectAddress(address);
+    this.setState({ redirectToUploading: true });
+  }
+
+  checkProject = async (address) => {
+    const { appStore } = this.props;
+    const isQuestionsUploaded = await appStore.checkIsQuestionsUploaded(address);
+    // eslint-disable-next-line no-unused-expressions
+    isQuestionsUploaded
+      ? this.gotoProject(address)
+      : this.startUploading(address);
+  }
+
   render() {
     const { appStore: { projectList }, t } = this.props;
+    const { redirectToProject, redirectToUploading } = this.state;
     const projects = projectList.map((project, index) => (
       <Button
         theme="project"
         key={`Button-${index + 1}`}
+        onClick={() => { this.checkProject(project.address); }}
       >
         {project.name.replace(/([!@#$%^&*()_+\-=])+/g, ' ')}
       </Button>
     ));
+
+    if (redirectToProject) return <Redirect to="/questions" />;
+    if (redirectToUploading) return <Redirect to="/uploadQuestions" />;
     return (
       <Container>
         <div className={`${styles.form} ${styles['form--wide']}`}>
@@ -62,6 +91,9 @@ ProjectList.propTypes = {
   appStore: propTypes.shape({
     readProjectList: propTypes.func.isRequired,
     projectList: propTypes.arrayOf(propTypes.object).isRequired,
+    checkIsQuestionsUploaded: propTypes.func.isRequired,
+    gotoProject: propTypes.func.isRequired,
+    setProjectAddress: propTypes.func.isRequired,
   }).isRequired,
   t: propTypes.func.isRequired,
 };
diff --git a/src/components/ProjectUploading/index.js b/src/components/ProjectUploading/index.js
index c323c6e6..418163d0 100644
--- a/src/components/ProjectUploading/index.js
+++ b/src/components/ProjectUploading/index.js
@@ -37,11 +37,34 @@ class ProjectUploading extends Component {
   componentDidMount() {
     const { steps } = this;
     const {
-      appStore, appStore: { deployArgs, name }, userStore: { password }, t,
+      appStore, appStore: { deployArgs, projectAddress }, userStore: { password }, type,
     } = this.props;
-    this.setState({
-      step: steps.sending,
-    });
+
+    switch (type) {
+      case ('project'):
+        this.setState({
+          step: steps.sending,
+        });
+        this.deployProject(deployArgs, password);
+        break;
+      case ('question'):
+        this.setState({
+          step: steps.questions,
+        });
+        appStore.deployQuestions(projectAddress).then(() => {
+          this.setState({
+            uploading: false,
+          });
+        });
+        break;
+      default:
+        break;
+    }
+  }
+
+  deployProject(deployArgs, password) {
+    const { steps } = this;
+    const { appStore, appStore: { name }, t } = this.props;
 
     appStore.deployContract('project', deployArgs, password)
       .then((txHash) => {
@@ -55,6 +78,7 @@ class ProjectUploading extends Component {
           this.setState({
             step: steps.questions,
           });
+          appStore.setProjectAddress(receipt.contractAddress);
           appStore.addProjectToList({ name, address: receipt.contractAddress });
           appStore.deployQuestions(receipt.contractAddress).then(() => {
             this.setState({
@@ -126,9 +150,11 @@ const AlertBlock = withTranslation()(({ t }) => (
         {t('headings:projectCreated.subheading.1')}
       </span>
     </Heading>
-    <Button theme="black" width="310" icon={<Login />} type="submit">
-      {t('buttons:toCreatedProject')}
-    </Button>
+    <NavLink to="/questions">
+      <Button theme="black" width="310" icon={<Login />} type="submit">
+        {t('buttons:toCreatedProject')}
+      </Button>
+    </NavLink>
     <NavLink to="/projects">
       <Button theme="link" type="submit">
         {t('buttons:otherProject')}
@@ -147,11 +173,14 @@ ProjectUploading.propTypes = {
     addProjectToList: propTypes.func.isRequired,
     deployQuestions: propTypes.func.isRequired,
     displayAlert: propTypes.func.isRequired,
+    projectAddress: propTypes.func.isRequired,
+    setProjectAddress: propTypes.func.isRequired,
   }).isRequired,
   userStore: propTypes.shape({
     password: propTypes.string.isRequired,
   }).isRequired,
   t: propTypes.func.isRequired,
+  type: propTypes.string.isRequired,
 };
 
 Progress.propTypes = {
diff --git a/src/components/Router/SimpleRouter.js b/src/components/Router/SimpleRouter.js
index 65373a94..13cc0ab1 100644
--- a/src/components/Router/SimpleRouter.js
+++ b/src/components/Router/SimpleRouter.js
@@ -2,7 +2,7 @@ import React from 'react';
 import {
   MemoryRouter, Route, Switch,
 } from 'react-router-dom';
-// import Login from '../Login';
+import Login from '../Login';
 import CreateWallet from '../CreateWallet';
 import InputSeed from '../InputSeed';
 import ShowSeed from '../ShowSeed';
@@ -23,7 +23,7 @@ const SimpleRouter = () => (
   <MemoryRouter>
     <Header />
     <Switch>
-      <Route path="/" exact component={Questions} />
+      <Route path="/" exact component={Login} />
       <Route path="/create" exact component={CreateWallet} />
       <Route path="/showSeed" exact component={ShowSeed} />
       <Route path="/checkSeed" exact component={() => (<InputSeed recover={false} />)} />
@@ -38,8 +38,9 @@ const SimpleRouter = () => (
       <Route path="/newProject" exact component={CreateNewProject} />
       <Route path="/createWithTokens" exact component={CreateNewProjectWithTokens} />
       <Route path="/createWithoutTokens" exact component={CreateNewProjectWithoutTokens} />
-      <Route path="/uploadWithExistingTokens" exact component={() => (<ProjectUploading newTokens={false} />)} />
-      <Route path="/uploadWithNewTokens" exact component={() => (<ProjectUploading newTokens />)} />
+      <Route path="/uploadProject" exact component={() => (<ProjectUploading type="project" />)} />
+      <Route path="/uploadQuestions" exact component={() => (<ProjectUploading type="question" />)} />
+      <Route path="/questions" exact component={Questions} />
       <Route path="/question/:id" exact component={FullQuestion} />
     </Switch>
   </MemoryRouter>
diff --git a/src/config.json b/src/config.json
index c19978c1..43132b02 100644
--- a/src/config.json
+++ b/src/config.json
@@ -12,6 +12,14 @@
 		{
 			"name": "T3st",
 			"address": "0xACA55c33D67d549CacA4f700D0319B865D8E0FC5"
+		},
+		{
+			"name": "wewqeq",
+			"address": "0x6849E1564Fb556048E102bC6A023C38AfE32859c"
+		},
+		{
+			"name": "T3sting!",
+			"address": "0x95D2CDb2Ed2bC5Bd687EE5856Caaa8B1F958a6c4"
 		}
 	]
 }
\ No newline at end of file
diff --git a/src/services/ContractService/ContractService.js b/src/services/ContractService/ContractService.js
index dd2a68e0..95971f21 100644
--- a/src/services/ContractService/ContractService.js
+++ b/src/services/ContractService/ContractService.js
@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 /* eslint-disable no-unused-vars */
 import browserSolc from 'browser-solc';
 import { BN } from 'ethereumjs-util';
@@ -191,15 +192,17 @@ class ContractService {
           gasLimit: 8000000,
           value: '0x0',
         };
-
         return new Promise((resolve) => {
           Web3Service.createTxData(address, rawTx, maxGasPrice)
+            // eslint-disable-next-line max-len
             .then((formedTx) => userStore.singTransaction(formedTx, password))
+            // eslint-disable-next-line no-console
             .then((signedTx) => Web3Service.sendSignedTransaction(`0x${signedTx}`))
+            // eslint-disable-next-line no-console
             .then((txHash) => resolve(txHash));
         });
-      }
-      return Promise.reject();
+      // eslint-disable-next-line prefer-promise-reject-errors
+      } return Promise.reject('WATAFAk');
     });
   }
 
diff --git a/src/stores/AppStore/AppStore.js b/src/stores/AppStore/AppStore.js
index 27400adc..3d8b8d5b 100644
--- a/src/stores/AppStore/AppStore.js
+++ b/src/stores/AppStore/AppStore.js
@@ -27,6 +27,8 @@ class AppStore {
 
   @observable userInProject = false;
 
+  @observable _projectAddress = '';
+
   constructor(rootStore) {
     this.rootStore = rootStore;
     this.readWalletList();
@@ -152,6 +154,16 @@ class AppStore {
     fs.writeFileSync(path.join(ROOT_DIR, './config.json'), JSON.stringify(config, null, '\t'));
   }
 
+  async checkIsQuestionsUploaded(address) {
+    const { Web3Service, contractService } = this.rootStore;
+    const abi = JSON.parse(fs.readFileSync(path.join(PATH_TO_CONTRACTS, './Voter.abi'), 'utf8'));
+    const contract = Web3Service.createContractInstance(abi);
+    contract.options.address = address;
+    contractService.setContract(contract);
+    const { countOfUploaded, totalCount } = await contractService.checkQuestions();
+    return countOfUploaded > totalCount;
+  }
+
   /**
    * Check transaction receipt
    * @param {string} hash Transaction hash
@@ -186,6 +198,10 @@ class AppStore {
     return this.userInProject;
   }
 
+  @computed get projectAddress() {
+    return this._projectAddress;
+  }
+
   @action setProjectName(value) {
     this.name = value;
   }
@@ -193,6 +209,15 @@ class AppStore {
   @action setDeployArgs(value) {
     this.deployArgs = value;
   }
+
+  @action gotoProject(address) {
+    this.setProjectAddress(address);
+    this.userInProject = true;
+  }
+
+  @action setProjectAddress(value) {
+    this._projectAddress = value;
+  }
 }
 
 export default AppStore;
diff --git a/src/stores/UserStore/UserStore.js b/src/stores/UserStore/UserStore.js
index 2c8c684c..deec6205 100644
--- a/src/stores/UserStore/UserStore.js
+++ b/src/stores/UserStore/UserStore.js
@@ -118,6 +118,7 @@ class UserStore {
         this.privateKey = data.privateKey;
         this.setEncryptedWallet(JSON.parse(data.wallet));
         this.authorized = true;
+        this.setPassword(password);
         Promise.resolve();
       }).catch(() => {
         appStore.displayAlert(i18n.t('errors:wrongPassword'), 3000);

From e4e5774dcd8e6d9a630e41adf45f22c6e17203f0 Mon Sep 17 00:00:00 2001
From: pavkahanov <pavkahanov@neos1.com>
Date: Thu, 5 Dec 2019 09:15:09 +0700
Subject: [PATCH 09/11] jsdoc comment

---
 src/stores/AppStore/AppStore.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/stores/AppStore/AppStore.js b/src/stores/AppStore/AppStore.js
index 3d8b8d5b..bfca6780 100644
--- a/src/stores/AppStore/AppStore.js
+++ b/src/stores/AppStore/AppStore.js
@@ -154,6 +154,11 @@ class AppStore {
     fs.writeFileSync(path.join(ROOT_DIR, './config.json'), JSON.stringify(config, null, '\t'));
   }
 
+  /**
+   * checks count of uploaded Questions
+   * @param {string} address address of project
+   * @returns {boolean} countOfUploaded > totalQuestionCount
+   */
   async checkIsQuestionsUploaded(address) {
     const { Web3Service, contractService } = this.rootStore;
     const abi = JSON.parse(fs.readFileSync(path.join(PATH_TO_CONTRACTS, './Voter.abi'), 'utf8'));

From 6102ad354f2d8e9fb1d56ebf2fae63958e00598c Mon Sep 17 00:00:00 2001
From: pavkahanov <pavkahanov@neos1.com>
Date: Thu, 5 Dec 2019 09:19:51 +0700
Subject: [PATCH 10/11] small dd fixes

---
 src/components/SimpleDropdown/index.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/components/SimpleDropdown/index.js b/src/components/SimpleDropdown/index.js
index 28636a72..7b5b6007 100644
--- a/src/components/SimpleDropdown/index.js
+++ b/src/components/SimpleDropdown/index.js
@@ -71,8 +71,6 @@ class SimpleDropdown extends Component {
         select={this.handleSelect}
       />
     ));
-    // eslint-disable-next-line no-console
-
 
     return (
       <div className={`${styles.dropdown} ${opened ? 'dropdown--opened' : ''}`} ref={this.setWrapperRef}>
@@ -97,12 +95,10 @@ class SimpleDropdown extends Component {
 
 SimpleDropdown.propTypes = {
   children: propTypes.element,
-  options: propTypes.arrayOf(propTypes.object).isRequired,
-  // eslint-disable-next-line react/forbid-prop-types
+  options: propTypes.arrayOf(propTypes.shape({})).isRequired,
   onSelect: propTypes.func,
-  // eslint-disable-next-line react/forbid-prop-types
-
 };
+
 SimpleDropdown.defaultProps = {
   children: '',
   onSelect: () => false,

From c4a0714d3c99ff17d922111e4e9a3e9802c7731e Mon Sep 17 00:00:00 2001
From: pavkahanov <pavkahanov@neos1.com>
Date: Thu, 5 Dec 2019 13:29:34 +0700
Subject: [PATCH 11/11] added some translations

---
 src/components/Questions/Question/index.js |  4 +++-
 src/components/Questions/index.js          | 12 ++++++++++--
 src/components/Router/SimpleRouter.js      |  4 ++--
 src/locales/ENG/buttons.js                 |  3 +++
 src/locales/RUS/buttons.js                 |  3 +++
 5 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/components/Questions/Question/index.js b/src/components/Questions/Question/index.js
index 51415ce2..07eb65ba 100644
--- a/src/components/Questions/Question/index.js
+++ b/src/components/Questions/Question/index.js
@@ -5,6 +5,7 @@ import { StartIcon } from '../../Icons';
 
 import styles from './Question.scss';
 
+// eslint-disable-next-line no-unused-vars
 const startBlock = () => (
   <div className={styles.question__right}>
     <div className={styles.question__start}>
@@ -12,7 +13,7 @@ const startBlock = () => (
         <StartIcon />
       </p>
       <p className={styles['question__start-label']}>
-      Начать новое голосование
+        Начать новое голосование
       </p>
     </div>
   </div>
@@ -72,6 +73,7 @@ const FormulaBlock = () => (
   </p>
 );
 
+// eslint-disable-next-line no-unused-vars
 const Question = ({ id, extended }) => (
   <div className={`${styles.question} ${extended ? styles['question--extended'] : ''}`}>
     <NavLink className={styles.question__left} to={`/question/${id}`}>
diff --git a/src/components/Questions/index.js b/src/components/Questions/index.js
index 4b8e2c50..398e5ee9 100644
--- a/src/components/Questions/index.js
+++ b/src/components/Questions/index.js
@@ -1,4 +1,6 @@
 import React, { Component } from 'react';
+import propTypes from 'prop-types';
+import { withTranslation } from 'react-i18next';
 import Container from '../Container';
 import Button from '../Button/Button';
 import { CreateToken } from '../Icons';
@@ -7,6 +9,7 @@ import styles from './Questions.scss';
 import SimpleDropdown from '../SimpleDropdown';
 import Footer from '../Footer';
 
+@withTranslation()
 class Questions extends Component {
   constructor(props) {
     super(props);
@@ -14,6 +17,7 @@ class Questions extends Component {
   }
 
   render() {
+    const { t } = this.props;
     const options = [{
       label: '1',
       value: '1',
@@ -31,10 +35,10 @@ class Questions extends Component {
           <div className={styles.questions__head}>
             <div className={styles['questions__head-create']}>
               <Button theme="white" icon={<CreateToken />}>
-              Создать группу вопросов
+                {t('buttons:createQuestionGroup')}
               </Button>
               <Button theme="white" icon={<CreateToken />}>
-              Создать вопрос
+                {t('buttons:createQuestion')}
               </Button>
             </div>
             <div className={styles['questions__head-filters']}>
@@ -56,4 +60,8 @@ class Questions extends Component {
     );
   }
 }
+
+Questions.propTypes = {
+  t: propTypes.func.isRequired,
+};
 export default Questions;
diff --git a/src/components/Router/SimpleRouter.js b/src/components/Router/SimpleRouter.js
index 13cc0ab1..d713a4b2 100644
--- a/src/components/Router/SimpleRouter.js
+++ b/src/components/Router/SimpleRouter.js
@@ -2,7 +2,7 @@ import React from 'react';
 import {
   MemoryRouter, Route, Switch,
 } from 'react-router-dom';
-import Login from '../Login';
+// import Login from '../Login';
 import CreateWallet from '../CreateWallet';
 import InputSeed from '../InputSeed';
 import ShowSeed from '../ShowSeed';
@@ -23,7 +23,7 @@ const SimpleRouter = () => (
   <MemoryRouter>
     <Header />
     <Switch>
-      <Route path="/" exact component={Login} />
+      <Route path="/" exact component={Questions} />
       <Route path="/create" exact component={CreateWallet} />
       <Route path="/showSeed" exact component={ShowSeed} />
       <Route path="/checkSeed" exact component={() => (<InputSeed recover={false} />)} />
diff --git a/src/locales/ENG/buttons.js b/src/locales/ENG/buttons.js
index 7303b775..5279cce9 100644
--- a/src/locales/ENG/buttons.js
+++ b/src/locales/ENG/buttons.js
@@ -17,5 +17,8 @@ const buttons = {
   withTokens: 'Connect contract and create project',
   withoutTokens: 'Create new contract and project',
   toWallets: 'To wallets',
+  createQuestion: 'Create question',
+  createQuestionGroup: 'Create group of questions',
+  startNewVoting: 'Start new voting',
 };
 export default buttons;
diff --git a/src/locales/RUS/buttons.js b/src/locales/RUS/buttons.js
index 0dba007a..67bf4fd3 100644
--- a/src/locales/RUS/buttons.js
+++ b/src/locales/RUS/buttons.js
@@ -17,5 +17,8 @@ const buttons = {
   withTokens: 'Подключить контракт и создать проект',
   withoutTokens: 'Создать новые токены и проект',
   toWallets: 'К выбору кошелька',
+  createQuestion: 'Создать вопрос',
+  createQuestionGroup: 'Создать группу воросов',
+  startNewVoting: 'Начать новое голосование',
 };
 export default buttons;