IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,701 Commits 5 Branches 2 Tags
Commit Graph

42 Commits

Author SHA1 Message Date
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
Wolfgang Huß
6794156c86 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into keep_private_rsa_key_secret_TirNew 2019-04-11 10:54:12 +02:00
Wolfgang Huß
c636d031be Refactored mutations "shout", "unshout" 
Formated "schema.graphql" for better readability.
"
 2019-04-10 15:24:58 +02:00
Robert Schäfer
102a03f552 Merge remote-tracking branch 'origin/master' into 236-list-social-media-accounts 2019-04-10 15:17:18 +02:00
Wolfgang Huß
2feedc94e7 Refactored mutation "unfollow" 
Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 219-refactor-follow-shout-mutations
 2019-04-10 14:45:45 +02:00
Wolfgang Huß
6a01146647 Refactored mutation "follow" 
Done by @Tirokk and @mattwr18 .
 2019-04-10 14:11:13 +02:00
Wolfgang Huß
587025e4d3 Start refactoring follow 2019-04-10 11:15:45 +02:00
Robert Schäfer
b63200ac8e Authorize and whitelist Notifications 2019-04-10 01:58:18 +02:00
Matt Rider
4de8407620 Rename variable, mutation 
- result is not a good name in this case because we know what is coming back, the result is a socialMedia node
- update the mutation name in the front end
 2019-04-08 12:05:57 -03:00
Wolfgang Huß
c513b7ba2e Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 219-refactor-follow-shout-mutations 2019-04-08 11:41:42 +02:00
Wolfgang Huß
c4e57fc928 User to query for "publicKey" is generated on port "4001" 
But still no "publicKey" is generated.
So wished failing test shows not "publicKey" except other than "null".
 2019-04-05 18:32:11 +02:00
Wolfgang Huß
8713f61734 Added Tests to "user_management.spec.js" 
Implemented suppression of "publicKey", now commented out for testing approach.
Use port 4001 for querying, but forgot that I have to generate the user on the same port, before I can query it with generated "publicKey".
Do this in next commit.
 2019-04-05 17:44:43 +02:00
Matt Rider
24d4259510 Add validURLMiddleware, remove unused package, extract tests 2019-04-05 09:15:22 -03:00
Matt Rider
2778bca11f Merge branch '236-list-social-media-accounts' of github.com:Human-Connection/Human-Connection into 236-list-social-media-accounts 2019-04-05 07:32:34 -03:00
Matt Rider
4d4978c0f2 Merge github.com:Human-Connection/Human-Connection into 236-list-social-media-accounts 2019-04-05 07:29:44 -03:00
Robert Schäfer
710a8515d3 Fix lint 2019-04-05 11:20:19 +02:00
Robert Schäfer
8477e71c28 Sketch test for #350 2019-04-05 02:31:32 +02:00
Robert Schäfer
5df54309b1 So close @mattwr18 2019-04-05 00:05:23 +02:00
Matt Rider
a51190d4e9 Add custom resolver for createSocialMedia 2019-04-04 15:43:06 -03:00
Wolfgang Huß
97707f7a20 Added file "backend/src/resolvers/follow.js" 
WIP !!! In development! Not able to run now!
 2019-04-04 18:29:50 +02:00
Matt Rider
9f6de23805 Add graphql-constraint-directive, uri contstraint 
- currently not compiling with "Error: Unknown directive "constraint""

Co-authored-by: Wolfgang Huss <wolle.huss@pjannto.com>
 2019-04-03 09:00:36 -03:00
Matt Rider
80f664dd78 Match user by id instead of email, update feature 2019-04-02 18:05:45 -03:00
Robert Schäfer
08c2e5d708 I was able to save an empty string as social media 2019-03-27 13:56:28 +01:00
Matt Rider
599f3814ba Create users with default socialMedia, append url 
- It was such that every time a user updates their social media it would replace the existing url with the one to be added.
creating a user with a default empty array means that we can concatenate the url to the array and not have a complicated cypher query
to account for an intial NULL value.

Co-authored-by: Joseph Ngugi <jngugi88@gmail.com>
 2019-03-25 20:10:49 -03:00
Matt Rider
aca3562e22 Migrate PRs from archived repos to monorepo 
Co-authored-by: Joseph Ngugi <jngugi88@gmail.com>
 2019-03-22 14:44:43 -03:00
Robert Schäfer
9703e2d5e5 Import changes from @Tirokk 2019-03-21 23:53:29 +01:00
Robert Schäfer
7a72185c9e Merging backend to master 2019-03-20 21:00:59 +01:00