165 Commits

Author SHA1 Message Date
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
Robert Schäfer
5eaac8b077 Document loading spinner implementation with test
Because it's slightly odd how I avoid a duplicate loading spinner, I
 thought this is a good target for a test.
2019-06-11 18:48:01 +02:00
Robert Schäfer
d1364e4aed Merge remote-tracking branch 'origin/master' into 402-userprofil-tab-click-function 2019-06-11 17:41:17 +02:00
Robert Schäfer
15b7043d00 Write a test for "load more" button
The crucial test is still missing: Write a test to check that no more
than one loading spinner is visible all the time.

@Tirokk FYI I wrote a page component test and made sure that the test
will also fail if the implementation is broken.
2019-06-08 01:50:08 +02:00
Robert Schäfer
9384f85ebf Use jest's expectation matchers if possible
@Tirokk jest has a lot of assertion matchers that will give you better
error messages than the default ones:
https://jestjs.io/docs/en/expect.html#tohavelengthnumber
2019-06-07 16:53:30 +02:00
Robert Schäfer
94ea9c9530 Fix lint 2019-06-07 13:48:59 +02:00
Robert Schäfer
7ab6ce4ed2 Fix typo in translation keys 2019-06-07 13:10:04 +02:00
Robert Schäfer
a06733fbfd Translate network tab on the left profile page 2019-06-07 13:01:47 +02:00
Robert Schäfer
574b42a2a7 "commentedCount" is different from "commentsCount"
One is how many comments you wrote, one is how many **posts** are there
with at least one comment of you.

E.g. you can comment twice on the same post. You will have a
`commentedCount` increase of 1 but a `commentsCount` of 2.

FYI @ogerly @Tirokk
2019-06-07 01:39:09 +02:00
Robert Schäfer
d3a70321b8 Show a loading spinner for better UX 2019-06-07 01:39:09 +02:00
Robert Schäfer
de0bcd949a Fix test 2019-06-07 01:39:09 +02:00
Robert Schäfer
08778f3798 Remove unnecessary refetching
First of all this removes a bug, but it also shows that apollo triggers
the rerendering of dependent components.

FYI @mattwr18
2019-06-07 01:38:02 +02:00
Robert Schäfer
c9ef1bc5ce Implement switching of tabs and updating list 2019-06-07 01:38:02 +02:00
Robert Schäfer
4278c75d52 Refactor profile page, separate requests 2019-06-06 23:31:27 +02:00
senderfm
92241576b3 Implement active Tabs 2019-06-06 19:34:28 +02:00
Robert Schäfer
58f272876e Frontend uses neo4j-graphql-js's filters 2019-06-06 15:30:25 +02:00
Robert Schäfer
16dc7328e7 Finish filter by followed users only 2019-06-05 22:34:34 +02:00
Robert Schäfer
b7eb299acb Style up filter bubble menu 2019-06-05 22:34:34 +02:00
Robert Schäfer
f3b088f862 Move the filter menu into the index page
A filter makes sense only on the news feed page in my opinion. As a
comparison: The way how full text search is implemented makes sense in
the menu bar, which is always visible. Why? The search results are shown
in a popover. Therefore those are different from the news feed. The news
feed however is only visible on the index page. Therefore I believe, it
makes sense to put the filter menu there and only there.
2019-06-05 22:34:34 +02:00
senderfm
12e79c83da Fixed No untranslated strings 2 2019-06-05 10:45:00 +02:00
senderfm
42f5fb6bf3 Fixed No untranslated strings 2019-06-05 10:38:15 +02: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
Wolfgang Huß
5bec0f1d72 Refined list deletion functions and started writing custom mutation for DeleteComment and their tests 2019-05-31 15:46:34 +02:00
Wolfgang Huß
3e3e447bc5 Refactored three quater of the tests 2019-05-29 17:59:07 +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
Wolfgang Huß
19771a342e First approach to test '_slug.spec.js' 2019-05-29 12:19:51 +02:00
Wolfgang Huß
7807831e0e Merge remote-tracking branch 'origin/master' into 553-delete-comment 2019-05-29 12:17:24 +02:00
Robert Schäfer
a07ca22e26 Replace <ds-avatar> on profile page 2019-05-28 15:20:24 +02: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
Matt Rider
39d4771ce1 Fix lint 2019-05-24 08:48:52 -03:00
Matt Rider
51d25c1c9a Work through merge conflict 2019-05-24 08:23:50 -03:00
Matt Rider
460d081d52 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 399-user-profile-image-uploads 2019-05-24 08:10:17 -03:00
Matt Rider
cebd1046c7 Write cypress tests, show dropzone conditionally
- If it's the user's profile, show vueDropzone, if not show just the user's avatar
- apollo mutation is being called twice for drag and drop events
2019-05-24 01:26:37 -03:00
5202763dd8
frontend lint fixes 2019-05-23 19:40:39 +02:00
Wolfgang Huß
8bcb250951 Started to rewrite the tests of DeleteModal.vue 2019-05-23 10:22:36 +02:00
aonomike
beeb7bb947 Change ds-avatar size to x-large 2019-05-21 23:26:51 +03:00
Matt Rider
610a7f6bfe Merge branch 'master' of github.com:Human-Connection/Human-Connection into 399-user-profile-image-uploads 2019-05-21 16:15:45 -03:00
Matt Rider
d463312397 Get avatar upload working from frontend to backend
- there are several things to work on still
- the upload sets the avatar as the background image of the previewElement, which means that you must refresh the page to upload a different avatar
- the CSS is slightly different before and after successful upload
- the CSS is slightly broken in that the avatar is not in the "ideal" place, it is entirely inside the card, instead of half in, half out on the top
2019-05-20 16:37:02 -03:00
Wolfgang Huß
7e922fa0b0 Got the go to Index Page to work on Post Page deletion 2019-05-20 07:00:33 +02:00
Wolfgang Huß
f5d9bc9ae4 First proof of functionality for Delete Comment and Post via DeleteModal 2019-05-19 12:54:25 +02:00
Wolfgang Huß
7f83f775a7 Clean up the delete-menu stuff for Comments and Posts 2019-05-19 08:23:51 +02:00
Wolfgang Huß
2016a9445b Rename confirm callbacks 2019-05-19 07:42:55 +02:00
Wolfgang Huß
388e9ff6b2 Go ahead with refactoring of DeleteModal in Comments and Posts 2019-05-18 15:56:07 +02:00
Wolfgang Huß
9af8c2b46c Refactored handling of DeleteModal in Comments and Posts 2019-05-18 12:58:51 +02:00
7095e38947
fixed post card design 2019-05-17 23:10:10 +02:00
Matt Rider
49e19a3bd7 Set avatar as background image of vue-dropzone 2019-05-16 07:42:48 -03:00
Matt Rider
a04bc977d4 Fix lint
- still not automated
2019-05-14 20:57:49 -03:00