53 Commits

Author SHA1 Message Date
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
mattwr18
26b4d4ab93 Add clock icon inside if clause 2019-12-04 19:37:21 +01:00
mattwr18
085b59bf4d Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-12-04 13:23:06 +01:00
roschaefer
75b2785941 Follow @alina-beck's suggestions 2019-12-03 00:47:07 +01:00
roschaefer
048fb51116 feat: swap user name<=>handle for discriminability 2019-11-30 11:03:46 +01:00
mattwr18
a8a9abb4e4 Refactor/Add new components 2019-11-29 14:02:53 +01:00
mattwr18
3d8435dde1 Get frontend working with data from backend 2019-11-28 16:13:48 +01:00
Alina Beck
3116f8cc0a use imageAspectRatio to set an estimated initial height for grid items 2019-11-27 21:35:43 +03:00
mattwr18
e6fdb70a07 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-11-27 18:09:24 +01:00
Alina Beck
77f4810ddc set up global localVue
by setting up localVue with all required plugins (such as styleguide and vuex)
in a separate testSetup file we can avoid doing this individually in all component tests
the testSetup is executed before each test suite, so each test file gets a fresh
instance of localVue
2019-11-20 12:31:40 +03:00
Alina Beck
4e6572a042 replace ds-icon with base-icon 2019-11-19 12:26:07 +03:00
Wolfgang Huß
913fcc2cdb Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation
# Conflicts:
#	backend/src/schema/index.js
#	webapp/locales/pt.json
2019-11-14 09:41:00 +01:00
Alexander Friedland
8bb8bb220d
Merge pull request #2193 from Human-Connection/Delete_BlockButton_in_MainPage_PostCard
Fix: Delete Block Button in MainPage PostCards
2019-11-12 11:18:42 +01:00
Wolfgang Huß
677039b786 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation
# Conflicts:
#	webapp/pages/moderation/index.vue
2019-11-11 17:52:58 +01:00
ogerly
47720e3ce0 Fix: Delete Block Button 2019-11-11 12:16:11 +01:00
mattwr18
44ed462db2 Add NotificationsTable story, refactor code
- Use percentages for width on all columns to help with resonsiveness
- export constants from other stories to dry code out
2019-11-11 08:52:04 +01:00
Wolfgang Huß
965882885a Refactor moderators report list 2019-10-18 15:41:18 +02:00
roschaefer
99db1338c1 docs: add storybook section for edit information 2019-10-04 01:05:39 +02:00
roschaefer
3912b21ea2 refactor: use named slot for additional text
@mattwr18 I can see odd behaviour of the EDITED marker on mobile: The
text would just overlap.

The current behaviour has its flaws, e.g. if you have a long text it
won't wrap but overflow the comment card. But putting the additional
text into a named slot is certainly better than adding some nodes next
to the `<hc-user>` component.
2019-10-04 01:00:31 +02:00
Robert Schäfer
d830fa4ae4
Merge pull request #1596 from Human-Connection/1583-follow-mutation
Improve follow/ufollow mutation
2019-09-19 16:54:35 +02:00
Vasily Belolapotkov
39db954ec6 improve follow/unfollow mutation usage 2019-09-19 12:10:59 +03:00
roschaefer
ec7d9753db Follow @alina-beck's PR review
https://github.com/Human-Connection/Human-Connection/pull/1640#pullrequestreview-290089879
2019-09-18 23:32:10 +02:00
roschaefer
ade92e387d Add slug to User component, fix #1486 2019-09-18 17:15:01 +02:00
Vasily Belolapotkov
fac7faf877 Sync 293-fix-follower-counter with master 2019-09-10 09:02:52 +03:00
Wolfgang Huß
f72bccbebe Fix lint prettier 2019-09-09 16:43:54 +02:00
roschaefer
28776d7a6a Avatar should be centered on profile page
This is a fix of e04eedf0d07ff66dba3e881e9ef8bdf5a868619e
2019-09-09 15:02:56 +02:00
Vasily Belolapotkov
beb78249f6 update follower count on follow/unfollow 2019-09-09 10:01:46 +03:00
roschaefer
e04eedf0d0 Fix and DRY hc-avatar stylings 2019-09-06 13:36:11 +02:00
roschaefer
a053181334 Fix #1506 2019-09-06 13:29:53 +02:00
Matt Rider
2af4151918 Update to use <client-only> instead of <no-ssr> 2019-08-26 17:09:24 +02:00
mattwr18
90fa70e83d
Merge pull request #1282 from Human-Connection/count_from_0_to_0_by_default
Get rid of property warnings
2019-08-19 10:06:09 +02:00
roschaefer
aa52587f83 Get rid of property warnings
If we always choose `0` as the default value for `endVal` in case it is
not given (maybe apollo assigns null when the request is in flight) then
just make `0` the default.
2019-08-16 17:08:00 +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
Robert Schäfer
b8c5db48a6 Implement prefix of image urls with a filter
Fix #820

