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
6,007 Commits 117 Branches 1,511 Tags
Commit Graph

1708 Commits

Author SHA1 Message Date
Wolfgang Huß
0517e38873 Implement a form schema that works 
A `ds-form` has not worked for any reason.
 2019-10-02 15:17:53 +02:00
Wolfgang Huß
90fdd24697 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1707-reporting-with-specific-information 2019-10-02 08:59:10 +02:00
Robert Schäfer
b31126c391
Merge pull request #1701 from Human-Connection/1273-fix-post-page-nav 
fix the bug with scrolling post comments into view
 2019-10-01 23:17:53 +02:00
roschaefer
24b2cab473 fix: handle edge case noticed by @vbelolapotkov 2019-10-01 17:51:16 +02:00
roschaefer
08e73747bd refactor: set global defaults of vue-scrollto 2019-10-01 17:51:16 +02:00
roschaefer
db1bcdd3d2 refactor: register vue-scrollto in nuxt.config.js 
This will allow us to use this.$scrollTo in components. I'm now also
using this in the mixin. With so many `this`s it gets horribly
difficult to properly test the mixin in isolation. So I decided to test
the mixin on the component directly.
 2019-10-01 17:25:28 +02:00
roschaefer
9da40c4895 fix: avoid many scrollTo calls for n components 
Thank you @vbelolapotkov for pointing out the flaws here:
https://github.com/Human-Connection/Human-Connection/pull/1756#discussion_r329361572

So here is my attempt to fix it:
* Install `vue-scrollto` which relies on `requestAnimationFrame`
  - apparently this is better on Safari and IE? 🤔
  - Mocking out entire modules is easier in jest:
    https://jestjs.io/docs/en/bypassing-module-mocks
* Require `checkAnchor` to be implemented on the component
 2019-10-01 11:55:18 +02:00
