89 Commits

Author SHA1 Message Date
Robert Schäfer
0637d97648 Merge remote-tracking branch 'origin/master' into 2019/kw15/User_can_change_its_username_to_emptystring 2019-05-07 14:09:10 +02:00
Robert Schäfer
b8cecd7fe3
Merge pull request #536 from Human-Connection/352-add-authorship-to-comments
Add authorship to comments at creation
2019-05-07 12:03:29 +02:00
Robert Schäfer
4097f0ed82
Merge pull request #452 from Human-Connection/451-lokalise-unlocalised-texts
[WIP] 451 lokalise unlocalised texts
2019-05-06 23:10:00 +02:00
Robert Schäfer
f27dca504b Refactor mixin with computed property
@ulfgebhardt I refactored the mixin because it's not enough code to
justify the additional complexity. If it's just two lines of code, I
find it the best solution to use a computed property.

You can use components and computed properties excessively, they tend to
be easier to maintain in the long run.
2019-05-06 22:59:25 +02:00
Matt Rider
957d894322 Start writing component test
- restructured directories
2019-05-03 11:18:14 -03:00
Matt Rider
40f5b6acd5 Extract CommentsList component
- this allows to Query for comments by Post
2019-05-02 21:03:31 -03:00
Matt Rider
346158da7f Update to use autogenerated Comment Query
- using the custom CommentByPost Query was not returning the author of the Post, therefore the users avatar was not showing up
- there are some weird bugs with the comments, if you dblclick on the button, two comments with the same content are created
- sometimes the comments appear as the bottom of the list, sometimes they appear three comments from the bottom(?)
2019-05-02 19:59:35 -03:00
ad05dcf735
frontend tests, backend tests 2019-05-02 17:47:34 +02:00
0be2891858
make email a required field for user, tests for front- & backend 2019-05-02 16:17:16 +02:00
Matt Rider
94384a7608 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 260-add-comment-form 2019-04-29 14:57:46 -03:00
Matt Rider
7181f03fdf Fix flaky cypress test 2019-04-27 18:00:37 -03:00
Matt Rider
30d0ff3cc7 Search for button with text "Comment" in cypress test 2019-04-26 11:31:18 -03:00
Matt Rider
5891129662 Ordered comments like alpha, move HcCommentForm, mobile responsive
- in the first instance, we will be importing posts/comments from the alpha, so to maintain consistency, we've ordered them alike. In the future, we could support user choice of order.
- Gives more space for HcCommentForm, user can see comments added to list, helps with mobile responsiveness

Co-authored-by: Tirokk <wolle.huss@pjannto.com>
Co-authored-by: Mike Aono <aonomike@gmail.com>
2019-04-26 08:57:29 -03:00
Matt Rider
c387760046 Extract CommentForm component
- Cypress test is now passing as a result

Co-authored-by: Tirokk <wolle.huss@pjannto.com>
2019-04-25 14:20:00 -03:00
Matt Rider
092dcd7122 Get cypress test passing in a hacky way 2019-04-25 10:10:08 -03:00
Matt Rider
7fafa1eb6e Get clear working properly 2019-04-24 20:56:15 -03:00
Matt Rider
05d393064a Disable Submit Button if comment is less than 3 characters 2019-04-24 14:58:22 -03:00
Matt Rider
f6cf05743a Add users to post for mentions 2019-04-24 12:47:20 -03:00
senderfm
412b56cffe seperatet username from truncate 2019-04-24 17:45:38 +02:00
Wolfgang Huß
bf19fc2b28 Added some translations 2019-04-24 17:10:02 +02:00
Matt Rider
546e2c99ad Localise text, remove frontend validations
- validations are not working for the editor, they only work for our ds-input
2019-04-24 09:15:41 -03:00
Matt Rider
20112bdd9b Add back asyncData, use CommentByPost query 2019-04-23 12:24:27 -03:00
Matt Rider
c6b11319fe Clear editor, write cypress test
- the editor only clears once, also there are some other bugs associated with clearing it this way
- according to https://github.com/scrumpy/tiptap/issues/21 there should be a clearContent(), but haven't been able to get it to work
- cypress test for some reason is with a weird bug where I need to submit the form, then click on the submit button, otherwise it doesn't call the handleSubmit method
2019-04-22 11:51:29 -03:00
Matt Rider
49c03c92c8 Extract PostQuery/convert to js, try to get clear working
Co-authored-by: Mike Aono <aonomike@gmail.com>
2019-04-20 10:49:02 -03:00
Matt Rider
4d8148297e Fix styling of hc-editor, localize toast message
- validations are not working for hc-editor, neither in this PR nor in ContributionForm
2019-04-19 12:53:59 -03:00
Matt Rider
9ff194f3d6 Refetch the post to update the comments
- I'm not happy with this as it is expensive, but seems to be used in other places in the code base, where I found the idea, @appinteractive left a comment suggesting a better approach would be to use subscriptions, but I haven't had time to research/try this option

