422 Commits

Author SHA1 Message Date
mattwr18
e0e026a8b8 fix(migration): return null for Image.url 2020-03-23 18:46:28 +01:00
mattwr18
906f1bc0ca Merge branch 'master' of github.com:Human-Connection/Human-Connection into 2144-Add_Search_Results_Page 2020-03-19 16:02:54 +01:00
Moriz Wahl
014be6e7f8 partially working, index page does not update when route is changed 2020-03-19 12:59:15 +01:00
mattwr18
627b47837e Rename findResources to searchResults 2020-03-18 19:45:48 +01:00
ogerly
1bf57cbf58 sorting result in users and posts 2020-03-17 06:15:48 +01:00
Robert Schäfer
512ef672bf
feat: Introduce graphql image type (#3043)
* refactor(graphql): Introduce image type

* Undo changes to .travis.yml

* chore: Upgrade travis to node LTS

- URL is available since v10

* chore: use lts

Co-authored-by: mattwr18 <mattwr18@gmail.com>
2020-03-16 15:32:19 +01:00
ogerly
bba5a09ba9 search query extended to categories, sorting of results, first graphical display 2020-03-15 10:11:16 +01:00
roschaefer
7d9cbb3ce9 perf(neo4j): Improve currentUser read performance 2020-03-04 13:32:30 +01:00
Wolfgang Huß
4bd7f61fcc Refactor GQL schema, resolvers and moderators report list
- Co-Authored-By: mattwr18 <mattwr18@gmail.com>
2020-02-20 10:35:37 +01:00
mattwr18
f16c8b27e7 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1703-add-vue-apollo-subsriptions 2020-02-10 17:37:34 +01:00
mattwr18
5347f734af Fix cypress tests/frontend implementation
- Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2020-02-10 16:25:00 +01:00
mattwr18
2f43069ea0 Subscribe to notifications/remove polling
- We want to publish when a notification occurs for a specific user, not
  have the client poll the backend for ever user every minute.

- Co-authored-by: @Tirokk <wolle.huss@pjannto.com>
2020-02-05 17:37:38 +01:00
mattwr18
04f0467d2d Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1703-add-vue-apollo-subsriptions 2020-02-05 14:33:57 +01:00
mattwr18
60cd593826 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1724-block-users 2020-01-30 10:47:50 +01:00
mattwr18
bcc1ab167e Improve styling per @alina-beck review 2020-01-30 10:46:43 +01:00
mattwr18
a28eb8c91f Start subscriptions for notifications 2020-01-24 18:23:59 +01:00
Mike Aono
d49afc25cf test(cypress): Cover "Pinned post" feature
* Implement cypress tests

- Start implementation of cypress tests for pinned posts

* Test that Admin can pin a post

- Tests the process of an admin pinning a post

* Resolve failing tests

- Fix ordering of posts immediately after pinning posts by reloading page
- Check that tests are pinned posts are displayed first for role user

* Refactor to seperate the initialization

- Of the post data created in the database during setup

* Fix toaster test

* test(cypress): Add missing parts for pin feature

* docs(cucumber): Link to admin 🥒 folder

* Follow @mattwr18's suggestions

* test(backend): Order pinned posts like frontend

@mattwr18 I think this was a false negative.

Co-authored-by: Robert Schäfer <git@roschaefer.de>
2020-01-23 20:30:12 +01:00
mattwr18
bbb4dd56cd Follow review suggestions/add button to unblock
- @roschaefer gave several suggestions
- we have a button to unblock/unmute users on profile page
2020-01-23 19:18:12 +01:00
mattwr18
704b8c2d57 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1724-block-users 2020-01-21 21:15:03 +01:00
mattwr18
c7ee90e980 Follow @roschaefer PR suggestions
- As blocking is now reciprocal, we do not need another query, we can
  use neo4j-graphql-js magic to query for a BLOCKED relationship between
the postAuthor and the currentUser
2020-01-21 18:50:46 +01:00
mattwr18
84e475fd8a Merge branch 'master' of github.com:Human-Connection/Human-Connection into 279-blacklist-users-content 2020-01-13 21:22:58 +01:00
mattwr18
1f06a862e7
Merge pull request #2262 from Human-Connection/1463-search-for-users
🍰 Search For Users
2020-01-10 13:59:44 +01:00
mattwr18
5d5574b1b5 Blocked users cannot comment on my posts 2020-01-09 16:07:25 +01:00
mattwr18
ba3e9e1025 Rename blacklist/whitelist to mute/unmute
- Follow @roschaefer suggestion in issue
- This can be reverted if we decide otherwise
2020-01-08 18:04:26 +01:00
mattwr18
c297b83f87 Convert block/unblock to blacklist/whitelist
- at the moment, we have implemented blocked like we want the
blacklist/whitelistUserContent to be, with the exception that is should
not be both ways. If I blacklist a user's content, they still see my
content in their news feed.
2020-01-07 18:57:35 +01:00
Moriz Wahl
57ab9128ea removed Hashtag search 2020-01-07 09:16:34 +01:00
Moriz Wahl
71c9d92aea query string for searches changed and basics for Hashtag search added 2020-01-06 16:46:43 +01:00
Moriz Wahl
a3cfbb09cb Fixes 2603 2019-12-23 15:24:51 +01:00
roschaefer
2bf998d1ba DRY graphql query with fragments
This is also adding `disabled`, `deleted` flags. I don't know if it
would change anything in the template, but now they are there.
2019-12-20 20:20:47 +01:00
mattwr18
3ef04f8391 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1463-search-for-users 2019-12-19 17:16:48 +01:00
Wolfgang Huß
377f2eecd2
Merge pull request #2351 from Human-Connection/1746-Blur_explicit_Image_Content
Blur Images
2019-12-19 11:46:38 +01:00
mattwr18
3abfe13dcc Fix maintenance service/LocaleSwitch import 2019-12-17 16:15:11 +01:00
Alexander Friedland
ed617f8c83
Merge branch 'master' into 1746-Blur_explicit_Image_Content 2019-12-17 07:39:26 +01:00
roschaefer
107409ecee Fix duplicate fragment user issue
This is refactoring all our fragments and fixing the warning about an
existing name `user`. Apparently, fragments should have a unique name
globally.

I decided to call `userFragment`, `postFragment` the fragments for one
object and use different names to query for related objects.

I would be glad to learn a better way to handle this.
2019-12-14 00:37:42 +01:00
mattwr18
4cd43b68a4 Refactor further search
- in the end, the error was due to not asking for the id of the author
back of the Post.. grrr.... why couldn't we get better error messages!!

- Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2019-12-13 15:56:18 +01:00
mattwr18
1f2216cd4f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1463-search-for-users 2019-12-13 12:31:14 +01:00
mattwr18
ebc5cf392d Fix search by adding result id
- Apollo cache requires an id to commit to their store
- add id to each query result
- refactor out the store
- still can use a lot of refactoring
2019-12-13 12:30:00 +01:00
mattwr18
fd1e2c91fd Refactor to consolidate UpdateUser mutations 2019-12-12 18:48:56 +01:00
mattwr18
d375ebe7d9 Write test/refactor tests/resolvers/middleware
- write tests for userMiddleware
- checks the functionality of nodes/locations middleware
- refactor to not allow users to update to remove their name
  debatable whether we want that or not, but we do not allow users to
create accounts with no name, so we should be consistent, before we were
using neode to validate this, but we have are removing neode from
production code, so we must validate ourselves
- collate UpdateUser mutations to one
2019-12-12 18:14:47 +01:00
ogerly
a6cbbbeaf1 DB rename blurImage to imageBlurred 2019-12-12 10:42:52 +01:00
Alexander Friedland
b89e081bad
Merge branch 'master' into 1746-Blur_explicit_Image_Content 2019-12-11 10:39:55 +01:00
roschaefer
deefc4e12f Improve notification query performance
Just don't ask for stuff that you don't want to show anyways
2019-12-10 18:09:32 +01:00
mattwr18
60bf819a56 Remove counts to make less expensive db requests 2019-12-09 17:41:38 +01:00
mattwr18
79c6bd5c20 Paginate moderations page without losing filtering
Co-authored-by: Tirokk <wolle.huss@pjannto.com>
2019-12-09 16:37:04 +01:00
Alexander Friedland
dee22d33db
Merge branch 'master' into 1746-Blur_explicit_Image_Content 2019-12-06 07:21:49 +01:00
mattwr18
4d0df181b6
Merge pull request #2432 from Human-Connection/remove-query-for-disable-property-for-reports
Remove disable from reports.disable Query
2019-12-05 21:14:55 +01:00
mattwr18
517963174b We are not setting disable on Report node
- we are adding the report rule which says that if a resource was
disabled by a report with this rule, then the latest review was the one
that disabled it.
- fix db script/ add new directory for keeping record of db scripts
2019-12-05 19:52:05 +01:00
mattwr18
be319615f8 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 2253-fix-scroll-layout-issue 2019-12-05 11:16:16 +01:00
ogerly
6ce797e8ef test review 2019-12-04 11:20:27 +01:00
mattwr18
7db3696819 Return createdAt/updatedAt for Report 2019-12-02 20:50:28 +01:00