From b5f00835a87c324fc9021d31cdfe3ad0ff5704a7 Mon Sep 17 00:00:00 2001 From: Maxim Filippov Date: Mon, 1 Apr 2019 21:57:06 +0300 Subject: [PATCH] Poll form --- .../poll/poll_container/poll_container.vue | 83 +++++++++++++++++++ src/components/poll/poll_icon/poll_icon.vue | 18 ++++ .../post_status_form/post_status_form.js | 6 +- .../post_status_form/post_status_form.vue | 3 +- src/i18n/en.json | 7 +- 5 files changed, 114 insertions(+), 3 deletions(-) create mode 100644 src/components/poll/poll_container/poll_container.vue create mode 100644 src/components/poll/poll_icon/poll_icon.vue diff --git a/src/components/poll/poll_container/poll_container.vue b/src/components/poll/poll_container/poll_container.vue new file mode 100644 index 00000000..9f420fd2 --- /dev/null +++ b/src/components/poll/poll_container/poll_container.vue @@ -0,0 +1,83 @@ + + + + + diff --git a/src/components/poll/poll_icon/poll_icon.vue b/src/components/poll/poll_icon/poll_icon.vue new file mode 100644 index 00000000..9bbadf2c --- /dev/null +++ b/src/components/poll/poll_icon/poll_icon.vue @@ -0,0 +1,18 @@ + + + diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js index 229aefb7..d66ab947 100644 --- a/src/components/post_status_form/post_status_form.js +++ b/src/components/post_status_form/post_status_form.js @@ -1,6 +1,8 @@ import statusPoster from '../../services/status_poster/status_poster.service.js' import MediaUpload from '../media_upload/media_upload.vue' import EmojiInput from '../emoji-input/emoji-input.vue' +import PollContainer from '../poll/poll_container/poll_container.vue' +import PollIcon from '../poll/poll_icon/poll_icon.vue' import fileTypeService from '../../services/file_type/file_type.service.js' import Completion from '../../services/completion/completion.js' import { take, filter, reject, map, uniqBy } from 'lodash' @@ -30,7 +32,9 @@ const PostStatusForm = { ], components: { MediaUpload, - EmojiInput + EmojiInput, + PollContainer, + PollIcon }, mounted () { this.resize(this.$refs.textarea) diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue index 9f9f16ba..784ca6f4 100644 --- a/src/components/post_status_form/post_status_form.vue +++ b/src/components/post_status_form/post_status_form.vue @@ -71,9 +71,10 @@ +
- +

{{ charactersLeft }}

{{ charactersLeft }}

diff --git a/src/i18n/en.json b/src/i18n/en.json index c501c6a7..0446ca74 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -66,6 +66,10 @@ "repeated_you": "repeated your status", "no_more_notifications": "No more notifications" }, + "polls": { + "add_option": "Add Option", + "option": "Option" + }, "post_status": { "new_status": "Post new status", "account_not_locked_warning": "Your account is not {0}. Anyone can follow you to view your follower-only posts.", @@ -415,7 +419,8 @@ "repeat": "Repeat", "reply": "Reply", "favorite": "Favorite", - "user_settings": "User Settings" + "user_settings": "User Settings", + "poll": "Add Poll" }, "upload":{ "error": {