127 Commits

Author SHA1 Message Date
Matt Rider
ff0b4b6867 Fix lint 2019-05-29 09:47:24 -03:00
Matt Rider
39d4771ce1 Fix lint 2019-05-24 08:48:52 -03:00
Matt Rider
51d25c1c9a Work through merge conflict 2019-05-24 08:23:50 -03:00
Matt Rider
460d081d52 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 399-user-profile-image-uploads 2019-05-24 08:10:17 -03:00
Matt Rider
cebd1046c7 Write cypress tests, show dropzone conditionally
- If it's the user's profile, show vueDropzone, if not show just the user's avatar
- apollo mutation is being called twice for drag and drop events
2019-05-24 01:26:37 -03:00
5202763dd8
frontend lint fixes 2019-05-23 19:40:39 +02:00
aonomike
beeb7bb947 Change ds-avatar size to x-large 2019-05-21 23:26:51 +03:00
Matt Rider
610a7f6bfe Merge branch 'master' of github.com:Human-Connection/Human-Connection into 399-user-profile-image-uploads 2019-05-21 16:15:45 -03:00
Matt Rider
d463312397 Get avatar upload working from frontend to backend
- there are several things to work on still
- the upload sets the avatar as the background image of the previewElement, which means that you must refresh the page to upload a different avatar
- the CSS is slightly different before and after successful upload
- the CSS is slightly broken in that the avatar is not in the "ideal" place, it is entirely inside the card, instead of half in, half out on the top
2019-05-20 16:37:02 -03:00
7095e38947
fixed post card design 2019-05-17 23:10:10 +02:00
Matt Rider
49e19a3bd7 Set avatar as background image of vue-dropzone 2019-05-16 07:42:48 -03:00
Matt Rider
a04bc977d4 Fix lint
- still not automated
2019-05-14 20:57:49 -03:00
Matt Rider
24a6ec88ad Add nuxt-dropzone, Upload component 2019-05-14 17:19:00 -03:00
Robert Schäfer
c0dc0e2d3d Revert logout.vue
For any static image URL we don't need to use `<hc-image>`. The assets
will be served from the frontend container. I did not anticipate that we
have a lot of static images in the frontend when I said "You can remove
every image with the `<hc-image>` component".

@aonomike: In the future you can make some screenshots and post them in the PR
and ask for help.

@ulfgebhardt: Yes, it would have been safer not to merge the PR. We
might run into the danger of forgetting things like this.
2019-05-10 15:36:36 +02:00
0712b3c0dc
Merge pull request #551 from Human-Connection/2019/kw15/change_password_strength
2019/kw15/change password strength
2019-05-10 15:13:22 +02:00
Robert Schäfer
6c5f529d85 Couple of corrections
@aonomike use computed properties when possible
2019-05-10 13:58:24 +02:00
Robert Schäfer
958ebf2c77 No need to use <hc-image> for static URLs
@aonomike OK, sorry. When I said that we can replace all `<img>` tags,
what I meant is that we can replace every img tag that has a dynamic
`:src` attribute.
2019-05-10 13:42:27 +02:00
Robert Schäfer
51ed1604a0 Merge branch '296-image_component' of github.com:Human-Connection/Human-Connection into 296-image_component 2019-05-10 13:42:21 +02:00
aonomike
e55129c64b Merge branch '296-image_component' of github.com:Human-Connection/Human-Connection into 296-image_component 2019-05-09 21:04:46 +03:00
aonomike
6445c534b4 Refactor to pass imageProps as an object without the computed section 2019-05-09 21:04:07 +03:00
Matt Rider
c0907dd7c5 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 2019/kw15/change_password_strength 2019-05-09 14:32:29 -03:00
82570bef7f
Merge pull request #478 from Human-Connection/2019/kw15/User_can_change_its_username_to_emptystring
2019/kw15/user can change its username to emptystring
2019-05-09 15:01:54 +02:00
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