Co-authored-by: Mike Aono <aonomike@gmail.com>
Co-authored-by: Joseph Ngugi <jngugi88@gmail.com>
2019-04-19 09:48:17 -03:00
d8546da116
fixed new mixins folder 2019-04-19 12:12:01 +02:00
6de253fd32
Merge branch 'master' into 2019/kw15/User_can_change_its_username_to_emptystring
# Conflicts:
#	webapp/components/_mixins/seo.js
#	webapp/components/mixins/seo.js
#	webapp/layouts/blank.vue
#	webapp/layouts/default.vue
#	webapp/mixins/seo.js
2019-04-19 12:09:24 +02:00
d986e086c4
use mixins instead of duplicate methods 2019-04-19 11:47:07 +02:00
Matt Rider
3d2a982d3f Attempt to updated comments
- by pushing to the post.comments array, which updates the array, but doesn't rerender the comments component
- by updating the apollo store as seen here https://akryum.github.io/vue-apollo/guide/apollo/mutations.html#server-side-example and https://github.com/Akryum/vue-apollo-todos
2019-04-18 22:14:23 -03:00
Matt Rider
fc496aec51 Merge github.com:Human-Connection/Human-Connection into 260-add-comment-form 2019-04-18 19:00:05 -03:00
Matt Rider
86d075292c Update frontend
- to work with new backend implementation
2019-04-17 12:51:50 -03:00
3eb96a20b2
lint fixes 2019-04-17 15:21:08 +02:00
2efc77097f
match specification of Dennis - minimum 3 characters for username, no hint for user to change the username to "Anonymous", Toast error if userdata cannot be changed due to username restrictions, display "Anonymous" if no username is found in database (even tho this is against implemented rules) 2019-04-17 14:49:03 +02:00
e5f98f2cee
Merge branch 'master' into 2019/kw15/User_can_change_its_username_to_emptystring
# Conflicts:
#	webapp/locales/de.json
#	webapp/locales/en.json
#	webapp/pages/profile/_id/_slug.vue
2019-04-17 13:59:30 +02:00
Matt Rider
dd9383ef40 Create two custom resolvers, get working with front end
- Had difficulty adding a relationship with one custom resolver, if id for comment was not passed in, the comment was not created, hard coding it in also wasn't a good solution
2019-04-16 23:12:13 -03:00
Robert Schäfer
4f2e70e871 Refactor and harden PostCard component 2019-04-17 00:08:21 +02:00
Robert Schäfer
d885fd1beb Move ContributionForm in dedicated folder 2019-04-17 00:08:21 +02:00
Matt Rider
674cdddfc3 Add Editor, cancel/submit buttons for comments
- to PagesPost_id_slugIndex.vue
- handle simple comment creation using auto-generated resolver

Co-authored-by: Joseph "Kachulio" Ngugi <jngugi88@gmail.com>
2019-04-16 13:45:07 -03:00
Robert Schäfer
c0bff47275 Merge remote-tracking branch 'origin/master' into 236-list-social-media-accounts 2019-04-12 17:49:14 +02:00
Wolfgang Huß
26be224464 Localised HC URL on Login page 2019-04-12 16:08:39 +02:00
Wolfgang Huß
d4ce1ef80b Localized HC link on Login page 2019-04-12 16:00:44 +02:00
Robert Schäfer
d3ff3ca241 Merge remote-tracking branch 'origin/master' into 342-merge_documentation 2019-04-12 14:48:27 +02:00
Matt Rider
444f01f879 Refactor test, component
- Remove redundant code
- change socialMediaUrl to add the attributes().href since that's the url
- grab last element of url as username, makes an assumption, but a safer one
2019-04-12 08:34:06 -03:00
54bfb17e31
tests for tag & category, directory refactoring, lint fixes,more 2019-04-12 11:00:54 +02:00
Matt Rider
366c5d776b Fix lint 2019-04-11 22:28:18 -03:00
Matt Rider
1e4fad8425 Add cucumber scenario, component tests 2019-04-11 21:23:17 -03:00
Matt Rider
8f32df2597 Add translation, linkify avatar 2019-04-11 21:22:33 -03:00
mattwr18
4383431260
GitBook: [342-merge_documentation] 56 pages and 14 assets modified 2019-04-11 22:12:37 +00:00
Matt Rider
60c56f8872 Start adding social media card section to user profile 2019-04-11 16:38:31 -03:00