5716 Commits

Author SHA1 Message Date
Matt Rider
32796bfa0d Fix failing build 2019-08-05 19:08:53 +02:00
Robert Schäfer
52e0361087 Fixing pasteRules for Embeds
Apparently the default pasteRules of tiptap interfere with the
pasteRules of a Link (in our case an Embed node). Consider this example:

https://de.wikipedia.org/wiki/Yin_und_Yang

Depending on some random conditions, tiptap might parse the `_und_` to be
italic because it's wrapped with underscores (markdown syntax). The
result is:

https://de.wikipedia.org/wiki/Yin # link
_und_                             # italic
Yang                              # plain text

So let's remove the default pasteRules of `Bold`, `Strike` and `Italic`
marks respectively to prefer our Embeds. Who is copy+pasting from one
tiptap editor to another tiptap editor anyways?
2019-08-05 17:26:50 +02:00
Matt Rider
1cd3ba907b Set vuex state to reset active button
- when a user clicks on the logo or changes pages, the filter is reset, but the active button didn't update
- still a bug with the active categoryIds since it's not so easy to set the state of an array in vuex
- dry out code for toggleFilters
- fix bug where user clicks on filter by users followed, then filters for categories of those users, then clicks to remove category filter
2019-08-05 14:39:45 +02:00
Robert Schäfer
8093fece00 Update URL regex taking e.g. "?" into account 2019-08-05 13:25:50 +02:00
Robert Schäfer
1aeb93f9fb Merge remote-tracking branch 'origin/master' into storybook 2019-08-05 12:47:46 +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
295b7e7769 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 384-emotions-on-posts 2019-08-05 09:50:54 +02:00
mattwr18
51e7c25569
Merge pull request #1181 from Human-Connection/dependabot/npm_and_yarn/webapp/vue/cli-shared-utils-3.10.0
Bump @vue/cli-shared-utils from 3.9.0 to 3.10.0 in /webapp
2019-08-05 09:45:13 +02:00
ogerly
aba21a9c70 changes and history template, english, german 2019-08-05 09:26:51 +02:00
dependabot-preview[bot]
f5608284ad
Bump @vue/cli-shared-utils from 3.9.0 to 3.10.0 in /webapp
Bumps [@vue/cli-shared-utils](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-shared-utils) from 3.9.0 to 3.10.0.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v3.10.0/packages/@vue/cli-shared-utils)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-05 04:28:12 +00:00
dependabot-preview[bot]
d1cd26e05a
Bump @nuxtjs/apollo from 4.0.0-rc9 to 4.0.0-rc10 in /webapp
Bumps [@nuxtjs/apollo](https://github.com/nuxt-community/apollo-module) from 4.0.0-rc9 to 4.0.0-rc10.
- [Release notes](https://github.com/nuxt-community/apollo-module/releases)
- [Commits](https://github.com/nuxt-community/apollo-module/compare/v4.0.0-rc.9...v4.0.0-rc.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-05 04:27:23 +00:00
Robert Schäfer
4b459c9974 Fix depreciation warnings
I couldn't see any difference in using `transition`, `pageTransition` or
neither of those, so I decided to disable the configuration completely.
2019-08-03 01:29:40 +02:00
Robert Schäfer
b797ce4b15 Follow @Tirokk's suggestions:
* Add target="_blank" (on embeds only!)
* When pasting a link, the cursor position is moved after the paste
* Can't reproduce a link slipping into the embed in front of it

@Tirokk it is an unpleasant side efffect that mentions + hastags appear
differently on Edit+View. That's because they don't get parsed from
HTML, it's a one way, they are write only. So, when viewing content,
hashtags and mentions appear as plain links. I don't think I can do
anything about it.

Regarding some links not being embedded: Only those links that have an
oembed provider in this file:
f44d0f1f96/backend/src/schema/resolvers/embeds/providers.json
...will be embedded. Your example `http://backreaction.blogspot.com` and `https://de.wikipedia.org/wiki/Yin_und_Yang`
have no embed provider and won't be embedded.

We would have to add oembed providers to this list if we wanted to embed those
links, too.
2019-08-02 23:18:10 +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
Matt Rider
751bbbf889 Make mobile responsive 2019-08-02 16:10:19 +02:00
Matt Rider
ec7a5865f7 Update tests, showFilterPostsDropdown only on route 2019-08-02 15:41:19 +02:00
Robert Schäfer
ffe6dc7736 Add MutationObserver to fix tests
Our build server failed because of frontend tests. However, all our
fullstack tests are passing... So maybe an issue in our test setup, not
reproducible in a real browser?

This commit:
ee4f132b0f (diff-0806c5f3fdae5e139222967601c7faca)
adds MutationObserver to their test setup. Adding it to our test suites
that touch the `editor` directly fixes our tests, too!

From what I can tell is that prosemirror is calling
`this.observer.takeRecords()`. Probably `tiptap` updated its
dependencies at some point and that's where `this.observer` was
introduced? Hard to tell. It really looks just like an issue only
present in test environments, so I think it's safe not to investigate
any further.
2019-08-02 14:32:06 +02:00
Robert Schäfer
f1b28c83a0 Meld commits from master 2019-08-02 14:26:06 +02:00
dependabot-preview[bot]
0663aa5904 Bump tiptap from 1.21.0 to 1.24.0 in /webapp
Bumps [tiptap](https://github.com/scrumpy/tiptap) from 1.21.0 to 1.24.0.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap@1.21.0...tiptap@1.24.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-02 13:43:08 +02:00
Matt Rider
afb9dbe241 Move filter by followers functionality to filter dropdown 2019-08-02 13:02:12 +02:00
Matt Rider
3da986518e Write component tests, refactor 2019-08-02 10:52:36 +02:00
Matt Rider
76a720caec Merge branch 'master' of github.com:Human-Connection/Human-Connection into 384-emotions-on-posts 2019-08-02 08:02:54 +02:00
dependabot-preview[bot]
bcab40e914
Bump tippy.js from 4.3.4 to 4.3.5 in /webapp
Bumps [tippy.js](https://github.com/atomiks/tippyjs) from 4.3.4 to 4.3.5.
- [Release notes](https://github.com/atomiks/tippyjs/releases)
- [Commits](https://github.com/atomiks/tippyjs/compare/v4.3.4...v4.3.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-02 04:22:11 +00:00
Robert Schäfer
76dacd6e56 Updating two packages at a time
Look, both dependency problems are related to each other:
https://github.com/nuxt-community/apollo-module/releases/tag/v4.0.0-rc.6
2019-08-02 00:30:25 +02:00
Robert Schäfer
18e6843774 Just remove obscure, possibly non-functional code 2019-08-02 00:28:39 +02:00
Robert Schäfer
3d224512b1 Warn about non-functional errorHandler hook
See: https://github.com/nuxt-community/apollo-module/pull/218#issuecomment-506939244
2019-08-02 00:19:28 +02:00
Robert Schäfer
15559dedfc Fix breaking change in errorHandler 2019-08-02 00:10:14 +02:00
dependabot-preview[bot]
246a2f690f Bump @nuxtjs/apollo from 4.0.0-rc4.2 to 4.0.0-rc5 in /webapp
Bumps [@nuxtjs/apollo](https://github.com/nuxt-community/apollo-module) from 4.0.0-rc4.2 to 4.0.0-rc5.
- [Release notes](https://github.com/nuxt-community/apollo-module/releases)
- [Commits](https://github.com/nuxt-community/apollo-module/compare/v4.0.0-rc.4.2...v4.0.0-rc.5)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-08-01 23:57:57 +02:00
Matt Rider
fb9a632d55 Query a currentUsers emotions for a post, translations 2019-08-01 15:11:41 +02:00
Robert Schäfer
8064e9a790
Merge pull request #1150 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-jest-22.14.1
Bump eslint-plugin-jest from 22.14.0 to 22.14.1 in /webapp
2019-08-01 12:46:32 +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
Matt Rider
8d7c55c97d Use a link's username, open separate window on click 2019-08-01 07:34:52 +02:00
dependabot-preview[bot]
008c9fb490
Bump eslint-plugin-jest from 22.14.0 to 22.14.1 in /webapp
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.14.0 to 22.14.1.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v22.14.0...v22.14.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-01 04:25:35 +00: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
34f86c95a0 Merge remote-tracking branch 'origin/master' into storybook 2019-08-01 00:08:15 +02:00
Wolfgang Huß
c1a13f3e0a
Merge pull request #977 from Human-Connection/806-HcContributionForm-submit-is-not-disabled-by-default
HcContributionForm submit is disabled by default
2019-07-31 15:20:03 +02:00
Matt Rider
5423412958 Set up UI 2019-07-31 14:58:05 +02:00
Wolfgang Huß
0dad956c28
Merge pull request #1063 from Human-Connection/375-Sorting-II
375 sorting (II)
2019-07-31 14:49:37 +02:00
Wolfgang Huß
6a6f1c5556 Removed submit function at the form
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
2019-07-31 14:09:04 +02:00
Wolfgang Huß
49f5851d2c Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 806-HcContributionForm-submit-is-not-disabled-by-default 2019-07-31 13:14:43 +02:00
Wolfgang Huß
c9ad86c863 Fixed jest tests 2019-07-31 13:11:31 +02:00
Wolfgang Huß
51321df931 In the middle of refactoring the tests 2019-07-31 12:19:47 +02:00
mattwr18
115680c2eb
Merge pull request #1141 from Human-Connection/fix_console_errors
Fix console.errors during `yarn run test`
2019-07-31 07:43:13 +02:00
dependabot-preview[bot]
e080b015f0
Bump vuex-i18n from 1.11.0 to 1.13.0 in /webapp
Bumps [vuex-i18n](https://github.com/dkfbasel/vuex-i18n) from 1.11.0 to 1.13.0.
- [Release notes](https://github.com/dkfbasel/vuex-i18n/releases)
- [Commits](https://github.com/dkfbasel/vuex-i18n/compare/v1.11.0...v1.13.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-31 04:25:12 +00:00
Robert Schäfer
c24452c8a0 Fix console.errors during yarn run test
@mattwr18 you added `currentUser` in 19b2b7a49 without running the tests,
didn't you?
2019-07-30 21:13:44 +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
Wolfgang Huß
86777a0a2d
Merge pull request #936 from Human-Connection/760_post-author-last-active
Add details to contribution form
2019-07-29 11:13:49 +02:00
Wolfgang Huß
1a1ab418a3 Fix tests and change variable names 2019-07-29 11:01:15 +02:00