845 Commits

Author SHA1 Message Date
mattwr18
6d1044d292 Hide new CommentForm while editing a comment 2019-10-21 16:08:01 +02:00
Alina Beck
c2c69a2f70 update styling and wording for pinned post ribbons 2019-10-21 14:34:26 +03:00
mattwr18
8872dc16cf Follow @Tirokk's PR review suggestions
- add type :User to match
- remove unneeded outdated pinPost
2019-10-18 18:27:20 +02:00
mattwr18
ddf8b657be Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1205-pinned-post-for-admins 2019-10-18 15:17:03 +02:00
Alexander Friedland
c819edc293
Merge pull request #1927 from Human-Connection/Set_and_save_language_in_user_settings
Language will be saved in the database of the user during registration
2019-10-18 15:11:04 +02:00
Alexander Friedland
0b5c1f831d
locale
change language to locale
2019-10-18 11:52:48 +02:00
Alexander Friedland
bfb3923023
locale
change language to locale
2019-10-18 11:50:42 +02:00
mattwr18
b800c7d5c9 Resolve pinnedAt undefinedToNull, clean up
- this was causing the noftications to break since they were using the
post fragment and pinnedAt was returning null
- remove unused bits of code
- revert changes to cypress since they were not causing the error
- can be changed in another PR
2019-10-18 00:01:46 +02:00
roschaefer
3e04b26068 Add styling to pinned post 2019-10-17 17:56:16 +02:00
mattwr18
f871df02ae Start setting up frontend pinning/unpinning
- Add pin/unpin post to content menu
- Update apollo cache to reactively unpin
- Update apollo cache in root path to re-order Posts
- Order with pinned post first
- Start setting up filters, so that the pinned post is always the first
post visible
2019-10-17 17:56:16 +02:00
Vasily Belolapotkov
20d9ba2439 wrap user component with client-only 2019-10-17 16:45:09 +03:00
Robert Schäfer
56b7aa6d0a
Merge pull request #1925 from Human-Connection/better-truncate-comments
Improved comment truncation
2019-10-17 12:21:43 +02:00
ogerly
54465c04a3 Fix Jest tests 2019-10-17 08:26:15 +02:00
mattwr18
d62ee23f2a Create new File with blob
- maintain filename
- reduce image size
2019-10-16 17:20:35 +02:00
ogerly
dd2efad937 fix lint 2019-10-16 15:02:17 +02:00
ogerly
97dad41b27 Set language will be saved in the database of the user during registration 2019-10-16 15:01:07 +02:00
Alina Beck
a306b9cf4b use constants, truncate only comments with more than 300 characters 2019-10-16 13:56:57 +03:00
Robert Schäfer
0a0690aabd
Merge pull request #1903 from Human-Connection/highlight-linked-comment
Highlight and expand linked comment
2019-10-16 12:13:16 +02:00
Robert Schäfer
0792e06a24
Merge pull request #1910 from Human-Connection/add-missing-translations-contribution-form
Add missing translations for Title placeholder
2019-10-16 12:10:19 +02:00
Wolfgang Huß
6dff10b236 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1707-reporting-with-specific-information 2019-10-16 09:27:13 +02:00
roschaefer
6a50ef6134 fix: storybook story of Comment.vue
This is the best solution that I can think of right now. Sure, it's not
so great to pass a property down from the page component. But at least
it fixes the storybook story, which is something.
2019-10-16 01:14:32 +02:00
mattwr18
17ead96450 Add missing translations for Title placeholder 2019-10-15 23:50:34 +02:00
Robert Schäfer
ade9aa209a
Merge pull request #1907 from Human-Connection/Confirm_privacy_policy_minimum_age_at_registration
Confirm privacy policy minimum age at registration
2019-10-15 23:41:00 +02:00
mattwr18
e8c6941142 Follow @roschaefer's PR review suggestions
- disable button if form.reasonCategory is falsy
- extract valuesReasonCategoryOptions to global constant
- extract reasonCategoryOptions to created lifecycle hook to keep data()
clean and use map
- extract formSchema to components/utils and test
- remove validator from formSchema and validate based on "Deep Rules" https://github.com/yiminghe/async-validator#deep-rules
- Use v-model to update reasonCategory and reasonDescription
- default to error message in English from backend
- Update template slot to use new syntax
2019-10-15 20:28:25 +02:00
ogerly
d7dc0646e0 Confirm, privacy policy, minimum age at registration 2019-10-15 19:21:05 +02:00
roschaefer
b2dccfb51c refactor: improve locale imports
While refactoring the login form component I found many inconsistent
ways of importing the list of locales. So I decided to refactor the
imports altogether. Don't use `process.env` to import locales!
2019-10-15 16:41:33 +02:00
ogerly
461defd460 WITH CHECKBOXES 2019-10-15 15:43:31 +02:00
Alina Beck
2090e3939b add $route mock to Comment and CommentList spec 2019-10-15 16:07:09 +03:00
Alina Beck
202da2a67c remove unused css 2019-10-15 15:47:24 +03:00
Alina Beck
134cea4e47 expand targeted comment by default 2019-10-15 15:44:22 +03:00
Alina Beck
597ca3029f improve html and css for collapse-button 2019-10-15 15:07:30 +03:00
Alina Beck
6318ced7a0 refactor comment component to just use one content viewer 2019-10-15 14:52:02 +03:00
ogerly
855caf78e9 reference to terms of use, data protection, minimum age at added 2019-10-15 13:05:51 +02:00
Alina Beck
cd9f2633d7 highlight comment targeted in anchor link 2019-10-15 12:09:01 +03:00
mattwr18
e307211ada
Keep button on top of crop overlay, but below navbar
Co-Authored-By: Alina Beck <alina.beck@mail.com>
2019-10-14 19:16:02 +02:00
mattwr18
b2cb65e942
Keep images from distorting or getting cropped
Co-Authored-By: Alina Beck <alina.beck@mail.com>
2019-10-14 19:13:00 +02:00
Wolfgang Huß
cae897808b Follow Matts suggestions from his review 2019-10-14 17:38:38 +02:00
mattwr18
c45f63ffd9 Follow @alina-beck PR suggestions 2019-10-14 16:42:11 +02:00
mattwr18
1c6b5f941b Remove aspect ratio on cropper, limit to max-height 2000px
- discussed it today's internal meeting and agreed upon with
@alina-beck, @Tirokk, @ogerly, @datenbrei, Dennis Hack