dependabot-preview[bot]
6f32da4de5
Bump eslint-loader from 3.0.1 to 3.0.2 in /webapp 
Bumps [eslint-loader](https://github.com/webpack-contrib/eslint-loader) from 3.0.1 to 3.0.2.
- [Release notes](https://github.com/webpack-contrib/eslint-loader/releases)
- [Changelog](https://github.com/webpack-contrib/eslint-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/eslint-loader/compare/v3.0.1...v3.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-30 22:30:36 +00:00
Robert Schäfer
10c50a912f
Merge pull request #1765 from Human-Connection/dependabot/npm_and_yarn/webapp/tiptap-1.26.0 
Bump tiptap from 1.25.0 to 1.26.0 in /webapp
 2019-10-01 00:27:44 +02:00
Robert Schäfer
e6d6ce0fcd
Merge pull request #1768 from Human-Connection/dependabot/npm_and_yarn/webapp/date-fns-2.4.1 
Bump date-fns from 2.4.0 to 2.4.1 in /webapp
 2019-10-01 00:27:12 +02:00
Robert Schäfer
1fed79a674
Merge pull request #1658 from Human-Connection/1637-notifications-self-update 
🍰 Notifications self update and refactoring
 2019-09-30 17:52:41 +02:00
dependabot-preview[bot]
f6091aefb8
Bump date-fns from 2.4.0 to 2.4.1 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.4.0 to 2.4.1.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.4.0...v2.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-30 15:49:00 +00:00
dependabot-preview[bot]
3877d559e0
Bump tiptap from 1.25.0 to 1.26.0 in /webapp 
Bumps [tiptap](https://github.com/scrumpy/tiptap) from 1.25.0 to 1.26.0.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap@1.25.0...tiptap@1.26.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-30 15:48:42 +00:00
roschaefer
0e2a0af7bf feat: no primary button for unread notifications 
@Tirokk if find this better, because a primary button always wants to be
clicked.
 2019-09-30 17:24:57 +02:00
Wolfgang Huß
78b43b05a4 Next step 2019-09-30 13:34:11 +02:00
Wolfgang Huß
eb6226f42d Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1707-reporting-with-specific-information 2019-09-30 11:53:27 +02:00
Wolfgang Huß
9a4187a6af Remove update on hover and click by Roberts suggestion 2019-09-30 10:15:56 +02:00
Wolfgang Huß
e24d08f35b Follow Roberts sorting suggestion 2019-09-30 10:06:51 +02:00
Wolfgang Huß
dc0b8d69a2 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1637-notifications-self-update 2019-09-30 09:56:25 +02:00
dependabot-preview[bot]
ba22b7cca6
Bump tiptap-extensions from 1.27.0 to 1.28.0 in /webapp 
Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.27.0 to 1.28.0.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.27.0...tiptap-extensions@1.28.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-30 04:31:25 +00:00
Vasily Belolapotkov
2c705a8680 sync with master to resolve merge conflicts 2019-09-29 20:33:39 +03:00
roschaefer
57598df228 refactor: re-use @vbelolapotkov's solution 
If we make this a mixin, we can re-use the same solution for e.g. the
comment. If sb. notifies you, the browser automatically scrolls to the
comment in which you have been mentioned.
 2019-09-29 14:28:38 +02:00
roschaefer
b9c0749334 fix: scroll to top as default 
So nuxt's default scrollBehavior seems to have some kind of "scroll to
anchor" already built in. Unfortunately we cannot use it, because the
the anchor is not yet in the DOM when the scroll behavior is called.

So the justification for this change is:
1. Remove scrollBehavior from `nuxt.config.js` it's deprecated to put it
there.
2. Also *don't* use the default scrollbehavior because of the reasons
above ☝️

Instead I assume to always scroll to the top. This might be undesired
sometimes but let's keep a watchful eye and define the behavior if
needed.
 2019-09-29 14:28:38 +02:00
roschaefer
0f7bfea1b0 docs: moves storybook into webapp/README.md 
It makes much more sense to put it under the webapp's README than backend.

FYI: @mattwr18
 2019-09-29 00:15:43 +02:00
dependabot-preview[bot]
1e9bd2acc6
Bump date-fns from 2.2.1 to 2.4.0 in /webapp 
Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.2.1 to 2.4.0.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.2.1...v2.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-28 13:38:05 +00:00
Wolfgang Huß
5cdd358731 Implement click update again, because of mobile has no hover 
But I prevent multiple triggered updates for 10 seconds.
 2019-09-27 16:53:48 +02:00
Wolfgang Huß
1543aa4510 Refactored error reporting 2019-09-27 16:11:25 +02:00
Wolfgang Huß
1f8cc9ef15 Sorted notifications after concatenation by Roberts suggestion 2019-09-27 16:11:25 +02:00
Wolfgang Huß
a57d228c40 Remove update on click 2019-09-27 16:11:25 +02:00
Wolfgang Huß
01cf5d3e9d Add logic for hover and little delay for open menu if not updated 2019-09-27 16:11:25 +02:00
Wolfgang Huß
0c25b013db Followed in big parts Roberts suggestions 2019-09-27 16:11:25 +02:00
Wolfgang Huß
a667d5cd85 Update webapp/components/notifications/NotificationMenu/NotificationMenu.vue 
Changed to `NOTIFICATIONS_POLL_INTERVAL`

Co-Authored-By: Robert Schäfer <git@roschaefer.de>
 2019-09-27 16:11:25 +02:00
mattwr18
99dafcda64 Reduce complexity of notifications watcher 
- Co-authored-by: @Tirokk <wolle.huss@pjannto.com>
 2019-09-27 16:11:25 +02:00
Wolfgang Huß
7727707d49 Followed some of Roberts suggestions and a bit more 2019-09-27 16:11:25 +02:00
Wolfgang Huß
87abcf8237 Implement this.$apollo.queries.notifications.refetch() 2019-09-27 16:11:25 +02:00
Wolfgang Huß
f4c8dec6d5 Update webapp/components/notifications/NotificationMenu/NotificationMenu.vue 
Co-Authored-By: Robert Schäfer <git@roschaefer.de>
 2019-09-27 16:11:25 +02:00
Wolfgang Huß
9d884d6fdc Update webapp/components/notifications/NotificationMenu/NotificationMenu.vue 
Co-Authored-By: Robert Schäfer <git@roschaefer.de>
 2019-09-27 16:11:25 +02:00
Wolfgang Huß
21cd33bcf7 Update webapp/components/notifications/NotificationMenu/NotificationMenu.vue 
Co-Authored-By: Robert Schäfer <git@roschaefer.de>
 2019-09-27 16:11:25 +02:00
Wolfgang Huß
72011fbe27 Update webapp/components/notifications/NotificationMenu/NotificationMenu.vue 
Co-Authored-By: Robert Schäfer <git@roschaefer.de>
 2019-09-27 16:11:25 +02:00
Wolfgang Huß
597ec9d109 Update webapp/components/notifications/NotificationMenu/NotificationMenu.spec.js 
Co-Authored-By: Robert Schäfer <git@roschaefer.de>
 2019-09-27 16:11:25 +02:00
Wolfgang Huß
d1444619ab Give the test more sence 2019-09-27 16:11:25 +02:00
Wolfgang Huß
da5c63e97d Rewrite the toggleMenu call 2019-09-27 16:11:25 +02:00
Wolfgang Huß
5b6f816ae1 Update notifications menu on click 2019-09-27 16:11:25 +02:00
Wolfgang Huß
92fcaea452 Distinguish between totalNotifications and unreadNotifications 2019-09-27 16:11:25 +02:00
Wolfgang Huß
e3d6509010 Update webapp/constants/notifications.js 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-09-27 16:11:25 +02:00
Wolfgang Huß
fb41d0064d Update webapp/components/notifications/NotificationMenu/NotificationMenu.vue 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-09-27 16:11:25 +02:00
Wolfgang Huß
433a555fd4 Update webapp/components/notifications/NotificationMenu/NotificationMenu.vue 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-09-27 16:11:24 +02:00
Wolfgang Huß
ca8bb9e434 Added timing as constant 2019-09-27 16:11:24 +02:00
Wolfgang Huß
f968c12ccf Implement updating by time and add new ones to the list 2019-09-27 16:11:24 +02:00
Wolfgang Huß
73cc068469 Fix lost translation 2019-09-27 16:11:24 +02:00