IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,868 Commits 5 Branches 2 Tags
Commit Graph

2160 Commits

Author SHA1 Message Date
Wolfgang Huß
b305bc27d7 Use eyes icon to show state of decision 2019-11-11 18:02:01 +01:00
Wolfgang Huß
3d147a1cff Fix lint 'pt.json' 2019-11-11 17:53:51 +01:00
Wolfgang Huß
677039b786 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 
# Conflicts:
#	webapp/pages/moderation/index.vue
 2019-11-11 17:52:58 +01:00
Wolfgang Huß
c3f6ad0e44 Implement always show resource status 
- Rename buttons after Roberts suggestion.
 2019-11-11 16:38:48 +01:00
Wolfgang Huß
4e49dfe9e1 Add a confirm modal. 2019-11-11 14:53:19 +01:00
mattwr18
46ed623cfa
Merge pull request #2111 from Human-Connection/russian-locales 
added Russian to locales
 2019-11-11 14:38:00 +01:00
mattwr18
36722962e0
Merge pull request #1975 from Human-Connection/1974-notifications-page 
Add notifications page with All Notifications
 2019-11-11 14:29:40 +01:00
mattwr18
52bdfa7c48
Merge pull request #2073 from Human-Connection/Laod_saved_Laguage_and_select 
1931 - after successful login the saved language of the user is set
 2019-11-11 11:43:12 +01:00
mattwr18
e1cee39aab
Merge pull request #2156 from Human-Connection/dependabot/npm_and_yarn/webapp/eslint-plugin-vue-6.0.0 
build(deps-dev): bump eslint-plugin-vue from 5.2.3 to 6.0.0 in /webapp
 2019-11-11 08:54:39 +01:00
mattwr18
288787bcb9 Remove deprecated slot syntax 
- Update slot to use syntax supported after Vue 2.6
 2019-11-11 08:52:51 +01:00
mattwr18
57b0a339c6 Avoid negative margins/targeting tags 
- follow @alina-beck's PR suggestions
 2019-11-11 08:52:51 +01:00
mattwr18
f2e2c78582 Add tests for notifications index page 2019-11-11 08:52:51 +01:00
mattwr18
64e2a2a7c2 Add story for Paginate component 2019-11-11 08:52:51 +01:00
mattwr18
7d0b9861b8 Add story for AvatarMenu 2019-11-11 08:52:51 +01:00
mattwr18
49f73976b7 Fix DropdownFilter story after refactor 
- it was refactored to make reuse easier
 2019-11-11 08:52:04 +01:00
mattwr18
d56c81dc3d Add test for NotificationsTable and refactor 2019-11-11 08:52:04 +01:00
mattwr18
09e4c20bb8 Update test to findIndex instead of hard coding 
Co-authored-by: Mike Aono <aonomike@gmail.com>
 2019-11-11 08:52:04 +01:00
mattwr18
b7e39ca3db Add test for DropdownComponent 2019-11-11 08:52:04 +01:00
mattwr18
088d4a8ae5 Use verbose variables 2019-11-11 08:52:04 +01:00
mattwr18
ddb9fcdcb7 Make dropdown filter reusable 2019-11-11 08:52:04 +01:00
roschaefer
25c9b9585b Translate dropdown values on notification page 
@mattwr18 this solves the problem by 50%. If you switch the language and
click on the notifications dropdown filter, you will see the translated
labels. However, the label showing the selected value will not change,
probably because `<ds-menu>` caches the selected option 😞.
 2019-11-11 08:52:04 +01:00
roschaefer
8e129c6001 fix: update counter when notification is read 
@mattwr18 vue-apollo rocks! Taking the time to study the docs is a
rewarding investment.

My first idea was to cache the `unreadNotificationsCount` with Vuex.
But the docs of apollo even suggest to use apollo's local state as a
complete replacement of Vuex:
https://vue-apollo.netlify.com/guide/local-state.html

Then I further investigated why the updated `NOTIFIED` objects won't
update the notification counter. Turns out: They don't have an ID and
the computed property didn't fire when the notifications array would
change. I fixed both in this commit and yes, it works as expected.

No additional code required 💪
 2019-11-11 08:52:04 +01:00
roschaefer
8ca2445a25 Fix data of NotificationsTable.story.js 
@mattwr18 probably you wanted to override the `author` of the
comment/post, right? If you use the { ... desctructuring } operator,
whatever comes last takes precedence. So you probaby want to put your
override last?
 2019-11-11 08:52:04 +01:00