- max-height was a suggestion and can be changed at any time
2019-10-14 16:42:11 +02:00
mattwr18
c85b2d49b6 Remove outdated test directly calling method 2019-10-14 16:42:11 +02:00
mattwr18
0d5b334f66 Remove unneeded max-heights 2019-10-14 16:42:11 +02:00
mattwr18
cabd68f7d8 Clean up code
- Set dropzoneOptions.url to arrow function which returns empty
string... url is required, but we don't use a restful api, we crop the
image and save the update file(blob) to an image

- set min-height of vuedropzone to 500px to be closer to the cropped
image and to center image overlay

- remove dz-message div, as one is already created automatically by
vue2-dropzone
2019-10-14 16:42:11 +02:00
mattwr18
3beddf1f69 Contain post/contribution form to limit width
- enforce 1.25:1 aspect ratio to be as close to possible with the 1:1
aspect ratio on our root path where we have 3 columns of 300px and a
max-height of 300px
2019-10-14 16:42:11 +02:00
mattwr18
db48e522cf Enforce a 16/9 aspect ratio
- if we set the max height any greater than this, it takes up the entire
page on a desktop screen
2019-10-14 16:42:11 +02:00
mattwr18
fa06696892 Convert canvas to blob to update file
- what was happening is that the file was being autocropped still and
sent to the backend with cropperjs autocrop... these changes update the
file's attributes so they can be saved properly
2019-10-14 16:42:11 +02:00
Brent Vardy
227db5f13a refactored tranformImage to remove dupication
- styled confirm button
- added locale translations
- added dropzoneDrop method to handle scenario where users drag and drop an image whilst in the cropper interface.

- co-authored-by: mattwr18 <mattwr18@gmail.com>
2019-10-14 16:42:11 +02:00
mattwr18
45dfc5cff1 Contain cropper overlay in image preview area
- Co-authored-by: Brent Vardy <brent.vardy@challengelogic.net>
2019-10-14 16:42:10 +02:00
Brent Vardy
d59defedf3 [WIP] - implement basic image cropping solution
#1466

- co-authored-by: mattwr18 <mattwr18@gmail.com>
2019-10-14 16:42:10 +02:00
Wolfgang Huß
f7cff9cd0b Delete shared file, because it doesn't work with jest tests 2019-10-14 16:18:26 +02:00
Wolfgang Huß
2cf2f2b011 Import report reason categories from a shared array 2019-10-14 15:20:51 +02:00