2667 Commits

Author SHA1 Message Date
Alina Beck
5586335ed2 refactor css, fix design issues 2019-12-11 18:54:49 +03:00
Alina Beck
dd89c2655b add button states 2019-12-11 17:06:06 +03:00
Alexander Friedland
b89e081bad
Merge branch 'master' into 1746-Blur_explicit_Image_Content 2019-12-11 10:39:55 +01:00
ogerly
0f3e4673ba clear css 2019-12-11 10:37:08 +01:00
ogerly
46db785550 fix lint, fix test 2019-12-11 10:33:10 +01:00
ogerly
e737a3cd82 review alina add 2019-12-11 08:25:32 +01:00
roschaefer
e24d8035b1 Fix this annoying bug with a tested helper
I don't know where the bug originates. But it can only be that either
`previousResult` or `fetchMore` result is sometimes undefined. This
should make the function bullet-proof for these situations.
2019-12-10 23:28:01 +01:00
roschaefer
5e53a155be Show the comments again
@alina-beck the CSS class `.ds-card-footer` gets in the way of the
`overflow: hidden` from the styleguide. The scoping avoids the issue.

Of course this is not a great solution and the whole file needs to be
refactored and fixed. I also see a lot of `<div>`s with a style
attribute. All of that is legacy code that survived for too long.
2019-12-10 18:53:40 +01:00
mattwr18
84edde273d
Merge pull request #2467 from Human-Connection/revert-layout-changes-imageAspectRatio
Revert layout changes image aspect ratio
2019-12-10 17:41:53 +01:00
mattwr18
4293fb845b
Merge pull request #2472 from Human-Connection/quickfix_for_nullpointer_error_in_user_vue
Quick fix for null pointer error in User.vue
2019-12-10 15:51:11 +01:00
mattwr18
da169d5d14 Revert changes to test 2019-12-10 15:40:03 +01:00
mattwr18
fb4f487abd Revert layout changes for imageAspectRatio
- we still add the imageAspectRatio for new posts, but we don't do
anything with the layout until we figure out how to add
imageAspectRatios for every post with an image in the database without
causing a big downtime
2019-12-10 15:40:03 +01:00
Robert Schäfer
1b787d7687
Merge pull request #2416 from Human-Connection/checkbox_no_comercial_add_to_creatUserAccount
Checkbox 'no comercial + no political account' add to creat user account
2019-12-10 15:21:40 +01:00
mattwr18
9703066699 Rename prop name following @roschaefer suggestion
- missed in previous PR
2019-12-10 14:37:05 +01:00
Alina Beck
2c2f69fbf8 add BaseButton component 2019-12-10 16:25:14 +03:00
Moriz Wahl
bdbabc2d12 Cleaning up backend, bugfix in frontend 2019-12-10 12:34:12 +01:00
Moriz Wahl
72e4d0abbc Basic Search Is Working For Users And Posts
The story of SearchInput.vue throws errors because of line 81, dateTime. What must be included to fix this?
The search results shown by the frontend are sometimes differnt from the response of the backend. It shows no results found though there are results incoming.
Tests are not implemented yet.
2019-12-10 10:36:08 +01:00
Moriz Wahl
81842592df Simple Implementation In Stroybook Of SearchInput
By the way, I added *~ to .gitignore, which are the backups of emacs editor.
See the Storybook of SearchInput.
Problems:
* I found no way to separate the heading of the search results from the first item. Do we have to write a complete new component for this?
* The incoming data must by sorted by type before passed to the component. I added keys searchType and firstType, to identify the type (post/user) (may be as a locale) and to know when I have to place the heading.
2019-12-10 10:36:08 +01:00
Moriz Wahl
3e6124fd92 Add Basic Story For SearchInput
I had to remove `| dateTime('dd.MM.yyyy')` in line 61 of the vue file due to issues with $i18n which surely can be easyly solved.
The idea is, that `results` is an object which contains the keys `posts` and `users`. The values are arrays with the search results.
2019-12-10 10:35:25 +01:00
Moriz Wahl
7d17c5c6d7 Created Folder For SearchInput And Changed Paths 2019-12-10 10:35:25 +01:00
Moriz Wahl
646df3e2b0 updated story 2019-12-10 10:34:42 +01:00
Moriz Wahl
3d2c501377 changed data structure 2019-12-10 10:34:42 +01:00
Moriz Wahl
595320dd1b Simple Implementation In Stroybook Of SearchInput
By the way, I added *~ to .gitignore, which are the backups of emacs editor.
See the Storybook of SearchInput.
Problems:
* I found no way to separate the heading of the search results from the first item. Do we have to write a complete new component for this?
* The incoming data must by sorted by type before passed to the component. I added keys searchType and firstType, to identify the type (post/user) (may be as a locale) and to know when I have to place the heading.
2019-12-10 10:34:42 +01:00
Moriz Wahl
f9678a7512 Simple Implementation In Stroybook Of SearchInput
By the way, I added *~ to .gitignore, which are the backups of emacs editor.
See the Storybook of SearchInput.
Problems:
* I found no way to separate the heading of the search results from the first item. Do we have to write a complete new component for this?
* The incoming data must by sorted by type before passed to the component. I added keys searchType and firstType, to identify the type (post/user) (may be as a locale) and to know when I have to place the heading.
2019-12-10 10:34:42 +01:00
Moriz Wahl
ee1bc67696 Add Basic Story For SearchInput
I had to remove `| dateTime('dd.MM.yyyy')` in line 61 of the vue file due to issues with $i18n which surely can be easyly solved.
The idea is, that `results` is an object which contains the keys `posts` and `users`. The values are arrays with the search results.
2019-12-10 10:33:18 +01:00
Moriz Wahl
6b68e18be6 Created Folder For SearchInput And Changed Paths 2019-12-10 10:32:11 +01:00
Moriz Wahl
79596ab375 updated story 2019-12-10 10:31:04 +01:00
Moriz Wahl
433e7d409a changed data structure 2019-12-10 10:31:04 +01:00
Moriz Wahl
8758bc9e42 Simple Implementation In Stroybook Of SearchInput
By the way, I added *~ to .gitignore, which are the backups of emacs editor.
See the Storybook of SearchInput.
Problems:
* I found no way to separate the heading of the search results from the first item. Do we have to write a complete new component for this?
* The incoming data must by sorted by type before passed to the component. I added keys searchType and firstType, to identify the type (post/user) (may be as a locale) and to know when I have to place the heading.
2019-12-10 10:28:43 +01:00
Moriz Wahl
6475458fe8 Add Basic Story For SearchInput
I had to remove `| dateTime('dd.MM.yyyy')` in line 61 of the vue file due to issues with $i18n which surely can be easyly solved.
The idea is, that `results` is an object which contains the keys `posts` and `users`. The values are arrays with the search results.
2019-12-10 10:28:43 +01:00
Moriz Wahl
9f4702d002 Created Folder For SearchInput And Changed Paths 2019-12-10 10:28:43 +01:00
roschaefer
30870d832b Quick fix for null pointer error
`this.openMenu` is not a function`
2019-12-10 02:47:19 +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
ogerly
5ae6b3c954 fixed contributionForm.vue 2019-12-06 13:16:40 +01:00
ogerly
652f6d1edc fix reviews ContributionForm, ContributionForm.spec 2019-12-06 10:53:26 +01:00
ogerly
a62d59741b fix and changes revies, fix lint 2019-12-06 09:16:14 +01:00
Alexander Friedland
dee22d33db
Merge branch 'master' into 1746-Blur_explicit_Image_Content 2019-12-06 07:21:49 +01:00
roschaefer
fdca5b008b Return empty array instead null for "not reviewed"
@mattwr18 why did you add the null check in th resolver?
2019-12-06 02:47:14 +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
mattwr18
8bd69e9e2f Fix import path 2019-12-04 20:11:34 +01:00
mattwr18
7becb09ef7 Add tests/Refactor
- Move tests which are not resource specific to own describe block, add
test cases
2019-12-04 19:41:58 +01:00
mattwr18
fe63e42262 Refactor component/story/test
- Remove data-test where not necessary
- Refactor tests to remove tests that belong in ReportRow
- Fix story
2019-12-04 19:40:32 +01:00
mattwr18
a59e72d8a8 Add stories/specs for ReportList 2019-12-04 19:40:08 +01:00
mattwr18
d0a18fded8 Rename component, add story/specs 2019-12-04 19:39:36 +01:00
mattwr18
235702867d Move components to components/features
- we are reserving _new directory for components that have no dependency
on the Nitro-Styleguide
- update pat
2019-12-04 19:38:48 +01:00
mattwr18
26b4d4ab93 Add clock icon inside if clause 2019-12-04 19:37:21 +01:00
ogerly
b532a38966 lint fix 2019-12-04 15:23:16 +01:00
ogerly
7b0b2cc93e rename checkedBlur to blurImage, testing checkbox 2019-12-04 15:14:57 +01:00
Alina Beck
b1955e64f4 improve tests, following @roschaefer suggestions 2019-12-04 16:57:42 +03:00