744 Commits

Author SHA1 Message Date
mattwr18
e639358557 Test drive to get the functionality how we'd like 2020-01-21 21:16:42 +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
2df4e463f8 Update/Add translations for placeholder message
- @alina-beck, I had a look at the Placeholder component and it's quite
  simple, but I guess migrating that is a separate PR, but I don't know
aobut adding more ds-placeholders, do you have some design ideas on what
could look better?
2020-01-21 19:28:19 +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
769c0cd105 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 2675-migrate-avatar-component-2 2020-01-21 17:08:51 +01:00
mattwr18
8fe6ad77e0
Merge pull request #2686 from Human-Connection/279-blacklist-users-content
feat: Convert block/unblock to mute/unmute
2020-01-21 17:05:09 +01:00
Alina Beck
287e9ce484 remove unused trunc prop 2020-01-21 17:00:37 +03:00
mattwr18
74a7db5388 Convert missed ds-avatar, fix cypress test 2020-01-20 10:08:27 +01:00
mattwr18
fdf00fc0c6 Follow @alina-beck's PR review suggestions
- Update styling
- Avoid nested tags
- Rename components with two names
- Add story

- Co-authored-by: Alina Beck <alina.beck@mail.com>
2020-01-20 10:04:30 +01:00
mattwr18
905f34c827 Support use of initials, add tests, move component
- if there is no user.avatar, we show a user's initials - up to 3
characters unless there is no name or the name is 'Anonymous'. This is
to support users who on the old alpha were allowed to be anonymous (do
we still want to support this?)

- Add test cases for ☝️
- Refactor to not use any styleguide components and move UserAvatar to
generic directory
2020-01-20 10:04:30 +01:00
mattwr18
068e2b4417 Fix styling, renaming classes 2020-01-20 10:04:30 +01:00
mattwr18
b090b1177f Migrate the bare minimum
- follow @alina-beck PR review
2020-01-20 10:04:30 +01:00
Robert Schäfer
d3473050c4
Merge pull request #2725 from Human-Connection/2229_remove_obsolete_translation
fix(translations): Remove duplicate and mistranslated item from code of conduct
2020-01-17 22:28:10 +01:00
roschaefer
c22a6330aa refactor(translations): Fix keys for muting
Provide the correct German translation. Remove "" and use `null` for
Italian. @mattwr18 we really have to make sure not to add empty strings
to our translations because we disable the fallback in that case. Also,
if we want, we could replace the other translations with `null` in order
to make sure that we have the better (though untranslated) explanation.

@mattwr18 I had a look into `notificationsMiddleware.js`. I think that
we can still keep the tests and the behaviour although there is no
`BLOCKED` relationship anymore, right?
2020-01-16 20:56:12 +01:00
roschaefer
c5a6919833 Merge remote-tracking branch 'origin/master' into 279-blacklist-users-content 2020-01-16 19:48:16 +01:00
mattwr18
0a4defe36d Merge branch 'master' of github.com:Human-Connection/Human-Connection into dependabot/npm_and_yarn/webapp/vue/test-utils-1.0.0-beta.30 2020-01-16 14:52:58 +01:00
mattwr18
851babeac3 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 279-blacklist-users-content 2020-01-16 14:48:56 +01:00
mattwr18
83491e15c8 Merge branch 'master' of github.com:Human-Connection/Human-Connection into dependabot/npm_and_yarn/webapp/vue/test-utils-1.0.0-beta.30 2020-01-16 13:19:33 +01:00
mattwr18
81cbb7a85c Refactor styling, fix naming convention
- Emotions buttons were not displaying images correctly
- Follow vue guidelines for multiword naming convention
- Favor tokens over magic px numbers
2020-01-15 17:37:54 +01:00
Alina Beck
eaf738c12b replace last instance of ds-button with base-button 2020-01-15 16:13:47 +03:00
Alina Beck
a45d9749c8 Merge branch 'master' into button-migration-fixes 2020-01-15 14:35:05 +03:00
Alina Beck
56a3822377
Merge pull request #2562 from Human-Connection/migrate-styleguide-buttons
refactor(styleguide): migrate and redesign buttons
2020-01-15 14:17:06 +03:00
Alina Beck
90d1e50b9e refactor EmotionButton 2020-01-15 11:20:18 +03:00
Alina Beck
e9ad67d39b
Merge branch 'migrate-styleguide-buttons' into button-migration-fixes 2020-01-14 17:04:25 +03:00
roschaefer
966cdc9574 fix #2229
I have to agree with @vbelolapotkov here. First of all the translation
for German an English does not match and second it does not make an awful
lot of sense to have "Report these actions" twice in the list. The
English translation "Advocacy or encouragement to these behaviors."
probably belongs into the section before.
2020-01-12 17:35:31 +01:00
roschaefer
8c29ad947b Update vue-test-utils and follow updated docs
https://vue-test-utils.vuejs.org/guides/#writing-asynchronous-tests-using-nexttick-new
2020-01-11 00:37:22 +01:00
mattwr18
5d5574b1b5 Blocked users cannot comment on my posts 2020-01-09 16:07:25 +01:00
Alina Beck
93b6323c34 make cancel buttons red 2020-01-09 13:37:15 +05:30
Alina Beck
34006a25e2 rename primary to filled 2020-01-09 13:25:12 +05:30
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
cd7f0e2783 Fix/extend cypress tests 2020-01-08 17:08:06 +01:00
Alina Beck
be30b55f65 fix styling of terms-and-conditions button 2020-01-08 14:31:37 +05:30
Alina Beck
5d2af860db wrap create-post link around button on user profile 2020-01-08 13:53:02 +05:30
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
Mo Zargham
e0b6f82878 removed typo! 2019-12-29 14:09:20 -05:00
Mo Zargham
4b9040a8a7 fixed format 2019-12-29 14:06:53 -05:00
Mo Zargham
3db3cb1171 removed ternary added v-if 2019-12-27 15:17:13 -05:00
Mo Zargham
3234c2e861 added language tag for posts 2019-12-27 15:02:51 -05: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
Alina Beck
56b1a74e64 let eslint do some magic 2019-12-19 12:53:38 +05:30
Alina Beck
ad27404059 fix failing component tests 2019-12-19 12:48:13 +05:30
Alina Beck
ea612bdf78 replace another batch of ds-buttons with base-buttons (wip) 2019-12-19 12:19:58 +05:30
Alina Beck
f6cdf9ff64 removes LoadMore button 2019-12-19 08:39:27 +05:30
Alina Beck
99a8efa8df fix emotions buttons markup 2019-12-19 01:03:35 +05:30
mattwr18
e002ed0b49 Add back layout changes/update db_manipulation
- we had removed these changes till we could deploy them by themselves
and run the db_manipulation

Co-authored-by: Alina Beck <alina.beck@mail.com>
2019-12-18 15:39:42 +01:00
Alexander Friedland
ed617f8c83
Merge branch 'master' into 1746-Blur_explicit_Image_Content 2019-12-17 07:39:26 +01:00
mattwr18
2d8fef1edc
Merge pull request #2487 from Human-Connection/fix_cannot_read_post_of_undefined_once_and_for_all
Fix broken scroll behaviour on index and profile page
2019-12-13 13:24:19 +01:00
mattwr18
dfd30cbaac Remove check for setting name to null or undefined
- this was making things more likely to fail from the frontend, we would
need to consider doing a db manipulation for users from the old alpha
who have user.name as null.
- it only protects against someone who bypasses our UI and sends a
message directly to the backend, but if they can do that we have bigger
problems.
2019-12-13 10:17:19 +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