76 Commits

Author SHA1 Message Date
Wolfgang Huß
92ae6375e1 Merge remote-tracking branch 'origin/master' into 553-delete-comment 2019-05-31 17:42:19 +02:00
Wolfgang Huß
e63e4ad890 Written custom mutation and Jest tests for DeleteComment 2019-05-31 17:42:04 +02:00
b51b8423e7
fixed fileloader pattern to actually load smth 2019-05-31 16:40:35 +02:00
754decd308
also wildcard include resolvers 2019-05-31 16:04:17 +02:00
Wolfgang Huß
5bec0f1d72 Refined list deletion functions and started writing custom mutation for DeleteComment and their tests 2019-05-31 15:46:34 +02:00
6f0447515a
- fixed several errors handling import
- split graphql schema into parts
- which data is imported which is not - a list
2019-05-29 15:37:28 +02:00
Matt Rider
1c1d1a67ea Merge in master 2019-05-23 15:31:05 -03:00
Matt Rider
758bf215ac Merge branch 'master' of github.com:Human-Connection/Human-Connection into uploads-on-server 2019-05-23 15:26:19 -03:00
cfd0975b24
backend linting 2019-05-23 19:23:03 +02:00
Robert Schäfer
3c22a432e6 Fix lint 2019-05-21 03:08:32 +02:00
Robert Schäfer
9dd35a887a Fix test 2019-05-21 02:07:43 +02:00
Robert Schäfer
2b03b515e2 Implement image upload for posts 2019-05-21 02:01:00 +02:00
Robert Schäfer
d624a3f232 Write tests for fileUpload 2019-05-21 02:01:00 +02:00
Robert Schäfer
4dbf1b2a2c UpdateUser with avatarUpload
This is a curl request from a folder where I have a file `avatar.jpg`:

```
curl localhost:4000/ \
  -F operations='{ "query": "mutation($id: ID!, $file: Upload) { UpdateUser(id: $id, avatarUpload: $file) { id name avatar } }", "variables": { "id": "u3", "file": null } }' \
  -F map='{ "0": ["variables.file"] }' \
  -F 0=@avatar.jpg
```

It uploads the avatar to the public folder. We should

* Write tests
* Change the `user.avatar` url and send it to `/api` in the frontend
2019-05-20 20:35:33 +02:00
Robert Schäfer
2d1daee23a Don't document that we can set IDs in mutations 2019-05-13 12:44:47 +02:00
Robert Schäfer
81a26e14ff Fix test case, move spec to the right location
@ulfgebhardt: The reason why the test case was failing is pretty
obvious. You forgot to create a user that you want to update. If there
is no user to update, then you get an empty response.

@ulfgebhardt: I moved the spec also in the right directory. You're
testing resolvers, so that's where I moved the `.spec` file.
2019-05-10 17:34:05 +02: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
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
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
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
Matt Rider
4c09268f49 Update tests after backend validations
- Now a comment cannot be created without a post to associate it with
2019-05-05 13:57:12 -03:00
Matt Rider
4d631c452d Add more unit tests, add back postId deletion 2019-05-04 17:42:42 -03:00
Matt Rider
31c8b6e35d Use single cypher query in CreateComments
- to create relation between post, comment, author
- fix test to create a post so said cypher query doesn't silently fail
2019-05-03 13:41:20 -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
Matt Rider
154082a251 Add authorship to commments at creation
- Co-authored-by: Mike Aono <aonomike@gmail.com>
2019-05-02 15:54:44 -03: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
Matt Rider
1b84ccbdfa Update to allow single character comments or greater 2019-04-29 12:19:27 -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
0078b743fe Validate comments length, presence/test
- Co-authored-by: Wolfgang Huss <wolle.huss@pjannto.com>
- Co-authored-by: Mike Aono <aonomike@gmail.com>
2019-04-24 09:11:33 -03:00
Matt Rider
43d6254f3e Add custom CommentByPost query 2019-04-23 12:23:21 -03:00
Matt Rider
0149f30f5f Fix failing tests, refactor
- due to changes made to comments factories, which caused failures
- to use new custom CreateComment resolver syntax to relate a comment to post by passing in the postId
2019-04-17 20:27:35 -03:00
Matt Rider
f4744fa513 Remove unused import, variables, set debug to false 2019-04-17 18:37:44 -03:00
Matt Rider
f46e5ee58c Use custom resolver
- add postId to type Comment
- remove it from params to create node without postId
- fix tests

Co-authored-by: Robert Schäfer <roschaefer@users.noreply.github.com>
Co-Authored-By: Tirokk <wolle.huss@pjannto.com>
Co-Authored-By: Mike Aono <aonomike@gmail.com>
2019-04-17 11:27:26 -03:00
Matt Rider
0bcfefe210 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 260-add-comment-form 2019-04-17 08:00:07 -03:00
Robert Schäfer
2d85e5496d
Merge pull request #449 from Human-Connection/219-refactor-follow-shout-mutations
refactor follow, unfollow, shout, unshout to custom mutations, but don't add date-time to relation yet
2019-04-17 11:35:47 +02:00
Matt Rider
c519bff743 Fix lint 2019-04-16 23:37:11 -03: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
Matt Rider
9bc0c0f92c Add tests, create comments only when authenticated 2019-04-16 20:31:34 -03:00
Matt Rider
dfef4fe05f Add custom resolver, update factories 2019-04-16 19:48:59 -03:00
Robert Schäfer
73f2ff59e4
Merge pull request #237 from Human-Connection/236-list-social-media-accounts
List socialMedia links
2019-04-15 12:07:10 +02:00
Matt Rider
aadfd16374 Remove redundant "not" 2019-04-12 13:23:10 -03:00
Wolfgang Huß
023c636017 Query of "publicKey" is now tested unauthenticated and authenticated 2019-04-12 17:17:01 +02:00
Robert Schäfer
e5e1f0a9fc Update backend/src/resolvers/user_management.spec.js
Co-Authored-By: Tirokk <wolle.huss@pjannto.com>
2019-04-12 16:51:41 +02:00
Robert Schäfer
828ca50f19 Update backend/src/resolvers/user_management.spec.js
Co-Authored-By: Tirokk <wolle.huss@pjannto.com>
2019-04-12 16:51:30 +02:00
Robert Schäfer
008d99c6ef Update backend/src/resolvers/user_management.spec.js
Co-Authored-By: Tirokk <wolle.huss@pjannto.com>
2019-04-12 16:51:10 +02:00
Wolfgang Huß
b007015eeb Backend test for query "publicKey" to asure that "privatKey" is generated
Minor approofments.
2019-04-12 14:30:04 +02:00
Wolfgang Huß
9929aa4626 Rnamed "sessionRes" to "transactionRes"
Even in the rewards mutation.
2019-04-12 08:41:53 +02:00
Matt Rider
366c5d776b Fix lint 2019-04-11 22:28:18 -03:00
Wolfgang Huß
95a0567e69 Query of users "publicKey" 'throws "Not Authorised!"'
Changes password and permission middleware.

Thanks for your big help @roschaefer !
2019-04-11 20:01:20 +02:00