-
1
-
-
Довольны ли вы качеством наших блюд?
-
-
+
+
onSelect(id)}>
+ {number}
+ {circle}
+ {title}
+
+
onMove('up', id)}>
+
onMove('down', id)}>
);
}
diff --git a/src/admin/components/AdminEditor/Question.sass b/src/admin/components/AdminEditor/Question.sass
index 75127e8..74d2cd2 100644
--- a/src/admin/components/AdminEditor/Question.sass
+++ b/src/admin/components/AdminEditor/Question.sass
@@ -2,17 +2,22 @@
.question
position: relative
- white-space: nowrap
- padding: calc($h * .5) $h
margin-left: -$h
background: transparent
transition: background .25s
- .number
- color: $gray
+ .content
+ cursor: pointer
+ white-space: nowrap
+ overflow: hidden
+ text-overflow: ellipsis
+ padding: calc($h * .5) $h
- .title
- font-size: calc($f * 1.25)
+ .number
+ color: $gray
+
+ .title
+ font-size: calc($f * 1.25)
.up,
.down
@@ -25,6 +30,12 @@
opacity: 0
background: $gray-light
border-radius: 50%
+ transition: background .25s
+ cursor: pointer
+
+ &:hover
+ background: $brand-primary
+ color: #fff
.down
bottom: calc(-$h * .5)
@@ -34,6 +45,7 @@
&:hover
background: rgba(30,30,30,.05)
+ z-index: 2
.up,
.down
@@ -46,3 +58,15 @@
&:last-of-type
.down
display: none
+
+
+.active
+ background: $brand-primary
+ color: #fff
+
+ &:hover
+ background: $brand-primary
+
+ .up,
+ .down
+ color: $text-color
diff --git a/src/admin/components/AdminEditor/QuestionsList.jsx b/src/admin/components/AdminEditor/QuestionsList.jsx
new file mode 100644
index 0000000..ecafdcf
--- /dev/null
+++ b/src/admin/components/AdminEditor/QuestionsList.jsx
@@ -0,0 +1,68 @@
+import React, { Component, PropTypes } from 'react';
+import { intlShape, injectIntl, defineMessages } from 'react-intl';
+
+import { Btn, Space } from 'ui';
+import Question from './Question';
+
+const messages = defineMessages({
+ title: {
+ id: 'Quiz questions',
+ defaultMessage: 'Quiz questions',
+ },
+ btnAddQuestion: {
+ id: 'Add another question',
+ defaultMessage: 'Add another question',
+ },
+ emptyQuiz: {
+ id: 'There are no questions in this quiz. Go ahead, add the first one.',
+ defaultMessage: 'There are no questions in this quiz. Go ahead, add the first one.',
+ },
+});
+
+class QuestionsList extends Component {
+ static propTypes = {
+ intl: intlShape.isRequired,
+ switchQuestionsIndex: PropTypes.func.isRequired,
+ viewQuestionDetails: PropTypes.func.isRequired,
+ addQuestion: PropTypes.func.isRequired,
+ questions: PropTypes.array,
+ }
+
+ static defaultProps = {
+ questions: [],
+ switchQuestionsIndex: () => {},
+ viewQuestionDetails: () => {},
+ addQuestion: () => {},
+ }
+
+ render() {
+ const { formatMessage } = this.props.intl;
+ const { questions, viewQuestionDetails, switchQuestionsIndex, addQuestion } = this.props;
+
+ return (
+
+
+ {formatMessage(messages.title)}
+
+
+ { questions.length > 1 ?
+ questions.map((q, i) =>
+
+ )
+ :
+
{formatMessage(messages.emptyQuiz)}
+ }
+
+
+
+
+ );
+ }
+}
+
+export default injectIntl(QuestionsList);
diff --git a/src/admin/components/AdminEditor/SuggestToSave.jsx b/src/admin/components/AdminEditor/SuggestToSave.jsx
new file mode 100644
index 0000000..e577bfc
--- /dev/null
+++ b/src/admin/components/AdminEditor/SuggestToSave.jsx
@@ -0,0 +1,43 @@
+import React, { Component, PropTypes } from 'react';
+import css from 'react-css-modules';
+import { intlShape, injectIntl, defineMessages } from 'react-intl';
+import cx from 'classnames';
+
+import { Btn } from 'ui';
+
+import styles from './SuggestToSave.sass';
+
+const messages = defineMessages({
+ btnTitle: {
+ id: 'Save them',
+ defaultMessage: 'Save them',
+ },
+ btnComment: {
+ id: 'You\'ve made some changes.',
+ defaultMessage: 'You\'ve made some changes.',
+ },
+});
+
+class SuggestToSave extends Component {
+ static propTypes = {
+ intl: intlShape.isRequired,
+ visible: PropTypes.bool.isRequired,
+ onSave: PropTypes.func.isRequired,
+ }
+
+ render() {
+ const {formatMessage} = this.props.intl;
+ const {visible, onSave} = this.props;
+ const styles = cx({
+ container: true,
+ visible: visible,
+ });
+ return (
+
+ {formatMessage(messages.btnComment)}
+
+ );
+ }
+}
+
+export default injectIntl(css(SuggestToSave, styles, {allowMultiple: true}));
diff --git a/src/admin/components/AdminEditor/SuggestToSave.sass b/src/admin/components/AdminEditor/SuggestToSave.sass
new file mode 100644
index 0000000..e3cd62b
--- /dev/null
+++ b/src/admin/components/AdminEditor/SuggestToSave.sass
@@ -0,0 +1,19 @@
+@import "ui/styles/variables.sass"
+
+.container
+ position: fixed
+ left: 0
+ bottom: 0
+ width: 100%
+ transform: translateY(100%)
+ opacity: 0
+ transition: all .35s ease
+ padding: $h
+ text-align: right
+ background: #fff
+ z-index: 1000
+ box-shadow: 0 -2px 5px -2px rgba(60, 60, 60, .45)
+
+ &.visible
+ opacity: 1
+ transform: translateY(0)
diff --git a/src/admin/components/AdminStatistics/AdminStatistics.jsx b/src/admin/components/AdminStatistics/AdminStatistics.jsx
index 10f64fa..4b7f224 100644
--- a/src/admin/components/AdminStatistics/AdminStatistics.jsx
+++ b/src/admin/components/AdminStatistics/AdminStatistics.jsx
@@ -1,6 +1,7 @@
import React, { Component } from 'react';
import css from 'react-css-modules';
import moment from 'moment';
+import { flatten } from 'lodash';
import styles from './AdminStatistics.sass';
import { Btn, Dropdown } from 'ui';
@@ -11,11 +12,14 @@ import Feedback from './Feedback';
class AdminStatistics extends Component {
state = {
+ feedbacks: feedbacksMok,
dateFrom: moment().subtract(7, 'days'),
dateTo: moment(),
}
render() {
+ console.log(prepareFeedbacks(this.state.feedbacks));
+
return (
@@ -35,3 +39,82 @@ class AdminStatistics extends Component {
}
}
export default css(AdminStatistics, styles, {allowMultiple: true});
+
+function prepareFeedbacks(feedbacks) {
+ let answers = [];
+ if (feedbacks && feedbacks.length > 1) {
+ answers = flatten(feedbacks.map(f =>
+ f.answers.map(a => ({
+ question: a.question.title,
+ answer: a.answer,
+ }))
+ ));
+ }
+ return answers;
+}
+
+
+const feedbacksMok = [
+ {
+ id: 'f1',
+ customer: {
+ id: 'c1',
+ email: '',
+ phone: '89234553434',
+ },
+ answers: [
+ {
+ question: {
+ title: 'Как сегодня дела со скоростью обслуживания?',
+ subtitle: '',
+ type: 'QuestionOneOfMany',
+ },
+ answer: 'все очень оперативно',
+ },
+ {
+ question: {
+ title: 'А как оценим работу и дружелюбность наших кассиров?',
+ subtitle: '',
+ type: 'QuestionOneOfMany',
+ },
+ answer: 'без энтузиазма',
+ },
+ {
+ question: {
+ title: 'Как вы оцените чистоту и порядок на месте?',
+ subtitle: '',
+ type: 'QuestionOneOfMany',
+ },
+ answer: 'все блестит и сверкает',
+ },
+ ],
+ createdAt: 'Fri Apr 22 2016 00:44:13 GMT+0600 (NOVT)',
+ },
+ {
+ id: 'f2',
+ customer: {
+ id: 'c2',
+ email: '',
+ phone: '89234553435',
+ },
+ answers: [
+ {
+ question: {
+ title: 'Как сегодня дела со скоростью обслуживания?',
+ subtitle: '',
+ type: 'QuestionOneOfMany',
+ },
+ answer: 'можно и побыстрее',
+ },
+ {
+ question: {
+ title: 'А как оценим работу и дружелюбность наших кассиров?',
+ subtitle: '',
+ type: 'QuestionOneOfMany',
+ },
+ answer: 'без энтузиазма',
+ },
+ ],
+ createdAt: 'Fri Apr 22 2016 00:43:03 GMT+0600 (NOVT)',
+ },
+];
diff --git a/src/admin/components/Login/Login.json b/src/admin/components/Login/Login.json
deleted file mode 100644
index dfcc6d3..0000000
--- a/src/admin/components/Login/Login.json
+++ /dev/null
@@ -1,6 +0,0 @@
-[
- {
- "id": "Sign in to your account",
- "defaultMessage": "Sign in to your account"
- }
-]
\ No newline at end of file
diff --git a/src/admin/components/Navbar/Navbar.json b/src/admin/components/Navbar/Navbar.json
deleted file mode 100644
index 14abf8c..0000000
--- a/src/admin/components/Navbar/Navbar.json
+++ /dev/null
@@ -1,6 +0,0 @@
-[
- {
- "id": "Log out",
- "defaultMessage": "Log out"
- }
-]
\ No newline at end of file
diff --git a/src/admin/index.js b/src/admin/index.js
index d73b303..eaf5a60 100644
--- a/src/admin/index.js
+++ b/src/admin/index.js
@@ -9,10 +9,7 @@ import Admin from './components/Admin/Admin';
import AdminStatistics from './components/AdminStatistics/AdminStatistics';
import AdminEditor from './components/AdminEditor/AdminEditor';
-const messages = {
- 'Sign in to your account': 'Войти в аккаунт',
- 'Your question...': 'Ваш вопрос...',
-};
+import messages from '../translation-ru';
const mountNode = document.getElementById('root');
ReactDOM.render(
diff --git a/src/translation-default.js b/src/translation-default.js
new file mode 100644
index 0000000..7b04213
--- /dev/null
+++ b/src/translation-default.js
@@ -0,0 +1,16 @@
+module.exports = {
+ "Type: One of many": "Type: One of many",
+ "Answers": "Answers",
+ "Your question...": "Your question...",
+ "Some additional info or comments (optional)": "Some additional info or comments (optional)",
+ "Show question to the client": "Show question to the client",
+ "An answer var": "An answer var",
+ "Add answer": "Add answer",
+ "Quiz questions": "Quiz questions",
+ "Add another question": "Add another question",
+ "There are no questions in this quiz. Go ahead, add the first one.": "There are no questions in this quiz. Go ahead, add the first one.",
+ "Save them": "Save them",
+ "You've made some changes.": "You've made some changes.",
+ "Sign in to your account": "Sign in to your account",
+ "Log out": "Log out"
+}
\ No newline at end of file
diff --git a/src/translation-ru.js b/src/translation-ru.js
new file mode 100644
index 0000000..6c0a726
--- /dev/null
+++ b/src/translation-ru.js
@@ -0,0 +1,16 @@
+module.exports = {
+ "Type: One of many": "Тип: один вариант из нескольких",
+ "Answers": "Ответы",
+ "Your question...": "Ваш вопрос...",
+ "Some additional info or comments (optional)": "Подробное разъяснение вопроса (не обязательно)",
+ "Show question to the client": "Показывать вопрос клиенту?",
+ "An answer var": "Вариант ответа",
+ "Add answer": "Добавить вариант",
+ "Quiz questions": "Вопросы",
+ "Add another question": "Добавить вопрос",
+ "There are no questions in this quiz. Go ahead, add the first one.": "There are no questions in this quiz. Go ahead, add the first one.",
+ "Save them": "Сохранить",
+ "You've made some changes.": "Вы внесли изменения",
+ "Sign in to your account": "Войти в свой аккаунт",
+ "Log out": "Выйти"
+}