Wolfgang Huß
5dfd0f9ada
Merge fixes and lint fixes
2020-03-09 09:54:43 +01:00
Wolfgang Huß
af8b479fb4
Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1709-send-feedbacks-in-report-processes-second-approach-merge-master
...
# Conflicts:
# backend/package.json
# backend/src/db/seed.js
# backend/src/middleware/notifications/notificationsMiddleware.js
# backend/src/middleware/notifications/notificationsMiddleware.spec.js
# backend/src/schema/resolvers/notifications.js
# backend/src/schema/resolvers/notifications.spec.js
# backend/yarn.lock
# cypress/integration/common/steps.js
# webapp/components/Notification/Notification.spec.js
# webapp/components/Notification/Notification.vue
# webapp/components/NotificationList/NotificationList.spec.js
# webapp/components/UserTeaser/UserTeaser.vue
# webapp/locales/de.json
# webapp/locales/en.json
# webapp/package.json
# webapp/yarn.lock
2020-03-09 09:34:49 +01:00
Wolfgang Huß
3ea1348bd4
Merge master
2020-03-09 08:37:05 +01:00
Alina Beck
ad385490bc
follow @mattwr18 PR review
...
- replace magic numbers with tokens
- remove unused name attribute
- use slot shorthand (for the slots added in this PR)
2020-02-17 10:44:52 +01:00
Alina Beck
37959d8167
refactor BaseCard to use slots and props
2020-02-11 16:10:45 +01:00
Alina Beck
1eac8ed14d
add variants to BaseCard
2020-02-11 11:17:04 +01:00
Alina Beck
6671d893e6
refactor PostCard (wip)
2020-02-11 09:20:45 +01:00
Alina Beck
cea538e2f1
refactor Notification component
2020-02-10 17:56:18 +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ß
49aec6e0b0
Fix lint
2020-02-06 12:39:08 +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ß
bef747b9a1
Implement suggestions of Matt
...
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
2020-02-05 11:05:37 +01:00
Wolfgang Huß
9a8720218f
Implement suggestions of Matt
2020-01-24 19:35:01 +01:00
Wolfgang Huß
7eeddf2a8f
Implement suggestions of Matt
2020-01-24 19:23:01 +01:00
Wolfgang Huß
1c0d54a935
Fix lint
2020-01-22 13:34:52 +01:00
Wolfgang Huß
71cf2a397a
Modify layout of notifications menu
2020-01-22 13:02:54 +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
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
Wolfgang Huß
48403471d5
Add tests in Notification.spec.js
2020-01-20 10:29:46 +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
Wolfgang Huß
35660ca073
Implemented the notifications for filling reports Notification.vue
2020-01-17 15:56:30 +01:00
Wolfgang Huß
d4e5de5eff
Approach the first time to get the new notifications in the frontend
2020-01-16 15:52:07 +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
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
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
