ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2026-01-15 09:24:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,367 Commits 101 Branches 1,536 Tags
Commit Graph

32 Commits

Author SHA1 Message Date
Wolfgang Huß
b417667d31 Rename return property of 'extractNotificationDataOfCurrentUser' 
- Renamed 'report' to 'filedReport'.
- Commented on the need of deep nested and similair properties for GQL of notifications.
 2020-04-03 15:25:07 +02:00
Wolfgang Huß
f8de595d3b Extent storybook NotificationsTable with filed report notifications 2020-04-03 13:43:42 +02:00
Wolfgang Huß
ff27a89579 Prettify notifications table 2020-04-03 09:34:15 +02:00
Wolfgang Huß
d0cf1cc185 Fix lint 2020-04-01 15:53:57 +02:00
Wolfgang Huß
a52cbe1c66 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1709-send-feedbacks-in-report-processes-second-approach 
# Conflicts:
#	backend/src/db/seed.js
#	backend/src/middleware/notifications/notificationsMiddleware.js
#	backend/src/schema/resolvers/notifications.js
#	webapp/components/NotificationsTable/NotificationsTable.spec.js
 2020-04-01 12:22:56 +02:00
roschaefer
276ea79e8f Update prettier to v2 2020-03-24 21:11:11 +01:00
Wolfgang Huß
06be781078 Fix frontend tests 2020-03-13 14:47:42 +01:00
Wolfgang Huß
3ea1348bd4 Merge master 2020-03-09 08:37:05 +01:00
Alina Beck
09dee69ee0 rename PostCard to PostTeaser 2020-02-11 10:07:16 +01:00
Wolfgang Huß
84fccdd470 Fix tests 2020-02-07 11:17:21 +01:00
Wolfgang Huß
9c3d4c1436 Change after Matts suggestions 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2020-02-07 10:10:36 +01:00
Wolfgang Huß
63f36f02b4 Clarified variable naming 2020-02-06 09:52:18 +01:00
Wolfgang Huß
0161b7f16c Implement suggestions of Matt 2020-02-05 12:50:16 +01:00
Wolfgang Huß
7eeddf2a8f Implement suggestions of Matt 2020-01-24 19:23:01 +01:00
Wolfgang Huß
58a120d3d7 Clean up 2020-01-22 15:13:13 +01:00
Wolfgang Huß
1c0d54a935 Fix lint 2020-01-22 13:34:52 +01:00
Wolfgang Huß
0bb2b905ee Add example notification for filed report to storybook 2020-01-22 13:32:54 +01:00
Wolfgang Huß
e563887022 Fix test in 'NotificationsTable.spec.js' for new 'user-teaser' component 2020-01-22 13:17:11 +01:00
Wolfgang Huß
4c6c3b8b27 Change the class 'text-notification-header' 2020-01-22 10:55:15 +01:00
Wolfgang Huß
2d73a54819 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1709-send-feedbacks-in-report-processes 
# Conflicts:
#	webapp/components/Notification/Notification.vue
#	webapp/components/NotificationsTable/NotificationsTable.vue
 2020-01-22 10:12:35 +01:00
Alina Beck
24898f5fe2 quick fix tests relying on classes of child components 
changing class names in the UserTeaser leads to tests failing for other components, like SearchableInput and NotificationsTable – I just updated the classes but long-term it would be good to find a way to not rely on implementation details of child components – maybe just test if the child component is rendered?
 2020-01-21 17:07:00 +03:00
Alina Beck
287e9ce484 remove unused trunc prop 2020-01-21 17:00:37 +03:00
Wolfgang Huß
4ca18522f1 Implement the filed report notification on the notification page 
- Get all the old tests running.
- Implement new necessary tests.
- Lint fixing.
 2020-01-20 18:03:40 +01:00
mattwr18
fdf00fc0c6 Follow @alina-beck's PR review suggestions 
- Update styling
- Avoid nested tags
- Rename components with two names
- Add story

- Co-authored-by: Alina Beck <alina.beck@mail.com>
 2020-01-20 10:04:30 +01:00
Alina Beck
77f4810ddc set up global localVue 
by setting up localVue with all required plugins (such as styleguide and vuex)
in a separate testSetup file we can avoid doing this individually in all component tests
the testSetup is executed before each test suite, so each test file gets a fresh
instance of localVue
 2019-11-20 12:31:40 +03:00
Alina Beck
4e6572a042 replace ds-icon with base-icon 2019-11-19 12:26:07 +03: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
d56c81dc3d Add test for NotificationsTable and refactor 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
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
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