ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,450 Commits 117 Branches 1,511 Tags
Commit Graph

86 Commits

Author SHA1 Message Date
Robert Schäfer
2736738c36 Fix @Tirokk's suggestions 
Wow @Tirokk that was a good catch! I thought that the emitting side
knows the `index`, but no, it only emits `removePostFromList` and that's
it. In order to delete the right post, we have to pass in the `index`
ourselves. So, the caller of the function is the page component itself.

I didn't see the error myself, because in Javascript if you parse
`undefined` or `null` as Integer, you get 0 and it does not raise an
error.
 2019-07-15 18:26:23 +02:00
Robert Schäfer
585e798dc0 Fix #822 by updating the counts of the user 
The load more button depends on the total of the posts available.
Removing posts changes the total counts, so we have to manually update
it.
 2019-07-13 23:57:14 +02:00
Matt Rider
7d9e6623ea Merge branch 'master' of github.com:Human-Connection/Human-Connection into 759-teaser-image-create-posts 2019-06-20 12:28:26 -03:00
Wolfgang Huß
68dcbacaff Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 734-authorization-problem-disabling-post 
# Conflicts:
#	webapp/components/ContributionForm/index.vue
#	webapp/graphql/PostMutations.js
 2019-06-14 19:02:33 +02:00
Wolfgang Huß
0b0fd6e825 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 734-authorization-problem-disabling-post 
# Conflicts:
#	webapp/pages/post/_id/_slug/index.vue
#	webapp/pages/profile/_id/_slug.vue
 2019-06-14 18:56:02 +02:00
mattwr18
dd627535e4
Merge pull request #795 from Human-Connection/781-language-of-contribution 
Create Posts with a specified language, or fallback
 2019-06-14 13:53:22 -03:00
Matt Rider
1c10e0863f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 781-language-of-contribution 2019-06-14 13:31:39 -03:00
Matt Rider
664a8b327f Merge branch 'master' of github.com:Human-Connection/Human-Connection into 404-delete-user-account-and-data 2019-06-14 11:37:45 -03:00
Wolfgang Huß
58b36372b9 Merge remote-tracking branch 'origin/master' into 734-authorization-problem-disabling-post 
# Conflicts:
#	webapp/pages/profile/_id/_slug.spec.js

Defined missing `$filter.truncate` which made console errors in the webapp Jest test.
 2019-06-14 11:11:22 +02:00
Matt Rider
306da8a4e3 Revert _slug.vue to master 2019-06-13 16:05:20 -03:00
Matt Rider
3c3db87c1b Add back deleted translations 
- mistakenly deleted when working through merge conflict
 2019-06-13 15:34:45 -03:00
Wolfgang Huß
482ac1572b Refactored and created the tests of DeletePostCallback 
Created a folder `utils` for PostHelpers.js.
Fixed a new incoming problem of the master with deleting Posts on the User Profile.

Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-06-13 19:23:13 +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
40aaa151dd Merge branch 'master' of github.com:Human-Connection/Human-Connection into 781-language-of-contribution 2019-06-12 16:42:40 -03:00
Matt Rider
70567857e8 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 404-delete-user-account-and-data 2019-06-12 15:51:38 -03:00
Wolfgang Huß
cd0074ec86 Merge remote-tracking branch 'origin/master' into 734-authorization-problem-disabling-post 
# Conflicts:
#	webapp/pages/profile/_id/_slug.spec.js
#	webapp/pages/profile/_id/_slug.vue
 2019-06-12 18:22:50 +02:00
Wolfgang Huß
1339734281 Rename DeleteModal to ConfirmModel and write some refactor some tests 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-06-12 18:02:50 +02:00
Wolfgang Huß
8eb089d218 Rename event deletePost to removePostFromList 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-06-12 15:58:23 +02:00
Wolfgang Huß
1c6016ddcc Refactored the PostHelpers to an imported lib instead a mixin 2019-06-12 09:05:43 +02:00
Matt Rider
4407d6648a Add component tests, translations 2019-06-11 15:47:10 -03: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
Matt Rider
a110a067fa Add teaser image to contribution form 2019-06-08 14:24:55 -03: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
Wolfgang Huß
b2e1873ade Refactored to modalData for Delete Comment and Posts 
The error is gone with this.
 2019-06-07 18:04:12 +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
Wolfgang Huß
f944142e4b Very first approach to resolve callback problem in direction of customization of Modals 2019-06-06 16:33:35 +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