255 Commits

Author SHA1 Message Date
Matt Rider
fdab1e12c2 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 296-image_component 2019-05-08 21:32:08 -03:00
Matt Rider
b8465c914c Update failing test, fix linting
- moved passwordStrength to watch since there was a "unexpected side effect in computed property vue" in lint
- found this SO post https://stackoverflow.com/questions/53757107/handling-unexpected-side-effect-in-computed-properties-vuejs
2019-05-08 21:20:58 -03:00
Matt Rider
5058a0c778 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 2019/kw15/change_password_strength 2019-05-08 20:31:21 -03:00
aonomike
bf57198815 Refactor code based on comments from PR review 2019-05-09 02:27:03 +03:00
Wolfgang Huß
c4a4d3d1f0 Wrote an additional frontend unit test
Skipped writing of a modal dialog before deletion, because many code parts are on the way in the delete post PR.
So makes no sense to write them twice.
I make a new issue …
2019-05-08 16:04:09 +02:00
Wolfgang Huß
ff303fccd3 Fixed linting errors 2019-05-08 14:14:34 +02:00
Wolfgang Huß
0ffbe567c7 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 463-delete-socialMedia 2019-05-08 08:54:11 +02:00
aonomike
399507c7fb Fix linting issues 2019-05-07 15:56:31 +03:00
aonomike
3ff034d014 Refactor <img> tags to use Image component 2019-05-07 15:21:42 +03:00
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
Wolfgang Huß
41711c316a Get delete SocialMedia to work, refactored Frontend Jest tests, written Cypress tests
Optimised tests and Vue for add Social Media a bit.
Added localisation.

Finished this commit together with @mattwr18 !!!
Thank you so much dude! You did great stuff …
2019-05-06 17:31:02 +02:00
9fcddfbd97
Merge branch 'master' into 2019/kw15/change_password_strength 2019-05-06 13:59:03 +02:00
Wolfgang Huß
2af9b853a1 Add first try of Webapp Component Test
Add `ìd` to the SocialMedia data
2019-05-04 10:13:40 +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
Wolfgang Huß
3294cffa88 Renamed handleDeleteSocialMedia 2019-05-02 18:09:46 +02:00
ad05dcf735
frontend tests, backend tests 2019-05-02 17:47:34 +02:00
Wolfgang Huß
b03cbb212a First Vue design of delete SocialMedia, custom mutation DeleteSocialMedia
Backend Jest tests for DeleteSocialMedia
New backend Jest tests for CreateSocialMedia
2019-05-02 17:41:54 +02:00
0be2891858
make email a required field for user, tests for front- & backend 2019-05-02 16:17:16 +02:00
Wolfgang Huß
a4f5fdc324 Make SocialMedia Links to target="_blank" 2019-05-02 07:22:32 +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