97 Commits

Author SHA1 Message Date
aonomike
cc61ce5461 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 296-image_component 2019-05-10 14:49:02 +03:00
aonomike
e55129c64b Merge branch '296-image_component' of github.com:Human-Connection/Human-Connection into 296-image_component 2019-05-09 21:04:46 +03:00
aonomike
6445c534b4 Refactor to pass imageProps as an object without the computed section 2019-05-09 21:04:07 +03:00
Matt Rider
fdab1e12c2 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 296-image_component 2019-05-08 21:32:08 -03:00
aonomike
bf57198815 Refactor code based on comments from PR review 2019-05-09 02:27:03 +03:00
aonomike
399507c7fb Fix linting issues 2019-05-07 15:56:31 +03:00
aonomike
3ff034d014 Refactor <img> tags to use Image component 2019-05-07 15:21:42 +03:00
Robert Schäfer
0637d97648 Merge remote-tracking branch 'origin/master' into 2019/kw15/User_can_change_its_username_to_emptystring 2019-05-07 14:09:10 +02: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
Matt Rider
ad46c2d059 Remove cypress test
- it is not part of the scope of this ticket, and therefore should be extracted and dealt with separately
2019-05-05 12:26:02 -03:00
Matt Rider
1fff9bbc46 Add cypress test to expose comment creation bug
- at the moment, one can create the same comment by clicking rapidly on the "Comment" button
- an idea for a fix https://stackoverflow.com/questions/53101521/prevent-repeated-queries-in-apollo-server-2
2019-05-04 18:46:34 -03:00
Matt Rider
70fb34345d Improve test by mounting CommentList with data 2019-05-03 15:53:16 -03:00
Matt Rider
da218f8a58 Add component test for extracted CommentList.vue 2019-05-03 15:48:20 -03:00
Matt Rider
d1c8682710 Update method name to be more descriptive/accurate 2019-05-03 15:47:54 -03:00
aonomike
f4b054d4c5 Fix linting error 2019-05-03 20:46:58 +03:00
Matt Rider
ebc290c6af Delete CommentForm.test.js, remove console.log
- this test is not part of this PR and I'll create another issue and put in a different PR for it
2019-05-03 13:39:43 -03:00
Matt Rider
957d894322 Start writing component test
- restructured directories
2019-05-03 11:18:14 -03:00
aonomike
f8ff40148c Add implementation to prefix relative image urls with '/api' 2019-05-03 16:21:33 +03:00
Matt Rider
40f5b6acd5 Extract CommentsList component
- this allows to Query for comments by Post
2019-05-02 21:03:31 -03: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
Matt Rider
1b84ccbdfa Update to allow single character comments or greater 2019-04-29 12:19:27 -03:00
Matt Rider
30d0ff3cc7 Search for button with text "Comment" in cypress test 2019-04-26 11:31:18 -03:00
Matt Rider
5891129662 Ordered comments like alpha, move HcCommentForm, mobile responsive
- in the first instance, we will be importing posts/comments from the alpha, so to maintain consistency, we've ordered them alike. In the future, we could support user choice of order.
- Gives more space for HcCommentForm, user can see comments added to list, helps with mobile responsiveness

Co-authored-by: Tirokk <wolle.huss@pjannto.com>
Co-authored-by: Mike Aono <aonomike@gmail.com>
2019-04-26 08:57:29 -03:00
Matt Rider
05ad8ccc30 Remove unused variable/method 2019-04-25 16:36:59 -03:00
Matt Rider
c387760046 Extract CommentForm component
- Cypress test is now passing as a result

Co-authored-by: Tirokk <wolle.huss@pjannto.com>
2019-04-25 14:20:00 -03:00
Matt Rider
092dcd7122 Get cypress test passing in a hacky way 2019-04-25 10:10:08 -03:00
Matt Rider
7fafa1eb6e Get clear working properly 2019-04-24 20:56:15 -03:00
senderfm
412b56cffe seperatet username from truncate 2019-04-24 17:45:38 +02:00
Matt Rider
8ae632be7b Fix component test, comment out form submission from cypress
- Added $t function to test now that it is being localised
- We are submitting the form by clicking on the button as a normal user would
- Cypress test still broken due to peculiarities of tiptap editor
2019-04-24 12:28:53 -03:00
Matt Rider
546e2c99ad Localise text, remove frontend validations
- validations are not working for the editor, they only work for our ds-input
2019-04-24 09:15:41 -03:00
Robert Schäfer
5978adff68 Sketch a test for a custom image component
@tansaku @aonomike I hope this clarifies the task.

When you're done, feel free to use this component wherever we use
`<img>` in `/webapp/`.
2019-04-23 19:35:41 +02:00
d8546da116
fixed new mixins folder 2019-04-19 12:12:01 +02:00
6de253fd32
Merge branch 'master' into 2019/kw15/User_can_change_its_username_to_emptystring
# Conflicts:
#	webapp/components/_mixins/seo.js
#	webapp/components/mixins/seo.js
#	webapp/layouts/blank.vue
#	webapp/layouts/default.vue
#	webapp/mixins/seo.js
2019-04-19 12:09:24 +02:00
55c1ac276d
use truncate instead of substring 2019-04-19 11:52:01 +02:00
d986e086c4
use mixins instead of duplicate methods 2019-04-19 11:47:07 +02:00
Robert Schäfer
6c37f525c5 Grey out a read notification + test it 2019-04-18 17:11:22 +02:00
Robert Schäfer
9a96f22870 Finish Mention.feature 🥒 2019-04-17 22:29:55 +02:00
3eb96a20b2
lint fixes 2019-04-17 15:21:08 +02:00
2efc77097f
match specification of Dennis - minimum 3 characters for username, no hint for user to change the username to "Anonymous", Toast error if userdata cannot be changed due to username restrictions, display "Anonymous" if no username is found in database (even tho this is against implemented rules) 2019-04-17 14:49:03 +02:00
Robert Schäfer
055b79bfe2 RemoveLinks is better suited as a filter
Unfortunately with `v-html` you cannot use filters directly in
handlebars.
See: https://github.com/nuxt/nuxt.js/issues/231

I also fixed the tests even **without** mocking vue-filters.js plugin 👍
2019-04-17 01:54:53 +02:00
Robert Schäfer
e595135e9d Display post.createdAt along with Notification 2019-04-17 01:18:53 +02:00
Robert Schäfer
f5afdf2435 Merge Notification with NotificationPostCard
cc @mattwr18 Please don't see this as a revert of your work. Your
structure of the `notification-post-card` component was helpful and showed
the redundancy with `hc-post-card`. I reused a lot of the code, but
because I merged both components it now *looks* as if I authored all the code.
2019-04-17 01:10:17 +02:00
Robert Schäfer
00046a5429 Remove obsolete href method 2019-04-17 00:08:39 +02:00
Robert Schäfer
c4577aa3e8 Move mixins to the right place 2019-04-17 00:08:39 +02:00
Robert Schäfer
4f2e70e871 Refactor and harden PostCard component 2019-04-17 00:08:21 +02:00
Robert Schäfer
128480fd0e Implement first test for Notification
Fixed a bug along the way `(post.contentExcerpt == null)`
2019-04-17 00:08:21 +02:00
Robert Schäfer
af60ad39a4 Follow directory layout 2019-04-17 00:08:21 +02:00
Robert Schäfer
9ed204fa72 Open mentioning link in new tab
This will help some people not to loose data after accidently clicking
on the user @-mentioning.
2019-04-17 00:08:21 +02:00