Ok, so after I would have to use the same method in three different
locations (`<ds-card>` expects an `image` attribute but cannot render
entire components) I decided to implement the prefix of image urls with
a filter rather than a component. The downside of this is that we have
to add the filter on a lot of component tests. The benefit is less
components and hopefully less complexity.
2019-06-13 16:56:41 +02:00
Matt Rider
f732ff44d0 Merge branch 'master' of github.com:Human-Connection/Human-Connection into dependabot/npm_and_yarn/webapp/prettier-1.17.1-fix_incompatibility 2019-05-29 10:33:43 -03:00
Matt Rider
ff0b4b6867 Fix lint 2019-05-29 09:47:24 -03:00
Robert Schäfer
db9596e276 Replace HcAvatar where possible
We still have `<ds-avatar>` in the code. It's used for the social media
icons. I'll leave it as it is for now.
2019-05-28 15:20:24 +02:00
5202763dd8
frontend lint fixes 2019-05-23 19:40:39 +02:00
7095e38947
fixed post card design 2019-05-17 23:10:10 +02:00
Matt Rider
bb306cad49 Update other ds-avatar sizes 2019-05-10 10:30:02 -03:00
Matt Rider
c28c51d86f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 586-deal-with-yarn-warn-due-to-invalid-size-prop 2019-05-10 10:20:23 -03:00
Robert Schäfer
6c5f529d85 Couple of corrections
@aonomike use computed properties when possible
2019-05-10 13:58:24 +02:00
Matt Rider
6e675c74d5 Update ds-avatar size to use small 2019-05-09 15:34:24 -03:00
Robert Schäfer
f27dca504b Refactor mixin with computed property
@ulfgebhardt I refactored the mixin because it's not enough code to
justify the additional complexity. If it's just two lines of code, I
find it the best solution to use a computed property.

You can use components and computed properties excessively, they tend to
be easier to maintain in the long run.
2019-05-06 22:59:25 +02:00
Robert Schäfer
ad111f5701 Double-check changed expectations, fix tests
See:
https://github.com/Human-Connection/Human-Connection/pull/478/files#r281267486

> We found the reason for it: If you have an exclamation mark in the schema e.g.
> email! and the response would e.g. expect the email for each User object, and
> the server does not have an email for the client, then the entire User object
> gets nullified.
2019-05-06 19:26:53 +02:00
ad05dcf735
frontend tests, backend tests 2019-05-02 17:47:34 +02:00
0be2891858
make email a required field for user, tests for front- & backend 2019-05-02 16:17:16 +02:00
senderfm
412b56cffe seperatet username from truncate 2019-04-24 17:45:38 +02:00
d8546da116
fixed new mixins folder 2019-04-19 12:12:01 +02:00
d986e086c4
use mixins instead of duplicate methods 2019-04-19 11:47:07 +02:00