279 Commits

Author SHA1 Message Date
Robert Schäfer
bedbb21def Refactor notification spec
Wow this took me the entire day: If you run `createServer` multiple
times, more and more middlewares get added to the schema. That's why
the test would create 2^n notifications for n times you called
`createServer`. This is related to the following bug:

https://github.com/prisma/graphql-middleware/issues/63
2019-08-13 11:05:29 +02:00
Robert Schäfer
700bdcb8f1 Implement+test unblock mutation 2019-08-13 11:05:29 +02:00
Robert Schäfer
f5a59568ab Implement block except for the unfollow feature 2019-08-13 11:05:29 +02:00
Robert Schäfer
05aee24efd Implement+test User.blockedUsers resolver 2019-08-13 11:05:29 +02:00
Matt Rider
21aa729edb Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 2019-08-08 09:10:18 +02:00
Matt Rider
39a94a8aac Refactor
- follow PR review by @roschaefer
2019-08-07 14:55:32 +02:00
Matt Rider
53af29b5a2 Refactor backend tests
- to use neode and apollo-server-testing
2019-08-06 18:26:39 +02:00
Matt Rider
1593eab9cf Merge branch 'master' of github.com:Human-Connection/Human-Connection into 384-emotions-on-posts 2019-08-06 08:07:39 +02:00
Wolfgang Huß
22b9bf77fa Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment
# Conflicts:
#	backend/src/schema/resolvers/notifications.spec.js
2019-08-05 10:15:20 +02:00
Matt Rider
d1d82a0051 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 384-emotions-on-posts 2019-08-02 16:55:54 +02:00
Robert Schäfer
f1b28c83a0 Meld commits from master 2019-08-02 14:26:06 +02:00
Robert Schäfer
e1bb6ed74e Fix lint 2019-08-02 01:45:36 +02:00
Matt Rider
fb9a632d55 Query a currentUsers emotions for a post, translations 2019-08-01 15:11:41 +02:00
Robert Schäfer
b6a59460bd Merge remote-tracking branch 'origin/master' into storybook 2019-08-01 12:22:09 +02:00
Robert Schäfer
c9e6d182ec Followed @mattwr18's suggestions here:
https://github.com/Human-Connection/Human-Connection/pull/952#pullrequestreview-269406016
2019-08-01 12:20:33 +02:00
Matt Rider
08899a4af9 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 384-emotions-on-posts 2019-08-01 09:22:57 +02:00
Robert Schäfer
72edf78889 Meld a chaotic commit history into one commit
Some important commit messages:

```
    Fix youtu.be not being embedded

    And also try to maintain the old behaviour matching
    `provider.provider_url`.
```

```
    Remove confusing code comments and obsolete code

    I discovered that the behaviour of no duplicate notifications being send
    out is caused by the frontend: When the editor reads html from the
    backend, it will parse hashtags and mentions as ordinary links, not as
    their respective nodes during editing. Also, we don't have to worry
    about duplicate ids being found: The cypher statement will implicitly
    suppress duplicate notification nodes for the same user.

    So let's remove the code to avoid confusing the next developer.
```

```
    Test editor.getHTML()

    I do this because I'm not able to test the content of `this.editor` from
    a wrapper of `vue-test-utils`. If I call `this.editor.getHTML` directly
    and use it as a computed property `renderedContent` to populate a `<div
    v-html="renderedContent" />` this will not work for the embeds. So, my
    current best bet is to test the editor object isolated from a real
    component. ;(
```

```
    Add core-js as explicit dependency

    Because of build errors on Travis.

    See: https://stackoverflow.com/a/55313456

    Remove as soon as this issue is resolved:
    https://github.com/storybookjs/storybook/issues/7591

```

