41 Commits

Author SHA1 Message Date
roschaefer
491a626031 Replace deleteComment with a more KISS solution 2019-09-03 21:28:29 +02:00
Robert Schäfer
079ced0593
Merge pull request #1400 from Human-Connection/1391-fix-bug-where-apollo-cache-not-updated-on-comment-deletion
Update the apollo cache
2019-08-28 19:37:59 +02:00
Matt Rider
470da18381 Revert to using async/await, follow @appinteractive PR suggestions 2019-08-27 09:55:05 +02:00
Matt Rider
ba1e62da21 Update the apollo cache 2019-08-26 18:54:21 +02:00
Matt Rider
2af4151918 Update to use <client-only> instead of <no-ssr> 2019-08-26 17:09:24 +02:00
Matt Rider
caff74e58b Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1017-send-out-notifications-on-create-omment 2019-08-19 10:50:46 +02:00
Matt Rider
dbaa8e687f Fix vue warnings, fix tests, refactor
- was throwing an error when trying to update commentsCount because of new implementation by @roschaefer which uses countResolver, but there was no related for commentsCount, it was r... also commentsCount is no longer needed anywhere in the code base, it is commentedCount now
2019-08-16 13:28:55 +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
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
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
Wolfgang Huß
744f0cb225 Approach to get scrollBehavior in a useful way. Works, but not fully successful 2019-07-18 08:30:44 +02:00
Wolfgang Huß
0d5471fee4 Try to implement scrollBehavior for Mentions of User in Comment of a Post
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
2019-07-16 19:25:03 +02: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
c7dc2f6a5c Hide CommentForm when an edit is in progress
- Follow @Tirokk PR review
2019-07-15 19:09:33 -03: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
senderfm
0c1403dda5 fix conflict 2019-07-03 10:06:48 +02:00
Matt Rider
2407f0b0d1 Add basic styling for comment list 2019-07-02 19:14:18 -03:00
senderfm
d7b423ec61 code variable designation changed from isActive to isCollapsed 2019-07-01 12:17:14 +02:00
ALau2088
912b94d43c add EditCommentForm spec.js 2019-06-27 10:59:53 -07:00
ALau2088
5e9f46405e Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 552-update_comment 2019-06-27 10:18:53 -07:00
senderfm
e0c7566edd variable changed 2019-06-25 12:09:50 +02:00
senderfm
9ae9cdacad Fix specs, Fix lint, Fix tests 2019-06-21 14:32:59 +02:00
senderfm
d85f49fb15 Fix: long comments can be folded up and down 2019-06-19 17:45:52 +02:00
Wolfgang Huß
482ac1572b Refactored and created the tests of DeletePostCallback
Created a folder `utils` for PostHelpers.js.
Fixed a new incoming problem of the master with deleting Posts on the User Profile.

Co-Authored-By: mattwr18 <mattwr18@gmail.com>
2019-06-13 19:23:13 +02:00
Wolfgang Huß
1339734281 Rename DeleteModal to ConfirmModel and write some refactor some tests
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
2019-06-12 18:02:50 +02:00
ALau2088
22f166adac merge upstream/552-update_comment 2019-06-08 15:55:51 -07:00
Wolfgang Huß
b2e1873ade Refactored to modalData for Delete Comment and Posts
The error is gone with this.
2019-06-07 18:04:12 +02:00
aonomike
55b3764258 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 722_comment-date 2019-06-04 13:54:41 +03:00
aonomike
f7e5c7bf2c Add date relative date on comments 2019-06-03 23:36:04 +03:00
Wolfgang Huß
948a99d9da Merge remote-tracking branch 'origin/master' into 553-delete-comment
# Conflicts:
#	webapp/components/Modal/DeleteModal.vue
#	webapp/components/PostCard/index.vue
#	webapp/components/comments/CommentList/index.vue
#	webapp/pages/index.vue
#	webapp/pages/post/_id/_slug/more-info.vue
2019-06-03 10:39:13 +02:00
Wolfgang Huß
e63e4ad890 Written custom mutation and Jest tests for DeleteComment 2019-05-31 17:42:04 +02:00
Matt Rider
ff0b4b6867 Fix lint 2019-05-29 09:47:24 -03:00
Wolfgang Huß
f9fe4f742f Lint fixes 2019-05-27 12:39:37 +02:00
Wolfgang Huß
68980f85c6 Merge remote-tracking branch 'origin/master' into 553-delete-comment
# Conflicts:
#	webapp/components/Comment.vue
#	webapp/components/ContentMenu.vue
#	webapp/components/Modal/DeleteModal.spec.js
#	webapp/components/Modal/DeleteModal.vue
#	webapp/components/Modal/DisableModal.spec.js
#	webapp/components/Modal/DisableModal.vue
#	webapp/components/Modal/ReportModal.spec.js
#	webapp/components/Modal/ReportModal.vue
#	webapp/components/PostCard/index.vue
#	webapp/components/comments/CommentList/index.vue
#	webapp/locales/de.json
#	webapp/pages/index.vue
#	webapp/pages/profile/_id/_slug.vue
2019-05-27 12:34:59 +02:00
ALau2088
8a8ed5131e refactor backend and add UI 2019-05-24 08:03:39 -07:00
5202763dd8
frontend lint fixes 2019-05-23 19:40:39 +02:00
Wolfgang Huß
2016a9445b Rename confirm callbacks 2019-05-19 07:42:55 +02:00
Wolfgang Huß
9af8c2b46c Refactored handling of DeleteModal in Comments and Posts 2019-05-18 12:58:51 +02:00
Wolfgang Huß
8033556145 Investigation how to update the Comments List intelligent 2019-05-18 07:35:45 +02:00
54bfb17e31
tests for tag & category, directory refactoring, lint fixes,more 2019-04-12 11:00:54 +02:00
Robert Schäfer
c91a61af89 Merging webapp to master 2019-03-20 21:06:17 +01:00