mattwr18
6fca753c1f Add component test for Empty.vue 2019-11-11 08:52:04 +01:00
mattwr18
1d8e328a47 Clean up 
- remove unused data variable
- avoid scoped scss
 2019-11-11 08:52:04 +01:00
mattwr18
7564908456 Refactor to follow @alina-beck suggestions 
- Update CSS
- Use design tokens where possible
- Update spec description
- Avoid scoped scss as it's more expensive
- did not change the next and back button as they weren't really visible
without the primary class
- Fix German translation
 2019-11-11 08:52:04 +01:00
mattwr18
44ed462db2 Add NotificationsTable story, refactor code 
- Use percentages for width on all columns to help with resonsiveness
- export constants from other stories to dry code out
 2019-11-11 08:52:04 +01:00
mattwr18
542647f418 Add NotificationsDropdownFilter story, refactor 
- rename incorrectly named varaibles
- use filterOptions to remove unneccessary computed routes

Co-authored-by: @alina-beck
 2019-11-11 08:52:04 +01:00
mattwr18
3ae71544d6 Add story for Empty component 
Co-authored-by: @alina-beck
 2019-11-11 08:52:04 +01:00
mattwr18
a1af4f5037 Add storybook notes 
Co-authored-by: @alina-beck
 2019-11-11 08:52:04 +01:00
mattwr18
aabaa2e637 Fix typo 
Co-authored-by: Alina Beck <alina.beck@mail.com>
 2019-11-11 08:50:35 +01:00
mattwr18
b916c9fe83 Add portuguese translations 
Co-authored-by: ppelegrin <56610168+ppelegrin@users.noreply.github.com>
 2019-11-11 08:50:35 +01:00
mattwr18
cb2cc37556 Extract components following @alina-beck suggestion 
- see https://github.com/Human-Connection/Human-Connection/pull/2075/files
 2019-11-11 08:50:35 +01:00
mattwr18
7007b1c444 Paginate notifications, reusable component w/ test 2019-11-11 08:50:35 +01:00
mattwr18
084388a21e Follow new file structure 
- avoid nested directories
 2019-11-11 08:50:35 +01:00
mattwr18
4448c12f2e Add componenet test for AvatarMenu 
Co-authored-by: mindcodemediator
<mindcodemediator@users.noreply.github.com>
Co-authored-by: Mike Aono <aonomike@gmail.com>
 2019-11-11 08:50:35 +01:00
mattwr18
d83a424513 Add styling 
- to link in NotificationMenu
- make table more mobile responsive
- remove unneccessary props

Co-authored-by: Alina Beck <alina.beck@mail.com>
 2019-11-11 08:50:35 +01:00
mattwr18
994a0b049d Extract AvatarMenu into its own component 2019-11-11 08:50:35 +01:00
mattwr18
58b1f7948c Follow @alina-beck and @Tirokk suggestions 
- following PR reviews
 2019-11-11 08:50:35 +01:00
mattwr18
e8cf51095a Add back missing translation 2019-11-11 08:50:35 +01:00
mattwr18
cf8124fb2d Clean up/add german translations 2019-11-11 08:50:35 +01:00
mattwr18
b79770469f Update notifications page 
- display more notifications by simplifying the table
- get sorting working
 2019-11-11 08:50:35 +01:00
mattwr18
7cdc12f4b9 Add notifications page with Notifications in table 
- At the moment, the notifications are displayed in a table, and have
the same functionality as the NotificationMenu where you can click on
the title of the Post and visit the Post

- Unsure about the styling, it would kind of be nice to have a more
condensed list to see more notifications per page, but still be able to
click on a row and visit the Post
 2019-11-11 08:50:35 +01:00
mattwr18
ceb77d2bb6
Merge pull request #1909 from Human-Connection/add-missing-portuguese-translations 
Add missing portuguese translation
 2019-11-11 08:49:19 +01:00
Wolfgang Huß
74bc1963f6 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-11-11 08:32:53 +01:00
Vasily Belolapotkov
dc09240c20 sync with 'master' to cleanup PR 2019-11-10 11:48:39 +03:00
Wolfgang Huß
553a3ca2cb Implement 'decide' button and functionality 2019-11-08 17:29:09 +01:00
Wolfgang Huß
c2444a5288 Changed layout 2019-11-08 16:26:46 +01:00
Wolfgang Huß
1a4ca722ca Corrected icon color related to decision status 2019-11-08 09:46:47 +01:00
Wolfgang Huß
526e4c642b Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1710-list-and-protocol-moderation 2019-11-08 08:28:47 +01:00