```
    Refactor: Keep Runtime-only builds

    See: https://vuejs.org/v2/guide/installation.html#Runtime-Compiler-vs-Runtime-only
```
2019-08-01 00:28:22 +02:00
Robert Schäfer
448706ab18 Merge remote-tracking branch 'origin/master' into refactor-social-media-backend 2019-07-31 17:36:02 +02:00
Matt Rider
5423412958 Set up UI 2019-07-31 14:58:05 +02:00
Matt Rider
0a98113c2d Add backend tests for RemovePostEmotions 2019-07-30 13:28:30 +02:00
Alina Beck
4f068116b9 add social media permissions in middleware 2019-07-29 17:16:40 +02:00
Alina Beck
0439b4407b remove social media validations from middleware 2019-07-29 17:16:05 +02:00
Matt Rider
3e43539e23 Set up some backend tests for emotions 2019-07-29 17:08:07 +02:00
Wolfgang Huß
a542b33f79
Merge pull request #1053 from Human-Connection/refine-social-media
🍰 Refine social media
2019-07-29 16:08:08 +02:00
Matt Rider
322ec597a3 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 384-emotions-on-posts 2019-07-29 12:40:01 +02:00
Robert Schäfer
c5789cbf90 Fix get-video-id expects a string bug 2019-07-22 00:20:43 +02:00
Robert Schäfer
657a5ac1f5 Fix resolve function returns undefind
I'm also trying to make sense of the attribute `sources` - probably it's
indicating where the data is coming from.
2019-07-21 23:31:44 +02:00
Robert Schäfer
d4c3b7ac10 Merge embed service with backend 2019-07-19 20:32:53 +02:00
Wolfgang Huß
f47724da6a One notifyMentions function for Posts and Comments 2019-07-18 17:33:34 +02:00
Matt Rider
5fb89fd45c Merge branch 'master' of github.com:Human-Connection/Human-Connection into refine-social-media 2019-07-17 07:23:29 -03:00
Matt Rider
1c53c58f42 Add backend validation tests to expose non-validation
- remove validation/index.js as it's not being used
- move validations to validationMiddleware.js where it validates
2019-07-16 14:54:13 -03:00
Wolfgang Huß
cd0c509c81 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 2019-07-16 16:10:36 +02:00
Matt Rider
16f077fe65 Add authentication tests for AddPostEmotions, emotionsCount 2019-07-16 11:02:43 -03:00
Matt Rider
a019c8c311 Revert unintended changes, refactor
- rename some variables in comments.spec.js while dealing with merge conflicts
- rename EditCommentForm/index.vue with new naming convention
- add comment to explain absense of <no-ssr>
- use a comments content for edit comment form content, not excerpt
2019-07-16 07:53:57 -03:00
Matt Rider
7de337f96d Merge branch 'master' of github.com:Human-Connection/Human-Connection into 552-update_comment 2019-07-16 07:24:23 -03:00
Wolfgang Huß
dded3344cc
Merge pull request #1040 from Human-Connection/remove_graphql_yoga
Remove graphql-yoga
2019-07-16 09:13:44 +02:00
Wolfgang Huß
ff234eeed5 Preparing for Mentions of users in Comments
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
2019-07-16 08:12:40 +02:00
Matt Rider
36c4a22b76 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 552-update_comment 2019-07-15 18:29:26 -03:00
Robert Schäfer
d59c94c9f3 Keep gql syntax highglighting
... with custom fake template string
2019-07-15 18:09:54 +02:00
Wolfgang Huß
ea896f8b3a
Merge pull request #1039 from Human-Connection/bugfix_email_template
Bugfix: Signup email was missing email query param
2019-07-15 13:35:57 +02:00
Wolfgang Huß
6430c9e1bf Comment can notify a Mention of a User in the database
Frontend notification is still missing.
2019-07-15 09:42:24 +02:00
Robert Schäfer
0d06b78ad4
Merge pull request #1038 from Human-Connection/1037-refactor-comments-resolver-extract-out-validations
Refactor CreateComment resolver
2019-07-13 23:59:15 +02:00
Robert Schäfer
f64a21bd01 Remove graphql-yoga 2019-07-13 19:26:56 +02:00
Robert Schäfer
2d4eec6a52 Bugfix: Signup email was missing email query param 2019-07-12 14:31:28 +02:00
Matt Rider
ba7e44a762 Refactor CreateComment resolver
- extract out the validations for a valid comment
2019-07-12 08:07:07 -03:00
Alina Beck
8847f071fd update social media links in database 2019-07-10 15:16:28 +02:00
Robert Schäfer
95a06a8344 Refactor all badges resolvers to use neode
FYI: @Tirokk I think we'll never remove or add new badges through
graphql. Instead, we will seed them manually with direct access to the
database. Therefore I removed the respective mutations and also your
tests regarding permissions.
2019-07-10 14:36:42 +02:00
Robert Schäfer
8c18b9c59b Allow to list all badges 2019-07-10 12:36:19 +02:00
Wolfgang Huß
e69f292bd8 Hashtags restricted in the chars, in Editor Suggestions and Backend
Refactor Seeding with Tag ids as Tag names.
In Frontend: Done as a suggestion with all the forbidden chars removed.
In Backend by Regex only the fitting links.
Rewrite backend test to make sure Hashtag „id“ is the name of the Hashtag.
Test for „https://www.example.org/#anchor“

Co-Authored-By: mattwr18 <mattwr18@gmail.com>
2019-07-08 19:25:57 +02:00
Wolfgang Huß
ac17f3fe1c Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 779-tags-of-contribution-in-text
# Conflicts:
#	backend/src/middleware/index.js
#	backend/src/schema/resolvers/passwordReset.js
2019-07-04 20:56:14 +02:00